geo_magic 0.2.4.1 → 0.2.4.2

data/README.textile

@@ -91,9 +91,9 @@ Single Geocode Geocoder:
 
 <pre>
   # Use Graticule Multi geocoder, which tries multiple geocode services in succession!
-  @geocoder = GeoMagic.geo_coder(:type => :geocode)
-  @geocoder.configure File.expand_path('../fixtures/map_api_keys.yaml', File.dirname(__FILE__)), :development
-  location = @geocoder.instance.geocode "Mullerstrasse 9, Munich"
+  geocoder = GeoMagic.geo_coder(:type => :geocode)
+  geocoder.configure File.expand_path('../fixtures/map_api_keys.yaml', File.dirname(__FILE__)), :development
+  location = geocoder.instance.geocode "Mullerstrasse 9, Munich"
   location.city
 </pre>
 
@@ -101,9 +101,9 @@ Single Graticule Geocoder:
 
 <pre>
   # Use Graticule Multi geocoder, which tries multiple geocode services in succession!
-  @geocoder = GeoMagic.geo_coder(:type => graticule)
-  @geocoder.configure File.expand_path('../fixtures/map_api_keys.yaml', File.dirname(__FILE__)), :development
-  location = @geocoder.instance.geocode "Mullerstrasse 9, Munich"
+  geocoder = GeoMagic.geo_coder(:type => graticule)
+  geocoder.configure File.expand_path('../fixtures/map_api_keys.yaml', File.dirname(__FILE__)), :development
+  location = geocoder.instance.geocode "Mullerstrasse 9, Munich"
   location.city
 </pre>
 
@@ -111,7 +111,7 @@ Multi Graticule Geocoder:
 
 <pre>
   # Use Graticule Multi geocoder, which tries multiple geocode services in succession!
-  @geocoder = GeoMagic.geo_coder(:type => graticule_multi)
+  geocoder = GeoMagic.geo_coder(:type => graticule_multi)
   ..
 </pre>
 
@@ -119,13 +119,26 @@ Multi Graticule Customization:
 
 <pre>
   # Use Graticule Multi geocoder, which tries multiple geocode services in succession!
-  @geocoder = GeoMagic.geo_coder(:type => graticule_multi)
-  location = @geocoder.instance(:timeout => 3) do |result|
+  geocoder = GeoMagic.geo_coder(:type => graticule_multi)
+  location = geocoder.instance(:timeout => 3) do |result|
     [:address, :street].include?(result.precision)]
   end
   ..
 </pre>
 
+Geocoder in Rails:
+
+<pre>
+  geocoder = GeoMagic.geo_coder(:env => :rails)
+  geocoder.configure
+
+  location = geocoder.instance.geocode "Mullerstrasse 9, Munich"
+  location.city.should == 'Munich'
+</pre>
+
+By default, the configuration expects a file in config/map_api_keys.yml containing the keys for each environment (see spec/fictures folder).
+This can be customized if needed: @geocoder.configure '../my_keys.yaml'@
+
 h3. Create random points in Radius
 
 * @create_points_in_square@ 

data/VERSION

@@ -1 +1 @@
-0.2.4.1
+0.2.4.2

data/geo_magic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geo_magic}
-  s.version = "0.2.4.1"
+  s.version = "0.2.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2011-01-28}
+  s.date = %q{2011-02-01}
   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 = [
@@ -43,9 +43,11 @@ Gem::Specification.new do |s|
     "lib/geo_magic/remote.rb",
     "lib/geo_magic/util.rb",
     "lib/rails/config.rb",
+    "spec/fixtures/config/map_api_keys.yml",
     "spec/fixtures/map_api_keys.yaml",
     "spec/fixtures/streets.de.yml",
     "spec/geo_magic/calculate_spec.rb",
+    "spec/geo_magic/geocoder_rails_spec.rb",
     "spec/geo_magic/geocoder_spec.rb",
     "spec/geo_magic/include_calc_spec.rb",
     "spec/geo_magic/include_remote_spec.rb",
@@ -63,6 +65,7 @@ Gem::Specification.new do |s|
   s.summary = %q{Get your IP and location data and calculate distances on the globe}
   s.test_files = [
     "spec/geo_magic/calculate_spec.rb",
+    "spec/geo_magic/geocoder_rails_spec.rb",
     "spec/geo_magic/geocoder_spec.rb",
     "spec/geo_magic/include_calc_spec.rb",
     "spec/geo_magic/include_remote_spec.rb",

data/lib/geo_magic/geocode/config.rb

@@ -18,8 +18,6 @@ module GeoMagic
       [:google, :yahoo]
     end
 
-    protected
-
     services_available.each do |api|
       class_eval %{
         def #{api}_key

data/lib/rails/config.rb

@@ -1,28 +1,18 @@
+require 'geo_magic/geocode/config'
+
 module GeoMagic
   module RailsServiceAdapter
-    attr_reader :geo_coder
-
-    def geocode location_str
-      raise 'method #geocode must be implemented by adapter subclass'
-    end
-
-    def reverse_geocode latitude, longitude
-      raise 'method #reverse_geocode should be implemented by adapter subclass'
-    end          
-
-    protected
+    include GeoMagic::ServiceAdapter
     
     def env 
-      ENV['HEROKU_SITE'] || ::Rails.env.downcase || 'development'
+      heroku = ENV['HEROKU_SITE'] if ENV         
+      rails_env = ::Rails.env.downcase if ::Rails.env
+      heroku || rails_env || 'development'
     end
   
-    def config
-      @config ||= ::YAML.load_file("#{::Rails.root}/config/map_api_keys.yml")[env]
+    def configure file_name = 'map_api_keys.yml'
+      @config ||= ::YAML.load_file("#{::Rails.root}/config/#{file_name}")[env]
     end
-
-    def google_key
-      config['google_key'] 
-    end    
   end  
 end
 

data/spec/fixtures/config/map_api_keys.yml

@@ -0,0 +1,4 @@
+development:
+  google_key: "ABQIAAAAUzkItq4p7LYo2YIR_gtjpRTJQa0g3IQ9GZqIMmInSLzwtGDKaBSzEc8_FNxIfQLkpKOh9R4JB87Rig" 
+test:
+  google_key: "ABQIAAAAUzkItq4p7LYo2YIR_gtjpRTJQa0g3IQ9GZqIMmInSLzwtGDKaBSzEc8_FNxIfQLkpKOh9R4JB87Rig" 

data/spec/geo_magic/geocoder_rails_spec.rb

@@ -0,0 +1,37 @@
+# Geocoder with Rails 3
+
+# Expects map api keys (fx for google maps) to be defined in ROOT/config/map_api_keys.yml
+# See spec/fixtures/map_api_keys.yml for example
+# 
+# Use @geocoder.configure(path, env) to customize this 
+
+require 'spec_helper'
+require 'geo_magic'
+require 'helper/streets'
+
+module Rails
+  def self.root
+    SPEC_DIR + '/fixtures'
+  end
+  
+  def self.env
+    'test'
+   end  
+end
+
+describe "GeoMagic Geocoder" do
+  it "should geocode for rails" do        
+    @geocoder = GeoMagic.geo_coder(:env => :rails)
+    @geocoder.configure
+    location = @geocoder.instance.geocode "Mullerstrasse 9, Munich"
+    location.city.should == 'Munich'
+  end
+
+
+  it "should geocode for rails with custom config file" do        
+    @geocoder = GeoMagic.geo_coder(:env => :rails)
+    @geocoder.configure '../map_api_keys.yaml'
+    location = @geocoder.instance.geocode "Mullerstrasse 9, Munich"
+    location.city.should == 'Munich'
+  end
+end

data/spec/geo_magic/geocoder_spec.rb

@@ -47,6 +47,8 @@ describe "GeoMagic Geocoder" do
       @geocoder = GeoMagic.geo_coder
       @geocoder.configure File.expand_path('../fixtures/map_api_keys.yaml', File.dirname(__FILE__)), :development
 
+      puts "config: #{@geocoder.config}"
+
       @streets = Streets.load :munich     
     end
     
@@ -70,18 +72,5 @@ describe "GeoMagic Geocoder" do
       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
-  # See spec/fixtures/map_api_keys.yml for example
-
-  # Use @geocoder.configure(path, env) to customize this 
-
-  # it "should geocode for rails" do        
-  #   @geocoder = GeoMap.geo_coder(:env => :rails)
-  #   location = @geocoder.instance.geocode "Mullerstrasse 9, Munich"
-  #   location.city.should == 'Munich'
-  # end
 end
 

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 2
   - 4
-  - 1
-  version: 0.2.4.1
+  - 2
+  version: 0.2.4.2
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-28 00:00:00 +01:00
+date: 2011-02-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -172,9 +172,11 @@ files:
 - lib/geo_magic/remote.rb
 - lib/geo_magic/util.rb
 - lib/rails/config.rb
+- spec/fixtures/config/map_api_keys.yml
 - spec/fixtures/map_api_keys.yaml
 - spec/fixtures/streets.de.yml
 - spec/geo_magic/calculate_spec.rb
+- spec/geo_magic/geocoder_rails_spec.rb
 - spec/geo_magic/geocoder_spec.rb
 - spec/geo_magic/include_calc_spec.rb
 - spec/geo_magic/include_remote_spec.rb
@@ -198,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3722236331284659990
+      hash: -3203749080952033166
       segments: 
       - 0
       version: "0"
@@ -219,6 +221,7 @@ specification_version: 3
 summary: Get your IP and location data and calculate distances on the globe
 test_files: 
 - spec/geo_magic/calculate_spec.rb
+- spec/geo_magic/geocoder_rails_spec.rb
 - spec/geo_magic/geocoder_spec.rb
 - spec/geo_magic/include_calc_spec.rb
 - spec/geo_magic/include_remote_spec.rb