on_the_map 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 914a50c4213246b7ccd438bb7b42fce3aa973a33
-  data.tar.gz: a133f2e998b628a9c218dcafed4a955ab51dd9a3
+  metadata.gz: 811edf28a0f93de8a49c23d5392dfe0e6b7cbce5
+  data.tar.gz: 16977c27a4d715afde3e6d199bdadcd71eeec096
 SHA512:
-  metadata.gz: 0a27ffe8f53ec8b1527fb7597e61e2aa892fdf242e4bcd7430a3f4766a262cbdeb38e98795f20e9ec8b252936bcdf8aa540689f5c1882e5d5d60157689edbac8
-  data.tar.gz: 75823ab95659bdc6db3f5ff3a5d712ea054767c26dc432128fad789044d58ed6d35170db6654a7f50fd3dbf5a86c8d6d184bea3a859a77f918ce0569241ee972
+  metadata.gz: fd1bdb8f829cbd3a927d9b8229cdf26182616aabd1598943f3a0944d4c95acfbc29e10cdd9c621521ba92c60d6ef2f38f87c274ca9108d628844a314a66f5b2f
+  data.tar.gz: a63b3333a79e43bb0be5eafd122fcfa95cd56f68a7619d382eec3ad40125d175355b4703dceb689e7947a54735be142790d82e305df8297c4fd9586e1389a402

data/lib/address.rb

@@ -17,6 +17,15 @@ class Address
     %w{street number floor_adr} + geo_address_fields
   end
 
+  def self.type_of name
+    case name.to_sym
+    when :latitude, :longitude, :postal_code
+      :int
+    else
+      :string
+    end
+  end
+
   address_fields.each do |name|
     field name, type: String    
   end

data/lib/on_the_map/addressable.rb

@@ -19,6 +19,14 @@ module OnTheMap
 
           unless value.to_s.strip.blank?
             # set address field
+            
+            value = case Address.type_of(fname)
+            when :int
+              value.to_i
+            else
+              value
+            end
+            
             self.address.send(meth_name, value)
 
             # update full address

data/lib/on_the_map/geo_locatable.rb

@@ -56,13 +56,13 @@ module OnTheMap
 
     def latitude
       perform_geocoding unless position
-      position[1] if position
+      position[1].to_i if position
     end
     alias_method :lat, :latitude
 
     def longitude
       perform_geocoding unless position
-      position[0] if position
+      position[0].to_i if position
     end
     alias_method :lng, :longitude
 

data/lib/on_the_map/version.rb

@@ -1,3 +1,3 @@
 module OnTheMap
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end 

data/spec/spec_helper.rb

@@ -13,6 +13,7 @@ require 'geocoder'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
+# Dir["#{File.dirname(__FILE__)}/support/*.rb"].each {|f| require f}
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
@@ -27,6 +28,9 @@ RSpec.configure do |config|
 
   config.include FactoryGirl::Syntax::Methods
 
+  # Stub geocoding
+  GeocodeStubbing.stub_geocoding!
+
   # == Mock Framework
   config.mock_with :rspec
 

data/spec/support/gmaps_lookup_stubs.rb

@@ -1,86 +1,106 @@
-Geocoder.configure(:lookup => :test)
-
-Invalid_adr = {
-  'latitude'     => nil,
-  'longitude'    => nil,
-  'address'      => nil,
-  'state'        => nil,
-  'state_code'   => nil,
-  'country'      => nil,
-  'country_code' => nil
-}
-
-# Invalid
-
-Geocoder::Lookup::Test.add_stub(
-  "blip blab", [Invalid_adr]
-)
-
-Geocoder::Lookup::Test.add_stub(
-  "blip blab, blop", [Invalid_adr]
-)
-
-Geocoder::Lookup::Test.add_stub(
-  "blip blab, blop, DK", [Invalid_adr]
-)
-
-Maglekildevej = {
-  'latitude'     => 55.677069,
-  'longitude'    => 12.513321,
-  'address'      => 'Maglekildevej 18, 4th, Frederiksberg, Copenhagen, Denmark',
-  'state'        => '',
-  'state_code'   => '',
-  'country'      => 'Denmark',
-  'country_code' => 'DK'
-}
-
-Gammel_kongevej = {
-  'latitude'     => 55.67616169999999,
-  'longitude'    => 12.5422907,
-  'address'      => 'Gammel kongevej 123, Frederiksberg, Copenhagen, Denmark',
-  'state'        => '',
-  'state_code'   => '',
-  'country'      => 'Denmark',
-  'country_code' => 'DK'
-}
-
-# Gammel kongevej
-
-Geocoder::Lookup::Test.add_stub(
-  "Gammel kongevej 123, Frederiksberg", [Gammel_kongevej]
-)
-
-Geocoder::Lookup::Test.add_stub(
-  "Gammel kongevej 123", [Gammel_kongevej]
-)
-
-Geocoder::Lookup::Test.add_stub(
-  "Gammel kongevej 123, Frederiksberg, DK", [Gammel_kongevej]
-)
-
-Geocoder::Lookup::Test.add_stub(
-  "Gammel kongevej 123, Frederiksberg, Denmark, DK", [Gammel_kongevej]
-)
-
-
-# Maglekildevej
-
-Geocoder::Lookup::Test.add_stub(
-  "Maglekildevej 18, 4th, Frederiksberg", [Maglekildevej]
-)
-
-Geocoder::Lookup::Test.add_stub(
-  "Maglekildevej 18, 4th", [Maglekildevej]
-)
-
-Geocoder::Lookup::Test.add_stub(
-  "Maglekildevej 18, 4th, Denmark, DK", [Maglekildevej]
-)
-
-Geocoder::Lookup::Test.add_stub(
-  "Maglekildevej 18, 4th, Frederiksberg, Denmark, DK", [Maglekildevej]
-)
-
-Geocoder::Lookup::Test.add_stub(
-  "Maglekildevej 18, 4th, Frederiksberg, DK", [Maglekildevej]
-)
+module GeocodeStubbing
+  def self.stub_geocoding!
+    StubGeocodeLookups.new
+  end
+end
+
+class StubGeocodeLookups
+  def initialize
+    Geocoder.configure(:lookup => :test)
+    configure
+  end
+
+  def configure
+    add_stubs :invalid_adr, :maglekildevej, :gammel_kongevej
+  end
+
+  protected
+
+  def add_stubs *stubs
+    stubs.flatten.each {|stub| add_stub stub }
+  end
+
+  def add_stub stub
+    stubber = stub_class(stub).new
+
+    stubber.places.flatten.each do |place|
+      Geocoder::Lookup::Test.add_stub place, [stubber.result]
+    end
+  end
+
+  def stub_class name
+    "StubGeocodeLookups::#{name.to_s.camelize}".constantize
+  end
+
+  def resolve *stubs
+    [stubs].flatten.map {|stub| send(stub) }
+  end  
+
+  class Stubber
+  end
+
+  class InvalidAdr < Stubber
+    def result
+      {
+    'latitude'     => nil,
+    'longitude'    => nil,
+    'address'      => nil,
+    'state'        => nil,
+    'state_code'   => nil,
+    'country'      => nil,
+    'country_code' => nil
+      }
+    end
+
+    def places
+      ["blip blab", "blip blab, blop", "blip blab, blop, DK"]
+    end    
+  end
+
+  class Maglekildevej < Stubber
+    def result 
+      {
+      'latitude'     => 55.677069,
+      'longitude'    => 12.513321,
+      'address'      => 'Maglekildevej 18, 4th, Frederiksberg, Copenhagen, Denmark',
+      'state'        => '',
+      'state_code'   => '',
+      'country'      => 'Denmark',
+      'country_code' => 'DK'
+      }
+    end
+
+    def places
+      [
+        "Maglekildevej 18, 4th",
+        "Maglekildevej 18, 4th, Frederiksberg",
+        "Maglekildevej 18, 4th, Denmark, DK",
+        "Maglekildevej 18, 4th, Frederiksberg, DK",
+        "Maglekildevej 18, 4th, Frederiksberg, Denmark, DK"
+      ]
+    end    
+  end
+
+  class GammelKongevej < Stubber
+    def result
+      {
+      'latitude'     => 55.67616169999999,
+      'longitude'    => 12.5422907,
+      'address'      => 'Gammel kongevej 123, Frederiksberg, Copenhagen, Denmark',
+      'state'        => '',
+      'state_code'   => '',
+      'country'      => 'Denmark',
+      'country_code' => 'DK'
+      }
+    end
+
+    def places
+      [
+        "Gammel kongevej 123", 
+        "Gammel kongevej 123, Frederiksberg", 
+        "Gammel kongevej 123, Frederiksberg, DK",
+        "Gammel kongevej 123, Frederiksberg, Denmark, DK"
+      ]
+    end
+  end    
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: on_the_map
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Kristian Mandrup