gmaps4rails 0.8.8 → 0.9.0

data/test/dummy/spec/{factories.rb → support/factories.rb}

@@ -17,9 +17,4 @@ end
 Factory.define :invalid_user, :parent => :user do |f|
   f.name    "me"
   f.sec_address "home"
-end
-
-Factory.define :user_incomplete_address, :parent => :user do |f|
-  f.name    "me"
-  f.sec_address "Toulon, PACA, France"
 end

data/test/dummy/spec/support/matchers.rb

@@ -0,0 +1,7 @@
+require 'rspec/expectations'
+
+RSpec::Matchers.define :have_same_position_as do |position_hash|
+  match do |object|
+    object.send(object.gmaps4rails_options[:lat_column]) == position_hash[:latitude] && object.send(object.gmaps4rails_options[:lng_column]) == position_hash[:longitude]
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gmaps4rails
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 59
   prerelease: false
   segments: 
   - 0
-  - 8
-  - 8
-  version: 0.8.8
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Benjamin Roth
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-11 00:00:00 +02:00
+date: 2011-07-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,13 +46,14 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - app/views/gmaps4rails/_gmaps4rails.html.erb
-- lib/acts_as_gmappable/base.rb
-- lib/array.rb
+- lib/extensions/array.rb
+- lib/extensions/hash.rb
 - lib/generators/gmaps4rails/install_generator.rb
 - lib/generators/templates/README
 - lib/gmaps4rails.rb
-- lib/gmaps4rails_helper.rb
-- lib/hash.rb
+- lib/gmaps4rails/acts_as_gmappable.rb
+- lib/gmaps4rails/base.rb
+- lib/helper/gmaps4rails_helper.rb
 - public/images/marker.png
 - public/javascripts/gmaps4rails.js
 - public/stylesheets/gmaps4rails.css
@@ -81,11 +82,13 @@ files:
 - test/dummy/db/schema.rb
 - test/dummy/db/seeds.rb
 - test/dummy/spec/base/base_spec.rb
-- test/dummy/spec/controllers/users_controller_spec.rb
-- test/dummy/spec/factories.rb
+- test/dummy/spec/javascripts/support/jasmine_config.rb
+- test/dummy/spec/javascripts/support/jasmine_runner.rb
 - test/dummy/spec/models/user_spec.rb
 - test/dummy/spec/requests/users_spec.rb
 - test/dummy/spec/spec_helper.rb
+- test/dummy/spec/support/factories.rb
+- test/dummy/spec/support/matchers.rb
 has_rdoc: true
 homepage: http://github.com/apneadiving/Google-Maps-for-Rails
 licenses: []
@@ -144,8 +147,10 @@ test_files:
 - test/dummy/db/schema.rb
 - test/dummy/db/seeds.rb
 - test/dummy/spec/base/base_spec.rb
-- test/dummy/spec/controllers/users_controller_spec.rb
-- test/dummy/spec/factories.rb
+- test/dummy/spec/javascripts/support/jasmine_config.rb
+- test/dummy/spec/javascripts/support/jasmine_runner.rb
 - test/dummy/spec/models/user_spec.rb
 - test/dummy/spec/requests/users_spec.rb
 - test/dummy/spec/spec_helper.rb
+- test/dummy/spec/support/factories.rb
+- test/dummy/spec/support/matchers.rb

data/lib/acts_as_gmappable/base.rb

@@ -1,209 +0,0 @@
-require 'net/http'
-require 'uri'
-require 'crack'
-require 'logger'
-
-module Gmaps4rails
-  
-  class GeocodeStatus < StandardError; end
-  class GeocodeNetStatus < StandardError; end
-  class GeocodeInvalidQuery < StandardError; end
-  class DirectionStatus < StandardError; end
-  class DirectionNetStatus < StandardError; end
-  class DirectionInvalidQuery < StandardError; end
-
-  def Gmaps4rails.create_json(object)
-    unless object.send(object.gmaps4rails_options[:lat_column]).blank? && object.send(object.gmaps4rails_options[:lng_column]).blank?
-"{#{Gmaps4rails.description(object)}#{Gmaps4rails.title(object)}#{Gmaps4rails.sidebar(object)}\"longitude\": \"#{object.send(object.gmaps4rails_options[:lng_column])}\", \"latitude\": \"#{object.send(object.gmaps4rails_options[:lat_column])}\"#{Gmaps4rails.picture(object)}},\n"
-    end
-  end  
-  
-  def Gmaps4rails.description(object)
-    return "\"description\": \"#{object.gmaps4rails_infowindow}\", " if object.respond_to?("gmaps4rails_infowindow")
-  end
-  
-  def Gmaps4rails.title(object)
-    return "\"title\": \"#{object.gmaps4rails_title}\", " if object.respond_to?("gmaps4rails_title")
-  end
-  
-  def Gmaps4rails.sidebar(object)
-    return "\"sidebar\": \"#{object.gmaps4rails_sidebar}\"," if object.respond_to?("gmaps4rails_sidebar")
-  end
-  
-  def Gmaps4rails.picture(object)
-    return ", \"picture\": \"#{object.gmaps4rails_marker_picture['picture']}\", \"width\": \"#{object.gmaps4rails_marker_picture['width']}\", \"height\": \"#{object.gmaps4rails_marker_picture['height']}\"" if object.respond_to?("gmaps4rails_marker_picture")
-  end
-  
-  def Gmaps4rails.geocode(address, lang="en", raw = false)
-   if address.nil? || address.empty?
-     raise Gmaps4rails::GeocodeInvalidQuery, "You must provide an address"
-   else #coordinates are valid
-     geocoder = "http://maps.googleapis.com/maps/api/geocode/json?language=#{lang}&address="
-     output = "&sensor=false"
-     #send request to the google api to get the lat/lng
-     request = geocoder + address + output
-     url = URI.escape(request)
-     resp = Net::HTTP.get_response(URI.parse(url))
-     #parse result if result received properly
-     if resp.is_a?(Net::HTTPSuccess)             
-       #parse the json
-       parse = Crack::JSON.parse(resp.body)
-       #logger.debug "Google geocoding. Address: #{address}. Result: #{resp.body}"
-       #check if google went well
-       if parse["status"] == "OK"
-         return parse if raw == true
-         array = []
-         parse["results"].each do |result|
-           array << { 
-                      :lat => result["geometry"]["location"]["lat"], 
-                      :lng => result["geometry"]["location"]["lng"],
-                      :matched_address => result["formatted_address"],
-                      :bounds => result["geometry"]["bounds"],
-                      :full_data => result
-                     }
-         end
-         return array
-       else #status != OK
-         raise Gmaps4rails::GeocodeStatus, "The address you passed seems invalid, status was: #{parse["status"]}.
-         Request was: #{request}"
-       end #end parse status
-       
-     else #if not http success
-       raise Gmaps4rails::GeocodeNetStatus, "The request sent to google was invalid (not http success): #{request}.
-       Response was: #{resp}"           
-     end #end resp test
-   end # end address valid
-  end #end geocode
-  
-  #output could be raw, pretty or clean
-  def Gmaps4rails.destination(start_end, options={}, output="pretty")
-   if start_end["from"].nil? || start_end["to"].empty?
-     raise Gmaps4rails::DirectionInvalidQuery, "Origin and destination must be provided in a hash as first argument"
-   else #great, we have stuff to work with
-     geocoder = "http://maps.googleapis.com/maps/api/directions/json?origin=#{start_end["from"]}&destination=#{start_end["to"]}"
-     #if value is an Array, it means it contains the waypoints, otherwise it's chained normally
-     dest_options = options.empty? ? "" : "&" + options.map {|k,v| v.is_a?(Array) ? k + "=" + v * ("|") : k + "=" + v }*("&") 
-     #send request to the google api to get the directions
-     request = geocoder + dest_options + "&sensor=false"
-     url = URI.escape(request)
-     resp = Net::HTTP.get_response(URI.parse(url))
-     #parse result if result received properly
-     if resp.is_a?(Net::HTTPSuccess)             
-       #parse the json
-       parse = Crack::JSON.parse(resp.body)
-       #check if google went well
-       if parse["status"] == "OK"
-        legs = []
-        #Each element in the legs array specifies a single leg of the journey from the origin to the destination in the calculated route
-        parse["routes"].first["legs"].each do |leg|
-          #delete coded polyline elements from legs and store it in polylines to make output cleaner
-          polylines = leg["steps"].map {|step| step.delete("polyline")} if output == "pretty" || output == "clean"
-          legs << {
-                    "duration"  => { "text" => leg["duration"]["text"], "value" => leg["duration"]["value"].to_f },
-                    "distance"  => { "text" => leg["distance"]["text"], "value" => leg["distance"]["value"].to_f },
-                    "steps"     => leg["steps"]
-                  }
-          if output == "pretty"
-            #polylines contain levels data, which are not that useful.
-            polylines.map{|poly| poly.delete("levels")}
-            #create valid json from all polylines, this could be directly passed to javascript for display
-            json = polylines.map { |poly| {"coded_array" => poly["points"]} }.to_json
-            #merge results in legs
-            legs.last.merge!({ "polylines" => json })
-          end
-        end
-        return legs
-       else #status != OK
-         raise Gmaps4rails::DirectionStatus, "The query you passed seems invalid, status was: #{parse["status"]}.
-         Request was: #{request}"
-       end #end parse status
-     else #if not http success
-       raise Gmaps4rails::DirectionNetStatus, "The request sent to google was invalid (not http success): #{request}.
-       Response was: #{resp}"           
-     end #end resp test
-   end # end origin + destination exist
-  end #end destination
-  
-  
-  def Gmaps4rails.filter(data)
-    return data if data.is_a?(Numeric) || data.is_a?(TrueClass) || data.is_a?(FalseClass)
-    "'#{data}'"
-  end
-  
-  module ActsAsGmappable
-
-    extend ActiveSupport::Concern
-    
-    module InstanceMethods
-        
-      def process_geocoding
-        #to prevent geocoding each time a save is made
-        return true if gmaps4rails_options[:check_process] == true && self.send(gmaps4rails_options[:checker]) == true
-        begin
-          coordinates = Gmaps4rails.geocode(self.send(gmaps4rails_options[:address]), gmaps4rails_options[:language])
-        rescue GeocodeStatus, GeocodeInvalidQuery  #address was invalid, add error to base.
-          errors[gmaps4rails_options[:address]] << gmaps4rails_options[:msg] if gmaps4rails_options[:validation]
-        rescue GeocodeNetStatus => e #connection error, No need to prevent save.
-          logger.warn(e)
-          #TODO add customization here?
-        else #if no exception
-          self.send(gmaps4rails_options[:lng_column]+"=", coordinates.first[:lng]) if self.respond_to?(gmaps4rails_options[:lng_column]+"=")
-          self.send(gmaps4rails_options[:lat_column]+"=", coordinates.first[:lat]) if self.respond_to?(gmaps4rails_options[:lat_column]+"=")
-          unless gmaps4rails_options[:normalized_address].nil?
-            self.send(gmaps4rails_options[:normalized_address].to_s+"=", coordinates.first[:matched_address])
-          end
-          # 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?
-          if gmaps4rails_options[:check_process] == true
-            self[gmaps4rails_options[:checker]] = true
-          end
-        end
-      end
-         
-      def to_gmaps4rails
-        json = "["
-        json += Gmaps4rails.create_json(self).to_s.chop.chop #removes the extra comma
-        json += "]"
-      end
-        
-    end
-    
-    module ClassMethods
-      
-      def acts_as_gmappable args = {}          
-        unless args[:process_geocoding] == false
-          validate :process_geocoding
-        end
-        
-        #instance method
-        define_method "gmaps4rails_options" do
-          {
-            :lat_column         => args[:lat]                    || "latitude",
-            :lng_column         => args[:lng]                    || "longitude",
-            :check_process      => args[:check_process].nil?     ?   true : args[:check_process],
-            :checker            => args[:checker]                || "gmaps",
-            :msg                => args[:msg]                    || "Address invalid",
-            :validation         => args[:validation].nil?        ?   true  : args[:validation],
-            :normalized_address => args[:normalized_address],
-            :address            => args[:address]                || "gmaps4rails_address",
-            :callback           => args[:callback],
-            :language           => args[:language]               || "en"
-            #TODO: address as a proc?
-          }
-        end
-        
-        include InstanceMethods
-        
-      end
-    end
-    
-  end #ActsAsGmappable
-end
-
-ActiveSupport.on_load(:active_record) do
-  ActiveRecord::Base.send(:include, Gmaps4rails::ActsAsGmappable)
-end
-#::ActiveRecord::Base.send :include, Gmaps4rails::ActsAsGmappable
-# Mongoid::Document::ClassMethods.class_eval do
-#   include Gmaps4rails::ActsAsGmappable::Base
-# end

data/test/dummy/spec/controllers/users_controller_spec.rb

@@ -1,57 +0,0 @@
-# require File.dirname(__FILE__) + '/../spec_helper'
-# 
-# describe UsersController do
-#   fixtures :all
-#   render_views
-# 
-#   it "index action should render index template" do
-#     get :index
-#     response.should render_template(:index)
-#   end
-# 
-#   it "show action should render show template" do
-#     get :show, :id => User.first
-#     response.should render_template(:show)
-#   end
-# 
-#   it "new action should render new template" do
-#     get :new
-#     response.should render_template(:new)
-#   end
-# 
-#   it "create action should render new template when model is invalid" do
-#     User.any_instance.stubs(:valid?).returns(false)
-#     post :create
-#     response.should render_template(:new)
-#   end
-# 
-#   it "create action should redirect when model is valid" do
-#     User.any_instance.stubs(:valid?).returns(true)
-#     post :create
-#     response.should redirect_to(user_url(assigns[:user]))
-#   end
-# 
-#   it "edit action should render edit template" do
-#     get :edit, :id => User.first
-#     response.should render_template(:edit)
-#   end
-# 
-#   it "update action should render edit template when model is invalid" do
-#     User.any_instance.stubs(:valid?).returns(false)
-#     put :update, :id => User.first
-#     response.should render_template(:edit)
-#   end
-# 
-#   it "update action should redirect when model is valid" do
-#     User.any_instance.stubs(:valid?).returns(true)
-#     put :update, :id => User.first
-#     response.should redirect_to(user_url(assigns[:user]))
-#   end
-# 
-#   it "destroy action should destroy model and redirect to index action" do
-#     user = User.first
-#     delete :destroy, :id => user
-#     response.should redirect_to(users_url)
-#     User.exists?(user.id).should be_false
-#   end
-# end