duck_map 0.8.0 → 0.8.1

data/lib/duck_map/handlers/show.rb

@@ -10,7 +10,6 @@ module DuckMap
       ##################################################################################
       def sitemap_show(options = {})
         rows = []
-puts YAML.dump(options)
 
         # always start off with default values from config, then, simply overwrite them as we progress.
         values = sitemap_defaults(options)
@@ -24,32 +23,21 @@ puts YAML.dump(options)
 
         # first, capture the values from the controller.
         attributes = self.sitemap_stripped_attributes(options[:action_name])
-puts "............................ attributes"
-puts YAML.dump(attributes)
-
         values = values.merge(self.sitemap_capture_attributes(attributes))
-puts "---------------------------------==== values"
-puts YAML.dump(values)
 
         if options[:source] == :meta_data
-puts " !!!!!!!!!!!!! going for it..."
+
           # capture values from the first available model unless disabled.
           model_object = sitemap_first_model(options[:handler])
-puts "###########################3 model_object: #{model_object}"
+
           unless model_object.blank?
             model_attributes = attributes
             if model_object.is_sitemap_attributes_defined?
               model_attributes = model_object.sitemap_stripped_attributes(options[:action_name])
             end
-puts "**********************************************==== model_attributes"
-puts YAML.dump(model_attributes)
-
-puts "wtf wtf wtf wtf wtf wtf wtf wtf wtf wtf wtf wtf wtf wtf wtf wtf wtf wtf wtf wtf "
-puts YAML.dump(model_object.sitemap_capture_attributes(model_attributes))
 
             values = values.merge(model_object.sitemap_capture_attributes(model_attributes))
-puts "---------------------------------==== values again"
-puts YAML.dump(values)
+
           end
 
           if values[:canonical].blank?
@@ -60,8 +48,6 @@ puts YAML.dump(values)
           else
             values[:loc] = values[:canonical]
           end
-puts "............................ values"
-puts YAML.dump(values)
 
           rows.push(values)
 
@@ -102,8 +88,11 @@ puts YAML.dump(values)
               # defined on the model.  The model attributes win!
               # same thing for segments below.
               model_attributes = attributes
+              segment_mappings = self.sitemap_attributes(options[:action_name])[:segments]
+
               if data_row.is_sitemap_attributes_defined?
                 model_attributes = data_row.sitemap_stripped_attributes(options[:action_name])
+                segment_mappings = data_row.sitemap_attributes(options[:action_name])[:segments]
               end
 
               row_values = values.merge(data_row.sitemap_capture_attributes(model_attributes))
@@ -112,7 +101,7 @@ puts YAML.dump(values)
 
               if row_values[:canonical].blank?
 
-                segments = data_row.sitemap_capture_segments(model_attributes, options[:route].segments)
+                segments = data_row.sitemap_capture_segments(segment_mappings, options[:route].segments)
                 row_values[:canonical] = self.send("#{options[:route].name}_url", url_options.merge(segments))
                 row_values[:loc] = row_values[:canonical]
 
@@ -131,100 +120,6 @@ puts YAML.dump(values)
         return sitemap_url_limit(rows, options[:handler])
       end
 
-      ###################################################################################
-      #def sitemap_show(options = {})
-        #rows = []
-
-        ## always start off with default values from config, then, simply overwrite them as we progress.
-        #values = sitemap_defaults
-
-        #if options[:source] == :meta_data
-
-          ## if the source is meta_data, that means this method call is the result of a user
-          ## requesting an index page.  Therefore, the controller action_name variable should be set.
-          ## so, go ahead and use it.
-
-          #lastmod = self.sitemap_static_lastmod(controller_name, action_name)
-          #unless lastmod.blank?
-            #values[:lastmod] = lastmod
-          #end
-
-          ## first, capture the values from the controller.
-          #attributes = self.sitemap_stripped_attributes(action_name)
-          #values = values.merge(self.sitemap_capture_attributes(attributes))
-
-          #if options[:handler][:first_model]
-            #model_object = sitemap_first_model(options[:handler])
-            #unless model_object.blank?
-              #values = values.merge(model_object.sitemap_capture_attributes(attributes))
-            #end
-          #end
-
-          #route = Rails.application.routes.find_route_via_path(request.path)
-          #values[:loc] = self.send("#{route.name}_url", params.merge({format: values[:url_format]}))
-          #values[:canonical] = values[:loc]
-
-          #rows.push(values)
-
-          #self.sitemap_meta_data = values
-
-        #elsif options[:source] == :sitemap
-
-          #begin
-
-            #route = options[:route]
-
-            #lastmod = self.sitemap_static_lastmod(route.controller_name, route.action_name)
-            #unless lastmod.blank?
-              #values[:lastmod] = lastmod
-            #end
-
-            #attributes = self.sitemap_stripped_attributes(options[:action_name])
-            #values = values.merge(self.sitemap_capture_attributes(attributes))
-
-            #data_rows = []
-
-            #if !options[:handler][:block].blank?
-
-              #data_rows = options[:handler][:block].call(options)
-
-            #elsif !options[:handler][:model].blank?
-
-              #data_rows = options[:handler][:model].send(:all)
-
-            #elsif !options[:model].blank?
-
-              #data_rows = options[:model].send(:all)
-
-            #end
-
-            #unless data_rows.kind_of?(Array)
-              #if data_rows.kind_of?(ActiveRecord::Base)
-                #data_rows = [data_rows]
-              #end
-            #end
-
-            #data_rows.each do |data_row|
-
-              #row_values = values.merge(data_row.sitemap_capture_attributes(attributes))
-
-              #segments = data_row.sitemap_capture_segments(attributes, route.segments)
-
-              #row_values[:canonical] = self.send("#{route.name}_url", {format: row_values[:url_format]}.merge(segments))
-              #row_values[:loc] = row_values[:canonical]
-              #rows.push(row_values)
-
-            #end
-
-          #rescue Exception => e
-            #DuckMap.logger.exception(e)
-          #end
-
-        #end
-
-        #return sitemap_url_limit(rows, values)
-      #end
-
     end
 
   end

data/lib/duck_map/list.rb

@@ -9,9 +9,9 @@ module DuckMap
 
       key = options[:key].blank? ? :all : options[:key].to_s.downcase.to_sym
 
-      contents = options.has_key?(:contents) ? true : false
+      verbose = options.has_key?(:verbose) ? true : false
 
-      contents = key.eql?(:all) ? contents : true
+      verbose = key.eql?(:all) ? verbose : true
 
       puts "Searching for route: #{key}"
 
@@ -46,12 +46,11 @@ module DuckMap
 
           puts %(#{"".ljust(40)} #{route.path.spec})
 
-          if contents
+          if verbose
 
             sitemap_routes = Rails.application.routes.sitemap_routes(route)
             if sitemap_routes.length > 0
-              #puts %(\r\n#{"".ljust(5)} route name                         controller_name#action_name)
-              #puts %(#{"".ljust(5)}                                    path)
+
               puts %(#{"".ljust(5)} --------------------------------------------------------------)
 
               sitemap_routes.each do |sitemap_route|

data/lib/duck_map/mapper.rb

@@ -35,6 +35,10 @@ module DuckMap
       @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

data/lib/duck_map/route_set.rb

@@ -105,6 +105,8 @@ module DuckMap
 
       end
 
+      list.reject! {|route| route.path.spec =~ %r{/rails/info/properties|^/assets}}
+
       return list
     end
 

data/lib/duck_map/sitemap_object.rb

@@ -178,6 +178,19 @@ module DuckMap
           keys.push(key)
         end
 
+        if values[:lastmod].kind_of?(String)
+          begin
+
+            buffer = LastMod.to_date(values[:lastmod])
+            if buffer.kind_of?(Time)
+              values[:lastmod] = buffer
+            end
+
+          rescue Exception => e
+            # TODO logging
+          end
+        end
+
         # process all of the keys in the list.
         keys.each do |key|
 

data/lib/duck_map/version.rb

@@ -1,3 +1,3 @@
 module DuckMap
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/lib/generators/duckmap/sitemaps/sitemaps_generator.rb

@@ -12,7 +12,7 @@ module Duckmap
                 required: false,
                 optional: true
 
-      class_option :contents, desc: "Include the routes contained in a sitemap"
+      class_option :verbose, desc: "Include the routes contained in a sitemap"
 
       def self.source_root
         File.join(File.dirname(__FILE__), "templates")
@@ -22,8 +22,8 @@ module Duckmap
 
         config = {key: key}
 
-        unless options[:contents].blank?
-          config[:contents] = options[:contents]
+        unless options[:verbose].blank?
+          config[:verbose] = options[:verbose]
         end
 
         DuckMap::List.new.build(config)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: duck_map
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-16 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline