RubyGems - interior - Versions diffs - 0.9.1 → 0.9.2 - Mend

interior 0.9.1 → 0.9.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

data/README.md +105 -185
data/lib/interior/geocoder.rb +2 -2
data/lib/interior/version.rb +1 -1
data/spec/fixtures/az_bad_response.xml +24 -0
data/spec/lib/interior/geocoder_spec.rb +9 -0
metadata +6 -4

data/README.md CHANGED Viewed

@@ -28,7 +28,7 @@ Section is option. If omitted, the centerpoint latitude and longitude will be fo
 the township and range:
     require 'interior'
-    response = Interior::Geocoder.get_lat_lon('AZ', 14, 1, 'N', 1, 'E') # No section
+    response = Interior::Geocoder.get_lat_lon('AZ', 14, 1, 'N', 1, 'E') # no section
     response.success?   => true
     response.latitude   => 33.4211630233451
     response.longitude  => -112.254699834217
@@ -69,351 +69,271 @@ Each meridian has a corresponding numeric key mapping:
   </tr>
   <tr>
     <td>AL</td>
-    <td>HUNTSVILLE MER</td>
+    <td>Huntsville</td>
     <td>16</td>
     <td>AL</td>
-    <td>ST. STEPHENS MER</td>
+    <td>St. Stephens</td>
     <td>25</td>
   </tr>
   <tr>
     <td>AL</td>
-    <td>TALLAHASEE MER</td>
+    <td>Tallahasee</td>
     <td>29</td>
     <td>AR</td>
-    <td>5TH PM</td>
+    <td>5th</td>
     <td>05</td>
   </tr>
   <tr>
     <td>AZ</td>
-    <td>GILA-SALT RIVER MER</td>
+    <td>Gila-Salt River</td>
     <td>14</td>
     <td>AZ</td>
-    <td>NAVAJO MER</td>
+    <td>Navajo</td>
     <td>22</td>
   </tr>
   <tr>
     <td>AZ</td>
-    <td>SAN BERNARDINO MER</td>
+    <td>San Bernardino</td>
     <td>27</td>
     <td>CA</td>
-    <td>GILA-SALT RIVER MER</td>
+    <td>Gila-Salt River</td>
     <td>14</td>
   </tr>
   <tr>
     <td>CA</td>
-    <td>HUMBOLDT MER</td>
+    <td>Humboldt</td>
     <td>15</td>
     <td>CA</td>
-    <td>MOUNT DIABLO MER</td>
+    <td>Mount Diablo</td>
     <td>21</td>
   </tr>
   <tr>
     <td>CA</td>
-    <td>SAN BERNARDINO MER</td>
+    <td>San Bernardino</td>
     <td>27</td>
     <td>CO</td>
-    <td>6TH PM</td>
+    <td>6th</td>
     <td>06</td>
   </tr>
   <tr>
     <td>CO</td>
-    <td>NEW MEX PM</td>
+    <td>New Mex</td>
     <td>23</td>
     <td>CO</td>
-    <td>UTE MER</td>
+    <td>Ute</td>
     <td>31</td>
   </tr>
-  <tr>
-    <td>CT</td>
-    <td>CONNECTICUT</td>
-    <td>CT</td>
-    <td>DE</td>
-    <td>DELAWARE</td>
-    <td>DE</td>
-  </tr>
   <tr>
     <td>FL</td>
-    <td>TALLAHASEE MER</td>
+    <td>Tallahasee</td>
     <td>29</td>
-    <td>GA</td>
-    <td>GEORGIA</td>
-    <td>GA</td>
-  </tr>
-  <tr>
     <td>IA</td>
-    <td>5TH PM</td>
+    <td>5th</td>
     <td>05</td>
-    <td>ID</td>
-    <td>BOISE MER</td>
-    <td>08</td>
   </tr>
   <tr>
+    <td>ID</td>
+    <td>Boise</td>
+    <td>08</td>
     <td>IL</td>
-    <td>2ND PM</td>
+    <td>2nd</td>
     <td>02</td>
-    <td>IL</td>
-    <td>3RD PM</td>
-    <td>03</td>
   </tr>
   <tr>
     <td>IL</td>
-    <td>4TH PM ILLINOIS</td>
+    <td>3rd</td>
+    <td>03</td>
+    <td>IL</td>
+    <td>4th Illinois</td>
     <td>04</td>
-    <td>IN</td>
-    <td>1ST PM</td>
-    <td>01</td>
   </tr>
   <tr>
     <td>IN</td>
-    <td>2ND PM</td>
+    <td>1st</td>
+    <td>01</td>
+    <td>IN</td>
+    <td>2nd</td>
     <td>02</td>
-    <td>KS</td>
-    <td>6TH PM</td>
-    <td>06</td>
   </tr>
   <tr>
-    <td>KY</td>
-    <td>KENTUCKY</td>
-    <td>KY</td>
+    <td>KS</td>
+    <td>6th</td>
+    <td>06</td>
     <td>LA</td>
-    <td>LOUISIANA MER</td>
+    <td>Louisiana</td>
     <td>18</td>
   </tr>
   <tr>
     <td>LA</td>
-    <td>ST. HELENA MER</td>
+    <td>St. Helena</td>
     <td>24</td>
-    <td>MA</td>
-    <td>MASSACHUSETS</td>
-    <td>MA</td>
-  </tr>
-  <tr>
-    <td>MD</td>
-    <td>MARYLAND</td>
-    <td>MD</td>
-    <td>ME</td>
-    <td>MAINE</td>
-    <td>ME</td>
-  </tr>
-  <tr>
     <td>MI</td>
-    <td>MICHIGAN MER</td>
+    <td>Michigan</td>
     <td>19</td>
-    <td>MN</td>
-    <td>5TH PM</td>
-    <td>05</td>
   </tr>
   <tr>
     <td>MN</td>
-    <td>4TH PM MN-WI</td>
-    <td>46</td>
-    <td>MO</td>
-    <td>5TH PM</td>
+    <td>5th</td>
     <td>05</td>
+    <td>MN</td>
+    <td>4th</td>
+    <td>46</td>
   </tr>
   <tr>
+    <td>MO</td>
+    <td>5th</td>
+    <td>05</td>
     <td>MS</td>
-    <td>CHICKASAW MER</td>
+    <td>Chickasaw</td>
     <td>09</td>
-    <td>MS</td>
-    <td>CHOCTAW MER</td>
-    <td>10</td>
   </tr>
   <tr>
     <td>MS</td>
-    <td>HUNTSVILLE MER</td>
-    <td>16</td>
+    <td>Choctaw</td>
+    <td>10</td>
     <td>MS</td>
-    <td>ST. STEPHENS MER</td>
-    <td>25</td>
+    <td>Huntsville</td>
+    <td>16</td>
   </tr>
   <tr>
     <td>MS</td>
-    <td>WASHINGTON MER</td>
+    <td>St. Stephens</td>
+    <td>25</td>
+    <td>MS</td>
+    <td>Washington</td>
     <td>32</td>
-    <td>MT</td>
-    <td>PRIN MER, MT</td>
-    <td>20</td>
   </tr>
   <tr>
-    <td>NC</td>
-    <td>NO CAROLINA</td>
-    <td>NC</td>
+    <td>MT</td>
+    <td>Prin</td>
+    <td>20</td>
     <td>ND</td>
-    <td>5TH PM</td>
+    <td>5th</td>
     <td>05</td>
   </tr>
   <tr>
     <td>NE</td>
-    <td>6TH PM</td>
+    <td>6th</td>
     <td>06</td>
-    <td>NH</td>
-    <td>NEW HAMPSHIRE</td>
-    <td>NH</td>
-  </tr>
-  <tr>
-    <td>NJ</td>
-    <td>NEW JERSEY</td>
-    <td>NJ</td>
     <td>NM</td>
-    <td>NEW MEX PM</td>
+    <td>New Mex</td>
     <td>23</td>
   </tr>
   <tr>
     <td>NV</td>
-    <td>MOUNT DIABLO MER</td>
+    <td>Mount Diablo</td>
     <td>21</td>
     <td>NV</td>
-    <td>SAN BERNARDINO MER</td>
+    <td>San Bernardino</td>
     <td>27</td>
   </tr>
   <tr>
-    <td>NY</td>
-    <td>NEW YORK</td>
-    <td>NY</td>
     <td>OH</td>
-    <td>1ST PM</td>
+    <td>1st</td>
     <td>01</td>
-  </tr>
-  <tr>
     <td>OH</td>
-    <td>MICHIGAN MER</td>
+    <td>Michigan</td>
     <td>19</td>
-    <td>OH</td>
-    <td>OHIO RIVER SURVEY</td>
-    <td>35</td>
   </tr>
   <tr>
     <td>OH</td>
-    <td>BETWEEN THE MIAMIS</td>
-    <td>36</td>
+    <td>Ohio River Survey</td>
+    <td>35</td>
     <td>OH</td>
-    <td>MUSKINGUM RIVER BASIN</td>
-    <td>37</td>
+    <td>Between the Miamis</td>
+    <td>36</td>
   </tr>
   <tr>
     <td>OH</td>
-    <td>OHIO RIVER BASIN</td>
-    <td>38</td>
+    <td>Muskingum River Basin</td>
+    <td>37</td>
     <td>OH</td>
-    <td>1ST SCIOTO RIVER BASE</td>
-    <td>39</td>
+    <td>Ohio River Basin</td>
+    <td>38</td>
   </tr>
   <tr>
     <td>OH</td>
-    <td>2ND SCIOTO RIVER BASE</td>
-    <td>40</td>
+    <td>1st Scioto River Base</td>
+    <td>39</td>
     <td>OH</td>
-    <td>3RD SCIOTO RIVER BASE</td>
-    <td>41</td>
+    <td>2nd Scioto River Base</td>
+    <td>40</td>
   </tr>
   <tr>
     <td>OH</td>
-    <td>TWELVE MILE SQUARE</td>
-    <td>43</td>
+    <td>3rd Scioto River Base</td>
+    <td>41</td>
     <td>OH</td>
-    <td>WEST OF GREAT MIAMI</td>
-    <td>47</td>
+    <td>Twelve Mile Square</td>
+    <td>43</td>
   </tr>
   <tr>
     <td>OH</td>
-    <td>US MILITARY SURVEY</td>
-    <td>48</td>
+    <td>West of Great Miami</td>
+    <td>47</td>
     <td>OH</td>
-    <td>CT WEST RES-OHIO</td>
-    <td>91</td>
+    <td>US Military Survey</td>
+    <td>48</td>
   </tr>
   <tr>
     <td>OH</td>
-    <td>OHIO CO PUR-OHIO</td>
-    <td>92</td>
+    <td>Ct West Res</td>
+    <td>91</td>
     <td>OH</td>
-    <td>VA MILITARY SURVEY-OHIO</td>
-    <td>93</td>
+    <td>Ohio CO Pur</td>
+    <td>92</td>
   </tr>
   <tr>
     <td>OH</td>
-    <td>OHIO</td>
-    <td>OH</td>
+    <td>Va Military Survey</td>
+    <td>93</td>
     <td>OK</td>
-    <td>CIMARRON MER</td>
+    <td>Cimarron</td>
     <td>11</td>
   </tr>
   <tr>
     <td>OK</td>
-    <td>INDIAN MER</td>
+    <td>Indian</td>
     <td>17</td>
     <td>OR</td>
-    <td>WILLAMETTE MER</td>
+    <td>Willamette</td>
     <td>33</td>
   </tr>
   <tr>
-    <td>PA</td>
-    <td>PENNSYLVANIA</td>
-    <td>PA</td>
-    <td>RI</td>
-    <td>RHODE ISLAND</td>
-    <td>RI</td>
-  </tr>
-  <tr>
-    <td>SC</td>
-    <td>SO CAROLINA</td>
-    <td>SC</td>
     <td>SD</td>
-    <td>5TH PM</td>
+    <td>5th</td>
     <td>05</td>
-  </tr>
-  <tr>
     <td>SD</td>
-    <td>6TH PM</td>
+    <td>6th</td>
     <td>06</td>
-    <td>SD</td>
-    <td>BLACK HILLS MER</td>
-    <td>07</td>
-  </tr>
-  <tr>
-    <td>TN</td>
-    <td>TENNESSEE</td>
-    <td>TN</td>
-    <td>TX</td>
-    <td>TEXAS</td>
-    <td>TX</td>
   </tr>
   <tr>
+    <td>SD</td>
+    <td>Black Hills</td>
+    <td>07</td>
     <td>UT</td>
-    <td>SALT LAKE MER</td>
+    <td>Salt Lake</td>
     <td>26</td>
-    <td>UT</td>
-    <td>UINTAH SPEC MER</td>
-    <td>30</td>
-  </tr>
-  <tr>
-    <td>VA</td>
-    <td>VIRGINIA</td>
-    <td>VA</td>
-    <td>VT</td>
-    <td>VERMONT</td>
-    <td>VT</td>
   </tr>
   <tr>
+    <td>UT</td>
+    <td>Uintah Spec</td>
+    <td>30</td>
     <td>WA</td>
-    <td>WILLAMETTE MER</td>
+    <td>Willamette</td>
     <td>33</td>
-    <td>WI</td>
-    <td>4TH PM MN-WI</td>
-    <td>46</td>
   </tr>
   <tr>
-    <td>WV</td>
-    <td>WEST VIRGINIA</td>
-    <td>WV</td>
+    <td>WI</td>
+    <td>4th</td>
+    <td>46</td>
     <td>WY</td>
-    <td>6TH PM</td>
+    <td>6th</td>
     <td>06</td>
   </tr>
   <tr>
     <td>WY</td>
-    <td>WIND RIVER MER</td>
+    <td>Wind River</td>
     <td>34</td>
     <td></td>
     <td></td>

data/lib/interior/geocoder.rb CHANGED Viewed

@@ -49,9 +49,9 @@ module Interior
         doc      = Nokogiri::XML(xml)
         data     = Nokogiri::XML(doc.children[0].children[5].text)
         points   = data.xpath('//georss:point').first.child.text.split
-        lon, lat = points
+        lon, lat = points == ['0', '0'] ? nil : points
-        { :lat => lat.to_f, :lon => lon.to_f }
+        { :lat => lat.to_f, :lon => lon.to_f } if lon && lat
       rescue
         nil # if XML is the wrong format, return nil
       end

data/lib/interior/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Interior
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/spec/fixtures/az_bad_response.xml ADDED Viewed

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TownshipGeocoderResult xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.esri.com/">
+  <CompletionStatus>true</CompletionStatus>
+  <Message>Ok</Message>
+  <Data>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;rss version="2.0" xmlns:georss="http://www.georss.org/georss"&gt;
+&lt;channel&gt;
+&lt;title&gt;Township GeoCoder&lt;/title&gt;
+&lt;item&gt;
+&lt;title&gt;Lat Lon&lt;/title&gt;
+&lt;link&gt;http://www.geocommunicator.gov&lt;/link&gt;
+&lt;description&gt;Latitude(33.384549272498), Longitude(-112.228362739723)&lt;/description&gt;
+&lt;pubDate&gt;1/17/2012 1:45:18 PM&lt;/pubDate&gt;
+&lt;georss:point&gt;0 0&lt;/georss:point&gt;
+&lt;/item&gt;
+&lt;item&gt;&lt;title&gt;Township Range Section&lt;/title&gt;
+&lt;link&gt;http://www.geocommunicator.gov&lt;/link&gt;
+&lt;description&gt;AZ,14,1,0,N,1,0,E,35,,0&lt;/description&gt;
+&lt;pubDate&gt;1/17/2012 1:45:18 PM&lt;/pubDate&gt;
+&lt;georss:polygon&gt;33.377309949200253,-112.22473576975602,33.377309762935738,-112.22508655240432,33.377309134293,-112.22616916833266,33.37730785372446,-112.22833437690633,33.377306363608341,-112.22906648958326,33.377305152888994,-112.23266758802146,33.377303662772874,-112.23339967741532,33.3773024054874,-112.23700079913641,33.380924970911053,-112.2369908107018,33.38454753633448,-112.23698082226719,33.387510306279239,-112.23697386063094,33.388168308962179,-112.23697292930837,33.39085871361948,-112.23697462897206,33.3917808161018,-112.23697244036401,33.391802213237952,-112.23269233791888,33.3918235638082,-112.22841218890744,33.391844751396775,-112.22413655681072,33.391865892419219,-112.21986092471394,33.388228751797271,-112.21980846796981,33.384591634458559,-112.21975596465961,33.380954284289089,-112.21970516101294,33.377316934119563,-112.21965433408343,33.377315932947795,-112.22005654902097,33.377313464942972,-112.22295871314896,33.3773114858825,-112.22400412274044,33.377309949200253,-112.22473576975602&lt;/georss:polygon&gt;
+&lt;/item&gt;&lt;/channel&gt;&lt;/rss&gt;</Data>
+</TownshipGeocoderResult>

data/spec/lib/interior/geocoder_spec.rb CHANGED Viewed

@@ -195,6 +195,15 @@ describe Interior::Geocoder do
       end
     end
+    # Interior web services sometimes has bad response
+    context 'when xml is invalid' do
+      let(:xml) { File.open('spec/fixtures/az_bad_response.xml').read }
+      it 'returns nil' do
+        subject.should == nil
+      end
+    end
     context 'when no xml is provided' do
       let(:xml) { nil }

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: interior
 version: !ruby/object:Gem::Version
-  hash: 57
+  hash: 63
   prerelease:
   segments:
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors:
 - Chris Hunt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-01-18 00:00:00 Z
+date: 2012-01-21 00:00:00 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -96,6 +96,7 @@ files:
 - lib/interior/response.rb
 - lib/interior/version.rb
 - spec/fixtures/az.xml
+- spec/fixtures/az_bad_response.xml
 - spec/fixtures/az_invalid_section.xml
 - spec/fixtures/az_no_section.xml
 - spec/fixtures/co.xml
@@ -137,6 +138,7 @@ specification_version: 3
 summary: Convert PLSS to latitude and longitude
 test_files:
 - spec/fixtures/az.xml
+- spec/fixtures/az_bad_response.xml
 - spec/fixtures/az_invalid_section.xml
 - spec/fixtures/az_no_section.xml
 - spec/fixtures/co.xml