placemaker 0.0.2 → 0.0.3

data/README.rdoc

@@ -20,7 +20,7 @@ The following is an example of using the Placemaker gem to read places in a stan
 already done so.
 
   require 'placemaker'
-  p = Placemaker::Client.new(:appid => YOUR_APP_ID, :document_url => 'http://feeds.feedburner.com/wooster', :document_type => 'text/xml')
+  p = Placemaker::Client.new(:appid => YOUR_APP_ID, :document_url => 'http://feeds.nytimes.com/nyt/rss/HomePage', :document_type => 'text/xml')
   p.fetch!
 
 This will make a call to the Placemaker service and populate the Placemaker::Client object with data about the places in the content that you
@@ -73,4 +73,6 @@ The request to the Yahoo place coding service returns information about the requ
 
 = Author
 
-Justin S. Leitgeb, justin@phq.org
+Justin S. Leitgeb, justin@stackbuilders.com
+
+Copyright (c) 2011 {Stack Builders Inc.}[http://stackbuilders.com]

data/lib/placemaker/client.rb

@@ -4,8 +4,8 @@ module Placemaker
   
   # Main interface to the Placemaker API.
   class Client
-    POST_FIELDS =  %w[ appid document_content document_url document_type document_title 
-      auto_disambiguate focus_woe_id input_language output_type ].map{|f| f.to_sym}
+    POST_FIELDS =  %w[  appid document_content document_url document_type document_title
+                        auto_disambiguate focus_woe_id input_language output_type         ].map(&:to_sym)
 
     def initialize(options = {})
       @options = options

data/lib/placemaker/coordinates.rb

@@ -3,11 +3,11 @@ module Placemaker
     include Placemaker::XmlHelper
     
     def lat
-      @nodeset.search('.//xmlns:latitude', 'xmlns' => 'http://wherein.yahooapis.com/v1/schema').inner_text.to_f
+      nested_node('latitude').to_f
     end
     
     def lng
-      @nodeset.search('.//xmlns:longitude', 'xmlns' => 'http://wherein.yahooapis.com/v1/schema').inner_text.to_f
+      nested_node('longitude').to_f
     end
   end
 end

data/lib/placemaker/document.rb

@@ -11,31 +11,31 @@ module Placemaker
     
     # Returns a Placemaker::Location object that is a container for one named place mentioned in the document 
     def place_details
-      @nodeset.search('.//xmlns:placeDetails', 'xmlns' => 'http://wherein.yahooapis.com/v1/schema').map do |p|
+      @nodeset.search('.//xmlns:placeDetails').map do |p|
         Placemaker::PlaceDetails.new(p)
       end
     end
     
     # Returns a Placemaker::Location object that is a container for the smallest administrative place that best describes the document 
     def administrative_scope
-      as = @nodeset.search('.//xmlns:administrativeScope', 'xmlns' => 'http://wherein.yahooapis.com/v1/schema').first
+      as = @nodeset.search('.//xmlns:administrativeScope').first
       Placemaker::Location.new(as) unless as.nil?
     end
     
     # Returns a Placemaker::Location object that is a container for the smallest place that best describes the document 
     def geographic_scope
-      gs = @nodeset.search('.//xmlns:geographicScope', 'xmlns' => 'http://wherein.yahooapis.com/v1/schema').first
+      gs = @nodeset.search('.//xmlns:geographicScope').first
       Placemaker::Location.new(gs) unless gs.nil?
     end
     
     # Returns a Placemaker::Extents object that is a container for the the map extents covering the places mentioned in the document 
     def extents
-      extents = @nodeset.search('.//xmlns:extents', 'xmlns' => 'http://wherein.yahooapis.com/v1/schema').first
+      extents = @nodeset.search('.//xmlns:extents').first
       Placemaker::Extents.new(extents) unless extents.nil?
     end
 
     def reference_list
-      @nodeset.search('.//xmlns:referenceList[1]/xmlns:reference', 'xmlns' => 'http://wherein.yahooapis.com/v1/schema').map do |reference|
+      @nodeset.search('.//xmlns:referenceList[1]/xmlns:reference').map do |reference|
         Placemaker::Reference.new(reference)
       end
     end

data/lib/placemaker/extents.rb

@@ -8,17 +8,17 @@ module Placemaker
             
     # coordinates of center (WGS84)
     def center
-      Placemaker::Coordinates.new(@nodeset.search('.//xmlns:center', 'xmlns' => 'http://wherein.yahooapis.com/v1/schema'))
+      Placemaker::Coordinates.new(@nodeset.search('.//xmlns:center'))
     end
     
     # coordinates of southwest corner of bounding box (WGS84)
     def south_west
-      Placemaker::Coordinates.new(@nodeset.search('.//xmlns:southWest', 'xmlns' => 'http://wherein.yahooapis.com/v1/schema'))
+      Placemaker::Coordinates.new(@nodeset.search('.//xmlns:southWest'))
     end
     
     # coordinates of northeast corner of bounding box (WGS84)
     def north_east
-      Placemaker::Coordinates.new(@nodeset.search('.//xmlns:northEast', 'xmlns' => 'http://wherein.yahooapis.com/v1/schema'))
+      Placemaker::Coordinates.new(@nodeset.search('.//xmlns:northEast'))
     end
   end
 

data/lib/placemaker/location.rb

@@ -23,13 +23,13 @@ module Placemaker
     
     # centroid for the place
     def centroid
-      Placemaker::Coordinates.new(@nodeset.search('.//xmlns:centroid', 'xmlns' => 'http://wherein.yahooapis.com/v1/schema'))
+      Placemaker::Coordinates.new(@nodeset.search('.//xmlns:centroid'))
     end
 
     private    
     
     def nested_node(name)
-      @nodeset.search(".//xmlns:#{name}", 'xmlns' => 'http://wherein.yahooapis.com/v1/schema').inner_text
+      @nodeset.search(".//xmlns:#{name}").inner_text
     end    
   end
 end

data/lib/placemaker/place_details.rb

@@ -6,7 +6,7 @@ module Placemaker
     
     # Returns a Placemaker::Location object as a container for place information.
     def place
-      Placemaker::Location.new(@nodeset.search('.//xmlns:place', 'xmlns' => 'http://wherein.yahooapis.com/v1/schema'))
+      Placemaker::Location.new(@nodeset.search('.//xmlns:place'))
     end
     
     # type of match (0=text or text and coordinates, 1=coordinates only) 

data/lib/placemaker/xml_helper.rb

@@ -6,7 +6,7 @@ module Placemaker
     
     # Returns the inner text of a node with the given name under the current @nodeset 
     def nested_node(name)
-      @nodeset.search(".//xmlns:#{name}", 'xmlns' => 'http://wherein.yahooapis.com/v1/schema').inner_text
+      @nodeset.search(".//xmlns:#{name}").inner_text
     end
     
     private :nested_node

data/lib/placemaker/xml_parser.rb

@@ -3,23 +3,22 @@ require 'placemaker/document'
 module Placemaker
   class XmlParser
     def initialize(xml_body)
-      @body = xml_body
       @xml = Nokogiri::XML(xml_body)
     end    
     
     # time in seconds to process the document
     def processing_time
-      @xml.xpath('.//xmlns:processingTime', 'xmlns' => 'http://wherein.yahooapis.com/v1/schema').inner_text.to_f
+      @xml.xpath('.//xmlns:processingTime').inner_text.to_f
     end
     
     # version of the software used to process the document 
     def version
-      @xml.xpath('.//xmlns:version', 'xmlns' => 'http://wherein.yahooapis.com/v1/schema').inner_text.strip
+      @xml.xpath('.//xmlns:version').inner_text.strip
     end
     
     # length in bytes of the document
     def document_length
-      @xml.xpath('.//xmlns:documentLength', 'xmlns' => 'http://wherein.yahooapis.com/v1/schema').inner_text.to_i  
+      @xml.xpath('.//xmlns:documentLength').inner_text.to_i
     end
     
     #  Returns a set of Placemaker::Document objects as containers for content location information

data/spec/placemaker/coordinates_spec.rb

@@ -2,10 +2,9 @@ require 'spec_helper'
 
 describe Placemaker::Coordinates do
   before do
-    @xml_str = File.read(File.join(File.dirname(__FILE__), %w[.. fixtures xml_rss_feed_result.xml]))
-    @xmlp = Placemaker::XmlParser.new(@xml_str)
-    @doc = @xmlp.documents[5]    
-    @coords = @doc.place_details.first.place.centroid
+    xmlp = Placemaker::XmlParser.new(File.read(File.join(File.dirname(__FILE__), %w[.. fixtures xml_rss_feed_result.xml])))
+    doc = xmlp.documents[5]
+    @coords = doc.place_details.first.place.centroid
   end
   
   it "should be a Placemaker::Coordinates object" do

data/spec/placemaker/document_spec.rb

@@ -2,9 +2,8 @@ require 'spec_helper'
 
 describe Placemaker::Document do
   before do
-    @xml_str = File.read(File.join(File.dirname(__FILE__), %w[.. fixtures xml_rss_feed_result.xml]))
-    @xmlp = Placemaker::XmlParser.new(@xml_str)
-    @doc = @xmlp.documents[5]
+    xmlp = Placemaker::XmlParser.new(File.read(File.join(File.dirname(__FILE__), %w[.. fixtures xml_rss_feed_result.xml])))
+    @doc = xmlp.documents[5]
   end
     
   describe "#places" do

data/spec/placemaker/extents_spec.rb

@@ -2,10 +2,9 @@ require 'spec_helper'
 
 describe Placemaker::Extents do
   before do
-    @xml_str = File.read(File.join(File.dirname(__FILE__), %w[.. fixtures xml_rss_feed_result.xml]))
-    @xmlp = Placemaker::XmlParser.new(@xml_str)
-    @doc = @xmlp.documents[5]
-    @extents = @doc.extents
+    xmlp = Placemaker::XmlParser.new(File.read(File.join(File.dirname(__FILE__), %w[.. fixtures xml_rss_feed_result.xml])))
+    doc = xmlp.documents[5]
+    @extents = doc.extents
   end
 
   it "should be a Placemaker::Extents object" do

data/spec/placemaker/location_spec.rb

@@ -2,10 +2,9 @@ require 'spec_helper'
 
 describe Placemaker::Location do
   before do
-    @xml_str = File.read(File.join(File.dirname(__FILE__), %w[.. fixtures xml_rss_feed_result.xml]))
-    @xmlp = Placemaker::XmlParser.new(@xml_str)
-    @doc = @xmlp.documents[5]    
-    @loc = @doc.place_details.first.place
+    xmlp = Placemaker::XmlParser.new(File.read(File.join(File.dirname(__FILE__), %w[.. fixtures xml_rss_feed_result.xml])))
+    doc = xmlp.documents[5]
+    @loc = doc.place_details.first.place
   end
   
   describe "#woe_id" do

data/spec/placemaker/place_details_spec.rb

@@ -2,10 +2,9 @@ require 'spec_helper'
 
 describe Placemaker::PlaceDetails do
   before do
-    @xml_str = File.read(File.join(File.dirname(__FILE__), %w[.. fixtures xml_rss_feed_result.xml]))
-    @xmlp = Placemaker::XmlParser.new(@xml_str)
-    @doc = @xmlp.documents[5]
-    @pd = @doc.place_details.first
+    xmlp = Placemaker::XmlParser.new(File.read(File.join(File.dirname(__FILE__), %w[.. fixtures xml_rss_feed_result.xml])))
+    doc = xmlp.documents[5]
+    @pd = doc.place_details.first
   end
     
   describe "#match_type" do

data/spec/placemaker/reference_spec.rb

@@ -2,8 +2,7 @@ require 'spec_helper'
 
 describe Placemaker::Reference do
   before do
-    xml_str = File.read(File.join(File.dirname(__FILE__), %w[.. fixtures xml_rss_feed_result.xml]))
-    xmlp = Placemaker::XmlParser.new(xml_str)
+    xmlp = Placemaker::XmlParser.new(File.read(File.join(File.dirname(__FILE__), %w[.. fixtures xml_rss_feed_result.xml])))
     doc = xmlp.documents[5]
     @reference = doc.reference_list.first
   end

data/spec/placemaker/xml_parser_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe Placemaker::XmlParser do
   before do
-    @xml_str = File.read(File.join(File.dirname(__FILE__), %w[.. fixtures xml_rss_feed_result.xml]))
-    @xmlp = Placemaker::XmlParser.new(@xml_str)
+    xml_str = File.read(File.join(File.dirname(__FILE__), %w[.. fixtures xml_rss_feed_result.xml]))
+    @xmlp = Placemaker::XmlParser.new(xml_str)
   end
 
   describe "processing_time" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: placemaker
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Justin Leitgeb