rails-marker 0.0.3 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f90f12acb68e225028bdbd6bd0058b55421b206b
+  data.tar.gz: e82af4dc4585582cd6bb6046f6d6cade0005cf18
+SHA512:
+  metadata.gz: fbfcb56150811d7e5e16dd14dc4f92fba8b4ae6a0f085ba6a33079025e97d89dd62e662f7537775bd1ba8d021b9b313a2baab6f9b6fa20c7dbed7df11840527b
+  data.tar.gz: 879d3529328ddf969614bfba24419b92a72f48ecfd217d801c51127926819cc7aabb99d78419cc4b1d1b4e9b56258e568255a0fc09dd60bcb2dc850b2369dfc1

data/README.md

@@ -6,7 +6,7 @@ Form helpers for edit fields such as zoom, longitude and latitude
 
 Add this line to your application's Gemfile:
 
-    gem 'rails-marker'
+    gem 'rails-marker', require: 'marker'
 
 And then execute:
 
@@ -16,6 +16,12 @@ Or install it yourself as:
 
     $ gem install rails-marker
 
+## Configure
+
+Get Google API key here https://developers.google.com/maps/documentation/javascript/get-api-key
+
+    Marker.google_api_key = 'your_google_api_key'
+
 ## Usage
 
 For example you have model office:
@@ -41,7 +47,7 @@ For example you have model office:
 class Office < ActiveRecord::Base
   validates_presence_of :title, :address
   validates_numericality_of :latitude, :longitude
-  
+
   attr_accessible :address, :email, :latitude, :longitude, :phone, :title, :is_visible, :zoom
 end
 ```
@@ -50,13 +56,17 @@ And you want edit fields zoom, longitude and latitude:
 
 ``` erb
 <%= form_for @office do |f| %>
-  <%= f.marker_field :map, {:lat => :latitude, :lng => :longitude}, {:style => "width:890px;height:400px;"} %>
+  <%= f.text_field :longitude, data: { map: 'lng' } %>
+  <%= f.text_field :latitude, data: { map: 'lat' } %>
+  <%= f.text_field :zoom, data: { map: 'zoom' } %>
+
+  <%= f.marker_field :map %>
 <% end %>
 ```
 Also support SimpleForm and Formtastic implementation.
 It's all you need! Just move the marker, and zoom, latitude and longitude fields will be automatically filled:
 
-![Marker field in use](http://img205.imageshack.us/img205/9493/screenshotfrom201205231.png)
+![Marker field in use](https://raw.githubusercontent.com/galetahub/rails-marker/master/screenshots/rails-marker-in-use.png)
 
 ## Contributing
 
@@ -66,4 +76,4 @@ It's all you need! Just move the marker, and zoom, latitude and longitude fields
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-Copyright (c) 2013 Fodojo, released under the MIT license
+Copyright (c) 2017 Fodojo, released under the MIT license

data/app/assets/javascripts/marker/application.js

@@ -0,0 +1,2 @@
+//= require marker/map_google
+//= require marker/init

data/app/assets/javascripts/marker/init.js.coffee

@@ -0,0 +1,8 @@
+initMarkerMap = () ->
+  elements = document.querySelectorAll('[data-marker]')
+
+  elements.forEach (el, index, array) ->
+    options = { zoom: el.getAttribute('data-zoom') }
+    map = new MapGoogle(el.id, options)
+
+window['initMarkerMap'] = initMarkerMap

data/app/assets/javascripts/marker/map_google.js.coffee

@@ -1,78 +1,88 @@
 $ = jQuery
 
 class MapGoogle
-
   constructor: (@dom_id, options = {}) ->
     defaults =
       lat: 50.44067063154785
       lng: 30.52654266357422
       zoom: 6
-      field_lat: "#lat"
-      field_lng: "#lng"
-      field_zoom: "#zoom"
-      
+
     @options = $.extend defaults, options
+
+    @element = document.getElementById(@dom_id)
+    @name = @element.getAttribute('data-marker')
+
+    @options.field_lat = "[data-#{@name}='lat']"
+    @options.field_lng = "[data-#{@name}='lng']"
+    @options.field_zoom = "[data-#{@name}='zoom']"
+
     this._setup()
-  
+
   _setup: ->
     @location = this._build_location()
-    @map = this._build_map(@dom_id)
+    @map = this._build_map(@element)
     @marker = this._build_marker()
-    
+
+    @field_lat = $(@options.field_lat + ':eq(0)')
+    @field_lng = $(@options.field_lng + ':eq(0)')
+    @field_zoom = $(@options.field_zoom + ':eq(0)')
+
+    console.log @field_lat
+
     google.maps.event.addListener(@marker, 'dragend', (event) =>
       pos = @marker.getPosition()
-      
-      $(@options.field_lat).val pos.lat()
-      $(@options.field_lng).val pos.lng()
-      
+
+      @field_lat.val pos.lat()
+      @field_lng.val pos.lng()
+
       @map.setCenter(event.latLng)
     )
-    
+
     google.maps.event.addListener(@map, 'zoom_changed', () =>
-      $(@options.field_zoom).val @map.getZoom()
+      @field_zoom.val @map.getZoom()
     )
-  
+
   placeMarker: (location) ->
     marker = this._build_marker {position: location}
 
     @map.setCenter(location);
-    
+
     return marker
-    
+
   _build_location: ->
     lat = this._parse_value @options.field_lat, @options.lat
     lng = this._parse_value @options.field_lng, @options.lng
-    
+
     new google.maps.LatLng(lat, lng)
-  
-  _build_map: (dom_id, options = {}) ->
+
+  _build_map: (element, options = {}) ->
     zoom = this._parse_value @options.field_zoom, @options.zoom
-    
+
     defaults =
       zoom: zoom
       center: @location
       mapTypeId: google.maps.MapTypeId.ROADMAP
-    
+
     settings = $.extend defaults, options
-    
-    new google.maps.Map(document.getElementById(dom_id), settings)
-  
+
+    new google.maps.Map(element, settings)
+
   _build_marker: (options = {}) ->
     defaults =
       position: @location
       map: @map
       draggable: true
-    
+
     settings = $.extend defaults, options
-    
+
     new google.maps.Marker(settings)
-  
+
   _parse_value: (field, default_value) ->
     value = parseFloat $(field).val()
-    
+
     if value
       return value
     else
-      return default_value
+      return parseFloat(default_value)
 
 window.MapGoogle = MapGoogle

data/app/views/marker/_google.html.erb

@@ -1,16 +1,4 @@
-<%= javascript_include_tag "http://maps.google.com/maps/api/js?sensor=false&language=#{I18n.locale}" %>
-<%= javascript_include_tag "marker/map_google.js" %>
+<%= javascript_include_tag 'marker/application' %>
+<%= javascript_include_tag "https://maps.googleapis.com/maps/api/js?key=#{Marker.google_api_key}&callback=initMarkerMap", async: true, defer: true %>
 
-<%= fields_for(field.object_name, field.object) do |f| -%>
-  <%= f.hidden_field field.input_options[:lat] %>
-  <%= f.hidden_field field.input_options[:lng] %>
-  <%= f.hidden_field field.input_options[:zoom] %>
-<% end -%>
-
-<%= content_tag :div, nil, field.html_options %>
-
-<script type="text/javascript">
-  $(document).ready(function(){
-    new MapGoogle("<%= field.html_options[:id] %>", <%=raw field.map_options.to_json %>);
-  });
-</script>
+<%= content_tag :div, nil, field.input_options %>

data/lib/marker.rb

@@ -1,10 +1,19 @@
-require "marker/version"
-require "marker/engine"
-
 module Marker
+  # View helpers
   module Helpers
     autoload :FormTagHelper, 'marker/helpers/form_tag_helper'
     autoload :FormBuilder, 'marker/helpers/form_builder'
     autoload :FieldTag, 'marker/helpers/field_tag'
   end
+
+  def self.google_api_key=(value)
+    @google_api_key = value
+  end
+
+  def self.google_api_key
+    @google_api_key || ENV['GOOGLE_API_KEY']
+  end
 end
+
+require 'marker/engine'
+require 'marker/version'

data/lib/marker/engine.rb

@@ -1,23 +1,16 @@
-require 'rails'
-require 'marker'
-
 module Marker
+  # Rails engine
   class Engine < ::Rails::Engine
-    
-    initializer "marker.assets_precompile", :group => :all do |app|
-      app.config.assets.precompile += ["marker/map_google.js"]
-    end
-    
-    initializer "marker.helpers" do    
+    initializer 'marker.helpers' do
       ActiveSupport.on_load :action_view do
         ActionView::Base.send(:include, Marker::Helpers::FormTagHelper)
         ActionView::Helpers::FormBuilder.send(:include, Marker::Helpers::FormBuilder)
       end
     end
-   
-    initializer "marker.hooks" do
-      require "marker/hooks/simple_form" if Object.const_defined?("SimpleForm")
-      require "marker/hooks/formtastic"  if Object.const_defined?("Formtastic")
+
+    initializer 'marker.hooks' do
+      require 'marker/hooks/simple_form' if Object.const_defined?('SimpleForm')
+      require 'marker/hooks/formtastic'  if Object.const_defined?('Formtastic')
     end
   end
 end

data/lib/marker/helpers/field_tag.rb

@@ -2,7 +2,10 @@ module Marker
   module Helpers
     class FieldTag
       attr_reader :template, :object, :engine, :html_options
-      
+
+      DEFAULT_MAP_ENGINE = 'google'.freeze
+      DEFAULT_STYLE = 'width:800px;height:400px'.freeze
+
       # Wrapper for render marker field
       # Usage:
       #
@@ -10,46 +13,42 @@ module Marker
       #   marker.to_s
       #
       def initialize(object_name, method_name, template, options = {}, html_options = {}) #:nodoc:
-        options = { :object_name => object_name, :method_name => method_name }.merge(options)
-        
-        @template, @options, @html_options = template, options.dup, html_options.dup
-        @engine = (@options.delete(:engine) || "google")
+        @options = { object_name: object_name, method_name: method_name }.merge!(options)
+        @template = template
+        @html_options = html_options
+
+        @engine = (@options.delete(:engine) || DEFAULT_MAP_ENGINE)
         @object = (@options.delete(:object) || @template.instance_variable_get("@#{object_name}"))
+
         @html_options[:id] ||= id
       end
-      
+
       def to_s(locals = {}) #:nodoc:
-        locals = { :field => self }.merge(locals)
-        @template.render :partial => "marker/#{@engine}", :locals => @options.merge(locals)
+        locals = { field: self }.merge!(locals)
+        @template.render partial: "marker/#{@engine}", locals: locals
       end
-      
+
       def id
-        @id ||= @template.dom_id(@object, [method_name, 'marker'].join('_'))
+        @id ||= @template.dom_id(@object, method_name)
       end
-      
+
       def input_options
-        @input_options ||= {:zoom => :zoom, :lat => :latitude, :lng => :longitude}.merge(@options)
-      end
-      
-      def map_options
-        {
-          :field_lat => "##{sanitized_object_name}_#{input_options[:lat]}",
-          :field_lng => "##{sanitized_object_name}_#{input_options[:lng]}",
-          :field_zoom => "##{sanitized_object_name}_#{input_options[:zoom]}"
-        }
-      end
-      
+        @input_options ||= {
+          data: {
+            marker: method_name,
+            zoom: @html_options[:zoom]
+          },
+          style: DEFAULT_STYLE
+        }.merge!(@html_options)
+      end
+
       def method_name
         @options[:method_name]
       end
-      
+
       def object_name
         @options[:object_name]
       end
-      
-      def sanitized_object_name
-        @sanitized_object_name ||= object_name.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
-      end
     end
   end
 end

data/lib/marker/helpers/form_builder.rb

@@ -3,13 +3,13 @@ module Marker
     module FormBuilder
       # Render map field
       # Usage:
-      #   
+      #
       #   <%= form_for @office do |f| %>
       #     <%= f.marker_field :marker %>
       #   <%= end %>
       #
       def marker_field(method, options = {}, html_options = {})
-        @template.send("marker_field_tag", @object_name, method, objectify_options(options), html_options)
+        @template.send('marker_field_tag', @object_name, method, objectify_options(options), html_options)
       end
     end
   end

data/lib/marker/helpers/form_tag_helper.rb

@@ -1,7 +1,6 @@
 module Marker
   module Helpers
     module FormTagHelper
-      
       # A helper that renders file map container
       #
       #   <%= marker_field_tag :office, :marker %>

data/lib/marker/hooks/formtastic.rb

@@ -2,11 +2,10 @@ require 'formtastic'
 
 class MarkerInput
   include Formtastic::Inputs::Base
-  
+
   def to_html
     input_wrapping do
-      label_html <<
-      builder.marker_field(method, options, input_html_options)
+      label_html << builder.marker_field(method, options, input_html_options)
     end
   end
 end

data/lib/marker/hooks/simple_form.rb

@@ -1,7 +1,15 @@
 require 'simple_form'
 
-class MarkerInput < SimpleForm::Inputs::Base
-  def input
-    @builder.marker_field(attribute_name, options, input_html_options)
+module Marker
+  module Hooks
+    module SimpleForm
+      class MarkerInput < ::SimpleForm::Inputs::Base
+        def input(_wrapper_options = nil)
+          @builder.marker_field(attribute_name, options, input_html_options)
+        end
+      end
+    end
   end
 end
+
+::SimpleForm::FormBuilder.map_type :marker, to: Marker::Hooks::SimpleForm::MarkerInput

data/lib/marker/version.rb

@@ -1,3 +1,3 @@
 module Marker
-  VERSION = "0.0.3".freeze
+  VERSION = '0.1.0'.freeze
 end

data/lib/rails_marker.rb

@@ -0,0 +1 @@
+require 'marker'

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-marker
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Igor Galeta
@@ -10,22 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2017-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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: Form helpers for edit fields such as zoom, longitude and latitude
@@ -35,42 +32,43 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/views/marker/_google.html.erb
+- MIT-LICENSE
+- README.md
+- Rakefile
+- app/assets/javascripts/marker/application.js
+- app/assets/javascripts/marker/init.js.coffee
 - app/assets/javascripts/marker/map_google.js.coffee
-- lib/marker/hooks/simple_form.rb
-- lib/marker/hooks/formtastic.rb
-- lib/marker/version.rb
+- app/views/marker/_google.html.erb
+- lib/marker.rb
 - lib/marker/engine.rb
-- lib/marker/helpers/form_builder.rb
 - lib/marker/helpers/field_tag.rb
+- lib/marker/helpers/form_builder.rb
 - lib/marker/helpers/form_tag_helper.rb
-- lib/rails-marker.rb
-- lib/marker.rb
-- MIT-LICENSE
-- Rakefile
-- README.md
+- lib/marker/hooks/formtastic.rb
+- lib/marker/hooks/simple_form.rb
+- lib/marker/version.rb
+- lib/rails_marker.rb
 homepage: https://github.com/galetahub/rails-marker
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.6.12
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Easy way to edit zoom, longitude and latitude
 test_files: []

data/lib/rails-marker.rb

@@ -1 +0,0 @@
-require "marker"