r43 0.2.0 → 0.3.0

data/lib/r43.rb

@@ -4,12 +4,12 @@
 
 require 'net/http'
 require 'rexml/document'
-require 'city'
-require 'entry'
-require 'goal'
-require 'id'
-require 'person'
-require 'tag'
+require 'r43/city'
+require 'r43/entry'
+require 'r43/goal'
+require 'r43/id'
+require 'r43/person'
+require 'r43/tag'
 
 module R43
 
@@ -19,8 +19,12 @@ module R43
   class R43::Service
     attr_reader :key, :proxy_addr
     
-    def initialize(key, proxy_addr, proxy_port, proxy_user, proxy_pass)
-      @key = key.to_s
+    #
+    # This method is only intended to be called by R43::Connection objects
+    #
+    def initialize(key, url, proxy_addr, proxy_port, proxy_user, proxy_pass)
+      @url        = url
+      @key        = key.to_s
       @proxy_addr = proxy_addr
       @proxy_port = proxy_port
       @proxy_user = proxy_user
@@ -29,9 +33,6 @@ module R43
 
     protected
 
-    #
-    # a private method to add the api_key to the url
-    #
     def _inject_key(url)
       key_str = "api_key=#{@key}"
       if url =~ /\?$/
@@ -51,11 +52,8 @@ module R43
       end
     end
 
-    #
-    # a private method for getting responses from 43 things.
-    #
     def _get_response(url)
-      _get_http.start('www.43things.com')  do |http|
+      _get_http.start(@url)  do |http|
         response = _build_response(http, url)
       end
     end
@@ -75,6 +73,10 @@ module R43
 
     public
     
+    #
+    # This method is only meant to be called by R43::Connection objects, 
+    # it's the mechanism for getting data from the web service
+    # 
     def get_response(url)
       _get_response(_inject_key(url))
     end
@@ -83,19 +85,187 @@ module R43
 
   public
   
+  class R43::Response
+    attr_reader :service, :query, :xml,
+                :object,  :entry,   :person, :goal,  :city,   :title,
+                :objects, :entries, :people, :goals, :cities, :tags,
+                :has_object, :max_in_page, :total_available, :next_offset
+
+    #
+    # This is only meant to be called by a R43::Connection object.
+    #
+    def initialize(service, query)
+      @service = service
+      @query = query
+      @has_object = false
+      @objects = []
+      @entries = []
+      @people = []
+      @goals = []
+      @cities = []
+      @tags = []
+      @title = ""
+      @max_in_page = 0
+      @total_available = 0
+      @next_offset = 0
+      _from_xml(service.get_response(query))
+    end
+
+    #
+    # When a response hase been paged, the more method provides a simple
+    # mechanism for getting additional entries.
+    #
+    #  require 'r43'
+    #  connection = R43::Connection.new(<api_key>)
+    #  people = connection.get_goals_people(<goal_id>)
+    #  people += connection.more
+    # 
+    def more()
+      clear_arrays()
+      _populate_collections_from_xml(service.get_response(query + "&offset=#{@next_offset}"))
+    end
+
+    private
+    
+
+    def clear_arrays()
+      @objects.clear()
+      @entries.clear()
+      @people.clear()
+      @goals.clear()
+      @cities.clear()
+      @tags.clear()
+    end
+
+    def object=(object)
+      if @has_object
+        @object = nil
+      else
+        @has_object = true
+        @object = object
+      end
+    end
+
+    def title=(title)
+      @title = title.to_s
+    end
+
+    def entry=(entry)
+      @entry = entry
+      self.object = entry
+      add_entry(entry)
+    end
+
+    def person=(person)
+      @person = person
+      self.object = person
+      add_person person
+    end
+
+    def goal=(goal)
+      @goal = goal
+      self.object = goal
+      add_goal goal
+    end
+
+    def city=(city)
+      @city = city
+      self.object = city
+      add_city city
+    end
+
+    def title=(title)
+      @title = title.to_s
+    end
+
+    def add_entry(entry)
+      @entries.push entry
+      @objects.push entry
+    end
+
+    def add_person(person)
+      @people.push person
+      @objects.push person
+    end
+
+    def add_goal(goal)
+      @goals.push goal
+      @objects.push goal
+    end
+
+    def add_city(city)
+      @cities.push city
+      @objects.push city
+    end
+
+    def add_tag(tag)
+      @tags.push tag
+      @objects.push tag
+    end
+
+    def _from_xml(xml)
+      @xml = xml
+      self.entry= Entry.from_xml(xml.elements["entry"]) if xml.elements["entry"]
+      self.person= Person.from_xml(xml.elements["person"]) if xml.elements["person"]
+      self.goal= Goal.from_xml(xml.elements["goal"]) if xml.elements["goal"]
+      self.city= City.from_xml(xml.elements["city"]) if xml.elements["city"]
+      self.title= xml.elements["feed/title"] if xml.elements["feed/title"]
+      self.title= xml.elements["feed/title"].text.strip if 
+        xml.elements["feed/title"]if xml.elements["feed/title"]
+      _populate_collections_from_xml xml
+    end
+
+    def _populate_collections_from_xml(xml)
+      if xml.elements["feed/pagination"] then
+        @max_per_page = xml.elements["feed/pagination/max"].text.to_i
+        @total_available = xml.elements["feed/pagination/total"].text.to_i
+        @next_offset = xml.elements["feed/pagination/next_offset"].text.to_i
+      end
+      
+      xml.elements.each("feed/entry") do |entry_element|
+        add_entry(Entry.from_xml(entry_element))
+      end
+
+      xml.elements.each("feed/person") do |person_element|
+        add_person(Person.from_xml(person_element))
+      end
+
+      xml.elements.each("feed/members/person") do |person_element|
+        add_person(Person.from_xml(person_element))
+      end
+
+      xml.elements.each("feed/goal") do |goal_element|
+        add_goal(Goal.from_xml(goal_element))
+      end
+
+      xml.elements.each("feed/city") do |city_element|
+        add_city(City.from_xml(city_element))
+      end
+
+      xml.elements.each("feed/tags/tag") do |tag_element|
+        tag = Tag.from_xml(tag_element)
+        add_tag(tag)
+      end
+    end
+  end
+
+
   #
   # Implements the 43 Things API.  This is where you actually
-  # instantiate objects.
+  # instantiate objects.  r43 supports multiple servers in the
+  # 43things family and the use of a web proxy.
   #
   #   require 'r43'
-  #   connection = R43::Connection.new(<api_key>) 
+  #   connection = R43::Connection.new(<api_key> [, <url> [, 
+  #       <proxy_address> [, <proxy_port> [, <proxy_user> [,
+  #       <proxy_password]]]]]) 
   #
   class R43::Connection
     attr_reader :service, :response
 
-    def initialize(key, proxy_addr=nil, proxy_port=nil, 
+    def initialize(key, url="www.43things.com", proxy_addr=nil, proxy_port=nil, 
                    proxy_user=nil, proxy_pass=nil)
-      @service = R43::Service.new(key, proxy_addr, proxy_port,
+      @service = R43::Service.new(key, url, proxy_addr, proxy_port,
                                   proxy_user, proxy_pass)
     end
 
@@ -103,13 +273,29 @@ module R43
     protected
     attr_reader :return_reference
 
-    #
-    # a private method for getting responses from 43 things.
-    #
     def _get_response(url)
       @response = Response.new(@service, url)
     end
 
+    def _clean_string(string)
+      string.gsub(/\s/, '+')
+    end
+
+
+    def _handle_optional
+      @string.gsub!(/\s/, "+") 
+      if @optional[:offset] then
+        @string += "&offset=#{@optional[:offset]}"
+      end
+      if @optional[:max] then
+        @string += "&max=#{@optional[:max]}"
+      end
+      if @optional[:view] then
+        @string += "&view=#{@optional[:view]}"
+      end
+
+    end
+
     def return_by_value(object)
       if object.kind_of? Enumerable then
         object.collect{|element| element.clone}
@@ -128,6 +314,11 @@ module R43
     #
     # Exposes paging from the last connection.
     #
+    #  require 'r43'
+    #  connection = R43::Connection(<api_key>)
+    #  people = connection.get_goals_people(<goal_id>)
+    #  people += connection.more
+    #
     def more()
       @response.more()
       return_by_value(@return_reference)
@@ -181,7 +372,7 @@ module R43
     #   goal = connection.get_goal_by_id(255)
     #
     def get_goal_by_id(id)
-      store_and_return(_get_response("get_goal_by_id?id=#{id}").goal)
+      store_and_return(_get_response("get_goal_by_id?id=#{id.to_i}").goal)
     end
 
 
@@ -194,11 +385,12 @@ module R43
     #  goal = connection.get_goal_by_name(<name>)
     #
     def get_goal_by_name(name)
-      name = name.gsub!(/\s/, '+')
+      name = _clean_string(name)
       store_and_return(_get_response("get_goal_by_name?name=#{name}").goal)
     end
 
 
+
     #
     # Implements the get_goals_similarities method from the Goals API and
     # returns an array of Goal objects
@@ -208,8 +400,10 @@ module R43
     #  connection = R43::Connection.new(<api_key>)
     #  goals = connection.get_goals_similarities(<id>)
     #
-    def get_goals_similarities(id)
-      store_and_return(_get_response("get_goals_similarities?id=#{id}").goals)
+    def get_goals_similarities(id, optional={})
+      @string, @optional = "id=#{id.to_i}", optional
+      _handle_optional
+      store_and_return(_get_response("get_goals_similarities?#{@string}").goals)
     end
 
     #
@@ -220,19 +414,14 @@ module R43
     #  require 'r43'
     #  connection = R43::Connection.new(<api_key>)
     #  goals = connection.search_goals(<query string>[,
-    #                               {["offset" => <offset>], 
-    #                                ["max" => <max>]}])
+    #                               {[:offset => <offset>], 
+    #                                [:max => <max>]}])
     #
-    def search_goals(string, optional={})
-      string.gsub!(/\s/, "+") 
-      if optional["offset"] then
-        string += "&offset=#{optional["offset"]}"
-      end
-      if optional["max"] then
-        string += "&max=#{optional["max"]}"
-      end
-  
-      store_and_return(_get_response("search_goals?q=#{string}").goals)
+    def search_goals(query, optional={})
+      query = _clean_string(query)
+      @string, @optional = "q=#{query}", optional
+      _handle_optional
+      store_and_return(_get_response("search_goals?#{@string}").goals)
     end
 
     #
@@ -242,19 +431,13 @@ module R43
     #  require 'r43'
     #  connection = R43::Connection.new(<api_key>)
     #  people = connection.get_goals_people(<id>[,
-    #                                    {["offset" => <offset>], 
-    #                                     ["max" => <max>]}])
+    #                                    {[:offset => <offset>], 
+    #                                     [:max => <max>]}])
     #
     def get_goals_people(id, optional={})
-      string = "id=#{id}"
-      if optional["offset"] then
-        string += "&offset=#{optional["offset"]}"
-      end
-      if optional["max"] then
-        string += "&max=#{optional["max"]}"
-      end
-  
-      store_and_return(_get_response("get_goals_people?#{string}").people)
+      @string, @optional = "id=#{id.to_i}", optional
+      _handle_optional
+      store_and_return(_get_response("get_goals_people?#{@string}").people)
     end
 
     #
@@ -263,23 +446,14 @@ module R43
     #
     #  require 'r43'
     #  connection = R43::Connection.new(<api_key>)
-    #  entries = connection.get_goals_entries(<id>,[{["offset" => <offset>], 
-    #                                             ["max" => <max>], 
-    #                                             ["view" => <view>]}])
+    #  entries = connection.get_goals_entries(<id>,[{[:offset => <offset>], 
+    #                                             [:max => <max>], 
+    #                                             [:view => <view>]}])
     #
     def get_goals_entries(id, optional={})
-      string = "id=#{id}"
-      if optional["offset"] then
-        string += "&offset=#{optional["offset"]}"
-      end
-      if optional["max"] then
-        string += "&max=#{optional["max"]}"
-      end
-      if optional["view"] then
-        string += "&view=#{optional["view"]}"
-      end
-      
-      store_and_return(_get_response("get_goals_entries?#{string}").entries)
+      @string, @optional = "id=#{id.to_i}", optional
+      _handle_optional
+      store_and_return(_get_response("get_goals_entries?#{@string}").entries)
     end
 
 
@@ -289,13 +463,17 @@ module R43
     # this is a paged collection.
     #
     #  require 'r43'
-    #  connection = R43::Connection.new(<api_key>)
+    #  connection = R43::Connection.new(<api_key> [,
+    #                                        {[:offset => <offset>],
+    #                                         [:max    => <max>]}])
     #  people = connection.search_people(<query>)
     #  people += connection.more
     #
-    def search_people(query, options={})
-      # TODO: add paging options
-      store_and_return(_get_response("search_people?q=#{query}").people)
+    def search_people(query, optional={})
+      query = _clean_string(query)
+      @string, @optional = "q=#{query}", optional
+      _handle_optional
+      store_and_return(_get_response("search_people?#{@string}").people)
     end
      
     #
@@ -308,9 +486,11 @@ module R43
     #  people = connection.search_people_by_email(<query>)
     #  people += connection.more
     #
-    def search_people_by_email(query, options={})
-      # TODO: add paging options
-      store_and_return(_get_response("search_people_by_email?q=#{query}").people)
+    def search_people_by_email(query, optional={})
+      query = _clean_string(query)
+      @string, @optional = "q=#{query}", optional
+      _handle_optional
+      store_and_return(_get_response("search_people_by_email?#{@string}").people)
     end
      
     #
@@ -324,13 +504,13 @@ module R43
     #  connection = R43::Connection.new(<api_key>)
     #  person = connection.get_person(<username>[, <true|false>])
     #
-    def get_person(id,use_flickr=false)
+    def get_person(username,use_flickr=false)
       if (use_flickr)
         id_cmd = "flickr_username"
       else
         id_cmd = "id"
       end
-      store_and_return(_get_response("get_person?#{id_cmd}=#{id}").person)
+      store_and_return(_get_response("get_person?#{id_cmd}=#{username}").person)
     end
 
     #
@@ -342,9 +522,11 @@ module R43
     #  person = connection.get_persons_completed_things("erik")
     #  completed_goals = person.completed_goals
     #
-    def get_persons_completed_things(username, options={})
+    def get_persons_completed_things(username, optional={})
       # TODO: add flickr_username handling
-      store_and_return(_get_response("get_persons_completed_things?id=#{username}").person)
+      @string, @optional = "id=#{username}", optional
+      _handle_optional
+      store_and_return(_get_response("get_persons_completed_things?#{@string}").person)
     end
 
     #
@@ -352,16 +534,16 @@ module R43
     # returns an array of the person's entries.  This method
     # sets connection.response and configures paging via connection.
     # 
-    # Currently broken.  The web service never returns entries.
-    #
     #  require 'r43'
     #  connection = R43::Connection.new(<api_key>)
     #  entries = connection.get_persons_completed_things(<username>)
     #  entries += connection.more
     #
-    def get_persons_entries(username, options={})
+    def get_persons_entries(username, optional={})
       # TODO: add flickr_username handling
-      store_and_return(_get_response("get_persons_entries?id=#{username}").entries)
+      @string, @optional = "id=#{username}", optional
+      _handle_optional
+      store_and_return(_get_response("get_persons_entries?#{@string}").entries)
     end
 
     #
@@ -375,9 +557,11 @@ module R43
     #                                                 [, options])
     #  entries += connection.more
     #
-    def get_persons_progress_on_goal(username, goal_id, options={})
+    def get_persons_progress_on_goal(username, goal_id, optional={})
       # TODO: add flickr_username handling
-      store_and_return(_get_response("get_persons_progress_on_goal?id=#{username}&goal_id=#{goal_id}").entries)
+      @string, @optional = "id=#{username}&goal_id=#{goal_id}", optional
+      _handle_optional
+      store_and_return(_get_response("get_persons_progress_on_goal?#{@string}").entries)
     end
 
 
@@ -392,10 +576,11 @@ module R43
     #                                         [, options])
     #  people += connection.more
     #
-    def get_persons_teammates(username, options={})
+    def get_persons_teammates(username, optional={})
       # TODO: add flickr_username handling
-      # TODO: add paging options
-      store_and_return(_get_response("get_persons_teammates?id=#{username}").people)
+      @string, @optional = "id=#{username}", optional
+      _handle_optional
+      store_and_return(_get_response("get_persons_teammates?#{@string}").people)
     end
 
 
@@ -410,10 +595,11 @@ module R43
     #                                          [, options])
     #  people += connection.more
     #
-    def get_persons_neighbors(username, options={})
+    def get_persons_neighbors(username, optional={})
       # TODO: add flickr_username handling
-      # TODO: add paging options
-      store_and_return(_get_response("get_persons_neighbors?id=#{username}").people)
+      @string, @optional = "id=#{username}", optional
+      _handle_optional
+      store_and_return(_get_response("get_persons_neighbors?#{@string}").people)
     end
 
     
@@ -426,9 +612,32 @@ module R43
     #  tags = connection.get_persons_tags(<username>
     #                                  [, options])
     #
-    def get_persons_tags(username, options={})
+    def get_persons_tags(username, optional={})
       # TODO: add flickr_username handling
-      store_and_return(_get_response("get_persons_tags?id=#{username}").tags)
+      @string, @optional = "id=#{username}", optional
+      _handle_optional
+      store_and_return(_get_response("get_persons_tags?#{@string}").tags)
+    end
+
+
+    #
+    # Implements the get_teams_progress from the Team API
+    # it returns an array of entries.  The array may
+    # be paginated.
+    #
+    #  require 'r43'
+    #  connection = R43::Connection(<api_key>)
+    #  entries = connection.get_teams_progress(<team_id>)
+    #
+    # The get_teams_progress API method also returns an array
+    # of Person objects.  This array can be accessed through the
+    # R43::Connection#people method
+    #
+    #  people = connection.people
+    #
+    def get_teams_progress(team_id)
+      store_and_return(
+             _get_response("get_teams_progress?id=#{team_id}").entries)
     end
 
     
@@ -441,12 +650,14 @@ module R43
     #  tags = connection.get_persons_tag_cloud(<username>
     #                                       [, options])
     #
-    def get_persons_tag_cloud(username, options={})
+    def get_persons_tag_cloud(username, optional={})
       # TODO: add flickr_username handling
+      @string, @optional = "id=#{username}", optional
+      _handle_optional
       store_and_return(_get_response("get_persons_tag_cloud?id=#{username}").tags)
     end
 
-    
+
     #
     # Implements the get_entry method of the Entries API and
     # returns an Entry object.
@@ -456,9 +667,62 @@ module R43
     #   entry = connection.get_entry(<id>)
     #
     def get_entry(id)
-      store_and_return(_get_response("get_entry?id=#{id}").entry)
+      store_and_return(_get_response("get_entry?id=#{id.to_i}").entry)
+    end
+
+    #
+    # Implements the search_tags method from the Tag API.  It returns an
+    # array of tags.
+    # 
+    #  require 'r43'
+    #  connection = R43::Connection.new(<api_key>)
+    #  tags = connection.search_tags(<query>)
+    #
+    # Once constructed, a tag can be grown by repeated calls to the
+    # R43::Connection#more method.
+    #
+    #  tags += connection.more
+    # 
+    def search_tags(query, optional={})
+      query = _clean_string(query)
+      @string, @optional = "q=#{query}", optional
+      _handle_optional
+      store_and_return(_get_response("search_tags?#{@string}").tags)
     end
 
+    #
+    # Implements the get_tags_goals method from the Tag API.  It returns an
+    # array of tags.
+    # 
+    #  require 'r43'
+    #  connection = R43::Connection.new(<api_key>)
+    #  tags = connection.get_tags_goals(<query>)
+    #  tags += connection.more
+    # 
+    def get_tags_goals(tag, optional={})
+      query = _clean_string(tag)
+      @string, @optional = "id=#{query}", optional
+      _handle_optional
+      store_and_return(_get_response("get_tags_goals?#{@string}").goals)
+    end
+
+    #
+    # Implements the get_tags_similarities method from the Tag API.  It
+    # returns an array of tags.
+    # 
+    #  require 'r43'
+    #  connection = R43::Connection.new(<api_key>)
+    #  tags = connection.get_tags_similarities(<query>)
+    #  tags += connection.more
+    # 
+    def get_tags_similarities(tag, optional={})
+      query = _clean_string(tag)
+      @string, @optional = "id=#{query}", optional
+      _handle_optional
+      store_and_return(_get_response("get_tags_similarities?#{@string}").tags)
+    end
+
+
     #
     # Implements the search_cities method of the Cities API
     #
@@ -466,7 +730,10 @@ module R43
     #   connection = R43::Connection.new(<api_key>)
     #   cities = connection.search_cities(<query>)
     #
-    def search_cities(query)
+    def search_cities(query, optional={})
+      query = _clean_string(query)
+      @string, @optional = "q=#{query}", optional
+      _handle_optional
       store_and_return(_get_response("search_cities?q=#{query}").cities)
     end
     
@@ -479,7 +746,7 @@ module R43
     #
 
     def get_city(id)
-      store_and_return(_get_response("get_city?id=#{id}").city)
+      store_and_return(_get_response("get_city?id=#{id.to_i}").city)
     end
 
     #
@@ -491,147 +758,14 @@ module R43
     #
 
     def get_citys_people(id, optional={})
-      params = "id=#{id}"
-      params += "&offset=#{optional["offset"]}" if optional["offset"]
-      params += "&max=#{optional["max"]}" if optional["max"]
+      @string, @optional = "id=#{id.to_i}", optional
+      _handle_optional
 
-      store_and_return(_get_response("get_citys_people?#{params}").people)
+      store_and_return(_get_response("get_citys_people?#{@string}").people)
     end
-    
-  end
 
-  class R43::Response
-    attr_reader :service, :query, :xml,
-                :object,  :entry,   :person, :goal, :city,
-                :objects, :entries, :people, :goals, :cities, :tags,
-                :has_object, :max_in_page, :total_available, :next_offset
-
-    def initialize(service, query)
-      @service = service
-      @query = query
-      @has_object = false
-      @objects = []
-      @entries = []
-      @people = []
-      @goals = []
-      @cities = []
-      @tags = []
-      @max_in_page = 0
-      @total_available = 0
-      @next_offset = 0
-      _from_xml(service.get_response(query))
-    end
-
-    def more()
-      clear_arrays()
-      _populate_collections_from_xml(service.get_response(query + "&offset=#{@next_offset}"))
-    end
-
-    private
+   
     
-    def clear_arrays()
-      @objects.clear()
-      @entries.clear()
-      @people.clear()
-      @goals.clear()
-      @cities.clear()
-      @tags.clear()
-    end
-
-    def object=(object)
-      if @has_object
-        @object = nil
-      else
-        @has_object = true
-        @object = object
-      end
-    end
-
-    def entry=(entry)
-      @entry = entry
-      self.object = @entry
-      add_entry(@entry)
-    end
-
-    def person=(person)
-      @person = person
-      self.object = @person
-      add_person @person
-    end
-
-    def goal=(goal)
-      @goal = goal
-      self.object = @goal
-      add_goal @goal
-    end
-
-    def city=(city)
-      @city = city
-      self.object = @city
-      add_city @city
-    end
-
-    def add_entry(entry)
-      @entries.push entry
-      @objects.push entry
-    end
-
-    def add_person(person)
-      @people.push person
-      @objects.push person
-    end
-
-    def add_goal(goal)
-      @goals.push goal
-      @objects.push goal
-    end
-
-    def add_city(city)
-      @cities.push city
-      @objects.push city
-    end
-
-    def add_tag(tag)
-      @tags.push tag
-      @objects.push tag
-    end
-
-    def _from_xml(xml)
-      @xml = xml
-      self.entry = Entry.from_xml(xml.elements["entry"]) if xml.elements["entry"]
-      self.person = Person.from_xml(xml.elements["person"]) if xml.elements["person"]
-      self.goal = Goal.from_xml(xml.elements["goal"]) if xml.elements["goal"]
-      self.city = City.from_xml(xml.elements["city"]) if xml.elements["city"]
-      _populate_collections_from_xml xml
-    end
-
-    def _populate_collections_from_xml(xml)
-      if xml.elements["feed/pagination"] then
-        @max_per_page = xml.elements["feed/pagination/max"].text.to_i
-        @total_available = xml.elements["feed/pagination/total"].text.to_i
-        @next_offset = xml.elements["feed/pagination/next_offset"].text.to_i
-      end
-      
-      xml.elements.each("feed/entry") do |entry_element|
-        add_entry(Entry.from_xml(entry_element))
-      end
-
-      xml.elements.each("feed/person") do |person_element|
-        add_person(Person.from_xml(person_element))
-      end
-
-      xml.elements.each("feed/goal") do |goal_element|
-        add_goal(Goal.from_xml(goal_element))
-      end
-
-      xml.elements.each("feed/city") do |city_element|
-        add_city(City.from_xml(city_element))
-      end
-
-      xml.elements.each("feed/tags/tag") do |tag_element|
-        tag = Tag.from_xml(tag_element)
-        add_tag(tag)
-      end
-    end
   end
+
 end