gmap_coordinates_picker 0.0.4 → 0.0.5

data/README.md

@@ -11,7 +11,7 @@ Usage
 add the following to your `Gemfile`:
 
 ```ruby
-gem " gmap_coordinates_picker"
+gem "gmap_coordinates_picker"
 ```
 
 Then, add in your form:
@@ -42,12 +42,19 @@ beside the option depicted on the example above it can be configured with the fo
 - `map_height` - default "400px"
 - `api_key` - Google Map api key (optional)
 - 'static'  - to display only static map, by default it set to false and the map will be editable
-- 'map_handler' - javascript map object to operate custom event on rendered map by default gMapObj is assigned as map object. You can implement any google map API methods like setCenter, zoom with that onject
+- 'map_handler' - javascript map object to operate custom event on rendered map by default gMapObj is assigned as map object. You can implement any google map API methods like setCenter, zoom with that object
 
 
 VERSION
 =======
 
+-0.0.5
+    - formtastic support added
+    - generator for settings override added
+    - passing option is simple and gmap_conf option depricated
+
+-0.0.4
+    - yanked
 -0.0.3
     - `static map` feature added
     -  `javascript map handler` support added

data/Rakefile

@@ -4,6 +4,24 @@ begin
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rdoc/rdoc'
+  require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
+end
+
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'GmapCoordinatesPicker'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+
+
 
 Bundler::GemHelper.install_tasks
 

data/lib/generators/gmap_coordinates_picker/config_generator.rb

@@ -0,0 +1,16 @@
+module GmapCoordinatesPicker
+  module Generators
+    class ConfigGenerator < Rails::Generators::Base
+      source_root File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+
+      desc <<DESC
+Description:
+    Copies GmapCoordinatesPicker configuration file to your application's initializer directory.
+DESC
+
+      def copy_config_file
+        template 'gmap_coordinates_picker_config.rb', 'config/initializers/gmap_coordinates_picker_config.rb'
+      end
+    end
+  end
+end

data/lib/generators/gmap_coordinates_picker/templates/gmap_coordinates_picker_config.rb

@@ -0,0 +1,10 @@
+GmapCoordinatesPicker.configure do |config|
+  #config.lat_column = :latitude
+  #config.lng_column = :longitude
+  #config.default_coordinates = [23.727666666, 90.410550] #Dhaka (my home town) center point :)
+  #config.map_handler = 'gMapObj' #javascript map object
+  #config.zoom_level = 10
+  #config.map_container_class = 'gmap_coordinate_picker_container'
+  #config.map_width = '600px'
+  #config.map_height = '400px'
+end

data/lib/gmap_coordinates_picker/config.rb

@@ -0,0 +1,37 @@
+require 'active_support/configurable'
+
+module GmapCoordinatesPicker
+
+  def self.configure(&block)
+    yield @config ||= GmapCoordinatesPicker::Configuration.new
+  end
+
+  # Global settings for GmapCoordinatesPicker
+  def self.config
+    @config
+  end
+
+  # need a Class for 3.0
+  class Configuration #:nodoc:
+    include ActiveSupport::Configurable
+    config_accessor :lat_column
+    config_accessor :lng_column
+    config_accessor :default_coordinates
+    config_accessor :map_handler
+    config_accessor :zoom_level
+    config_accessor :map_container_class
+    config_accessor :map_width
+    config_accessor :map_height
+  end
+
+  configure do |config|
+    config.lat_column = :latitude
+    config.lng_column = :longitude
+    config.default_coordinates = [23.727666666, 90.410550] #Dhaka (my home town) center point :)
+    config.map_handler = 'gMapObj'
+    config.zoom_level = 10
+    config.map_container_class = 'gmap_coordinate_picker_container'
+    config.map_width = '600px'
+    config.map_height = '400px'
+  end
+end

data/lib/gmap_coordinates_picker/engine.rb

@@ -3,33 +3,18 @@ require 'rails'
 require 'gmap_coordinates_picker'
 
 module GmapCoordinatesPicker
-  #class Engine < ::Rails::Engine
-  #  config.before_initialize do
-  #    ActiveSupport.on_load :active_record do
-  #      ActiveRecord::Base.send(:include, SimpleCaptcha::ModelHelpers)
-  #    end
-  #  end
-  #
-  #  config.after_initialize do
-  #    ActionView::Base.send(:include, SimpleCaptcha::ViewHelper)
-  #    ActionView::Helpers::FormBuilder.send(:include, SimpleCaptcha::FormBuilder)
-  #
-  #    if Object.const_defined?("Formtastic")
-  #      if Formtastic.const_defined?("Helpers")
-  #        Formtastic::Helpers::FormHelper.builder = SimpleCaptcha::CustomFormBuilder
-  #      else
-  #        Formtastic::SemanticFormHelper.builder = SimpleCaptcha::CustomFormBuilder
-  #      end
-  #    end
-  #  end
-  #
-  #  config.app_middleware.use SimpleCaptcha::Middleware
-  #end
-
   class Engine < ::Rails::Engine
     config.after_initialize do
       ActionView::Base.send(:include, GmapCoordinatesPicker::ViewHelper)
       ActionView::Helpers::FormBuilder.send(:include, GmapCoordinatesPicker::FormBuilder)
+
+      if Object.const_defined?("Formtastic")
+        if Formtastic.const_defined?("Helpers")
+          Formtastic::Helpers::FormHelper.builder = GmapCoordinatesPicker::FormtasticMapBuilder
+        else
+          Formtastic::SemanticFormHelper.builder = GmapCoordinatesPicker::FormtasticMapBuilder
+        end
+      end
     end
   end
 end

data/lib/gmap_coordinates_picker/formtastic.rb

@@ -0,0 +1,9 @@
+module GmapCoordinatesPicker
+  class FormtasticMapBuilder < Formtastic::FormBuilder
+
+    def gmap_coordinate_picker(options = {})
+      options.update :object => @object_name
+      render_gmap_coordinate_picker(objectify_options(options))
+    end
+  end
+end

data/lib/gmap_coordinates_picker/version.rb

@@ -1,3 +1,3 @@
 module GmapCoordinatesPicker
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/gmap_coordinates_picker/view_helper.rb

@@ -3,8 +3,13 @@ module GmapCoordinatesPicker #:nodoc
     def render_gmap_coordinate_picker(options={})
 
       unless options[:static].to_s == 'true'
-        lat_column = options[:gmap_conf][:lat_column]
-        lng_column = options[:gmap_conf][:lng_column]
+        options[:gmap_conf] ||= {}
+        if options[:gmap_conf].present?
+          ActiveSupport::Deprecation.warn "passing :gmap_conf => {:lat_column => 'latitude', :lng_column => 'longitude'} as options is deprecated and may be removed from future releases, use :lat_column, :lng_column directly in the option instead  or see the document.", caller
+        end
+        lat_column = options[:lat_column] || options[:gmap_conf][:lat_column] ||  GmapCoordinatesPicker.config.lat_column
+        lng_column = options[:lng_column] || options[:gmap_conf][:lng_column] || GmapCoordinatesPicker.config.lng_column
+        default_coordinates = options[:default_coordinates] || GmapCoordinatesPicker.config.default_coordinates
         lat_column_value = options[:object].present? ? options[:object].send(lat_column) : default_coordinates[0]
         lng_column_value = options[:object].present? ? options[:object].send(lng_column) : default_coordinates[1]
         prefix = options[:object].present? ? options[:object].class.name.downcase : "gmap_coordinate_picker"
@@ -14,13 +19,13 @@ module GmapCoordinatesPicker #:nodoc
 
       default_locals = {
           :api_key => options[:api_key],
-          :map_handler => options[:map_handler] || 'gMapObj',
-          :zoom_level => options[:zoom_level] || 10,
+          :map_handler => options[:map_handler] || GmapCoordinatesPicker.config.map_handler,
+          :zoom_level => options[:zoom_level] || GmapCoordinatesPicker.config.zoom_level,
           :map_container => "gmap_coordinate_picker_container_#{Time.now.to_i}",
-          :map_container_class => options[:map_container_class],
-          :map_width => options[:map_width] || "600px",
-          :map_height => options[:map_height] ||"400px",
-          :default_coordinates => options[:default_coordinates] || [0, 0],
+          :map_container_class => options[:map_container_class] || GmapCoordinatesPicker.config.map_container_class,
+          :map_width => options[:map_width] || GmapCoordinatesPicker.config.map_width,
+          :map_height => options[:map_height] || GmapCoordinatesPicker.config.map_height,
+          :default_coordinates => options[:default_coordinates] || GmapCoordinatesPicker.config.default_coordinates,
       }
 
       editable_map_locals = {
@@ -35,10 +40,12 @@ module GmapCoordinatesPicker #:nodoc
           :lat_field => lat_lng_field(lat_column, lat_column_value, lat_dom_id, options),
           :lng_field => lat_lng_field(lng_column, lng_column_value, lng_dom_id, options)
       }
+
       unless options[:static].to_s == 'true'
-        render :partial => 'gmap_coordinate_picker/gmap_coordinate_picker', :locals => default_locals.merge(editable_map_locals)
+         @template ||= self
+         @template.render :partial => '/gmap_coordinate_picker/gmap_coordinate_picker', :locals => default_locals.merge(editable_map_locals)
       else
-        render :partial => 'gmap_coordinate_picker/render_map', :locals => default_locals
+        render :partial => '/gmap_coordinate_picker/render_map', :locals => default_locals
       end
     end
 
@@ -53,4 +60,4 @@ module GmapCoordinatesPicker #:nodoc
 
 
   end
-end
+end

data/lib/gmap_coordinates_picker.rb

@@ -1,8 +1,8 @@
+require 'gmap_coordinates_picker/config'
+require 'gmap_coordinates_picker/engine' if defined?(Rails)
+
 module GmapCoordinatesPicker
   autoload :ViewHelper, 'gmap_coordinates_picker/view_helper'
   autoload :FormBuilder, 'gmap_coordinates_picker/form_builder'
-
-
-end
-
-require 'gmap_coordinates_picker/engine' if defined?(Rails)
+  autoload :FormtasticMapBuilder, 'gmap_coordinates_picker/formtastic'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gmap_coordinates_picker
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
@@ -24,9 +24,57 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: It works without any dependency to any third party library
 email:
 - ahmed2tul@gmail.com
@@ -36,8 +84,12 @@ extra_rdoc_files: []
 files:
 - app/views/gmap_coordinate_picker/_gmap_coordinate_picker.html.erb
 - app/views/gmap_coordinate_picker/_render_map.html.erb
+- lib/generators/gmap_coordinates_picker/config_generator.rb
+- lib/generators/gmap_coordinates_picker/templates/gmap_coordinates_picker_config.rb
+- lib/gmap_coordinates_picker/config.rb
 - lib/gmap_coordinates_picker/engine.rb
 - lib/gmap_coordinates_picker/form_builder.rb
+- lib/gmap_coordinates_picker/formtastic.rb
 - lib/gmap_coordinates_picker/version.rb
 - lib/gmap_coordinates_picker/view_helper.rb
 - lib/gmap_coordinates_picker.rb