rails-google-maps 0.0.15 → 0.0.16

data/README.md

@@ -31,6 +31,11 @@ And include it in your ```application.js``` file after jquery:
 //= require rails-google-maps/google_maps
 ```
 
+Optionally you can use default styles for the map object:
+```
+// application.css
+*= require rails_google_maps
+```
 
 ## Usage
 ####SimpleForm usage:

data/app/inputs/google_maps_autocomplete_input.rb

@@ -1,4 +1,5 @@
 class GoogleMapsAutocompleteInput < SimpleForm::Inputs::StringInput
+  include ActionView::Helpers::JavaScriptHelper
   include ActionView::Helpers::TagHelper
   def input
     gmap_id = input_html_options.delete(:gmap_id)
@@ -6,7 +7,7 @@ class GoogleMapsAutocompleteInput < SimpleForm::Inputs::StringInput
     lat_id = input_html_options.key?(:lat_id) ? input_html_options.delete(:lat_id) : nil
     lng_id = input_html_options.key?(:lng_id) ? input_html_options.delete(:lng_id) : nil
     input = @builder.text_field(attribute_name, input_html_options)
-    (input + content_tag('script', script_text(gmap_id, input, apply, lat_id, lng_id).html_safe)).html_safe
+    (input + javascript_tag(script_text(gmap_id, input, apply, lat_id, lng_id))).html_safe
   end
 
   private
@@ -30,7 +31,8 @@ class GoogleMapsAutocompleteInput < SimpleForm::Inputs::StringInput
       }
       var latId = '#{lat_id.to_s}', lngId = '#{lng_id.to_s}';
       if(latId && lngId){
-        gmap.setOptions({longitudeInput: lngId, latitudeInput: latId});
+        gmap.setOptions({longitudeInput: '#' + lngId, latitudeInput: '#' + latId});
+        gmap.setFromLatLng()
       }
     })"
   end

data/lib/rails-google-maps/version.rb

@@ -1,3 +1,3 @@
 module RailsGoogleMaps
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

data/vendor/assets/javascripts/rails-google-maps/autocomplete.js.coffee

@@ -1,23 +1,18 @@
-root = exports ? this
-
-class root.Autocomplete
-  source: ()->
+class @Autocomplete
+  source: ()=>
     []
-  select: ()->
-    ()->
-  change: ()->
-    ()->
+  select: ()=>
+  change: ()=>
   minChars: 2
 
-  constructor: (@selector)->
-    @$el = $(@selector)
+  constructor: (selector)->
+    @$el = $(selector)
 
   apply: ()->
-    self = this
-    $(@selector).autocomplete
-      source: self.source(self)
-      select: self.select(self)
-      change: self.change(self)
+    @$el.autocomplete
+      source: @source
+      select: @select
+      change: @change
     this.afterApply()
 
   afterApply: ()->
@@ -28,38 +23,35 @@ class root.Autocomplete
 #  gmap.apply()
 #  autoComplete = new GmapAutocomplete('#gmaps-input-address', gmap)
 #  autoComplete.apply()
-class root.GmapAutocomplete extends Autocomplete
+class @GmapAutocomplete extends Autocomplete
 
-  constructor: (@selector, @gmap)->
-    self = this
-    @gmap.onSucceed.push (address)->
-      $(self.selector).val address
+  constructor: (selector, @gmap)->
+    super selector
+    @gmap.onSucceed.push (address)=>
+      @$el.val address
 
-  source: (self)->
-    (request, response)->
-      self.gmap.searchGeocodes request.term, (results)->
-        response $.map results, (item) ->
-          label: item.formatted_address
-          value: item.formatted_address
-          geocode: item
+  source: (request, response) =>
+    @gmap.searchGeocodes request.term, (results)->
+      response $.map results, (item) ->
+        label: item.formatted_address
+        value: item.formatted_address
+        geocode: item
 
-  select: (self)->
-    (event, ui) ->
-      self.gmap.update ui.item.geocode
+  select: (event, ui) =>
+    @gmap.update ui.item.geocode
 
   afterApply: ()->
-    this.syncWithMap()
-    this._addKeyDownHandlers()
+    @syncWithMap()
+    @_addKeyDownHandlers()
 
   syncWithMap: ()->
-    @gmap.setMarker('address', $(@selector).val()) if $(@selector).val()
+    @gmap.setMarker('address', @$el.val()) if @$el.val()
 
   _addKeyDownHandlers: ()->
-    self = this
-    $(@selector).bind 'keydown', (event)->
+    @$el.bind 'keydown', (event)=>
       if event.keyCode == 13
-        self.gmap.setMarker  'address', $(self.selector).val()
-        $(self.selector).autocomplete "disable"
+        @gmap.setMarker  'address', @$el.val()
+        @$el.autocomplete "disable"
       else
-        $(self.selector).autocomplete "enable"
+        @$el.autocomplete "enable"
 

data/vendor/assets/javascripts/rails-google-maps/google_maps.js.coffee

@@ -1,11 +1,8 @@
-root = exports ? this
-return unless google?
-
 # Google map class
 # Example:
 #   gmap = new GoogleMap
 #   gmap.apply()
-class root.GoogleMap
+class @GoogleMap
 
   #defines whether user can change map pin or not
   immutable: false
@@ -33,112 +30,92 @@ class root.GoogleMap
     @errorField = options['errorField'] if options['errorField']
     if options['longitudeInput'] and options['latitudeInput']
       @saveLangLat = true
-      @longitudeInput = options['longitudeInput']
-      @latitudeInput = options['latitudeInput']
-
+      @latLng = new LatLngContainer(options['latitudeInput'], options['longitudeInput'])
 
   apply: ()->
     if($(@mapSelector).length > 0)
       @map = new google.maps.Map $(@mapSelector)[0], @gmapOptions
-      @marker = new google.maps.Marker {map: @map, draggable: true}
+      @marker = new google.maps.Marker {map: @map, draggable: !@immutable}
     else
       @mapless = true
     @geocoder = new google.maps.Geocoder()
     @gmapErrors = new GmapErrors @errorField
-    this._addListeners()
+    @_addListeners() unless @immutable or @mapless
     @_applied = true
 
   applied: ()->
     @_applied
 
-  setMarker: (type, value, update = true, afterCallback = ()->)->
+  setMarker: (type, value, focusOnMarker = true, afterCallback = ()->)->
     request = {}
     request[type] = value
-    self = this
-    @geocoder.geocode request, (results, status)->
-      self.gmapErrors.cleanErrors()
-      if status is google.maps.GeocoderStatus.OK
-        self._succeed(results, update)
+    @geocoder.geocode request, (results, status)=>
+      if status is google.maps.GeocoderStatus.OK and results[0]
+        @_succeed results, focusOnMarker
       else
-        self._failed(update, type, value)
+        @_failed(type, value)
       afterCallback()
 
   searchGeocodes: (term, callback)->
     @geocoder.geocode {'address': term }, (results, status)->
       callback(results, status)
 
-
   update: (geocode)->
     unless @mapless
       @map.fitBounds geocode.geometry.viewport
       @marker.setPosition geocode.geometry.location
-    this.saveLatLang(geocode.geometry) if @saveLangLat
+    @latLng.store(geocode.geometry) if @saveLangLat
 
-  _addListeners: ()->
-    self = this
-    return if @immutable
-    unless @mapless
-      google.maps.event.addListener @marker, 'dragend', () ->
-        self.setMarker 'latLng', self.marker.getPosition(), false
-      google.maps.event.addListener @map, 'click', (event) ->
-        self.marker.setPosition event.latLng
-        self.setMarker 'latLng', event.latLng, false
-
-  _succeed: (results, update)->
-    if results[0]
-      this.update(results[0]) if update
-      $.map @onSucceed, (callback)->
-        callback(results[0].formatted_address)
-      this.saveLatLang(results[0].geometry) if @saveLangLat
-    else
-      @gmapErrors.wrongInputError()
+  setFromLatLng: ()->
+    @setMarker('latLng', new google.maps.LatLng(@latLng.lat(), @latLng.lng()))
 
-  _failed: (update, type, value)->
-    this.clearLatLng() if @saveLangLat
+  _addListeners: ()->
+    google.maps.event.addListener @marker, 'dragend', () =>
+      @setMarker 'latLng', @marker.getPosition(), false
+    google.maps.event.addListener @map, 'click', (event) =>
+      @marker.setPosition event.latLng
+      @setMarker 'latLng', event.latLng, false
+
+  _succeed: (results, focusOnMarker)->
+    @update(results[0]) if focusOnMarker
+    $.map @onSucceed, (callback)->
+      callback(results[0].formatted_address)
+    @latLng.store(results[0].geometry) if @saveLangLat
+
+  _failed: (type, value)->
     if type is 'address'
       @gmapErrors.incorrectAddress(value)
     else
       @gmapErrors.incorrectLatlng()
 
-  saveLatLang: (geometry)->
-    $(@latitudeInput).val(geometry.location.lat())
-    $(@longitudeInput).val(geometry.location.lng())
-
-  clearLatLng: ()->
-    $(@latitudeInput).val('')
-    $(@longitudeInput).val('')
-
 # Class for displaying Gmap Errors.
 # All the errors can be customised
 # There are several type of errors:
 #  GmapErrors.wrongInputText
 #  GmapErrors.incorrectLatLngText
 #  GmapErrors.incorrectAddressText(value)  - callback, incorrect address can be used inside
-class root.GmapErrors
+class @GmapErrors
 
-  @wrongInputText: "Sorry, something went wrong. Try again!"
   @incorrectLatLngText: "Woah... that's pretty remote! You're going to have to manually enter a place name."
 
   constructor: (@errorField)->
 
   incorrectAddress: (value)->
-    this.setError(GmapErrors.incorrectAddressText(value))
-    this.show()
+    @cleanErrors()
+    @setError(GmapErrors.incorrectAddressText(value))
+    @show()
 
   incorrectLatlng: ()->
-    this.setError(@incorrectLatLngText)
-    this.show()
+    @cleanErrors()
+    @setError(@incorrectLatLngText)
+    @show()
 
   @incorrectAddressText: (value)->
     "Sorry! We couldn't find #{value}. Try a different search term, or click the map."
 
-  wrongInputError: ()->
-    this.setError(@wrongInputText)
-    this.show()
-
   cleanErrors: ()->
-    this.setError('')
-    this.hide()
+    @setError('')
+    @hide()
 
   show: ()->
     $(@errorField).show()
@@ -149,5 +126,28 @@ class root.GmapErrors
   setError: (text)->
     $(@errorField).html(text)
 
+class LatLngContainer
+  constructor: (latitudeInput, longitudeInput)->
+    @latitudeInput = $(latitudeInput)
+    @longitudeInput = $(longitudeInput)
+
+  lat: ()->
+    @latitudeInput.val()
+
+  lng: ()->
+    @longitudeInput.val()
+
+  googleLatLng: ()->
+    new google.maps.LatLng(@lat, @lng)
+
+  store: (geometry)->
+    @latitudeInput.val(geometry.location.lat())
+    @longitudeInput.val(geometry.location.lng())
+
+  clear: ()->
+    @latitudeInput.val('')
+    @longitudeInput.val('')
+
+
 
 

data/vendor/assets/stylesheets/rails_google_maps.css

@@ -0,0 +1,11 @@
+#gmap_canvas {
+    padding: 6px;
+    border-width: 1px;
+    border-style: solid;
+    border-color: #ccc #ccc #999 #ccc;
+    -webkit-box-shadow: rgba(64, 64, 64, 0.5) 0 2px 5px;
+    -moz-box-shadow: rgba(64, 64, 64, 0.5) 0 2px 5px;
+    box-shadow: rgba(64, 64, 64, 0.1) 0 2px 5px;
+    width: 800px;
+    height: 400px;
+}

metadata

@@ -1,48 +1,48 @@
 --- !ruby/object:Gem::Specification
 name: rails-google-maps
 version: !ruby/object:Gem::Version
-  version: 0.0.15
   prerelease: 
+  version: 0.0.16
 platform: ruby
 authors:
 - Yuri Ratanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: jquery-rails
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 description: Provides simple way to add google maps to your app
 email:
 - yratanov@gmail.com
@@ -62,6 +62,7 @@ files:
 - rails-google-maps.gemspec
 - vendor/assets/javascripts/rails-google-maps/autocomplete.js.coffee
 - vendor/assets/javascripts/rails-google-maps/google_maps.js.coffee
+- vendor/assets/stylesheets/rails_google_maps.css
 homepage: http://github.com/yratanov/rails_google_maps
 licenses: []
 post_install_message: 
@@ -69,20 +70,26 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 1853501962189102729
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 1853501962189102729
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Provides simple way to add google maps to your app