duck_map 0.9.1 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86ec3b2f41916cd82223eef468e8f6427c6f58fc
-  data.tar.gz: f5ca2a9974f3d7bfd16d3589c00e4956712b0b06
+  metadata.gz: 9540576082cb9cb20dd6d835390ad5a6cca063f1
+  data.tar.gz: 3153fb9d81fa3d651aadf987b7ec1cb6571e4c27
 SHA512:
-  metadata.gz: d248d028bfc527ecc8a7da12deae494b05de4fe80bd5a27854aa1e5e4f9fa431133c79995563dee93380b7f312ab6bb5cd4ca661f7ff82f36069a2b2c3e95bc6
-  data.tar.gz: 841e71bb490bf9b476e9ba04ad71be66a6dce110e3ed43688dfadb0c87d372df05857f470a2ab1b86a0df90c039e0805d80c45e967bd6a083230d9214be42695
+  metadata.gz: 4e569a54d332b30812e6cc55ce36a1f395fb9f97f414fb56d119b67566f519ffcc87f54420fed31e7271acd566d42baab40133ea4d0d416e4b1b03a64793aa69
+  data.tar.gz: b27d61b5c622da9ce98a0ba95769999a6bdc6fe7d95f111339a9c66d9b6e1e55f96c074250279f78b0d3865050a396f5173467b177e5c7230ecba6363a247e42

data/lib/duck_map/engine.rb

@@ -60,7 +60,9 @@ module DuckMap
       ActiveRecord::Base.send :include, InheritableClassAttributes
       ActiveRecord::Base.send :include, Attributes
       ActiveRecord::Base.send :include, SitemapObject
-
+      ActiveRecord::Relation.send :include, InheritableClassAttributes
+      ActiveRecord::Relation.send :include, Attributes
+      ActiveRecord::Relation.send :include, SitemapObject
     end
 
     ActiveSupport.on_load(:before_initialize) do

data/lib/duck_map/mapper.rb

@@ -24,11 +24,30 @@ module DuckMap
       config = {controller: :sitemap, url_limit: nil}.merge(options)
 
       sitemap_raw_route_name = "#{name}_sitemap"
+      sitemap_route_name = name_for_action(sitemap_raw_route_name, nil)
 
       begin
 
-        # create a route for the sitemap using the name that was passed to the sitemap method inside config/routes.
-        match %(/#{name}.:format), controller: config[:controller], action: name, via: [:get], as: sitemap_raw_route_name
+        unless @set.routes.find {|route| route.name.eql?(sitemap_route_name)}
+
+          # create a route for the sitemap using the name that was passed to the sitemap method inside config/routes.
+          match %(/#{name}.:format), controller: config[:controller], action: name, via: [:get], as: sitemap_raw_route_name
+
+          # if not found here, then, there must be a real problem.
+          # later, i will implement an exception, etc.
+          sitemap_route = @set.routes.find {|route| route.name.eql?(sitemap_route_name)}
+
+          # identify the route as a "sitemap" route and build it's full name.
+          sitemap_route.is_sitemap = true
+          sitemap_route.url_limit = config[:url_limit]
+          sitemap_route.sitemap_route_name = sitemap_route_name
+          sitemap_route.sitemap_raw_route_name = sitemap_raw_route_name
+
+          # this is how I am faking to always point to the SitemapController
+          # regardless of namespace
+          sitemap_route.defaults[:controller] = "sitemap"
+
+        end
 
       rescue ArgumentError => e
         unless e.message.include?("Invalid route name")
@@ -36,36 +55,10 @@ module DuckMap
         end
       end
 
-      # the current Rails implementation keeps the routes in an array.  Also, it does nothing to prevent duplicate routes from being added.
-      # at the time of development, the route is always at the end of the list, so, it is pretty safe to assume
-      # the last route in the list is the sitemap route we just added.
-
-      # last_route_name is used after we check to see if we just added a duplicate route.
-      #last_route_name = @set.routes.last.route_name
-      last_route_name = @set.routes.last.name
-
-      # identify the route as a "sitemap" route and build it's full name.
-      @set.routes.last.is_sitemap = true
-      @set.routes.last.url_limit = config[:url_limit]
-      @set.routes.last.sitemap_route_name = last_route_name
-      @set.routes.last.sitemap_raw_route_name = sitemap_raw_route_name
-
-      # this is how I am faking to always point to the SitemapController
-      # regardless of namespace
-      @set.routes.last.defaults[:controller] = "sitemap"
-
-      # determine if we added a duplicate route.
-      # The gem defines a default sitemap in config/routes.rb (inside the gem, not the app).
-      # So, it is very likely that most apps will be creating duplicates since most of the code is geared towards
-      # automagically configuring as much as possible.
-      sitemap_routes = @set.routes.find_all {|route| route.is_sitemap? && route.name.eql?(last_route_name) }
-      
-      # if there are more than one routes with the same name, then, we must have added a duplicate.  so, remove it.
-      #@set.routes.pop if sitemap_routes.length > 1
-      @set.routes.routes.pop if sitemap_routes.length > 1
-
-      # now, find the route again.
-      sitemap_route = @set.routes.find {|route| route.is_sitemap? && route.name.eql?(last_route_name) }
+      # now, find the route again, because, we need to set the following boolean and there might be several
+      # calls to sitemap without a block.  if we were to set this boolean in the code above when checking
+      # if the route already exists, then, the boolean may never be set.
+      sitemap_route = @set.routes.find {|route| route.is_sitemap? && route.name.eql?(sitemap_route_name) }
 
       # once a sitemap route has been flagged as being defined with a block, then, you should never set it back to false.
       # one of the features is to be able to encapsulate a set of routes within a sitemap as many times as you need.

data/lib/duck_map/mongoid_engine.rb

@@ -3,15 +3,11 @@ module DuckMap
 
   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
 
-      Mongoid::Document.send :include, InheritableClassAttributes
-      Mongoid::Document.send :include, Attributes
-      Mongoid::Document.send :include, SitemapObject
-
-      Model::Supported.models.push(Mongoid::Document)
-
-    end
+    Model::Supported.models.push(Mongoid::Document)
 
   end
 

data/lib/duck_map/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duck_map
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.4
 platform: ruby
 authors:
 - Jeff Duckett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails