gmaps4rails 1.5.4 → 1.5.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gmaps4rails (1.5.4)
+    gmaps4rails (1.5.5)
 
 GEM
   remote: http://rubygems.org/

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

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

data/lib/gmaps4rails/base.rb

@@ -22,7 +22,9 @@ module Gmaps4rails
   autoload :Places,           'gmaps4rails/api_wrappers/places'
   autoload :ObjectAccessor,   'gmaps4rails/object_accessor'
 
-  mattr_accessor :http_proxy
+  mattr_accessor :http_proxy, :escape_js_url
+
+  self.escape_js_url = true
   
   # This method geocodes an address using the GoogleMaps webservice
   # options are:

data/lib/gmaps4rails/helper/gmaps4rails_helper.rb

@@ -16,10 +16,16 @@ module Gmaps4railsHelper
     options_with_indifferent_access = options.with_indifferent_access
     view_helper                     = Gmaps4rails::ViewHelper.new(options_with_indifferent_access)
     
+    js_dependencies = if Gmaps4rails.escape_js_url
+                        view_helper.js_dependencies_array
+                      else
+                        view_helper.js_dependencies_array.map(&:html_safe)
+                      end
+
     render :partial => '/gmaps4rails/gmaps4rails', 
            :locals  => { 
              :options         => options_with_indifferent_access, 
-             :js_dependencies => view_helper.js_dependencies_array,
+             :js_dependencies => js_dependencies,
              :dom             => view_helper.dom_attributes
             }
   end

data/lib/gmaps4rails/version.rb

@@ -1,3 +1,3 @@
 module Gmaps4rails
-  VERSION = "1.5.4"
+  VERSION = "1.5.5"
 end

data/spec/dummy/config/initializers/gmaps4rails.rb

@@ -0,0 +1 @@
+# Gmaps4rails.escape_js_url = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gmaps4rails
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000 Z
+date: 2012-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -314,6 +314,7 @@ files:
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/gmaps4rails.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
@@ -376,7 +377,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3497814623676724947
+      hash: 371063818464557253
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -385,7 +386,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3497814623676724947
+      hash: 371063818464557253
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -422,6 +423,7 @@ test_files:
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/gmaps4rails.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb