tagcrumbs 0.3.1 → 0.3.2

data/spec/tagcrumbs/resources/models/model_spec.rb

@@ -1,6 +1,11 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-describe Tagcrumbs::Model do
+class Tagcrumbs::ValidationTestModel < Tagcrumbs::Model
+  writeable_attributes :one, :two
+
+end
+
+describe Tagcrumbs::Model do  
   before(:each) do
     @model = Tagcrumbs::Model.new
   end
@@ -22,6 +27,18 @@ describe Tagcrumbs::Model do
   
   
   describe "(Accessors)" do
-    
+    it "should get error from document" do
+      Tagcrumbs.supported_formats.keys.each do |format|      
+        model = Tagcrumbs::ValidationTestModel.new
+ 
+        model.errors_from_document(external_fixture_file('/validation_errors', format), format)
+
+        model.should_not be_valid
+
+        model.errors.size.should == 2
+        model.errors[0].should == "Latitude is not on this planet"
+        model.errors[1].should == "Name is already taken"
+      end
+    end
   end
-end
+end

data/spec/tagcrumbs/resources/models/paragraph_spec.rb

@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe Tagcrumbs::Paragraph do
+  it "should create from a document" do
+    Tagcrumbs.supported_formats.keys.each do |format|
+      paragraph = Tagcrumbs::Paragraph.new_from_document(external_fixture_file("paragraph", format), format)
+    
+      paragraph.resource_url.should be_blank
+      paragraph.new_record.should be_false
+      paragraph.loaded.should be_true
+      
+      paragraph.heading.should == "HEADING"
+      
+      paragraph.subparagraphs.should be_an_instance_of(Tagcrumbs::Collection)
+      paragraph.subparagraphs.size.should == 2
+      
+      paragraph.subparagraphs[0].should == "SUBPARAGRAPH 1"
+      paragraph.subparagraphs[1].should == "SUBPARAGRAPH 2"
+    end
+  end
+end

data/spec/tagcrumbs/resources/models/picture_spec.rb

@@ -3,31 +3,23 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 describe Tagcrumbs::Picture do
   it "should create from a document" do
     Tagcrumbs.supported_formats.keys.each do |format|
-      picture = Tagcrumbs::Picture.new_from_document(fixture_file("picture", format), format)
+      picture = Tagcrumbs::Picture.new_from_document(external_fixture_file("picture", format), format)
     
       picture.class.should == Tagcrumbs::Picture
       picture.loaded?.should be_true
       picture.resource_url.should == tagcrumbs_url('/sascha/profile/picture', format)
-      picture.url.should == "URL"
-      picture.small_thumbnail_url.should == "SMALL THUMBNAIL URL"
-      picture.medium_thumbnail_url.should == "MEDIUM THUMBNAIL URL"
+      picture.large_thumbnail_url.should == "http://s3.amazonaws.com/tagcrumbs_attachments_production/users/pictures/sascha/large.jpg?1246269353"
+      picture.small_thumbnail_url.should == "http://s3.amazonaws.com/tagcrumbs_attachments_production/users/pictures/sascha/small.jpg?1246269353"
+      picture.medium_thumbnail_url.should == "http://s3.amazonaws.com/tagcrumbs_attachments_production/users/pictures/sascha/medium.jpg?1246269353"
       picture.content_type.should == "image/jpeg"
+      picture.created_at.should be_an_instance_of(Time)
+      picture.updated_at.should be_an_instance_of(Time)
     
-      picture.profile.resource_url.should == tagcrumbs_url('/sascha/profile', format)
-      picture.profile.new_record.should be_false
-      picture.profile.loaded.should be_true
-      
-      picture.profile.fullname.should == "FULLNAME"
-      picture.profile.description.should == "DESCRIPTION"
-      picture.profile.about.should == "ABOUT"
-      picture.profile.created_at.should be_an_instance_of(Time)
-      picture.profile.updated_at.should be_an_instance_of(Time)
-          
       # has one associations
-      picture.profile.user.class.should == Tagcrumbs::User
-      picture.profile.user.loaded?.should be_true
-      picture.profile.user.resource_url.should == tagcrumbs_url('/sascha', format)
-      picture.profile.user.username.should == 'sascha'
+      picture.user.class.should == Tagcrumbs::User
+      picture.user.loaded?.should be_true
+      picture.user.resource_url.should == tagcrumbs_url('/sascha', format)
+      picture.user.username.should == 'sascha'
     end
   end
   
@@ -35,8 +27,8 @@ describe Tagcrumbs::Picture do
     @picture = Tagcrumbs::Picture.new
     @picture.get_file(File.dirname(__FILE__) + '/../../../fixtures/picture.png')
     
-    @picture.picture_file[:filename].should == 'picture.png'
-    @picture.picture_file[:mime_type].should == 'image/png'
-    @picture.picture_file[:content].should be_present
+    @picture.file[:filename].should == 'picture.png'
+    @picture.file[:mime_type].should == 'image/png'
+    @picture.file[:content].should be_present
   end
 end

data/spec/tagcrumbs/resources/models/place_spec.rb

@@ -2,11 +2,11 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe Tagcrumbs::Place do
   it "should search for a place" do
-    stub_get('/index', 'root.xml', [200])
-    stub_get('/places/search.xml?for=city&q=stuttgart', 'placemarks.xml', [200]) # not correct result, but doesn't matter
+    stub_get('/index', 'root', :xml, [200])
+    stub_get('/places/search.xml?for=city&q=stuttgart', 'placemarks', :xml, [200]) # not correct result, but doesn't matter
     
     places = Tagcrumbs::Place.search('stuttgart', :for => 'city')
     
-    places.should be_an_instance_of(Tagcrumbs::Array)
+    places.should be_an_instance_of(Tagcrumbs::Collection)
   end
 end

data/spec/tagcrumbs/resources/models/placemark_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 describe Tagcrumbs::Placemark do
   it "should create from a document" do
     Tagcrumbs.supported_formats.keys.each do |format|
-      placemark = Tagcrumbs::Placemark.new_from_document(fixture_file("placemark", format), format)
+      placemark = Tagcrumbs::Placemark.new_from_document(external_fixture_file("placemark", format), format)
     
       placemark.resource_url.should == tagcrumbs_url('/sascha/placemarks/placemark-name', format)
       placemark.new_record.should be_false
@@ -31,24 +31,26 @@ describe Tagcrumbs::Placemark do
       placemark.address.loaded?.should be_true
       placemark.address.resource_url.should == tagcrumbs_url('/sascha/placemarks/placemark-name/address', format)
       
-      # has many associations
-      placemark.recommendations.class.should == Tagcrumbs::Array
-      placemark.recommendations.loaded?.should be_false
-      placemark.recommendations.resource_url.should == tagcrumbs_url('/sascha/placemarks/placemark-name/recommendations', format)
+      placemark.application.class.should == Tagcrumbs::Application
+      placemark.application.loaded?.should be_true
+      placemark.application.name.should == "Tagcrumbs Gem"
+      placemark.application.url.should == "http://www.tagcrumbs.com"
       
-      placemark.comments.class.should == Tagcrumbs::Array
+      # has many associations
+
+      placemark.comments.class.should == Tagcrumbs::Collection
       placemark.comments.loaded?.should be_false
       placemark.comments.resource_url.should == tagcrumbs_url('/sascha/placemarks/placemark-name/comments', format)
       
-      placemark.links.class.should == Tagcrumbs::Array
+      placemark.links.class.should == Tagcrumbs::Collection
       placemark.links.loaded?.should be_false
       placemark.links.resource_url.should == tagcrumbs_url('/sascha/placemarks/placemark-name/links', format)
     end
   end
   
   it "should load suggestions" do
-    stub_get('/you', 'user.xml', [200])
-    stub_get('/sascha/tagcrumbs/suggestions.xml?latitude=10&longitude=9', 'suggestions.xml', [200])
+    stub_get('/you', 'user', :xml, [200])
+    stub_get('/sascha/tagcrumbs/suggestions.xml?latitude=10&longitude=9', 'suggestions', :xml, [200])
     
     placemark = Tagcrumbs::Placemark.new(:latitude => 10, :longitude => 9)
     suggestions = placemark.suggestions

data/spec/tagcrumbs/resources/models/profile_link_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 describe Tagcrumbs::ProfileLink do
   it "should create from a document" do
     Tagcrumbs.supported_formats.keys.each do |format|
-      profile_link = Tagcrumbs::ProfileLink.new_from_document(fixture_file("profile_link", format), format)
+      profile_link = Tagcrumbs::ProfileLink.new_from_document(external_fixture_file("profile_link", format), format)
     
       profile_link.resource_url.should == tagcrumbs_url('/sascha/profile/links/1000042', format)
       profile_link.new_record.should be_false
@@ -11,18 +11,12 @@ describe Tagcrumbs::ProfileLink do
       
       profile_link.url.should == "http://www.test1.de"
       profile_link.link_type.should == "Homepage"
-      
-      profile_link.profile.fullname.should == "FULLNAME"
-      profile_link.profile.description.should == "DESCRIPTION"
-      profile_link.profile.about.should == "ABOUT"
-      profile_link.profile.created_at.should be_an_instance_of(Time)
-      profile_link.profile.updated_at.should be_an_instance_of(Time)
-          
+
       # has one associations
-      profile_link.profile.user.class.should == Tagcrumbs::User
-      profile_link.profile.user.loaded?.should be_true
-      profile_link.profile.user.resource_url.should == tagcrumbs_url('/sascha', format)
-      profile_link.profile.user.username.should == 'sascha'
+      profile_link.user.class.should == Tagcrumbs::User
+      profile_link.user.loaded?.should be_true
+      profile_link.user.resource_url.should == tagcrumbs_url('/sascha', format)
+      profile_link.user.username.should == 'sascha'
       
     end
   end

data/spec/tagcrumbs/resources/models/profile_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 describe Tagcrumbs::Profile do
   it "should create from a document" do
     Tagcrumbs.supported_formats.keys.each do |format|
-      profile = Tagcrumbs::Profile.new_from_document(fixture_file("profile", format), format)
+      profile = Tagcrumbs::Profile.new_from_document(external_fixture_file("profile", format), format)
     
       profile.resource_url.should == tagcrumbs_url('/sascha/profile', format)
       profile.new_record.should be_false
@@ -21,19 +21,12 @@ describe Tagcrumbs::Profile do
       profile.user.resource_url.should == tagcrumbs_url('/sascha', format)
       profile.user.username.should == 'sascha'
       
-      profile.picture.class.should == Tagcrumbs::Picture
-      profile.picture.loaded?.should be_true
-      profile.picture.resource_url.should == tagcrumbs_url('/sascha/profile/picture', format)
-      profile.picture.url.should == "URL"
-      profile.picture.small_thumbnail_url.should == "SMALL THUMBNAIL URL"
-      profile.picture.medium_thumbnail_url.should == "MEDIUM THUMBNAIL URL"
-      profile.picture.content_type.should == "image/jpeg"
-      
-      profile.picture.profile.class.should == Tagcrumbs::Profile
-      profile.picture.profile.loaded?.should be_false
+      profile.user.picture.class.should == Tagcrumbs::Picture
+      profile.user.picture.loaded?.should be_false
+
       
       # has many associations
-      profile.profile_links.class.should == Tagcrumbs::Array
+      profile.profile_links.class.should == Tagcrumbs::Collection
       profile.profile_links.loaded?.should be_true
       profile.profile_links.size.should == 2
       profile.profile_links[0].url.should == 'http://www.test1.de'

data/spec/tagcrumbs/resources/models/root_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 describe Tagcrumbs::Root do
   it "should create from a document" do
     Tagcrumbs.supported_formats.keys.each do |format|
-      root = Tagcrumbs::Root.new_from_document(fixture_file("root", format), format)
+      root = Tagcrumbs::Root.new_from_document(external_fixture_file("root", format), format)
     
       root.resource_url.should == tagcrumbs_url("/?format=#{format}")
       root.new_record.should be_false
@@ -14,44 +14,40 @@ describe Tagcrumbs::Root do
       root.you.loaded?.should be_false
       root.you.resource_url.should == tagcrumbs_url('/you', format)
       
-      root.location.class.should == Tagcrumbs::Location
-      root.location.loaded?.should be_false
-      root.location.resource_url.should == tagcrumbs_url('/location', format)
-      
+
       # has many
-      root.tagcrumbs.class.should == Tagcrumbs::Array
+      root.tagcrumbs.class.should == Tagcrumbs::Collection
       root.tagcrumbs.loaded?.should be_false
       root.tagcrumbs.resource_url.should == tagcrumbs_url('/tagcrumbs', format)
       
-      root.nearby_tagcrumbs.class.should == Tagcrumbs::Array
-      root.nearby_tagcrumbs.loaded?.should be_false
-      root.nearby_tagcrumbs.resource_url.should == tagcrumbs_url('/nearby', format)
-      
-      root.countries.class.should == Tagcrumbs::Array
+      root.countries.class.should == Tagcrumbs::Collection
       root.countries.loaded?.should be_false
       root.countries.resource_url.should == tagcrumbs_url('/places', format)
       
-      root.popular_countries.class.should == Tagcrumbs::Array
+      root.popular_countries.class.should == Tagcrumbs::Collection
       root.popular_countries.loaded?.should be_false
       root.popular_countries.resource_url.should == tagcrumbs_url('/popular/places', format)
       
-      root.place_search.class.should == Tagcrumbs::Array
+      root.place_search.class.should == Tagcrumbs::Collection
       root.place_search.loaded?.should be_false
       root.place_search.resource_url.should == tagcrumbs_url('/places/search', format)
       
       
-      root.tags.class.should == Tagcrumbs::Array
+      root.tags.class.should == Tagcrumbs::Collection
       root.tags.loaded?.should be_false
       root.tags.resource_url.should == tagcrumbs_url('/tags', format)
       
-      root.users.class.should == Tagcrumbs::Array
+      root.users.class.should == Tagcrumbs::Collection
       root.users.loaded?.should be_false
       root.users.resource_url.should == tagcrumbs_url('/users', format)
+
+      root.privacy_policy.class.should == Tagcrumbs::Collection
+      root.privacy_policy.loaded?.should be_false
+      root.privacy_policy.resource_url.should == tagcrumbs_url('/privacy', format)
       
-      root.search.class.should == Tagcrumbs::Array
-      root.search.loaded?.should be_false
-      root.search.resource_url.should == tagcrumbs_url('/search', format)
-      
+      root.terms_and_conditions.class.should == Tagcrumbs::Collection
+      root.terms_and_conditions.loaded?.should be_false
+      root.terms_and_conditions.resource_url.should == tagcrumbs_url('/terms', format)
     end
   end
 end

data/spec/tagcrumbs/resources/models/settings_spec.rb

@@ -3,16 +3,18 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 describe Tagcrumbs::Settings do
   it "should create from a document" do
     Tagcrumbs.supported_formats.keys.each do |format|
-      settings = Tagcrumbs::Settings.new_from_document(fixture_file("settings", format), format)
+      settings = Tagcrumbs::Settings.new_from_document(external_fixture_file("settings", format), format)
     
       settings.resource_url.should == tagcrumbs_url('/sascha/settings', format)
       settings.new_record.should be_false
       settings.loaded.should be_true
       
       settings.locale.should == 'de-DE'
+      settings.timezone.should == 'Berlin'
       settings.unit_system.should == 'imperial'
       settings.notification_recommendation.should be_true
       settings.notification_fan.should be_true
+      settings.notification_subscription.should be_true
       settings.newsletter.should be_false
       settings.facebook_new_placemark_feed.should be_true
       settings.facebook_new_comment_feed.should be_true

data/spec/tagcrumbs/resources/models/state_spec.rb

@@ -3,24 +3,21 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 describe Tagcrumbs::State do
   it "should create from a document" do
     Tagcrumbs.supported_formats.keys.each do |format|
-      state = Tagcrumbs::State.new_from_document(fixture_file("state", format), format)
+      state = Tagcrumbs::State.new_from_document(external_fixture_file("state", format), format)
     
       state.resource_url.should == tagcrumbs_url('/places/germany/states/land-baden-w%C3%BCrttemberg', format)
       state.new_record.should be_false
       state.loaded.should be_true
       
       state.name.should == 'Land Baden-Württemberg'
-      state.permalink.should == 'land-baden-württemberg'
       
       state.country.name.should == 'Deutschland'
-
-      state.country.permalink.should == 'germany'
       
       state.country.geoname.class.should == Tagcrumbs::Geoname
       state.country.geoname.loaded?.should be_true
       state.country.geoname.resource_url.should == "http://www.geonames.org/2921044"
 
-      state.country.states.class.should == Tagcrumbs::Array
+      state.country.states.class.should == Tagcrumbs::Collection
       state.country.states.loaded?.should be_false
       state.country.states.resource_url.should == tagcrumbs_url('/places/germany/states', format)
 

data/spec/tagcrumbs/resources/models/subscription_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 describe Tagcrumbs::Subscription do
   it "should create from a document" do
     Tagcrumbs.supported_formats.keys.each do |format|
-      subscription = Tagcrumbs::Subscription.new_from_document(fixture_file("subscription", format), format)
+      subscription = Tagcrumbs::Subscription.new_from_document(external_fixture_file("subscription", format), format)
     
       subscription.resource_url.should == tagcrumbs_url('/sascha/subscriptions/1', format)
       subscription.new_record.should be_false

data/spec/tagcrumbs/resources/models/suggestions_spec.rb

@@ -3,25 +3,25 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 describe Tagcrumbs::Suggestions do
   it "should create from a document" do
     Tagcrumbs.supported_formats.keys.each do |format|
-      suggestions = Tagcrumbs::Suggestions.new_from_document(fixture_file("suggestions", format), format)
+      suggestions = Tagcrumbs::Suggestions.new_from_document(external_fixture_file("suggestions", format), format)
     
       suggestions.resource_url.should == tagcrumbs_url('/sascha/tagcrumbs/suggestions', format)
       suggestions.new_record.should be_false
       suggestions.loaded.should be_true
       
-      suggestions.cities.class.should == Tagcrumbs::Array
-      suggestions.cities.size.should == 21
-      suggestions.cities[0].name == 'Laim'
+      suggestions.cities.class.should == Tagcrumbs::Collection
+      suggestions.cities.size.should == 3
+      suggestions.cities[0].name.should == 'Hohenhaslach'
       
-      suggestions.popular_tags.class.should == Tagcrumbs::Array
+      suggestions.popular_tags.class.should == Tagcrumbs::Collection
       suggestions.popular_tags.size.should == 2
       suggestions.popular_tags[0].name.should == 'tag1'
       
-      suggestions.recommended_tags.class.should == Tagcrumbs::Array
+      suggestions.recommended_tags.class.should == Tagcrumbs::Collection
       suggestions.recommended_tags.size.should == 2
       suggestions.recommended_tags[0].name.should == 'tag3'
       
-      suggestions.names.class.should == Tagcrumbs::Array
+      suggestions.names.class.should == Tagcrumbs::Collection
       suggestions.names.size.should == 3
       suggestions.names[0] == 'name1'
       suggestions.names[1] == 'name2'

data/spec/tagcrumbs/resources/models/tag_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 describe Tagcrumbs::Tag do
   it "should create from a document" do
     Tagcrumbs.supported_formats.keys.each do |format|
-      tag = Tagcrumbs::Tag.new_from_document(fixture_file("tag", format), format)
+      tag = Tagcrumbs::Tag.new_from_document(external_fixture_file("tag", format), format)
     
       tag.resource_url.should == tagcrumbs_url('/tags/tag1', format)
       tag.new_record.should be_false

data/spec/tagcrumbs/resources/models/tagcrumb_spec.rb

@@ -2,20 +2,12 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe Tagcrumbs::Tagcrumb do
   it "should find Tagcrumbs" do
-    stub_get('/index', 'root.xml', [200])
-    stub_get("/tagcrumbs.xml?tagcrumb_type=Favorite", 'placemarks.xml', [200])
+    stub_get('/index', 'root', :xml, [200])
+    stub_get("/tagcrumbs.xml?tagcrumb_type=Favorite", 'placemarks', :xml, [200])
 
     placemarks = Tagcrumbs::Tagcrumb.find(:tagcrumb_type => :favorite)
     
-    placemarks.should be_an_instance_of(Tagcrumbs::Array)
+    placemarks.should be_an_instance_of(Tagcrumbs::Collection)
   end
   
-  it "should search Tagcrumbs" do
-    stub_get('/index', 'root.xml', [200])
-    stub_get('/search.xml?q=test', 'placemarks.xml', [200])
-    
-    placemarks = Tagcrumbs::Tagcrumb.search(:q => 'test')
-    
-    placemarks.should be_an_instance_of(Tagcrumbs::Array)
-  end
 end

data/spec/tagcrumbs/resources/models/user_recommendation_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 describe Tagcrumbs::UserRecommendation do
   it "should create from a document" do
     Tagcrumbs.supported_formats.keys.each do |format|
-      user_recommendation = Tagcrumbs::UserRecommendation.new_from_document(fixture_file("user_recommendation", format), format)
+      user_recommendation = Tagcrumbs::UserRecommendation.new_from_document(external_fixture_file("user_recommendation", format), format)
     
       user_recommendation.resource_url.should == tagcrumbs_url('/sascha/recommendations/70', format)
       user_recommendation.new_record.should be_false

data/spec/tagcrumbs/resources/models/user_spec.rb

@@ -3,13 +3,14 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 describe Tagcrumbs::User do
   it "should create from a document" do
     Tagcrumbs.supported_formats.keys.each do |format|
-      user = Tagcrumbs::User.new_from_document(fixture_file("user", format), format)
+      user = Tagcrumbs::User.new_from_document(external_fixture_file("user", format), format)
     
       user.resource_url.should == tagcrumbs_url('/sascha', format)
       user.new_record.should be_false
       user.loaded.should be_true
     
       user.username.should == 'sascha'
+      user.facebook_uid.should == 1234
       user.created_at.should be_an_instance_of(Time)
     
       # has one associations
@@ -30,97 +31,104 @@ describe Tagcrumbs::User do
       user.suggestions.resource_url.should == tagcrumbs_url('/sascha/tagcrumbs/suggestions', format)
     
       user.picture.class.should == Tagcrumbs::Picture
-      user.picture.loaded?.should be_false
+      user.picture.loaded?.should be_true
       user.picture.resource_url.should == tagcrumbs_url('/sascha/profile/picture', format)
+      
+      user.picture.large_thumbnail_url.should == "http://s3.amazonaws.com/tagcrumbs_attachments_production/users/pictures/sascha/large.jpg?1246269353"
+      user.picture.small_thumbnail_url.should == "http://s3.amazonaws.com/tagcrumbs_attachments_production/users/pictures/sascha/small.jpg?1246269353"
+      user.picture.medium_thumbnail_url.should == "http://s3.amazonaws.com/tagcrumbs_attachments_production/users/pictures/sascha/medium.jpg?1246269353"
+      user.picture.content_type.should == "image/jpeg"
+      user.picture.created_at.should be_an_instance_of(Time)
+      user.picture.updated_at.should be_an_instance_of(Time)
     
       # has many associations
-      user.filters.class.should == Tagcrumbs::Array 
+      user.filters.class.should == Tagcrumbs::Collection 
       user.filters.loaded?.should be_false
       user.filters.resource_url.should == tagcrumbs_url('/sascha/filters', format)
     
-      user.comments.class.should == Tagcrumbs::Array 
+      user.comments.class.should == Tagcrumbs::Collection 
       user.comments.loaded?.should be_false
       user.comments.resource_url.should == tagcrumbs_url('/sascha/comments', format)
     
-      user.recommendations.class.should == Tagcrumbs::Array 
+      user.recommendations.class.should == Tagcrumbs::Collection 
       user.recommendations.loaded?.should be_false
       user.recommendations.resource_url.should == tagcrumbs_url('/sascha/recommendations', format)
     
-      user.received_recommendations.class.should == Tagcrumbs::Array 
+      user.received_recommendations.class.should == Tagcrumbs::Collection 
       user.received_recommendations.loaded?.should be_false
-      user.received_recommendations.resource_url.should == tagcrumbs_url('/sascha/recommendations/received', format)
+      user.received_recommendations.resource_url.should == tagcrumbs_url('/sascha/received_recommendations', format)
     
-      user.profile_links.class.should == Tagcrumbs::Array 
+      user.profile_links.class.should == Tagcrumbs::Collection 
       user.profile_links.loaded?.should be_false
       user.profile_links.resource_url.should == tagcrumbs_url('/sascha/profile/links', format)
     
-      user.tagcrumbs.class.should == Tagcrumbs::Array 
+      user.tagcrumbs.class.should == Tagcrumbs::Collection 
       user.tagcrumbs.loaded?.should be_false
       user.tagcrumbs.resource_url.should == tagcrumbs_url('/sascha/tagcrumbs', format)
     
-      user.placemarks.class.should == Tagcrumbs::Array 
+      user.placemarks.class.should == Tagcrumbs::Collection 
       user.placemarks.loaded?.should be_false
       user.placemarks.resource_url.should == tagcrumbs_url('/sascha/placemarks', format)
     
-      user.favorites.class.should == Tagcrumbs::Array 
+      user.favorites.class.should == Tagcrumbs::Collection 
       user.favorites.loaded?.should be_false
       user.favorites.resource_url.should == tagcrumbs_url('/sascha/favorites', format)
     
-      user.activities.class.should == Tagcrumbs::Array 
+      user.activities.class.should == Tagcrumbs::Collection 
       user.activities.loaded?.should be_false
       user.activities.resource_url.should == tagcrumbs_url('/sascha/activities', format)
     
-      user.tags.class.should == Tagcrumbs::Array 
+      user.tags.class.should == Tagcrumbs::Collection 
       user.tags.loaded?.should be_false
       user.tags.resource_url.should == tagcrumbs_url('/sascha/tags', format)
     
-      user.places.class.should == Tagcrumbs::Array 
+      user.places.class.should == Tagcrumbs::Collection 
       user.places.loaded?.should be_false
       user.places.resource_url.should == tagcrumbs_url('/sascha/places', format)
     
-      user.friendships.class.should == Tagcrumbs::Array 
+      user.friendships.class.should == Tagcrumbs::Collection 
       user.friendships.loaded?.should be_false
       user.friendships.resource_url.should == tagcrumbs_url('/sascha/friends', format)
     
-      user.fanships.class.should == Tagcrumbs::Array 
+      user.fanships.class.should == Tagcrumbs::Collection 
       user.fanships.loaded?.should be_false
       user.fanships.resource_url.should == tagcrumbs_url('/sascha/fans', format)
     
-      user.tagcrumbs_friends.class.should == Tagcrumbs::Array 
+      user.tagcrumbs_friends.class.should == Tagcrumbs::Collection 
       user.tagcrumbs_friends.loaded?.should be_false
       user.tagcrumbs_friends.resource_url.should == tagcrumbs_url('/sascha/friends/tagcrumbs', format)
     
-      user.tagcrumbs_fans.class.should == Tagcrumbs::Array 
+      user.tagcrumbs_fans.class.should == Tagcrumbs::Collection 
       user.tagcrumbs_fans.loaded?.should be_false
       user.tagcrumbs_fans.resource_url.should == tagcrumbs_url('/sascha/fans/tagcrumbs', format)
     end   
   end
   
   it "should search users" do
-    stub_get('/index', 'root.xml', [200])
-    stub_get('/users.xml?u=sascha', 'placemarks.xml', [200]) # not correct result, but doesn't matter
+    stub_get('/index', 'root', :xml, [200])
+    stub_get('/users.xml?q=sascha', 'placemarks', :xml, [200]) # not correct result, but doesn't matter
 
-    users = Tagcrumbs::User.search('sascha')
+    users = Tagcrumbs::User.search(:q => 'sascha')
 
-    users.should be_an_instance_of(Tagcrumbs::Array)
+    users.should be_an_instance_of(Tagcrumbs::Collection)
   end
   
   it "should find by username" do
-    stub_get('/peter', 'user.xml', [200])
+    stub_get('/peter', 'user', :xml, [200])
     
     Tagcrumbs::User.find_by_username('peter')
   end
   
   it "should find the friendship with another user" do
-    stub_get('/you', 'user.xml', [200])
-    stub_get('/sascha/friends/peter', 'friendship.xml', [200])
+    stub_get('/you', 'user', :xml, [200])
+    stub_get('/sascha/friends/peter', 'friendship', :xml, [200])
     
     Tagcrumbs.current_user.friendship_with('peter')
   end
   
   it "should find the fanship with another user" do
-    stub_get('/you', 'user.xml', [200])
-    stub_get('/sascha/fans/peter', 'fanship.xml', [200])
+    stub_get('/you', 'user', :xml, [200])
+    stub_get('/sascha/fans/peter', 'fanship', :xml, [200])
     
     Tagcrumbs.current_user.fanship_with('peter')
   end