geo_magic 0.2.4 → 0.2.4.1

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.4.1

data/geo_magic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geo_magic}
-  s.version = "0.2.4"
+  s.version = "0.2.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2011-01-24}
+  s.date = %q{2011-01-28}
   s.description = %q{Get IP and location data using freegeoip.net - can also  calculate of distance between map points using haversine supporting multiple distance units}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -44,6 +44,7 @@ Gem::Specification.new do |s|
     "lib/geo_magic/util.rb",
     "lib/rails/config.rb",
     "spec/fixtures/map_api_keys.yaml",
+    "spec/fixtures/streets.de.yml",
     "spec/geo_magic/calculate_spec.rb",
     "spec/geo_magic/geocoder_spec.rb",
     "spec/geo_magic/include_calc_spec.rb",
@@ -52,6 +53,7 @@ Gem::Specification.new do |s|
     "spec/geo_magic/remote_spec.rb",
     "spec/geo_magic/select_nearest_spec.rb",
     "spec/geo_magic/within_rect_spec.rb",
+    "spec/helper/streets.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/kristianmandrup/geo_magic}
@@ -68,6 +70,7 @@ Gem::Specification.new do |s|
     "spec/geo_magic/remote_spec.rb",
     "spec/geo_magic/select_nearest_spec.rb",
     "spec/geo_magic/within_rect_spec.rb",
+    "spec/helper/streets.rb",
     "spec/spec_helper.rb"
   ]
 

data/lib/geo_magic/geocode/geocode_adapter.rb

@@ -12,7 +12,10 @@ module GeoMagic
     end
   
     def geocode location_str
-      geo_coder.geocode(location_str).extend GeocodeAPI
+      result = geo_coder.geocode(CGI.escape(location_str)).extend GeocodeAPI
+      # p result.data['Status']
+      raise GeoMagic::GeoCodeError if result.data['Status']['code'] != 200
+      result
     end
 
     module GeocodeAPI

data/lib/geo_magic/geocode/geocoder.rb

@@ -6,6 +6,8 @@ require 'geo_magic/geocode/graticule_adapter'
 require 'geo_magic/geocode/geocode_adapter'
 
 module GeoMagic 
+  class GeoCodeError < StandardError; end;
+  
   class << self    
     def geo_coder options = {:type => :geocode, :service => :google}
       service_name = options[:service_name] || :google
@@ -19,7 +21,7 @@ module GeoMagic
       clazz.new services, env
     end 
   
-    def geocode location_str
+    def geocode location_str      
       geo_coder.geocode location_str
     end    
   end

data/spec/fixtures/streets.de.yml

@@ -0,0 +1,19 @@
+de:
+  munich:
+    - Rosenheimerstrasse 108
+    - Marienplatz 14
+    - Karlzplatz 32
+    - Maximilianstrasse 7
+    - Burkleinstrasse 1
+    - Bruderstrasse 15
+    - Maxburgstrasse 12
+    - Rindermarkt 2
+    - Marienstrasse 10
+    - Reitmorstrasse 6
+    - Pilotystrasse 11
+    - Müllerstrasse 43
+    - Maxburgstrasse 9
+    - Salvatorstrasse 10
+    - Odeonsplatz 8
+    - Elisenstrasse 7
+    - sdgdsgpapdsdgdsg 1

data/spec/geo_magic/geocoder_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'geo_magic'
+require 'helper/streets'
 
 describe "GeoMagic Geocoder" do
   before do
@@ -41,6 +42,35 @@ describe "GeoMagic Geocoder" do
   end        
 
 
+  context 'Streets from munich' do
+    before do
+      @geocoder = GeoMagic.geo_coder
+      @geocoder.configure File.expand_path('../fixtures/map_api_keys.yaml', File.dirname(__FILE__)), :development
+
+      @streets = Streets.load :munich     
+    end
+    
+    it "should not fail" do
+      begin
+        inst = @geocoder.instance
+        
+        @streets.each do |street|          
+          adr = "#{street}"
+          @adr = adr
+          p adr
+          @location = inst.geocode adr
+          # p "status: #{@location.data["Status"]}"
+          @location.city.should_not be_nil
+          # p "city: #{@location.city}"
+        end 
+      rescue GeoMagic::GeoCodeError
+        p "OH NO! #{@adr}"
+      rescue Exception => e
+        p e      
+      end
+    end
+  end
+
   # Geocoder with Rails 3
 
   # Expects map api keys (fx for google maps) to be defined in ROOT/config/map_api_keys.yml

data/spec/helper/streets.rb

@@ -0,0 +1,26 @@
+module Streets
+  def self.load city
+    country_code = country_code_of(city)
+    city = city.to_s
+  
+    @streets ||= {}
+    filename = File.join(SPEC_DIR, "fixtures/streets.#{country_code}.yml") # File.expand_path("./../fixtures/streets.#{country_code}.yml", __FILE__)
+    @streets[city] ||= begin
+      yml = YAML.load_file(filename)
+      yml[country_code.to_s][city.to_s]
+    rescue
+      puts "No key found for city: #{city} in #{filename}"
+      []
+    end
+  end    
+
+  # Move away!
+  def self.country_code_of city = :munich
+    COUNTRY_CODES[city.to_s.downcase.to_sym]
+  end      
+
+  COUNTRY_CODES = {
+    :munich     => :de,
+    :vancouver  => :ca
+  }  
+end

data/spec/spec_helper.rb

@@ -7,6 +7,8 @@ require 'geo_magic'
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
+SPEC_DIR = File.dirname(__FILE__)
+
 RSpec.configure do |config|
   
 end

metadata

@@ -6,7 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 2
   - 4
-  version: 0.2.4
+  - 1
+  version: 0.2.4.1
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-24 00:00:00 +01:00
+date: 2011-01-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -172,6 +173,7 @@ files:
 - lib/geo_magic/util.rb
 - lib/rails/config.rb
 - spec/fixtures/map_api_keys.yaml
+- spec/fixtures/streets.de.yml
 - spec/geo_magic/calculate_spec.rb
 - spec/geo_magic/geocoder_spec.rb
 - spec/geo_magic/include_calc_spec.rb
@@ -180,6 +182,7 @@ files:
 - spec/geo_magic/remote_spec.rb
 - spec/geo_magic/select_nearest_spec.rb
 - spec/geo_magic/within_rect_spec.rb
+- spec/helper/streets.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/kristianmandrup/geo_magic
@@ -195,7 +198,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1749247139327050469
+      hash: 3722236331284659990
       segments: 
       - 0
       version: "0"
@@ -223,4 +226,5 @@ test_files:
 - spec/geo_magic/remote_spec.rb
 - spec/geo_magic/select_nearest_spec.rb
 - spec/geo_magic/within_rect_spec.rb
+- spec/helper/streets.rb
 - spec/spec_helper.rb