@@ -16,8 +16,16 @@ module Yahoo end def api_path(resource, id, collection, *args) + args = args.extract_options! + count = args.delete(:count) + start = args.delete(:start) + collection += ";count=#{count}" if count + collection += ";start=#{start}" if start + parameters = [resource, id, collection, *args].compact - return parameters.collect!{|param| CGI::escape(param.to_s).downcase}.join('/') + # return parameters.collect!{|param| CGI::escape(param.to_s).downcase}.join('/') + return parameters.collect!{|param| param.to_s.downcase}.join('/') + end end lib/yahoo-geoplanet/base.rb @@ -39,8 +39,8 @@ module Yahoo # Association Collections ["parent", "ancestors", "belongtos", "neighbors", "siblings", "children"].each do |association| - define_method(association.to_sym) do - xml = self.class.fetch_and_parse(self.class.api_path(self.class.name, @woe_id, association), :select => :long) + define_method(association.to_sym) do |*options| + xml = self.class.fetch_and_parse(self.class.api_path(self.class.name, @woe_id, association, *options), :select => :long) value = xml.search(self.class.name.downcase).collect{|elem| self.class.new(elem)} return association.singularize == association ? value.first : value end lib/yahoo-geoplanet/place.rb 617e557075a6bf0db5ab1f057759251acfdbfa90 Tom Taylor tom@mu.local http://github.com/mattt/yahoo-geoplanet/commit/d70f80f4554fe30c92bcbe06584addba06f65065 d70f80f4554fe30c92bcbe06584addba06f65065 2009-01-24T10:54:26-08:00 2009-01-24T10:54:26-08:00 This is a bit nasty, but it allows pagination of results from children, ancestors and other methods. add0191dc445aecc1b388856dff0f4b97177b29b Tom Taylor tom@mu.local