gmaps4rails 1.5.2 → 1.5.3

data/.gitignore

@@ -9,3 +9,4 @@ test/dummy/log/**/*
 test/dummy/.rvmrc
 pkg
 .idea
+.redcar

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gmaps4rails (1.5.2)
+    gmaps4rails (1.5.3)
 
 GEM
   remote: http://rubygems.org/
@@ -33,6 +33,7 @@ GEM
     activesupport (3.2.3)
       i18n (~> 0.6)
       multi_json (~> 1.0)
+    addressable (2.2.8)
     arel (3.0.2)
     builder (3.0.0)
     childprocess (0.3.1)
@@ -42,6 +43,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.2.0)
+    crack (0.3.1)
     database_cleaner (0.7.2)
     diff-lcs (1.1.3)
     erubis (2.7.0)
@@ -152,6 +154,9 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.32)
+    webmock (1.8.7)
+      addressable (>= 2.2.7)
+      crack (>= 0.1.7)
 
 PLATFORMS
   ruby
@@ -171,3 +176,4 @@ DEPENDENCIES
   rails (~> 3.2.1)
   rspec-rails
   sqlite3
+  webmock

data/README.rdoc

@@ -1,4 +1,4 @@
-== Google Maps for Rails (gmaps4rails) {<img src="https://secure.travis-ci.org/apneadiving/Google-Maps-for-Rails.png?branch=master" alt="Build Status" />}[http://travis-ci.org/apneadiving/Google-Maps-for-Rails]
+== Google Maps for Rails (gmaps4rails) {<img src="https://secure.travis-ci.org/apneadiving/Google-Maps-for-Rails.png?branch=master" alt="Build Status" />}[http://travis-ci.org/apneadiving/Google-Maps-for-Rails] {<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/apneadiving/Google-Maps-for-Rails]
 
 Gmaps4rails is developed to simply create a Google Map:
 
@@ -124,4 +124,4 @@ MIT license.
 
 Authors: Benjamin Roth, David Ruyer
 
-Contributors: Mircea Pricop, Kamil Śliwak, Alex Vorobiev
+{Contributors}[https://github.com/apneadiving/Google-Maps-for-Rails/graphs/contributors]

data/app/assets/javascripts/gmaps4rails/gmaps4rails.base.js.coffee

@@ -70,6 +70,14 @@ class @Gmaps4Rails
     @markerClusterer = null  # contains all marker clusterers
     @markerImages = []
 
+	#Polyline Styling
+    @polylines_conf =         #default style for polylines
+      strokeColor: "#FF0000"
+      strokeOpacity: 1
+      strokeWeight: 2
+      clickable: false
+      zIndex: null
+
   #tnitializes the map
   initialize : ->
     @serviceObject = @createMap()
@@ -228,73 +236,7 @@ class @Gmaps4Rails
     #save polygon in list
     polygon.serviceObject = new_poly
 
-  #////////////////////////////////////////////////////
-  #/////////////////// POLYLINES //////////////////////
-  #////////////////////////////////////////////////////
-
-  #replace old markers with new markers on an existing map
-  replacePolylines : (new_polylines) ->
-    #reset previous polylines and kill them from map
-    @destroy_polylines()
-    #set new polylines
-    @polylines = new_polylines
-    #create
-    @create_polylines()
-    #.... and adjust map boundaries
-    @adjustMapToBounds()
-
-  destroy_polylines : ->
-    for polyline in @polylines
-      #delete polylines from map
-      polyline.serviceObject.setMap(null)
-    #empty array
-    @polylines = []
-
-  #polylines is an array of arrays. It loops.
-  create_polylines : ->
-    for polyline in @polylines
-      @create_polyline polyline
-
-  #creates a single polyline, triggered by create_polylines
-  create_polyline : (polyline) ->
-    polyline_coordinates = []
-
-    #2 cases here, either we have a coded array of LatLng or we have an Array of LatLng
-    for element in polyline
-      #if we have a coded array
-      if element.coded_array?
-        decoded_array = new google.maps.geometry.encoding.decodePath(element.coded_array)
-        #loop through every point in the array
-        for point in decoded_array
-          polyline_coordinates.push(point)
-
-      #or we have an array of latlng
-      else
-        #by convention, a single polyline could be customized in the first array or it uses default values
-        if element == polyline[0]
-          strokeColor   = element.strokeColor   || @polylines_conf.strokeColor
-          strokeOpacity = element.strokeOpacity || @polylines_conf.strokeOpacity
-          strokeWeight  = element.strokeWeight  || @polylines_conf.strokeWeight
-          clickable     = element.clickable     || @polylines_conf.clickable
-          zIndex        = element.zIndex        || @polylines_conf.zIndex
-
-        #add latlng if positions provided
-        if element.lat? && element.lng?
-          latlng = @createLatLng(element.lat, element.lng)
-          polyline_coordinates.push(latlng)
-
-    # Construct the polyline
-    new_poly = new google.maps.Polyline
-      path:         polyline_coordinates
-      strokeColor:  strokeColor
-      strokeOpacity: strokeOpacity
-      strokeWeight: strokeWeight
-      clickable:    clickable
-      zIndex:       zIndex
-
-    #save polyline
-    polyline.serviceObject = new_poly
-    new_poly.setMap(@serviceObject)
+  
 
   #////////////////////////////////////////////////////
   #///////////////////// MARKERS //////////////////////
@@ -421,47 +363,46 @@ class @Gmaps4Rails
         @extendBoundsWithMarkers()
 
         #from polylines:
-        for polyline in @polylines
-          polyline_points = polyline.serviceObject.latLngs.getArray()[0].getArray()
-          for point in polyline_points
-            @boundsObject.extend point
+        @updateBoundsWithPolylines()
 
         #from polygons:
-        for polygon in @polygons
-          polygon_points = polygon.serviceObject.latLngs.getArray()[0].getArray()
-          for point in polygon_points
-            @boundsObject.extend point
+        @updateBoundsWithPolygons()
 
         #from circles
-        for circle in @circles
-          @boundsObject.extend(circle.serviceObject.getBounds().getNorthEast())
-          @boundsObject.extend(circle.serviceObject.getBounds().getSouthWest())
+        @updateBoundsWithCircles()
 
       #in every case, I've to take into account the bounds set up by the user
-      for bound in @map_options.bounds
-        #create points from bounds provided
-        #TODO:only works with google maps
-        bound = @createLatLng(bound.lat, bound.lng)
-        @boundsObject.extend bound
+      @extendMapBounds()
 
       #SECOND_STEP: ajust the map to the bounds
-
-      #if autozoom is false, take user info into account
-      if !@map_options.auto_zoom
-        map_center = @boundsObject.getCenter()
-        @map_options.center_latitude  = map_center.lat()
-        @map_options.center_longitude = map_center.lng()
-        @serviceObject.setCenter(map_center)
-      else
-        @fitBounds()
+      @adaptMapToBounds()
 
   #////////////////////////////////////////////////////
-  #/////////////////        KML      //////////////////
+  #/////////////////// POLYLINES //////////////////////
   #////////////////////////////////////////////////////
 
-  create_kml : ->
-    for kml in @kml
-      kml.serviceObject = @createKmlLayer kml
+  #replace old markers with new markers on an existing map
+  replacePolylines : (new_polylines) ->
+    #reset previous polylines and kill them from map
+    @destroy_polylines()
+    #set new polylines
+    @polylines = new_polylines
+    #create
+    @create_polylines()
+    #.... and adjust map boundaries
+    @adjustMapToBounds()
+
+  destroy_polylines : ->
+    for polyline in @polylines
+      #delete polylines from map
+      polyline.serviceObject.setMap(null)
+    #empty array
+    @polylines = []
+
+  #polylines is an array of arrays. It loops.
+  create_polylines : ->
+    for polyline in @polylines
+      @create_polyline polyline
 
   #////////////////////////////////////////////////////
   #///////////////// Basic functions //////////////////

data/app/assets/javascripts/gmaps4rails/gmaps4rails.bing.js.coffee

@@ -161,3 +161,14 @@ class @Gmaps4RailsBing extends Gmaps4Rails
 
   centerMapOnUser: ->
     @serviceObject.setView({ center: @userLocation})
+
+  updateBoundsWithPolylines: ()->
+
+  updateBoundsWithPolygons: ()->
+
+  updateBoundsWithCircles: ()->
+  
+  extendMapBounds :->
+
+  adaptMapToBounds: ->
+    @fitBounds()

data/app/assets/javascripts/gmaps4rails/gmaps4rails.googlemaps.js.coffee

@@ -36,14 +36,6 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
       fillOpacity: 0.35
       clickable: false
 
-    #Polyline Styling
-    @polylines_conf =         #default style for polylines
-      strokeColor: "#FF0000"
-      strokeOpacity: 1
-      strokeWeight: 2
-      clickable: false
-      zIndex: null
-
     #Circle Styling
     @circles_conf =           #default style for circles
       fillColor: "#00AAFF"
@@ -250,7 +242,66 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
     kml.setMap(@serviceObject)
     return kml
 
+  #////////////////////////////////////////////////////
+  #/////////////////// POLYLINES //////////////////////
+  #////////////////////////////////////////////////////
+
+  #creates a single polyline, triggered by create_polylines
+  create_polyline : (polyline) ->
+    polyline_coordinates = []
 
+    #2 cases here, either we have a coded array of LatLng or we have an Array of LatLng
+    for element in polyline
+      #if we have a coded array
+      if element.coded_array?
+        decoded_array = new google.maps.geometry.encoding.decodePath(element.coded_array)
+        #loop through every point in the array
+        for point in decoded_array
+          polyline_coordinates.push(point)
+
+      #or we have an array of latlng
+      else
+        #by convention, a single polyline could be customized in the first array or it uses default values
+        if element == polyline[0]
+          strokeColor   = element.strokeColor   || @polylines_conf.strokeColor
+          strokeOpacity = element.strokeOpacity || @polylines_conf.strokeOpacity
+          strokeWeight  = element.strokeWeight  || @polylines_conf.strokeWeight
+          clickable     = element.clickable     || @polylines_conf.clickable
+          zIndex        = element.zIndex        || @polylines_conf.zIndex
+
+        #add latlng if positions provided
+        if element.lat? && element.lng?
+          latlng = @createLatLng(element.lat, element.lng)
+          polyline_coordinates.push(latlng)
+
+    # Construct the polyline
+    new_poly = new google.maps.Polyline
+      path:         polyline_coordinates
+      strokeColor:  strokeColor
+      strokeOpacity: strokeOpacity
+      strokeWeight: strokeWeight
+      clickable:    clickable
+      zIndex:       zIndex
+
+    #save polyline
+    polyline.serviceObject = new_poly
+    new_poly.setMap(@serviceObject)
+
+  
+  updateBoundsWithPolylines: ()->
+    for polyline in @polylines
+      polyline_points = polyline.serviceObject.latLngs.getArray()[0].getArray()
+      for point in polyline_points
+        @boundsObject.extend point
+  
+  #////////////////////////////////////////////////////
+  #/////////////////        KML      //////////////////
+  #////////////////////////////////////////////////////
+
+  create_kml : ->
+    for kml in @kml
+      kml.serviceObject = @createKmlLayer kml
+            
   #////////////////////////////////////////////////////
   #/////////////////// Other methods //////////////////
   #////////////////////////////////////////////////////
@@ -260,4 +311,29 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
 
   centerMapOnUser : ->
     @serviceObject.setCenter(@userLocation)
-
+  
+  updateBoundsWithPolygons: ()->
+    for polygon in @polygons
+      polygon_points = polygon.serviceObject.latLngs.getArray()[0].getArray()
+      for point in polygon_points
+        @boundsObject.extend point
+
+  updateBoundsWithCircles: ()->
+    for circle in @circles
+      @boundsObject.extend(circle.serviceObject.getBounds().getNorthEast())
+      @boundsObject.extend(circle.serviceObject.getBounds().getSouthWest())
+
+  extendMapBounds: ()->
+    for bound in @map_options.bounds
+      #create points from bounds provided
+      @boundsObject.extend @createLatLng(bound.lat, bound.lng)
+  
+  adaptMapToBounds:()->
+    #if autozoom is false, take user info into account
+    if !@map_options.auto_zoom
+      map_center = @boundsObject.getCenter()
+      @map_options.center_latitude  = map_center.lat()
+      @map_options.center_longitude = map_center.lng()
+      @serviceObject.setCenter(map_center)
+    else
+      @fitBounds()

data/app/assets/javascripts/gmaps4rails/gmaps4rails.mapquest.js.coffee

@@ -1,7 +1,7 @@
 #######################################################################################################
 ##############################################  Map Quest #############################################
 #######################################################################################################
-# http://www.mapquestapi.com/sdk/js/v6.0.0/poi.html
+# http://developer.mapquest.com/web/documentation/sdk/javascript/v7.0/api/MQA.Poi.html
 
 class @Gmaps4RailsMapquest extends Gmaps4Rails
 
@@ -131,4 +131,15 @@ class @Gmaps4RailsMapquest extends Gmaps4Rails
     @serviceObject.addShape object
 
   removeFromMap: (object)->
-    @serviceObject.removeShape object
+    @serviceObject.removeShape object
+    
+  updateBoundsWithPolylines: ()->
+
+  updateBoundsWithPolygons: ()->
+
+  updateBoundsWithCircles: ()->
+    
+  extendMapBounds :->
+
+  adaptMapToBounds: ->
+    @fitBounds()

data/app/assets/javascripts/gmaps4rails/gmaps4rails.openlayers.js.coffee

@@ -18,6 +18,7 @@ class @Gmaps4RailsOpenlayers extends Gmaps4Rails
     @openMarkers = null
     @markersLayer = null
     @markersControl = null
+    @polylinesLayer = null
 
   #////////////////////////////////////////////////////
   #/////////////// Basic Objects   ////////////////////
@@ -110,6 +111,7 @@ class @Gmaps4RailsOpenlayers extends Gmaps4Rails
     @serviceObject.removeLayer(@markersLayer) if @markersLayer != null and @serviceObject.getLayer(@markersLayer.id) != null
   
   extendBoundsWithMarkers: ->
+    console.log "here"
     for marker in @markers
       @boundsObject.extend(@createLatLng(marker.lat,marker.lng))        
 
@@ -187,16 +189,62 @@ class @Gmaps4RailsOpenlayers extends Gmaps4Rails
                                null, true, @onPopupClose)
     feature.popup = popup
     popup.feature = feature
-    @serviceObject.addPopup popup
+    @map.addPopup popup
 
   onFeatureUnselect: (evt) ->
     feature = evt.feature
     if feature.popup
       #//popup.feature = null;
-      @serviceObject.removePopup feature.popup
+      @map.removePopup feature.popup
       feature.popup.destroy()
       feature.popup = null
 
+  #////////////////////////////////////////////////////
+  #/////////////////// POLYLINES //////////////////////
+  #////////////////////////////////////////////////////
+
+  create_polyline : (polyline) ->
+	
+    if(@polylinesLayer == null)
+      @polylinesLayer = new OpenLayers.Layer.Vector("Polylines", null)
+      @serviceObject.addLayer(@polylinesLayer)
+      @polylinesLayer.events.register("featureselected", @polylinesLayer, @onFeatureSelect)
+      @polylinesLayer.events.register("featureunselected", @polylinesLayer, @onFeatureUnselect)
+      @polylinesControl = new OpenLayers.Control.DrawFeature(@polylinesLayer, OpenLayers.Handler.Path)
+      @serviceObject.addControl(@polylinesControl)
+    
+    polyline_coordinates = []
+
+    for element in polyline
+      #by convention, a single polyline could be customized in the first array or it uses default values
+      if element == polyline[0]
+        strokeColor   = element.strokeColor   || @polylines_conf.strokeColor
+        strokeOpacity = element.strokeOpacity || @polylines_conf.strokeOpacity
+        strokeWeight  = element.strokeWeight  || @polylines_conf.strokeWeight
+        clickable     = element.clickable     || @polylines_conf.clickable
+        zIndex        = element.zIndex        || @polylines_conf.zIndex	  
+      
+      #add latlng if positions provided
+      if element.lat? && element.lng?
+        latlng = new OpenLayers.Geometry.Point(element.lng, element.lat)
+        polyline_coordinates.push(latlng)
+    
+    line_points = new OpenLayers.Geometry.LineString(polyline_coordinates);
+    line_style = { strokeColor: strokeColor, strokeOpacity: strokeOpacity, strokeWidth: strokeWeight };
+   
+    polyline = new OpenLayers.Feature.Vector(line_points, null, line_style);
+    polyline.geometry.transform(new OpenLayers.Projection("EPSG:4326"), new OpenLayers.Projection("EPSG:900913"))
+
+    @polylinesLayer.addFeatures([polyline])
+
+    return polyline
+
+  updateBoundsWithPolylines: ()->
+  
+  updateBoundsWithPolygons: ()->
+    
+  updateBoundsWithCircles: ()->
+  
   # #////////////////////////////////////////////////////
   # #/////////////////// Other methods //////////////////
   # #////////////////////////////////////////////////////
@@ -207,3 +255,7 @@ class @Gmaps4RailsOpenlayers extends Gmaps4Rails
   centerMapOnUser: ->
     @serviceObject.setCenter @userLocation
     
+  extendMapBounds :->
+    
+  adaptMapToBounds: ->
+    @fitBounds()

data/app/views/gmaps4rails/_gmaps4rails.html.erb

@@ -1,5 +1,5 @@
 <% content_for :scripts do %>
-<%= javascript_include_tag *js_dependencies %>
+<%= javascript_include_tag *(js_dependencies.map(&:html_safe)) %>
 
 <script type="text/javascript" charset="utf-8">
 <%=raw options.to_gmaps4rails %>

data/gmaps4rails.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "guard-rspec"
   
   s.add_development_dependency "factory_girl_rails"  
+  s.add_development_dependency "webmock"
   
   s.add_development_dependency 'pry'
 end

data/lib/generators/gmaps4rails/install_generator.rb

@@ -7,22 +7,38 @@ module Gmaps4rails
 
       def copy_locale
         if Rails::VERSION::MINOR >= 1
-          copy_file '../../../app/assets/javascripts/gmaps4rails/gmaps4rails.base.js.coffee',       'app/assets/javascripts/gmaps4rails/gmaps4rails.base.js.coffee'
-          copy_file '../../../app/assets/javascripts/gmaps4rails/gmaps4rails.googlemaps.js.coffee', 'app/assets/javascripts/gmaps4rails/gmaps4rails.googlemaps.js.coffee'
-          copy_file '../../../app/assets/javascripts/gmaps4rails/gmaps4rails.openlayers.js.coffee', 'app/assets/javascripts/gmaps4rails/gmaps4rails.openlayers.js.coffee'
-          copy_file '../../../app/assets/javascripts/gmaps4rails/gmaps4rails.bing.js.coffee',       'app/assets/javascripts/gmaps4rails/gmaps4rails.bing.js.coffee'
-          copy_file '../../../app/assets/javascripts/gmaps4rails/gmaps4rails.mapquest.js.coffee',   'app/assets/javascripts/gmaps4rails/gmaps4rails.mapquest.js.coffee'        
-          copy_file '../../../public/stylesheets/gmaps4rails.css', 'app/assets/stylesheets/gmaps4rails.css'
+          copy_file "#{source_assets_base_path}gmaps4rails.base.js.coffee",       "#{destination_assets_base_path}gmaps4rails.base.js.coffee"
+          copy_file "#{source_assets_base_path}gmaps4rails.googlemaps.js.coffee", "#{destination_assets_base_path}gmaps4rails.googlemaps.js.coffee"
+          copy_file "#{source_assets_base_path}gmaps4rails.openlayers.js.coffee", "#{destination_assets_base_path}gmaps4rails.openlayers.js.coffee"
+          copy_file "#{source_assets_base_path}gmaps4rails.bing.js.coffee",       "#{destination_assets_base_path}gmaps4rails.bing.js.coffee"
+          copy_file "#{source_assets_base_path}gmaps4rails.mapquest.js.coffee",   "#{destination_assets_base_path}gmaps4rails.mapquest.js.coffee"        
+          copy_file "../../../public/stylesheets/gmaps4rails.css", "app/assets/stylesheets/gmaps4rails.css"
         else
         #I don't copy manifests, kind of useless
-          copy_file '../../../public/javascripts/gmaps4rails/gmaps4rails.base.js',       'public/javascripts/gmaps4rails/gmaps4rails.base.js'
-          copy_file '../../../public/javascripts/gmaps4rails/gmaps4rails.googlemaps.js', 'public/javascripts/gmaps4rails/gmaps4rails.googlemaps.js'
-          copy_file '../../../public/javascripts/gmaps4rails/gmaps4rails.bing.js',       'public/javascripts/gmaps4rails/gmaps4rails.bing.js'
-          copy_file '../../../public/javascripts/gmaps4rails/gmaps4rails.openlayers.js', 'public/javascripts/gmaps4rails/gmaps4rails.openlayers.js'
-          copy_file '../../../public/javascripts/gmaps4rails/gmaps4rails.mapquest.js',   'public/javascripts/gmaps4rails/gmaps4rails.mapquest.js'
-          copy_file '../../../public/stylesheets/gmaps4rails.css',                       'public/stylesheets/gmaps4rails.css'
+          copy_file "#{source_js_base_path}gmaps4rails.base.js",       "#{destination_js_base_path}gmaps4rails.base.js"
+          copy_file "#{source_js_base_path}gmaps4rails.googlemaps.js", "#{destination_js_base_path}gmaps4rails.googlemaps.js"
+          copy_file "#{source_js_base_path}gmaps4rails.bing.js",       "#{destination_js_base_path}gmaps4rails.bing.js"
+          copy_file "#{source_js_base_path}gmaps4rails.openlayers.js", "#{destination_js_base_path}gmaps4rails.openlayers.js"
+          copy_file "#{source_js_base_path}gmaps4rails.mapquest.js",   "#{destination_js_base_path}gmaps4rails.mapquest.js"
+          copy_file "../../../public/stylesheets/gmaps4rails.css",     "public/stylesheets/gmaps4rails.css"
         end
       end
+      
+      def source_assets_base_path
+        '../../../app/assets/javascripts/gmaps4rails/'
+      end
+      
+      def destination_assets_base_path
+        'app/assets/javascripts/gmaps4rails/'
+      end
+      
+      def source_js_base_path
+        "../../../public/javascripts/gmaps4rails/"
+      end
+      
+      def destination_js_base_path
+        "public/javascripts/gmaps4rails/"
+      end
 
       def show_readme
         readme 'README' if behavior == :invoke

data/lib/gmaps4rails/acts_as_gmappable.rb

@@ -10,57 +10,14 @@ module Gmaps4rails
       
       # This is a validation method which triggers the geocoding and save its results
       def process_geocoding
-        #to prevent geocoding each time a save is made
-        return true if gmaps4rails_prevent_geocoding?
-        begin
-          coordinates = Gmaps4rails.geocode(self.send(gmaps4rails_options[:address]), gmaps4rails_options[:language], false, gmaps4rails_options[:protocol])
-        rescue GeocodeStatus, GeocodeInvalidQuery => e  #address was invalid, add error to address.
-          Rails.logger.warn(e)
-          errors[gmaps4rails_options[:address]] << gmaps4rails_options[:msg] if Gmaps4rails.condition_eval(self, gmaps4rails_options[:validation])
-        rescue GeocodeNetStatus => e                    #connection error, No need to prevent save.
-          Rails.logger.warn(e)
-        else #if no exception, save the values
-          self.gmaps4rails_save_data(coordinates)
-        end
-      end
-      
-      # saves coordinates according to the various options
-      def gmaps4rails_save_data(coordinates)
-        self.send("#{gmaps4rails_options[:lng_column]}=", coordinates.first[:lng])
-        self.send("#{gmaps4rails_options[:lat_column]}=", coordinates.first[:lat])
-        # save normalized address if required
-        self.send("#{gmaps4rails_options[:normalized_address]}=", coordinates.first[:matched_address]) unless gmaps4rails_options[:normalized_address].nil?          
-        # Call the callback method to let the user do what he wants with the data
-        self.send(gmaps4rails_options[:callback], coordinates.first[:full_data]) unless gmaps4rails_options[:callback].nil?
-        # update checker if required
-        self.send("#{gmaps4rails_options[:checker]}=", true) if gmaps4rails_check_geocoding?
-      end
-      
-      # if process_geocoding is a TrueClass or a FalseClass, 'check_process' and 'checker' play an additional role
-      # if process_geocoding is a Proc or a Symbol, 'check_process' and 'checker' are skipped since process_geocoding bears the whole logic
-      def gmaps4rails_prevent_geocoding?
-        if gmaps4rails_options[:process_geocoding].is_a?(TrueClass) || gmaps4rails_options[:process_geocoding].is_a?(FalseClass)
-          return true if !Gmaps4rails.condition_eval(self, gmaps4rails_options[:process_geocoding])
-          Gmaps4rails.condition_eval(self, gmaps4rails_options[:check_process]) && self.send("#{gmaps4rails_options[:checker]}") == true 
-        else
-          !Gmaps4rails.condition_eval(self, gmaps4rails_options[:process_geocoding])
-        end
-      end
-      
-      # Do we have to check the geocoding 
-      def gmaps4rails_check_geocoding?
-        if gmaps4rails_options[:process_geocoding].is_a?(TrueClass) || gmaps4rails_options[:process_geocoding].is_a?(FalseClass)
-          Gmaps4rails.condition_eval(self, gmaps4rails_options[:check_process])
-        else
-          false
-        end
+        Gmaps4rails::ModelHandler.new(self, gmaps4rails_options).retrieve_coordinates
       end
       
       # creates json for one instance 
       def to_gmaps4rails(&block)
         json = "["
         object_json = Gmaps4rails.create_json(self, &block)
-        json << object_json.to_s unless json.nil?
+        json << object_json.to_s unless object_json.nil?
         json << "]"
       end
 
@@ -97,5 +54,5 @@ module Gmaps4rails
       end
     end
 
-  end #ActsAsGmappable
+  end
 end

data/lib/gmaps4rails/api_wrappers/base_net_methods.rb

@@ -0,0 +1,40 @@
+module Gmaps4rails
+  
+  module BaseNetMethods
+
+    def checked_google_response(&block)
+      raise_net_status unless valid_response?
+  
+      raise_query_error unless valid_parsed_response?
+  
+      yield
+    end
+
+    def base_url
+      URI.escape base_request
+    end
+
+    def response
+      @response ||= get_response
+    end
+
+    def valid_response?
+      response.is_a?(Net::HTTPSuccess)
+    end
+
+    def valid_parsed_response?
+      parsed_response["status"] == "OK"
+    end
+
+    def parsed_response
+      @parsed_response ||= JSON.parse(response.body)
+    end
+    
+    def get_response
+      url = URI.parse(base_url)
+      http = Gmaps4rails.http_agent
+      http.get_response(url)
+    end
+    
+  end
+end