gmaps4rails 1.4.7 → 1.4.8

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

@@ -1,6 +1,6 @@
 <% #thanks to enable_css, user can avoid this css to be loaded
 if enable_css == true && options[:scripts].nil? %>
-  <% if Rails::VERSION::MAJOR >= 3 && Rails::VERSION::MINOR < 1 %>
+  <% unless gmaps4rails_pipeline_enabled? %>
     <% content_for :head do %>
       <%= stylesheet_link_tag 'gmaps4rails' %>
     <% end %>

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

@@ -19,7 +19,7 @@
     <% end  %>
   <% end %>
 
-  <% if Rails::VERSION::MAJOR >= 3 && Rails::VERSION::MINOR < 1 %>
+  <% unless gmaps4rails_pipeline_enabled? %>
     <% unless scripts.try(:to_sym) == :api %>
       <%= javascript_include_tag 'gmaps4rails/gmaps4rails.base.js' %>
     <% end %>

data/lib/gmaps4rails.rb

@@ -1,36 +1,34 @@
-if defined?(Rails) && Rails::VERSION::MAJOR == 3
-  module Gmaps4rails
-    require 'rails'
-    require 'gmaps4rails/base'
-    
-    class Engine < Rails::Engine
-       
-       initializer "gmaps4rails view helpers" do |app|
-         ActionView::Base.send :include, Gmaps4railsHelper
+module Gmaps4rails
+  require 'rails'
+  require 'gmaps4rails/base'
+  
+  class Engine < Rails::Engine
+     
+     initializer "gmaps4rails view helpers" do |app|
+       ActionView::Base.send :include, Gmaps4railsHelper
+     end
+     
+     initializer "add asset directories to pipeline" do |app|
+       if Rails::VERSION::MAJOR >= 3 && Rails::VERSION::MINOR >= 1
+         app.config.assets.paths << "#{root}/public/stylesheets"
+       else
+         app.middleware.use ::ActionDispatch::Static, "#{root}/public"
        end
-       
-       initializer "add asset directories to pipeline" do |app|
-         if Rails::VERSION::MINOR >= 1
-           app.config.assets.paths << "#{root}/public/stylesheets"
-         else
-           app.middleware.use ::ActionDispatch::Static, "#{root}/public"
-         end
+     end
+     
+  end
+  
+  class Railtie < Rails::Railtie
+  
+     initializer "include acts_as_gmappable within ORM" do
+       ActiveSupport.on_load(:active_record) do
+         ActiveRecord::Base.send(:include, Gmaps4rails::ActsAsGmappable)
        end
        
-    end
-    
-    class Railtie < Rails::Railtie
-    
-       initializer "include acts_as_gmappable within ORM" do
-         ActiveSupport.on_load(:active_record) do
-           ActiveRecord::Base.send(:include, Gmaps4rails::ActsAsGmappable)
-         end
-         
-         ActiveSupport.on_load(:mongoid) do
-           Mongoid::Document.send(:include, Gmaps4rails::ActsAsGmappable)
-         end
+       ActiveSupport.on_load(:mongoid) do
+         Mongoid::Document.send(:include, Gmaps4rails::ActsAsGmappable)
        end
-    
-    end
+     end
+  
   end
-end
+end

data/lib/gmaps4rails/helper/gmaps4rails_helper.rb

@@ -46,4 +46,8 @@ module Gmaps4railsHelper
   def gmaps4rails_html(map_options = nil)
     render "/gmaps4rails/html", :map_options => map_options
   end
+  
+  def gmaps4rails_pipeline_enabled?
+    Rails.configuration.methods.include?(:assets) && Rails.configuration.assets.enabled
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gmaps4rails
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-11 00:00:00.000000000Z
+date: 2012-03-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2161242960 !ruby/object:Gem::Requirement
+  requirement: &2157065020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161242960
+  version_requirements: *2157065020
 description: ! 'Enables easy display of items (taken from a Rails 3 model) on a Google
   Maps (JS API V3), OpenLayers, Mapquest and Bing. Geocoding + Directions included.
   Provides much options: markers customization, infowindows, auto-adjusted zoom, polylines,