lib/gowalla/client.rb in gowalla-0.0.1 vs lib/gowalla/client.rb in gowalla-0.1.0

@@ -6,16 +6,19 @@
     base_uri "http://api.gowalla.com"
     headers({'Accept' => 'application/json', "User-Agent" => 'Ruby gem'})
     
     attr_reader :username
     
-    def initialize(username=nil, password=nil)
-      @username = username
+    def initialize(options={})
+      api_key = options[:api_key] || Gowalla.api_key
+      @username = options[:username] || Gowalla.username
+      password = options[:password] || Gowalla.password
       self.class.basic_auth(@username, password) unless @username.nil?
+      self.class.headers({'X-Gowalla-API-Key' => api_key })
     end
     
-    def user(user_id="me")
+    def user(user_id=self.username)
       mashup(self.class.get("/users/#{user_id}"))
     end
     
     def events(user_id=self.username)
       mashup(self.class.get("/users/#{user_id}/events")).events
@@ -32,19 +35,23 @@
     def friends(user_id=self.username)
       mashup(self.class.get("/users/#{user_id}/friends")).friends
     end
     
     def items(user_id=self.username)
-      mashup(self.class.get("/users/#{user_id}/items"))
+      mashup(self.class.get("/users/#{user_id}/items")).items
     end
     
+    def item(id)
+      mashup(self.class.get("/items/#{id}"))
+    end
+    
     def pins(user_id=self.username)
       mashup(self.class.get("/users/#{user_id}/pins"))
     end
     
-    def stamps(user_id=self.username)
-      mashup(self.class.get("/users/#{user_id}/stamps"))
+    def stamps(user_id=self.username, limit=20)
+      mashup(self.class.get("/users/#{user_id}/stamps", :query => {:limit => limit}))
     end
     
     def top_spots(user_id=self.username)
       mashup(self.class.get("/users/#{user_id}/top_spots"))
     end
@@ -63,10 +70,57 @@
     
     def spot_events(spot_id)
       mashup(self.class.get("/spots/#{spot_id}/events")).events
     end
     
+    def spot_items(spot_id)
+      mashup(self.class.get("/spots/#{spot_id}/items")).items
+    end
+    
+    def list_spots(options={})
+      query = format_geo_options(options)
+      mashup(self.class.get("/spots", :query => query)).spots
+    end
+    
+    def featured_spots(options={})
+      list_spots(options.merge(:featured => 1))
+    end
+    
+    def bookmarked_spots(options={})
+      list_spots(options.merge(:bookmarked => 1))
+    end
+    
+    def trips(options={})
+      if user_id = options.delete(:user_id)
+        options[:user_url] = "/users/#{user_id}"
+      end
+      query = format_geo_options(options)
+      mashup(self.class.get("/trips", :query => query))
+    end
+    
+    def featured_trips(options={})
+      trips(options.merge(:context => 'featured'))
+    end
+    
+    def friends_trips(options={})
+      trips(options.merge(:context => 'friends'))
+    end
+    
+    def categories
+      mashup(self.class.get("/categories"))
+    end
+    
+    def category(id)
+      mashup(self.class.get("/categories/#{id}"))
+    end
+    
     private
+    
+      def format_geo_options(options={})
+        options[:lat] = "+#{options[:lat]}" if options[:lat].to_i > 0
+        options[:lng] = "+#{options[:lng]}" if options[:lng].to_i > 0
+        options
+      end
     
       def mashup(response)
         case response.code
         when 200
           if response.is_a?(Hash)
\ No newline at end of file