geomancer 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39fb1aa146cb2d56f019c302370ae8e1a0bc6be6
-  data.tar.gz: 73d491d86cc64110431b76374e5eab91d5ba5532
+  metadata.gz: eefb06205d0d05df1e1687cef51d978ee4f94e3c
+  data.tar.gz: d9ee2fba66a67084baed6120f011a1479a16c0d7
 SHA512:
-  metadata.gz: 156b8f2a42f7d16f7e78c05889bdd828d9e2e28ddb320048a5bc5d45ea8343d4d4ffb72ed3dca0eae60905ab59a9b562a021b505a8ef398c42b6e418cfebd534
-  data.tar.gz: 099febd6e0ff17744852b42fc908b46f204d007c1fb501c716070066436314663ee90ca52295547aef8a643fbcb8e1436de6aa0696a56dd27c2ec10b2c50a204
+  metadata.gz: e6f34ffce78af9b62b245536dbd2c103987e014bc40067589908eb0411295ea6720db68fb4723b80de68c582e72a1e70b09a54bdb756459689fd5963b0700563
+  data.tar.gz: 4e869fb98950958cfa250f66283783e1a204aee4d6c71cbcfb4731d89669102baea2196b49478afab06bf3e6a5e3b49bd279ce840993f7da2593e36a5b9ac9f2

checksums.yaml.gz.asc

@@ -0,0 +1,12 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+iQEcBAABCgAGBQJTclGPAAoJEP5F5V2hilTW9lEH/j8VyHMYPbNXg4Biss/nWxvN
+bc2ezN1WTWHU4l95Ssoj0NPat2hqyF1aEQkV63u6C5Dk4y+U0wKHH+hA8rj/K4SS
+9IusNj9AJg38hzYcoSJMpN1+Yl8unU6mb7ZerX7uA+fXtp2y2gqzMgQq/aZsRIjj
+LPv0zscXs/1EdOz6XCCxlynYLJJPwspJjlq+W0aoGEQozvmFZFFgtHcxshftkvXe
+DBybusWom/x7U5CJkS+oTyYbfd28pEg10OlaCPcMfqKdQNaxdz1+U4SrBgLXpEQ1
+PF9R325wAuDfeVHZQe28k7LsuRHjd6QuxrmE/2p5RCdLNW/i4KYBmIWnhR3ZQ0Q=
+=iGB2
+-----END PGP SIGNATURE-----

data/.ruby-gemset

@@ -0,0 +1 @@
+geomancer

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.1.2

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+0.7.0 - 2014-05-13
+==================
+
+* If an address looks like a zip code, don't ever do 'real' 
+  geolocation and fall back to the static lookup.
+
+* If an address looks something like "latitude: 41.9040, longitude:
+  12.4530" just extract the numbers and trust that's what we want
+  instead of 'real' geolocation.
+
+* Support :cache option to save results: `cache => Redis.new`
+
 0.6.1 - 2014-04-09
 ==================
 

data/Rakefile

@@ -1 +1,5 @@
 require "bundler/gem_tasks"
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec

data/geomancer.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

data/lib/geomancer/version.rb

@@ -1,3 +1,3 @@
 module Geomancer
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

data/lib/geomancer.rb

@@ -1,4 +1,5 @@
 require "geomancer/version"
+require "geomancer/zip_code"
 
 module Geomancer
   # Your code goes here...
@@ -11,11 +12,40 @@ module Geomancer
       require_relative './geomancer/zip_code'
     else
       require 'geocoder'
-      Geocoder.configure(engine => opts)
+
+      cache = opts.delete(:cache)
+      geocoder_config = { :engine => opts }
+      geocoder_config[:cache] = cache if cache
+      
+      Geocoder.configure(geocoder_config)
     end
   end
 
+  LAT_LONG_RE = /lat(itude)?:\s+(?<latitude>[\d\.\-]+)[\s,]+long(itude)?:\s+(?<longitude>[\d\.\-]+)/
+
+  def self.extract_lat_and_long address
+    matches = LAT_LONG_RE.match(address)
+
+    return nil if !matches
+
+    latitude = matches["latitude"]
+    longitude = matches["longitude"]
+
+    return nil if !(latitude && longitude)
+
+    return {:latitude => latitude.to_f, :longitude => longitude.to_f}
+  end
+
+  def self.zip_code_only? address
+    address.match(/^\d\d\d\d\d(?:-\d\d\d\d)?$/)
+  end
+
   def self.geolocate address
+    return Geomancer::ZipCode.geolocate(address) if zip_code_only?(address)
+
+    lat_and_long = extract_lat_and_long(address)
+    return lat_and_long if lat_and_long
+
     if !@engine
       warn("No configuration provided.  Defaulting to zip code geolocator")
       configure(:zip_code)

data/spec/lat_and_long_spec.rb

@@ -0,0 +1,36 @@
+require 'geomancer'
+
+describe Geomancer do
+  it "extracts basic latitude" do
+    Geomancer.extract_lat_and_long("latitude: 41.9040 longitude: 12.4530").should_not be_nil
+  end
+  
+  it "extracts abbreviated latitude" do
+    Geomancer.extract_lat_and_long("lat: 41.9040 long: 12.4530").should_not be_nil
+  end
+
+  it "extracts comma separated stuff" do
+    Geomancer.extract_lat_and_long("lat: 41.9040, long: 12.4530").should_not be_nil
+  end
+
+  it "doesn't extract only latitude" do
+    Geomancer.extract_lat_and_long("lat: 41.9040").should be_nil
+  end
+
+  it "doesn't extract only longitude" do
+    Geomancer.extract_lat_and_long("longitude: 41.9040").should be_nil
+  end
+
+  it "extracts actual numbers" do
+    lat_and_long = Geomancer.extract_lat_and_long("lat: 41.9040, long: 12.4530")
+    lat_and_long[:latitude].should be_a Float
+    lat_and_long[:longitude].should be_a Float
+  end
+
+  it "extracts negative numbers" do
+    lat_and_long = Geomancer.extract_lat_and_long("lat: 37.2350, long: -115.8111")
+    lat_and_long[:longitude].should == -115.8111
+  end
+  
+
+end

data/spec/zip_code_spec.rb

@@ -0,0 +1,19 @@
+require 'geomancer'
+
+describe Geomancer do
+  context 'zips' do
+    ["15217", "15217-3343"].each do |zip|
+      it "detects #{zip}" do
+        Geomancer.zip_code_only?(zip).should be_true
+      end
+    end
+  end
+
+  context 'non-zips' do
+    ["123456", "123456-22"].each do |nonzip|
+      it "doesn't detect #{nonzip}" do
+        Geomancer.zip_code_only?(nonzip).should be_false
+      end
+    end
+  end
+end

data.tar.gz.asc

@@ -0,0 +1,12 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+iQEcBAABCgAGBQJTclGPAAoJEP5F5V2hilTWfIgH/3g+u5l6XWzkALF4zOxzbu0Q
+9Nxz/beoG6ToP5gN9IBHLKDKzBMQrnLyzSIkRLvnnT+M0xVFWUEBKVS5wpU1zJs0
+wA2jSkC1k8SqbxW5kDovr47S8GhY3ytJLwZBMorGBURklF53H4UUiqkTNSJqktuy
+WL/X39xEgTdl1EQmjqdWPJV4wEsLlRBgw7sDGKILVn7Xh94Nqb4au9tryqQQqs5j
+aS8UyDAOXtzQRHOU3kXgOeuAdDXdv5S8891gg2HdLO3WolnAEoh/VoMzcAwOQnuX
+8u/XzXC3HKAFR5as7fA3UIhDu6IYeQYJwtDQIorkyn9nEUaBRakvwathbA6DfWE=
+=8YHO
+-----END PGP SIGNATURE-----

metadata

@@ -1,55 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: geomancer
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Grant T. Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geocoder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -59,7 +73,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -70,6 +86,8 @@ files:
 - lib/geomancer/version.rb
 - lib/geomancer/zip_code.rb
 - lib/geomancer/zips.rb
+- spec/lat_and_long_spec.rb
+- spec/zip_code_spec.rb
 homepage: ''
 licenses:
 - MIT
@@ -80,12 +98,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -94,4 +112,6 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple wrapper around various geolocation services
-test_files: []
+test_files:
+- spec/lat_and_long_spec.rb
+- spec/zip_code_spec.rb

metadata.gz.asc

@@ -0,0 +1,12 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+iQEcBAABCgAGBQJTclGPAAoJEP5F5V2hilTWIWYH/3PCruEHKd9uZnSPFO+C1Q+3
+ejuzn/lgyg8L9de4XPOVcRH7Xn6f81NBTQHhLOobhNoI/5A+KxgThuy1RsSGDoLu
+EqK1qzNCyYpuIwhlhebE6ya4W11UPrVYfPIYNf+QZcIiWHihRfoH1tu7ePw56VEi
+mmolO3SUxT3CRI1qR966ycZTtauGT6OdLt9nPpgpgjXjBAN0l4qFrtK1RKdI+mIZ
+DzauuMLQmosFbSnjRhAAb+dxXiGCuco02mTG/1zWAoM7Gk4JB35QySmvvbmBUb/d
+6jwskjtGTfyLWlQ8+W9Mfn9fVWr2jy9zZahjDTI58p7vUxYy4uEYfB0nv91gE18=
+=mR7X
+-----END PGP SIGNATURE-----