nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix data conversion, fixture generation in publicscontroller

Browse source
This commit is contained in:
Raphael 2011-01-26 18:39:09 -08:00
parent b67aca0ffc
commit f892a00b99
5 changed files with 7 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -21,6 +21,7 @@ public/stylesheets/ui.css
public/stylesheets/mobile.css public/stylesheets/mobile.css
public/diaspora public/diaspora
spec/fixtures/*.yml spec/fixtures/*.yml
spec/fixtures/*.fixture.*
# Uploded files and local files # Uploded files and local files
public/uploads/* public/uploads/*

7
lib/data_conversion/import_to_mysql.rb
View file

@ -60,7 +60,12 @@ module DataConversion
log "Importing users to main table..." log "Importing users to main table..."
User.connection.execute <<-SQL User.connection.execute <<-SQL
INSERT INTO users INSERT INTO users
SELECT mongo_users.* from mongo_users SELECT mongo_users.*, 'email', mongo_users.email from mongo_users
SQL
User.connection.execute <<-SQL
UPDATE users
SET users.invitation_service = NULL, users.invitation_identifier = NULL
WHERE users.invitation_token IS NULL AND users.mongo_id IS NOT NULL
SQL SQL
log "Imported #{User.count} users." log "Imported #{User.count} users."
end end

62
spec/fixtures/hcard.fixture.html vendored
View file

@ -1,62 +0,0 @@
<div id='content'>
<h1>Robert12074e3 Grimm1009eba</h1>
<div id='content_inner'>
<div class='entity_profile vcard author' id='i'>
<h2>User profile</h2>
<dl class='entity_nickname'>
<dt>Nickname</dt>
<dd>
<a class='nickname url uid' href='http://google-1266a2d.com/' rel='me'>Robert12074e3 Grimm1009eba</a>
</dd>
</dl>
<dl class='entity_given_name'>
<dt>First name</dt>
<dd>
<span class='given_name'>Robert12074e3</span>
</dd>
</dl>
<dl class='entity_family_name'>
<dt>Family name</dt>
<dd>
<span class='family_name'>Grimm1009eba</span>
</dd>
</dl>
<dl class='entity_fn'>
<dt>Full name</dt>
<dd>
<span class='fn'>Robert12074e3 Grimm1009eba</span>
</dd>
</dl>
<dl class='entity_url'>
<dt>URL</dt>
<dd>
<a class='url' href='http://google-1266a2d.com/' id='pod_location' rel='me'>http://google-1266a2d.com/</a>
</dd>
</dl>
<dl class='entity_photo'>
<dt>Photo</dt>
<dd>
<img class='photo avatar' height='300px' src='/images/user/default.png' width='300px'>
</dd>
</dl>
<dl class='entity_photo_medium'>
<dt>Photo</dt>
<dd>
<img class='photo avatar' height='100px' src='/images/user/default.png' width='100px'>
</dd>
</dl>
<dl class='entity_photo_small'>
<dt>Photo</dt>
<dd>
<img class='photo avatar' height='50px' src='/images/user/default.png' width='50px'>
</dd>
</dl>
<dl class='entity_searchable'>
<dt>Searchable</dt>
<dd>
<span class='searchable'>true</span>
</dd>
</dl>
</div>
</div>
</div>

9
spec/fixtures/host-meta.fixture.html vendored
View file

@ -1,9 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'
xmlns:hm='http://host-meta.net/xrd/1.0'>
<hm:Host>example.org</hm:Host>
<Link rel='lrdd'
template='http://example.org/webfinger?q={uri}'>
<Title>Resource Descriptor</Title>
</Link>
</XRD>

18
spec/fixtures/webfinger.fixture.html vendored
View file

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
<Subject>acct:alice@example.org</Subject>
<Alias>"http://google-1266a2d.com/"</Alias>
<Link rel="http://microformats.org/profile/hcard" type="text/html" href="http://google-1266a2d.com/hcard/users/677146a674670091"/>
<Link rel="http://joindiaspora.com/seed_location" type = 'text/html' href="http://google-1266a2d.com/"/>
<Link rel="http://joindiaspora.com/guid" type = 'text/html' href="677146a674670091"/>
<Link rel="http://schemas.google.com/g/2010#updates-from" type="application/atom+xml" href="http://google-1266a2d.com/public/alice.atom"/>
<Link rel="diaspora-public-key" type = 'RSA' href="LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JR0pBb0dCQU0xWWlZ
UDdkMzVqY0FwcUtTNU1BeWFPQkxjOUpNQkxzYkljeVFhNWU4WktXcGIxUDkz
RnB4b1gKVmxuZ0t0L2dzMEZwUHp2eCtJdTFldWR0SGEwUUZxV0dHMmN6SExE
cHJWajRNNjd2b1hTQVhrc1duUHUzOUs3RgpvaXFENnZGOXZpdkZ3aXJ6ZG9M
YktmU2ovdjNDb0FEZWwzeXlVYksvL0FCNyt5MmRSYTAxQWdNQkFBRT0KLS0t
LS1FTkQgUlNBIFBVQkxJQyBLRVktLS0tLQo=
"/>
</XRD>