duck_map 0.8.4 → 0.8.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 305fb5ad0e27605cee8fc74c2a2e4503a1df9a83
+  data.tar.gz: 20c88d54a9cfb4ed011fe8cb260f2e1af0936f45
+SHA512:
+  metadata.gz: 1f69066f412ac398337f4a8a3d2e3087a586303488eabe15a6bc442d76fe4ff02d7e684497ef3a54d89df361dc92e15c86c40c9e2ecc9b78101b990d098c7a64
+  data.tar.gz: 8505654b66ebe33decedb58ee7ee3be7ffdf0a31230acb74253ee1632aab9db0c491d1aeda80cde93b3bb750cef45f1b47a38dc13d88758237573c43a4573364

data/lib/duck_map/array_helper.rb

@@ -1,4 +1,3 @@
-# DONE
 module DuckMap
 
   # This is a small helper used to ensure values in an Array of are a certain type.

data/lib/duck_map/attributes.rb

@@ -1,12 +1,11 @@
-# DONE
 require 'active_support/concern'
 
 module DuckMap
 
   ##################################################################################
   # This module has a single purpose.  To declare a class-level attribute using the Rails class_attribute method.
-  # Also, we are using {ActiveSupport::Concern} and the included block.  This module is included in
-  # {ActionController::Base}, so, every controller object will have the attribute.
+  # Also, we are using ActiveSupport::Concern and the included block.  This module is included in
+  # ActionController::Base, so, every controller object will have the attribute.
   #
   # See {DuckMap::Attributes::ClassMethods#sitemap_attributes} for an explanation.
   module InheritableClassAttributes

data/lib/duck_map/class_helpers.rb

@@ -1,4 +1,3 @@
-# DONE
 module DuckMap
 
   ##################################################################################

data/lib/duck_map/engine.rb

@@ -1,5 +1,3 @@
-require 'journey'
-
 module DuckMap
   extend ActiveSupport::Autoload
 
@@ -33,7 +31,7 @@ module DuckMap
 
   end
 
-  class DuckMapEngine < Rails::Engine
+  class Engine < Rails::Engine
 
 #     # this is so I can develop the gem
 #     # run dev.com, make changes to files in lib/duck_captcha, refresh browser.
@@ -49,7 +47,7 @@ module DuckMap
                                 seo: "%a, %d %b %Y %H:%M:%S %Z")
     end
 
-    Journey::Route.send :include, Route
+    ActionDispatch::Journey::Route.send :include, Route
 
     ActionDispatch::Routing::RouteSet.send :include, RouteSet
     ActionDispatch::Routing::RouteSet.send :include, RouteFilter
@@ -64,11 +62,13 @@ module DuckMap
       ActiveRecord::Base.send :include, SitemapObject
     end
 
-    ActiveSupport.on_load(:action_controller) do
+    ActiveSupport.on_load(:after_initialize) do
       ActionController::Base.send :include, InheritableClassAttributes
       ActionController::Base.send :include, Attributes
       ActionController::Base.send :include, ControllerHelpers
       ActionController::Base.send :include, Handlers::Base
+      ActionController::Base.send :include, Handlers::Edit
+      ActionController::Base.send :include, Handlers::New
       ActionController::Base.send :include, Handlers::Index
       ActionController::Base.send :include, Handlers::Show
       ActionController::Base.send :include, Model

data/lib/duck_map/filter_stack.rb

@@ -1,4 +1,3 @@
-# DONE
 require 'active_support/concern'
 
 module DuckMap

data/lib/duck_map/handlers/base.rb

@@ -3,6 +3,8 @@ require 'active_support/concern'
 module DuckMap
   module Handlers
 
+    autoload :Edit, "duck_map/handlers/edit"
+    autoload :New, "duck_map/handlers/new"
     autoload :Index, "duck_map/handlers/index"
     autoload :Show, "duck_map/handlers/show"
 

data/lib/duck_map/handlers/edit.rb

@@ -0,0 +1,19 @@
+require 'active_support/concern'
+
+module DuckMap
+  module Handlers
+
+    ##################################################################################
+    module Edit
+      extend ActiveSupport::Concern
+
+      ##################################################################################
+      # Not implemented yet.
+      def sitemap_edit(options = {})
+        return []
+      end
+
+    end
+
+  end
+end

data/lib/duck_map/handlers/index.rb

@@ -7,16 +7,6 @@ module DuckMap
     module Index
       extend ActiveSupport::Concern
 
-      ##################################################################################
-      def sitemap_new(options = {})
-        return []
-      end
-
-      ##################################################################################
-      def sitemap_edit(options = {})
-        return []
-      end
-
       ##################################################################################
       # Default handler method for index actions.
       #

data/lib/duck_map/handlers/new.rb

@@ -0,0 +1,19 @@
+require 'active_support/concern'
+
+module DuckMap
+  module Handlers
+
+    ##################################################################################
+    module New
+      extend ActiveSupport::Concern
+
+      ##################################################################################
+      # Not implemented yet.
+      def sitemap_new(options = {})
+        return []
+      end
+
+    end
+
+  end
+end

data/lib/duck_map/last_mod.rb

@@ -1,4 +1,3 @@
-# DONE
 module DuckMap
 
   ##################################################################################
@@ -9,7 +8,7 @@ module DuckMap
     # Parses a DateTime represented as a String into a DateTime value.  If value is String, then, it is parsed
     # and returns a DateTime Object if valid.  Otherwise, it returns nil.  If the value passed is a Date, Time, or DateTime, then,
     # it is returned as is.
-    # @param [String] A DateTime represented as a String to parse or can be a Date, Time, or DateTime value.
+    # @param [String] value A DateTime represented as a String to parse or can be a Date, Time, or DateTime value.
     # @return [DateTime] DateTime value.
     def self.to_date(value)
       date_value = nil

data/lib/duck_map/logger.rb

@@ -1,4 +1,3 @@
-# DONE
 module DuckMap
 
   # Logger class generates logging information in log/duckmap.log

data/lib/duck_map/mapper.rb

@@ -11,6 +11,12 @@ module DuckMap
 
     ##################################################################################
     # Defines a sitemap for a Rails app.
+    #
+    #
+    # You can find a few examples and apps at:
+    # - (http://www.jeffduckett.com/blog/11/defining-rails-3-x-sitemaps-using-duckmap.html)
+    # - (http://www.jeffduckett.com/blog/12/multiple-sitemap-definitions.html)
+    #
     # @return [Nil]
     def sitemap(name = :sitemap, options = {}, &block)
       options = name.kind_of?(Hash) ? name : options
@@ -20,14 +26,15 @@ module DuckMap
       sitemap_raw_route_name = "#{name}_sitemap"
 
       # 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, as: sitemap_raw_route_name
+      match %(/#{name}.:format), controller: config[:controller], action: name, via: [:get], as: sitemap_raw_route_name
 
       # 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.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
@@ -145,7 +152,7 @@ module DuckMap
     extend ActiveSupport::Concern
 
     ##################################################################################
-    # See {DuckMap::Sitemap::RouteFilter::InstanceMethods#blank_route_name blank_route_name}
+    # See {DuckMap::RouteFilter#blank_route_name blank_route_name}
     def allow_blank_route_name(value)
       @set.blank_route_name = value
     end

data/lib/duck_map/model.rb

@@ -1,4 +1,3 @@
-# DONE
 require 'active_support/concern'
 
 module DuckMap

data/lib/duck_map/route_filter.rb

@@ -20,6 +20,8 @@ module DuckMap
   ##################################################################################
   # Mixin module for ActionDispatch::Routing::RouteSet.  This module is responsible for evaluating each route
   # for consideration to be included in a sitemap.
+  #
+  # You can find a few examples and apps at: (http://www.jeffduckett.com/blog/15/route-filters.html)
   module RouteFilter
     extend ActiveSupport::Concern
 

data/lib/duck_map/route_set.rb

@@ -10,8 +10,8 @@ module DuckMap
 
     ##################################################################################
     # Builds a list of routes associated with a sitemap.  The actual list of routes returned is based
-    # on {DuckMap::Sitemap::Route::InstanceMethods#sitemap_route_name sitemap_route_name}, which is the named route of the sitemap.
-    # @note See {DuckMap::Sitemap::Mapper::InstanceMethods#sitemap} for a full explanation of how to define a sitemap and how those rules affect this method.
+    # on {DuckMap::Route#sitemap_route_name sitemap_route_name}, which is the named route of the sitemap.
+    # @note See {DuckMap::Mapper#sitemap} for a full explanation of how to define a sitemap and how those rules affect this method.
     # @param [String] name_or_path  The request.path of the current sitemap url or the name assigned to the sitemap via config/routes.rb.
     # @return [Array]
     def find_sitemap_route(name_or_path)
@@ -35,9 +35,9 @@ module DuckMap
 
     ##################################################################################
     # Builds a list of routes associated with a sitemap route.  The actual list of routes returned is based
-    # on {DuckMap::Sitemap::Route::InstanceMethods#sitemap_route_name sitemap_route_name}, which is the named
+    # on {DuckMap::Route#sitemap_route_name sitemap_route_name}, which is the named
     # route of the sitemap.
-    # @note See {DuckMap::Sitemap::Mapper::InstanceMethods#sitemap} for a full explanation of how to define a sitemap and how those rules affect this method.
+    # @note See {DuckMap::Mapper#sitemap} for a full explanation of how to define a sitemap and how those rules affect this method.
     # @param [String] sitemap_route A sitemap route.
     # @return [Array]
     def sitemap_routes(sitemap_route)
@@ -58,7 +58,6 @@ module DuckMap
         else
 
           candidates = self.routes.find_all {|route| !route.is_sitemap?}
-
           potential_owners = self.routes.find_all {|route| route.is_sitemap?}
           potential_owners.sort! { |a,b| b.namespace_prefix_underscores <=> a.namespace_prefix_underscores}
 
@@ -106,6 +105,7 @@ module DuckMap
       end
 
       list.reject! {|route| route.path.spec =~ %r{/rails/info/properties|^/assets}}
+      list.reject! {|route| route.name.eql?("rails_info")}
       list.reject! {|route| !route.is_available?}
 
       return list
@@ -155,7 +155,7 @@ module DuckMap
     ##################################################################################
     def find_route_via_path(path, environment = {})
       method = (environment[:method] || "GET").to_s.upcase
-      path = Journey::Router::Utils.normalize_path(path) unless path =~ %r{://}
+      path = ActionDispatch::Journey::Router::Utils.normalize_path(path) unless path =~ %r{://}
 
       begin
         env = Rack::MockRequest.env_for(path, {:method => method})
@@ -167,13 +167,13 @@ module DuckMap
       @router.recognize(req) do |route, matches, params|
         params.each do |key, value|
           if value.is_a?(String)
-            value = value.dup.force_encoding(Encoding::BINARY) if value.encoding_aware?
+            value = value.dup.force_encoding(Encoding::BINARY)# if value.encoding_aware?
             params[key] = URI.parser.unescape(value)
           end
         end
 
         dispatcher = route.app
-        #while dispatcher.is_a?(Mapper::Constraints) && dispatcher.matches?(env) do
+
         while dispatcher.is_a?(ActionDispatch::Routing::Mapper::Constraints) && dispatcher.matches?(env) do
           dispatcher = dispatcher.app
         end
@@ -187,10 +187,6 @@ module DuckMap
       raise ActionController::RoutingError, "No route matches #{path.inspect}"
     end
 
-
-
-
-
   end
 
 end

data/lib/duck_map/sitemap_object.rb

@@ -1,4 +1,3 @@
-# DONE i think.  need to proof read and re-verify
 require 'active_support/concern'
 
 module DuckMap
@@ -131,7 +130,7 @@ module DuckMap
       #   @option options [Symbol] :keywords            Default value: :keywords
       #   @option options [Symbol] :lastmod             Default value: :updated_at
       #   @option options [Symbol] :priority            Valid static values range from 0.0 to 1.0
-      #   @option options [Symbol] :segments            Sub-hash containing attributes for the segments.  See {#segments_handler segments_handler}
+      #   @option options [Symbol] :segments            Sub-hash containing attributes for the segments.  See {#sitemap_segments sitemap_segments}
       #   @option options [Symbol] :title               Default value: :title
       #   @option options [Symbol] :url_format          Default value: "html"
       #   @option options [Symbol] :url_limit           Default value: 50000
@@ -329,7 +328,7 @@ module DuckMap
     # - :my_title is a Symbol, however, a matching attribute/method does NOT exist on the target object, so,
     #   it is ignored and not included in the returning Hash.
     #
-    # @param [Hash] options                  Options hash. Can be any combination of key/value pairs (one-dimensional).
+    # @param [Hash] attributes Options hash. Can be any combination of key/value pairs (one-dimensional).
     # return [Hash]
     def sitemap_capture_attributes(attributes = {})
       values = {}

data/lib/duck_map/version.rb

@@ -1,3 +1,3 @@
 module DuckMap
-  VERSION = "0.8.4"
+  VERSION = "0.8.6"
 end

data/lib/duck_map/view_helpers.rb

@@ -1,4 +1,3 @@
-# DONE
 require 'active_support/concern'
 
 module DuckMap
@@ -11,13 +10,12 @@ module DuckMap
     ##################################################################################
     # View helper method to generate the content of a sitemap.  Loops through all of the current
     # Hashes contained in {DuckMap::Model#sitemap_model}.
-    # @param [Block] A block to execute for each row contained in {DuckMap::Model#sitemap_model}.
-    #
     #
     # To see it in action, have a look at the file.
     #
     # /app/views/sitemap/default_template.xml.erb
     #
+    # @param [Block] block A block to execute for each row contained in {DuckMap::Model#sitemap_model}.
     # @return [NilClass]
     def sitemap_content(&block)
 

data/lib/duck_map.rb

@@ -1,3 +1,4 @@
+require "duck_map/engine"
+
 module DuckMap
-  require "duck_map/engine" if defined?(Rails)
 end

data/lib/tasks/duck_map_tasks.rake

@@ -0,0 +1,4 @@
+# desc "Explaining what the task does"
+# task :duck_map do
+#   # Task goes here
+# end

metadata

@@ -1,33 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: duck_map
 version: !ruby/object:Gem::Version
-  version: 0.8.4
-  prerelease: 
+  version: 0.8.6
 platform: ruby
 authors:
 - Jeff Duckett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Duck Map is a Rails 3.x compliant gem providing support for dynamically
+description: Duck Map is a Rails 4.x compliant gem providing support for dynamically
   generating sitemaps and meta tags in HTML page headers.
 email:
 - jeff.duckett@gmail.com
@@ -41,6 +66,7 @@ files:
 - lib/generators/duckmap/sync/USAGE
 - lib/generators/duckmap/sitemaps/sitemaps_generator.rb
 - lib/generators/duckmap/sitemaps/USAGE
+- lib/tasks/duck_map_tasks.rake
 - lib/duck_map/sync.rb
 - lib/duck_map/mapper.rb
 - lib/duck_map/sitemap_object.rb
@@ -57,6 +83,8 @@ files:
 - lib/duck_map/model.rb
 - lib/duck_map/route.rb
 - lib/duck_map/handlers/base.rb
+- lib/duck_map/handlers/edit.rb
+- lib/duck_map/handlers/new.rb
 - lib/duck_map/handlers/index.rb
 - lib/duck_map/handlers/show.rb
 - lib/duck_map/static.rb
@@ -71,28 +99,26 @@ files:
 - config/routes.rb
 homepage: http://www.jeffduckett.com/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: duck_map
-rubygems_version: 1.8.24
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
-summary: Duck Map is a Rails 3.x compliant gem providing support for dynamically generating
+specification_version: 4
+summary: Duck Map is a Rails 4.x compliant gem providing support for dynamically generating
   sitemaps and meta tags in HTML page headers.
 test_files: []
-has_rdoc: