tagcrumbs 0.3.1 → 0.3.2

data/lib/tagcrumbs/resources/models/profile.rb

@@ -9,7 +9,6 @@ module Tagcrumbs
     
     has_one :user
     has_one :city, :modifiable => true
-    has_one :picture
     
     has_many :profile_links
   end

data/lib/tagcrumbs/resources/models/profile_link.rb

@@ -7,6 +7,6 @@ module Tagcrumbs
     writeable_attributes :url, :link_type
     readable_attributes :created_at, :updated_at
 
-    has_one :profile
+    has_one :user
   end
 end

data/lib/tagcrumbs/resources/models/root.rb

@@ -3,17 +3,17 @@ module Tagcrumbs
   # It is used as the starting point for many other queries.
   class Root < Model
     has_one :you
-    has_one :location
     
     has_many :tagcrumbs
-    has_many :nearby_tagcrumbs
     has_many :countries
     
     has_many :popular_countries
     has_many :tags
     has_many :users
     
-    has_many :search
     has_many :place_search
+    
+    has_many :privacy_policy
+    has_many :terms_and_conditions
   end
 end

data/lib/tagcrumbs/resources/models/settings.rb

@@ -4,7 +4,8 @@ module Tagcrumbs
     can_be :updated
     
     readable_attributes :created_at, :updated_at 
-    writeable_attributes :locale, :unit_system, :notification_fan, :notification_recommendation, :newsletter, :facebook_new_placemark_feed, 
+    writeable_attributes :locale, :unit_system, :notification_fan, :notification_recommendation, :notification_subscription, 
+                         :timezone, :newsletter, :facebook_new_placemark_feed, 
                          :facebook_new_favorite_feed, :facebook_new_comment_feed
     
     

data/lib/tagcrumbs/resources/models/tagcrumb.rb

@@ -9,24 +9,16 @@ module Tagcrumbs
                              :tags, # comma separates tag list
                              :tagcrumb_type, # Placemarks, Favorite or both?
                              :city, :state, :country, :middle_of_nowhere, # filter by the place hierarchy
-                             :within, # within a certain radius
-                             :latitude, :longitude, # per default within is the current location, can be overwritten with latitude and longitude
+                             :range, # within a certain radius
+                             :latitude, :longitude, # per default range refers to the current location, can be overwritten with latitude and longitude
                              :bbox, # everything between a bounding box
                              :since, :until, # filter by time
                              :per_page, :page, :sort, :order # filter options
                             )
 
-      Array.load(Tagcrumbs.root.tagcrumbs_url, typecast_and_validate_query_parameters(args))
+      Collection.load(Tagcrumbs.root.tagcrumbs_url, typecast_and_validate_query_parameters(args))
     end
-    
-    # Use a fulltext search to find Tagcrumbs.
-    # This is different from "finding" by filter criteria
-    def self.search(args={})
-      args.assert_valid_keys(:q, :from, :l, :w, :page, :per_page)
-      
-      Array.load(Tagcrumbs.root.search_url, typecast_and_validate_query_parameters(args))
-    end
-    
+        
     
     def self.typecast_and_validate_query_parameters(args)
       query_args = {}

data/lib/tagcrumbs/resources/models/user.rb

@@ -1,13 +1,19 @@
 module Tagcrumbs
   # The main actor in the webservice.
   class User < Model
-    readable_attributes :username, :created_at, :updated_at
+    can_be :created
     
+    writeable_attributes :username, :password, :password_confirmation, :email, :openid_identifier, :facebook_uid
+    
+    readable_attributes :created_at
+
     has_one :profile
     has_one :picture
     has_one :settings
     has_one :location
     has_one :suggestions
+    has_one :access_token # only directly after the user was created
+    has_one :friendship # only if friend of current user
     
     has_many :tagcrumbs
     has_many :placemarks
@@ -59,8 +65,7 @@ module Tagcrumbs
     
     # The friendship with a specific user
     def friendship_with(user)
-      f = Friendship.new
-      f.reload("/#{self.username}/friends/#{user}")      
+      f = Friendship.load("/#{self.username}/friends/#{user}")     
     rescue Net::HTTPServerException => error
       f.requestor.response.code == '404' ? nil : (raise error) # not found
     end
@@ -83,9 +88,9 @@ module Tagcrumbs
     end
     
     
-    # Search a User by name or email
-    def self.search(q, args={})
-      Array.load(Tagcrumbs.root.users_url, args.merge(:u => q))
+    # Search Users by many different criterias
+    def self.search(args={})
+      Collection.load(Tagcrumbs.root.users_url, args)
     end
     
     # Load a User by its username
@@ -97,5 +102,21 @@ module Tagcrumbs
       self.username
     end
     
+    # Custom create method as the AccessToken has to be fetched and the configuration must be updated
+    def create      
+      if super && access_token.is_a?(AccessToken)        
+        Tagcrumbs.options[:access_token]  = access_token.token
+    	  Tagcrumbs.options[:access_secret] = access_token.secret
+        
+        true
+      else
+        false
+      end
+    end
+    
+    def create_url
+      Tagcrumbs.root.users_url # has to be overwritten, cannot be based on the current_user
+    end
+    
   end
 end

data/lib/tagcrumbs/resources/models/user_recommendation.rb

@@ -1,7 +1,7 @@
 module Tagcrumbs
   # A Recommendation of a Placemark between two Users
   class UserRecommendation < Model
-    can_be :created
+    can_be :created, :destroyed
     
     readable_attributes :created_at, :updated_at
     writeable_attributes :message

data/lib/tagcrumbs/resources/resource.rb

@@ -29,9 +29,9 @@ module Tagcrumbs
     end
        
     # Reset the Resource, reload the data from the web and initialize it again from the document
-    def reload(url = nil)
-      self.requestor.get(url || resource_url)
-      initialize_from_document(requestor.response.body, requestor.response_format)
+    def reload(url = nil, parameters = {})
+      self.requestor.get(url || resource_url, parameters)
+      initialize_from_document(requestor.response.plain_body, requestor.response_format)
       true
     end
     
@@ -47,7 +47,7 @@ module Tagcrumbs
       requestor = Requestor.new(requestor_options)
       requestor.get(path, query_string)
       
-      resource = new_from_document(requestor.response.body, requestor.response_format)
+      resource = new_from_document(requestor.response.plain_body, requestor.response_format)
     end
     
     # Create a new Resource from a document.

data/script/console

@@ -2,9 +2,14 @@
 # File: script/console
 irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
 
+ENV['TC_ENV'] = ARGV.last
 libs =  " -r irb/completion"
-# Perhaps use a console_lib to store any extra methods I may want available in the cosole
-# libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
+
 libs <<  " -r #{File.dirname(__FILE__) + '/../lib/tagcrumbs.rb'}"
+libs <<  " -r #{File.dirname(__FILE__) + '/../lib/console.rb'}"
+
+
 puts "Loading tagcrumbs gem"
-exec "#{irb} #{libs} --simple-prompt"
+
+exec "#{irb} #{libs} --simple-prompt"
+

data/spec/fixtures_external/README.rdoc

@@ -0,0 +1,15 @@
+= Tagcrumbs Fixtures
+
+== DESCRIPTION:
+
+This repository contains fixtures of various representations of Tagcrumbs API resources.
+
+The fixtures are used to unit-test the official Tagcrumbs Ruby Gem and you can use them to test your own library as well. You can just download the files or include this repository as a git submodule so that you can update the fixtures from time to time. We will push out a new version of the fixtures when we change the output of the API, making it easy for you to test your own library against the new version of the API.
+
+You can find out more information about the Tagcrumbs API on http://wiki.tagcrumbs.com/developers.
+
+== WEBSITES:
+
+* http://www.tagcrumbs.com/
+* http://wiki.tagcrumbs.com/developers
+* http://github.com/tagcrumbs/fixtures

data/spec/fixtures_external/json/access_token.json

@@ -0,0 +1,11 @@
+{
+    "token": {
+        "token": {
+            "$": "TOKEN"
+        },
+        "secret": {
+            "$": "SECRET"
+        },
+        "@type": "AccessToken"
+    }
+}

data/spec/{fixtures → fixtures_external/json}/activity.json

@@ -8,26 +8,36 @@
         "event_type": {
             "$": "create"
         },
+        "application": {
+            "@xlink:href": "http://www.tagcrumbs.com/applications/3.json",
+            "name": {
+                "$": "Tagcrumbs Gem"
+            },
+            "@type": "Application",
+            "url": {
+                "$": "http://www.tagcrumbs.com"
+            }
+        },
         "user": {
             "tagcrumbs_fans": {
                 "@xlink:href": "http://www.tagcrumbs.com/sascha/fans/tagcrumbs.json",
-                "@type": "array"
+                "@type": "Collection"
             },
             "tags": {
                 "@xlink:href": "http://www.tagcrumbs.com/sascha/tags.json",
-                "@type": "array"
+                "@type": "Collection"
             },
             "activities": {
                 "@xlink:href": "http://www.tagcrumbs.com/sascha/activities.json",
-                "@type": "array"
+                "@type": "Collection"
             },
             "tagcrumbs": {
                 "@xlink:href": "http://www.tagcrumbs.com/sascha/tagcrumbs.json",
-                "@type": "array"
+                "@type": "Collection"
             },
             "subscriptions": {
                 "@xlink:href": "http://www.tagcrumbs.com/sascha/subscriptions.json",
-                "@type": "array"
+                "@type": "Collection"
             },
             "profile": {
                 "@xlink:href": "http://www.tagcrumbs.com/sascha/profile.json",
@@ -39,7 +49,7 @@
             "@xlink:href": "http://www.tagcrumbs.com/sascha.json",
             "places": {
                 "@xlink:href": "http://www.tagcrumbs.com/sascha/places.json",
-                "@type": "array"
+                "@type": "Collection"
             },
             "picture": {
                 "@xlink:href": "http://www.tagcrumbs.com/sascha/profile/picture.json",
@@ -47,15 +57,15 @@
             },
             "comments": {
                 "@xlink:href": "http://www.tagcrumbs.com/sascha/comments.json",
-                "@type": "array"
+                "@type": "Collection"
             },
             "fanships": {
                 "@xlink:href": "http://www.tagcrumbs.com/sascha/fans.json",
-                "@type": "array"
+                "@type": "Collection"
             },
             "favorites": {
                 "@xlink:href": "http://www.tagcrumbs.com/sascha/favorites.json",
-                "@type": "array"
+                "@type": "Collection"
             },
             "settings": {
                 "@xlink:href": "http://www.tagcrumbs.com/sascha/settings.json",
@@ -67,16 +77,16 @@
             },
             "placemarks": {
                 "@xlink:href": "http://www.tagcrumbs.com/sascha/placemarks.json",
-                "@type": "array"
+                "@type": "Collection"
             },
             "@type": "User",
             "profile_links": {
                 "@xlink:href": "http://www.tagcrumbs.com/sascha/profile/links.json",
-                "@type": "array"
+                "@type": "Collection"
             },
             "links": {
                 "@xlink:href": "http://www.tagcrumbs.com/sascha/links.json",
-                "@type": "array"
+                "@type": "Collection"
             },
             "suggestions": {
                 "@xlink:href": "http://www.tagcrumbs.com/sascha/tagcrumbs/suggestions.json",
@@ -88,27 +98,27 @@
             },
             "flags": {
                 "@xlink:href": "http://www.tagcrumbs.com/sascha/flags.json",
-                "@type": "array"
+                "@type": "Collection"
             },
             "filters": {
                 "@xlink:href": "http://www.tagcrumbs.com/sascha/filters.json",
-                "@type": "array"
+                "@type": "Collection"
             },
             "tagcrumbs_friends": {
                 "@xlink:href": "http://www.tagcrumbs.com/sascha/friends/tagcrumbs.json",
-                "@type": "array"
+                "@type": "Collection"
             },
             "received_recommendations": {
-                "@xlink:href": "http://www.tagcrumbs.com/sascha/recommendations/received.json",
-                "@type": "array"
+                "@xlink:href": "http://www.tagcrumbs.com/sascha/received_recommendations.json",
+                "@type": "Collection"
             },
             "recommendations": {
                 "@xlink:href": "http://www.tagcrumbs.com/sascha/recommendations.json",
-                "@type": "array"
+                "@type": "Collection"
             },
             "friendships": {
                 "@xlink:href": "http://www.tagcrumbs.com/sascha/friends.json",
-                "@type": "array"
+                "@type": "Collection"
             }
         },
         "@type": "Activity",
@@ -151,7 +161,7 @@
             "@xlink:href": "http://www.tagcrumbs.com/sascha/placemarks/placemark-name.json",
             "comments": {
                 "@xlink:href": "http://www.tagcrumbs.com/sascha/placemarks/placemark-name/comments.json",
-                "@type": "array"
+                "@type": "Collection"
             },
             "longitude": {
                 "@type": "float",
@@ -161,9 +171,6 @@
                 "@type": "timestamp",
                 "$": "2009-06-08T16:00:15+02:00"
             },
-            "permalink": {
-                "$": "placemark-name"
-            },
             "notes": {
                 "$": "PLACEMARK NOTES"
             },
@@ -177,7 +184,7 @@
             "@type": "Placemark",
             "links": {
                 "@xlink:href": "http://www.tagcrumbs.com/sascha/placemarks/placemark-name/links.json",
-                "@type": "array"
+                "@type": "Collection"
             },
             "private": {
                 "@type": "boolean",
@@ -192,7 +199,7 @@
             },
             "recommendations": {
                 "@xlink:href": "http://www.tagcrumbs.com/sascha/placemarks/placemark-name/recommendations.json",
-                "@type": "array"
+                "@type": "Collection"
             },
             "updated_at": {
                 "@type": "timestamp",

data/spec/{fixtures → fixtures_external/json}/address.json

@@ -12,7 +12,7 @@
             "@xlink:href": "http://www.tagcrumbs.com/sascha/placemarks/placemark-name.json",
             "comments": {
                 "@xlink:href": "http://www.tagcrumbs.com/sascha/placemarks/placemark-name/comments.json",
-                "@type": "array"
+                "@type": "Collection"
             },
             "longitude": {
                 "@type": "float",
@@ -22,32 +22,29 @@
                 "@type": "timestamp",
                 "$": "2009-06-07T13:52:10+02:00"
             },
-            "permalink": {
-                "$": "placemark-name"
-            },
             "notes": {
                 "$": "PLACEMARK NOTES"
             },
             "user": {
                 "tagcrumbs_fans": {
                     "@xlink:href": "http://www.tagcrumbs.com/sascha/fans/tagcrumbs.json",
-                    "@type": "array"
+                    "@type": "Collection"
                 },
                 "tags": {
                     "@xlink:href": "http://www.tagcrumbs.com/sascha/tags.json",
-                    "@type": "array"
+                    "@type": "Collection"
                 },
                 "activities": {
                     "@xlink:href": "http://www.tagcrumbs.com/sascha/activities.json",
-                    "@type": "array"
+                    "@type": "Collection"
                 },
                 "tagcrumbs": {
                     "@xlink:href": "http://www.tagcrumbs.com/sascha/tagcrumbs.json",
-                    "@type": "array"
+                    "@type": "Collection"
                 },
                 "subscriptions": {
                     "@xlink:href": "http://www.tagcrumbs.com/sascha/subscriptions.json",
-                    "@type": "array"
+                    "@type": "Collection"
                 },
                 "profile": {
                     "@xlink:href": "http://www.tagcrumbs.com/sascha/profile.json",
@@ -59,7 +56,7 @@
                 "@xlink:href": "http://www.tagcrumbs.com/sascha.json",
                 "places": {
                     "@xlink:href": "http://www.tagcrumbs.com/sascha/places.json",
-                    "@type": "array"
+                    "@type": "Collection"
                 },
                 "picture": {
                     "@xlink:href": "http://www.tagcrumbs.com/sascha/profile/picture.json",
@@ -67,15 +64,15 @@
                 },
                 "comments": {
                     "@xlink:href": "http://www.tagcrumbs.com/sascha/comments.json",
-                    "@type": "array"
+                    "@type": "Collection"
                 },
                 "fanships": {
                     "@xlink:href": "http://www.tagcrumbs.com/sascha/fans.json",
-                    "@type": "array"
+                    "@type": "Collection"
                 },
                 "favorites": {
                     "@xlink:href": "http://www.tagcrumbs.com/sascha/favorites.json",
-                    "@type": "array"
+                    "@type": "Collection"
                 },
                 "settings": {
                     "@xlink:href": "http://www.tagcrumbs.com/sascha/settings.json",
@@ -87,16 +84,16 @@
                 },
                 "placemarks": {
                     "@xlink:href": "http://www.tagcrumbs.com/sascha/placemarks.json",
-                    "@type": "array"
+                    "@type": "Collection"
                 },
                 "@type": "User",
                 "profile_links": {
                     "@xlink:href": "http://www.tagcrumbs.com/sascha/profile/links.json",
-                    "@type": "array"
+                    "@type": "Collection"
                 },
                 "links": {
                     "@xlink:href": "http://www.tagcrumbs.com/sascha/links.json",
-                    "@type": "array"
+                    "@type": "Collection"
                 },
                 "suggestions": {
                     "@xlink:href": "http://www.tagcrumbs.com/sascha/tagcrumbs/suggestions.json",
@@ -108,27 +105,27 @@
                 },
                 "flags": {
                     "@xlink:href": "http://www.tagcrumbs.com/sascha/flags.json",
-                    "@type": "array"
+                    "@type": "Collection"
                 },
                 "filters": {
                     "@xlink:href": "http://www.tagcrumbs.com/sascha/filters.json",
-                    "@type": "array"
+                    "@type": "Collection"
                 },
                 "tagcrumbs_friends": {
                     "@xlink:href": "http://www.tagcrumbs.com/sascha/friends/tagcrumbs.json",
-                    "@type": "array"
+                    "@type": "Collection"
                 },
                 "received_recommendations": {
-                    "@xlink:href": "http://www.tagcrumbs.com/sascha/recommendations/received.json",
-                    "@type": "array"
+                    "@xlink:href": "http://www.tagcrumbs.com/sascha/received_recommendations.json",
+                    "@type": "Collection"
                 },
                 "recommendations": {
                     "@xlink:href": "http://www.tagcrumbs.com/sascha/recommendations.json",
-                    "@type": "array"
+                    "@type": "Collection"
                 },
                 "friendships": {
                     "@xlink:href": "http://www.tagcrumbs.com/sascha/friends.json",
-                    "@type": "array"
+                    "@type": "Collection"
                 }
             },
             "name": {
@@ -137,7 +134,7 @@
             "@type": "Placemark",
             "links": {
                 "@xlink:href": "http://www.tagcrumbs.com/sascha/placemarks/placemark-name/links.json",
-                "@type": "array"
+                "@type": "Collection"
             },
             "private": {
                 "@type": "boolean",
@@ -152,7 +149,7 @@
             },
             "recommendations": {
                 "@xlink:href": "http://www.tagcrumbs.com/sascha/placemarks/placemark-name/recommendations.json",
-                "@type": "array"
+                "@type": "Collection"
             },
             "updated_at": {
                 "@type": "timestamp",