duck_map 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edb5f6641ee44fc53ee42c4326333a03bf92f58a
-  data.tar.gz: c689a439a43cf410584ea6f829681ab44f18dd7a
+  metadata.gz: 86ec3b2f41916cd82223eef468e8f6427c6f58fc
+  data.tar.gz: f5ca2a9974f3d7bfd16d3589c00e4956712b0b06
 SHA512:
-  metadata.gz: dcf98311dc089a814d5a23613efbbef6176d6e81dc02653b8f884905fa4b67ab6a60f92af28f77e3a4eeb583ebdd4e0c37552017ac7f785e8c8a469760d699f7
-  data.tar.gz: 1cb7c3261490d9f15bf0308433d73c80b7d48cbd17bffeae9d4fcea399a45c0fe8b09d7be5fc6350d7abf1caa7169273308edbc6c81dccac1b7ccf4cf2c2691b
+  metadata.gz: d248d028bfc527ecc8a7da12deae494b05de4fe80bd5a27854aa1e5e4f9fa431133c79995563dee93380b7f312ab6bb5cd4ca661f7ff82f36069a2b2c3e95bc6
+  data.tar.gz: 841e71bb490bf9b476e9ba04ad71be66a6dce110e3ed43688dfadb0c87d372df05857f470a2ab1b86a0df90c039e0805d80c45e967bd6a083230d9214be42695

data/lib/duck_map/controller_helpers.rb

@@ -128,8 +128,11 @@ module DuckMap
     def find_first_model_object
       model_object = self.find_model_object
 
-      if model_object.kind_of?(Array) &&
-          (model_object.first.kind_of?(ActiveRecord::Base) || model_object.first.kind_of?(Mongoid::Document))
+      #if model_object.kind_of?(Array) &&
+          #(model_object.first.kind_of?(ActiveRecord::Base) || model_object.first.kind_of?(Mongoid::Document))
+        #model_object = model_object.first
+      #end
+      if model_object.kind_of?(Array) && ::DuckMap::Model::Supported.is_supported?(model_object.first)
         model_object = model_object.first
       end
 
@@ -154,10 +157,10 @@ module DuckMap
       list.each do |obj_sym|
         obj = self.instance_variable_get(obj_sym)
         if obj
-          if obj.kind_of?(ActiveRecord::Base) || obj.kind_of?(Mongoid::Document)
+          if ::DuckMap::Model::Supported.is_supported?(obj)
             model_object = obj
             break
-          elsif obj.kind_of?(Array) &&
+          elsif obj.kind_of?(Array) && ::DuckMap::Model::Supported.is_supported?(obj.first)
                 (obj.first.kind_of?(ActiveRecord::Base) || obj.first.kind_of?(Mongoid::Document)) &&
                 candidate.blank?
             candidate = obj

data/lib/duck_map/engine.rb

@@ -61,10 +61,6 @@ module DuckMap
       ActiveRecord::Base.send :include, Attributes
       ActiveRecord::Base.send :include, SitemapObject
 
-      Mongoid::Document.send :include, InheritableClassAttributes
-      Mongoid::Document.send :include, Attributes
-      Mongoid::Document.send :include, SitemapObject
-
     end
 
     ActiveSupport.on_load(:before_initialize) do

data/lib/duck_map/handlers/index.rb

@@ -101,7 +101,7 @@ module DuckMap
 
         # data_rows may have changed from an Array to a model object.
         # Make data_rows an Array if it has been switched to an model object.
-        if data_rows.kind_of?(ActiveRecord::Base) || data_rows.kind_of?(Mongoid::Document)
+        if ::DuckMap::Model::Supported.is_supported?(data_rows)
           data_rows = [data_rows]
         end
 

data/lib/duck_map/handlers/show.rb

@@ -128,7 +128,7 @@ module DuckMap
 
           # data_rows may have changed from an Array to a model object.
           # Make data_rows an Array if it has been switched to an model object.
-          if data_rows.kind_of?(ActiveRecord::Base) || data_rows.kind_of?(Mongoid::Document)
+          if ::DuckMap::Model::Supported.is_supported?(data_rows)
             data_rows = [data_rows]
           end
 

data/lib/duck_map/model.rb

@@ -8,6 +8,8 @@ module DuckMap
   module Model
     extend ActiveSupport::Concern
 
+    autoload :Supported, 'duck_map/model'
+
     ##################################################################################
     # Array containing all of the Hash objects that represent the contents of a single sitemap.
     # Originally, this method was part of {DuckMap::ControllerHelpers}, however, it was separated
@@ -21,6 +23,35 @@ module DuckMap
       @sitemap_model = value
     end
 
+    ##################################################################################
+    class Supported
+
+      ##################################################################################
+      def self.models
+        unless defined?(@@models)
+          @@models = [ActiveRecord::Base, ActiveRecord::Relation]
+        end
+        return @@models
+      end
+
+      ##################################################################################
+      def self.is_supported?(obj)
+        value = false
+
+        unless obj.blank?
+          self.models.each do |model|
+            if obj.kind_of?(model)
+              value = true
+              break
+            end
+          end
+        end
+
+        return value
+      end
+
+    end
+
   end
 
 end

data/lib/duck_map/mongoid_engine.rb

@@ -0,0 +1,18 @@
+module DuckMap
+  extend ActiveSupport::Autoload
+
+  class MongoidEngine < Rails::Engine
+
+    ActiveSupport.on_load(:active_record) do
+
+      Mongoid::Document.send :include, InheritableClassAttributes
+      Mongoid::Document.send :include, Attributes
+      Mongoid::Document.send :include, SitemapObject
+
+      Model::Supported.models.push(Mongoid::Document)
+
+    end
+
+  end
+
+end

data/lib/duck_map/version.rb

@@ -1,3 +1,3 @@
 module DuckMap
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/lib/duck_map_mongoid.rb

@@ -0,0 +1,5 @@
+require "duck_map/engine"
+require "duck_map/mongoid_engine"
+
+module DuckMap
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duck_map
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Jeff Duckett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -92,7 +92,9 @@ files:
 - lib/duck_map/last_mod.rb
 - lib/duck_map/class_helpers.rb
 - lib/duck_map/route_filter.rb
+- lib/duck_map/mongoid_engine.rb
 - lib/duck_map.rb
+- lib/duck_map_mongoid.rb
 - app/views/sitemap/default_template.xml.erb
 - app/controllers/sitemap_base_controller.rb
 - app/controllers/sitemap_controller.rb