Refactored last_updated to be a defaults method rather than an Active…

…Record class_eval

lib/spree/sitemap_generator/defaults.rb

@@ -30,7 +30,7 @@ def add_password_reset(options={})
       def add_products(options={})
         active_products = Spree::Product.active
 
-        add(products_path, options.merge(:lastmod => active_products.last_updated))
+        add(products_path, options.merge(:lastmod => last_updated(active_products)))
 
         active_products.each do |product|
           opts = options.merge(:lastmod => product.updated_at, :priority => priority(product))
@@ -68,7 +68,7 @@ def add_taxons(options={})
       end
 
       def add_taxon(taxon, options={})
-        opts = options.merge(:lastmod => taxon.products.last_updated, :priority => priority(taxon))
+        opts = options.merge(:lastmod => last_updated(taxon.products), :priority => priority(taxon))
 
         if gem_available? 'spree_taxon_splash' and taxon.taxon_splash.present?
           @video_exclude ||= []
@@ -117,7 +117,17 @@ def video_options(youtube_id, object = false)
         def priority(object)
           0.5
         end
-      end
+
+        def last_updated(object)
+          if object.is_a? ActiveRecord::Relation
+            return object.order('updated_at DESC').first.try :updated_at
+          elsif object.kind_of? ActiveRecord::Base
+            return object.last_updated
+          end
+
+          Time.now
+        end
+    end
   end
 end
 

lib/spree_sitemap_generator/engine.rb

@@ -12,19 +12,6 @@ class Engine < Rails::Engine
     end
 
     def self.activate
-      ActiveRecord::Relation.class_eval do
-        def last_updated
-          last_update = order('updated_at DESC').first
-          last_update.try(:updated_at) 
-        end 
-      end
-
-      ActiveRecord::Base.class_eval do
-        def self.last_updated
-          scoped.last_updated
-        end
-      end
-
       SitemapGenerator::Interpreter.send :include, Spree::SitemapGenerator::Defaults
     end