gmaps4rails 1.4.0 → 1.4.1

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

@@ -1,13 +1,13 @@
 <% #thanks to enable_css, user can avoid this css to be loaded
-if enable_css == true and options[:scripts].nil? %>
-  <% if Rails::VERSION::MAJOR >= 3 and Rails::VERSION::MINOR < 1 %>
+if enable_css == true && options[:scripts].nil? %>
+  <% if Rails::VERSION::MAJOR >= 3 && Rails::VERSION::MINOR < 1 %>
     <% content_for :head do %>
       <%= stylesheet_link_tag 'gmaps4rails' %>
     <% end %>
 	<% end %>
 <% end %>
 <% content_for :scripts do %>
-<% if enable_js == true and options[:scripts].try(:to_sym) != :none %>
+<% if enable_js == true && options[:scripts].try(:to_sym) != :none %>
   <% case options[:map_options].try(:[], :provider) %>
   <% when "openlayers" %>
     <script src="http://www.openlayers.org/api/OpenLayers.js"></script>
@@ -22,7 +22,7 @@ if enable_css == true and options[:scripts].nil? %>
     <script type="text/javascript" src="//google-maps-utility-library-v3.googlecode.com/svn/trunk/richmarker/src/richmarker-compiled.js"></script>  
   <% end %>
   
-  <% if Rails::VERSION::MAJOR >= 3 and Rails::VERSION::MINOR < 1 %>
+  <% if Rails::VERSION::MAJOR >= 3 && Rails::VERSION::MINOR < 1 %>
     <% unless options[:scripts].try(:to_sym) == :api %>
       <%= javascript_include_tag 'gmaps4rails/gmaps4rails.base.js' %>
     <% end %>

data/lib/gmaps4rails.rb

@@ -18,9 +18,10 @@ if defined?(Rails) && Rails::VERSION::MAJOR == 3
        end
        
        initializer "include acts_as_gmappable within ActiveRecord" do
-         if defined?(::ActiveRecord::Base)
-           ActiveRecord::Base.send(:include, Gmaps4rails::ActsAsGmappable::InstanceMethods)
-           ActiveRecord::Base.send(:extend, Gmaps4rails::ActsAsGmappable::ClassMethods)
+         if defined? ::ActiveRecord 
+           ActiveRecord::Base.send :include, Gmaps4rails::ActsAsGmappable
+         elsif defined? ::Mongoid
+           Mongoid::Document.send :include, Gmaps4rails::ActsAsGmappable
          end
        end
        

data/lib/gmaps4rails/acts_as_gmappable.rb

@@ -1,6 +1,11 @@
 module Gmaps4rails
   module ActsAsGmappable
-
+    
+    def self.included base
+      base.send :include, InstanceMethods
+      base.send :extend, ClassMethods
+    end
+    
     module InstanceMethods
       
       # This is a before_filter to trigger the geocoding and save its results

data/lib/gmaps4rails/extensions/array.rb

@@ -5,7 +5,8 @@ class Array
     output = "["
     json_array = []
     each do |object|
-      json_array << Gmaps4rails.create_json(object, &block).to_s
+      json = Gmaps4rails.create_json(object, &block)
+      json_array << json.to_s unless json.nil?
     end
     output << json_array * (",")
     output << "]"

data/lib/gmaps4rails/json_handler.rb

@@ -8,6 +8,8 @@ module Gmaps4rails
       handle_block(&block) if block_given?
       handle_model_methods
       return_json
+    else
+      nil
     end
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gmaps4rails
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 1
   - 4
-  - 0
-  version: 1.4.0
+  - 1
+  version: 1.4.1
 platform: ruby
 authors: 
 - Benjamin Roth