@@ -1,5 +1,22 @@ -#Describes a location module FireEagle + class StringWithExactMatch < String + attr_writer :exact_match + + def initialize(value = "") + node = XML::Parser.string(value).parse.root + str = super(node.content) + str.exact_match = node.attributes.to_h["exact-match"] == "true" + node = nil + + str + end + + def exact_match? + @exact_match + end + end + + # Represents a location class Location include HappyMapper @@ -11,9 +28,9 @@ module FireEagle element :located_at, Time, :tag => "located-at" element :name, String element :normal_name, String, :tag => "normal-name" - element :place_id, String, :tag => "place-id" + element :place_id, StringWithExactMatch, :tag => "place-id", :parser => :new, :raw => true element :query, String - element :woeid, Integer + element :woeid, StringWithExactMatch, :parser => :new, :raw => true element :_box, GeoRuby::SimpleFeatures::Geometry, :tag => "box", :namespace => "georss", :parser => :from_georss, :raw => true @@ -24,15 +41,15 @@ module FireEagle best_guess == true end - def to_s - name - end - # The GeoRuby[http://georuby.rubyforge.org/] representation of this location def geom _point || _box end alias_method :geo, :geom + + def to_s + name + end end end lib/fireeagle/location.rb @@ -3,7 +3,8 @@ module FireEagle include HappyMapper tag "location-hierarchy" - attribute :timezone, String + attribute :string, String + attribute :timezone, String has_many :locations, Location end end \ No newline at end of file lib/fireeagle/location_hierarchy.rb @@ -23,21 +23,40 @@ describe FireEagle::Location do @location.name.should == 'Davis, CA' end - it "should represent the location place id" do + it "should represent the raw name" do + @location.normal_name.should == "Davis" + end + + it "should represent the location's place id" do @location.place_id.should == 'u4L9ZOObApTdx1q3' end + it "should represent whether the location's place id is an exact match" do + @location.place_id.should be_an_exact_match + end + + it "should represent the location's WOEID" do + @location.woeid.should == "2389646" + end + + it "should represent whether the location's WOEID is an exact match" do + @location.woeid.should be_an_exact_match + end + it "should represent the location's timestamp" do @location.located_at.should == Time.parse("2008-01-22T14:23:11-08:00") end + it "should represent the label" do + @location.label.should == "Home of UC Davis" + end + it "should use the name for #to_s" do @location.to_s.should == @location.name end - it "should return the actual query string" do - pending("unclear what this should actually look like; perhaps a Hash?") - @location_with_query.query.should == "333 W Harbor Dr, San Diego, CA" + it "should represent the querystring" do + @location_with_query.query.should == "q=333%20W%20Harbor%20Dr,%20San%20Diego,%20CA" end describe "GeoRuby support" do spec/location_spec.rb @@ -4,5 +4,8 @@ <level-name>city</level-name> <located-at>2008-01-22T14:23:11-08:00</located-at> <name>Davis, CA</name> - <place-id>u4L9ZOObApTdx1q3</place-id> + <normal-name>Davis</normal-name> + <woeid exact-match="true">2389646</woeid> + <place-id exact-match="true">u4L9ZOObApTdx1q3</place-id> + <label>Home of UC Davis</label> </location> spec/responses/location_chunk.xml @@ -5,5 +5,5 @@ <level-name>exact</level-name> <located-at>2008-03-03T09:05:16-08:00</located-at> <name>333 W Harbor Dr, San Diego, CA</name> - <query> "q=333%20W%20Harbor%20Dr,%20San%20Diego,%20CA" </query> + <query>q=333%20W%20Harbor%20Dr,%20San%20Diego,%20CA</query> </location> spec/responses/location_chunk_with_query.xml ef1bd51e330faf4a707abaea3bca3538297be48e Seth Fitzsimmons seth@mojodna.net http://github.com/jnewland/fireeagle/commit/46538cc188fa4fb42f28c145be9f5a8f8498aa18 46538cc188fa4fb42f28c145be9f5a8f8498aa18 2009-02-02T19:15:40-08:00 2009-02-02T19:15:02-08:00 Added missing response elements 375f6559f64699050981fdb8706e92b799073c7e Seth Fitzsimmons seth@mojodna.net