mascot-rails 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8f75b9c928c6100afdf542f5c1613d50599bce2
-  data.tar.gz: 048b5189fbb78e517da38b523f4af3447bf31188
+  metadata.gz: 9d01108d929b171be4baedad66287fe49624c625
+  data.tar.gz: 5756960e8c3ff99aff2ad75ef1a6f7ead99e0c33
 SHA512:
-  metadata.gz: f6883892fb9176d61dff68831542610b381b2faf829da5c9ce03aa44ff30d9ed48a5189b489d58778b3900a2fa09b470ca9ed11d08f9728338f3898b007df0ef
-  data.tar.gz: 0a63879f28f859ab19faae79461eb29d17e989f54e1aafce8cbf8404111cc12cff74101ca4d06d89d3fb4ac1fea63912f30f5ba651bad610390e387c1b3077c4
+  metadata.gz: 7a60470d2fa4ef0787d25ae7f64833bfb624d5488d7d865646c2c42fd176840e109e262c6d5dc4a13029fd4ca715d94b8457a7436a5dd3b8fe51d69ba15c7e56
+  data.tar.gz: 5c0e8b15656a400a986369d2bc630bc399267dfd886691089c850c1c63c9fd746963f15627c0f414f5d5672d99e48c1de3056232bea18d0a9c105586e7aef834

data/config/routes.rb

@@ -1,7 +1,7 @@
 Mascot.configuration.parent_engine.routes.draw do
   if Mascot.configuration.routes
     constraints Mascot::RouteConstraint.new do
-      get "*path", controller: "mascot/sitemap", action: "show", as: :page, format: false
+      get "*resource_path", controller: "mascot/sitemap", action: "show", as: :page, format: false
     end
   end
 end

data/lib/mascot/action_controller_context.rb

@@ -40,7 +40,7 @@ module Mascot
 
     # Default finder of the resource for the current controller context.###
     def find_resource
-      get controller.params[:path]
+      get controller.params[:resource_path]
     end
 
     private

data/lib/mascot/extensions/index_request_path.rb

@@ -0,0 +1,22 @@
+module Mascot
+  module Extensions
+    # Removes files beginning with "_" from the resource collection.
+    class IndexRequestPath
+      # Name of the file that we'll want to change to a / path
+      FILE_NAME = "index.html".freeze
+
+      def initialize(file_name: FILE_NAME)
+        @file_name = file_name
+      end
+
+      def process_resources(resources)
+        resources.each do |r|
+          if r.asset.path.basename.to_s.start_with? @file_name
+            # TODO: Conslidate this into SafeRoot.
+            r.request_path = Pathname.new("/").join(r.request_path).dirname.cleanpath.to_s
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mascot/extensions/layouts.rb

@@ -0,0 +1,27 @@
+module Mascot
+  module Extensions
+    # Register layouts with resources that match certain patterns.
+    class Layouts
+      Rule = Struct.new(:layout, :processor)
+
+      def initialize
+        @rules = Array.new
+      end
+
+      # Register a layout for a set of resources.
+      def layout(layout, &block)
+        @rules << Rule.new(layout, block)
+      end
+
+      def process_resources(resources)
+        resources.each do |resource|
+          @rules.each do |rule|
+            if rule.processor.call(resource)
+              resource.data["layout"] = rule.layout
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mascot/rails.rb

@@ -13,6 +13,8 @@ module Mascot
   module Extensions
     autoload :RailsRequestPaths,      "mascot/extensions/rails_request_paths"
     autoload :PartialsRemover,        "mascot/extensions/partials_remover"
+    autoload :IndexRequestPath,       "mascot/extensions/index_request_path"
+    autoload :Layouts,                "mascot/extensions/layouts"
   end
 
   # Default configuration object for Mascot Rails integration.

data/spec/dummy/log/production.log

@@ -1248,3 +1248,59 @@ I, [2016-07-31T23:28:55.218581 #23080]  INFO -- : Processing by Mascot::SitemapC
 I, [2016-07-31T23:28:55.218613 #23080]  INFO -- :   Parameters: {"path"=>"page-9999.html"}
 I, [2016-07-31T23:28:57.825229 #23080]  INFO -- :   Rendered inline template within layouts/application (1153.3ms)
 I, [2016-07-31T23:28:57.826056 #23080]  INFO -- : Completed 200 OK in 2607ms (Views: 1154.2ms | ActiveRecord: 0.0ms)
+I, [2016-08-02T15:28:49.239877 #82906]  INFO -- : Started GET "/baseline/render" for 127.0.0.1 at 2016-08-02 15:28:49 -0700
+I, [2016-08-02T15:28:49.252320 #82906]  INFO -- : Processing by BaselineController#show as HTML
+I, [2016-08-02T15:28:49.256779 #82906]  INFO -- :   Rendered baseline/show.html.erb within layouts/application (0.3ms)
+I, [2016-08-02T15:28:49.263443 #82906]  INFO -- : Completed 200 OK in 11ms (Views: 10.7ms | ActiveRecord: 0.0ms)
+I, [2016-08-02T15:28:49.265997 #82906]  INFO -- : Started GET "/page-1.html" for 127.0.0.1 at 2016-08-02 15:28:49 -0700
+I, [2016-08-02T15:28:49.267297 #82906]  INFO -- : Processing by Mascot::SitemapController#show as HTML
+I, [2016-08-02T15:28:49.267372 #82906]  INFO -- :   Parameters: {"path"=>"page-1.html"}
+I, [2016-08-02T15:28:53.130167 #82906]  INFO -- :   Rendered inline template within layouts/application (3857.5ms)
+I, [2016-08-02T15:28:53.132209 #82906]  INFO -- : Completed 200 OK in 3865ms (Views: 3861.8ms | ActiveRecord: 0.0ms)
+I, [2016-08-02T15:28:53.135581 #82906]  INFO -- : Started GET "/page-9999.html" for 127.0.0.1 at 2016-08-02 15:28:53 -0700
+I, [2016-08-02T15:28:53.136057 #82906]  INFO -- : Processing by Mascot::SitemapController#show as HTML
+I, [2016-08-02T15:28:53.136088 #82906]  INFO -- :   Parameters: {"path"=>"page-9999.html"}
+I, [2016-08-02T15:28:53.244549 #82906]  INFO -- :   Rendered inline template within layouts/application (107.9ms)
+I, [2016-08-02T15:28:53.245972 #82906]  INFO -- : Completed 200 OK in 110ms (Views: 109.4ms | ActiveRecord: 0.0ms)
+I, [2016-08-02T15:28:53.536255 #82906]  INFO -- : Started GET "/baseline/render" for 127.0.0.1 at 2016-08-02 15:28:53 -0700
+I, [2016-08-02T15:28:53.536910 #82906]  INFO -- : Processing by BaselineController#show as HTML
+I, [2016-08-02T15:28:53.537335 #82906]  INFO -- :   Rendered baseline/show.html.erb within layouts/application (0.0ms)
+I, [2016-08-02T15:28:53.538976 #82906]  INFO -- : Completed 200 OK in 2ms (Views: 1.8ms | ActiveRecord: 0.0ms)
+I, [2016-08-02T15:28:53.596571 #82906]  INFO -- : Started GET "/page-1.html" for 127.0.0.1 at 2016-08-02 15:28:53 -0700
+I, [2016-08-02T15:28:53.597074 #82906]  INFO -- : Processing by Mascot::SitemapController#show as HTML
+I, [2016-08-02T15:28:53.597107 #82906]  INFO -- :   Parameters: {"path"=>"page-1.html"}
+I, [2016-08-02T15:28:53.685423 #82906]  INFO -- :   Rendered inline template within layouts/application (87.9ms)
+I, [2016-08-02T15:28:53.686357 #82906]  INFO -- : Completed 200 OK in 89ms (Views: 88.9ms | ActiveRecord: 0.0ms)
+I, [2016-08-02T15:28:53.761308 #82906]  INFO -- : Started GET "/page-9999.html" for 127.0.0.1 at 2016-08-02 15:28:53 -0700
+I, [2016-08-02T15:28:53.761775 #82906]  INFO -- : Processing by Mascot::SitemapController#show as HTML
+I, [2016-08-02T15:28:53.761807 #82906]  INFO -- :   Parameters: {"path"=>"page-9999.html"}
+I, [2016-08-02T15:28:53.852588 #82906]  INFO -- :   Rendered inline template within layouts/application (90.4ms)
+I, [2016-08-02T15:28:53.854070 #82906]  INFO -- : Completed 200 OK in 92ms (Views: 92.0ms | ActiveRecord: 0.0ms)
+I, [2016-08-02T15:28:56.646916 #82906]  INFO -- : Started GET "/baseline/render" for 127.0.0.1 at 2016-08-02 15:28:56 -0700
+I, [2016-08-02T15:28:56.647492 #82906]  INFO -- : Processing by BaselineController#show as HTML
+I, [2016-08-02T15:28:56.647863 #82906]  INFO -- :   Rendered baseline/show.html.erb within layouts/application (0.0ms)
+I, [2016-08-02T15:28:56.648281 #82906]  INFO -- : Completed 200 OK in 1ms (Views: 0.6ms | ActiveRecord: 0.0ms)
+I, [2016-08-02T15:28:56.649138 #82906]  INFO -- : Started GET "/page-1.html" for 127.0.0.1 at 2016-08-02 15:28:56 -0700
+I, [2016-08-02T15:28:56.649576 #82906]  INFO -- : Processing by Mascot::SitemapController#show as HTML
+I, [2016-08-02T15:28:56.649607 #82906]  INFO -- :   Parameters: {"path"=>"page-1.html"}
+I, [2016-08-02T15:29:01.588282 #82906]  INFO -- :   Rendered inline template within layouts/application (3418.5ms)
+I, [2016-08-02T15:29:01.589245 #82906]  INFO -- : Completed 200 OK in 4940ms (Views: 3419.6ms | ActiveRecord: 0.0ms)
+I, [2016-08-02T15:29:01.592650 #82906]  INFO -- : Started GET "/page-9999.html" for 127.0.0.1 at 2016-08-02 15:29:01 -0700
+I, [2016-08-02T15:29:01.593184 #82906]  INFO -- : Processing by Mascot::SitemapController#show as HTML
+I, [2016-08-02T15:29:01.593223 #82906]  INFO -- :   Parameters: {"path"=>"page-9999.html"}
+I, [2016-08-02T15:29:05.328473 #82906]  INFO -- :   Rendered inline template within layouts/application (1890.2ms)
+I, [2016-08-02T15:29:05.330198 #82906]  INFO -- : Completed 200 OK in 3737ms (Views: 1892.0ms | ActiveRecord: 0.0ms)
+I, [2016-08-02T15:29:07.365328 #82906]  INFO -- : Started GET "/baseline/render" for 127.0.0.1 at 2016-08-02 15:29:07 -0700
+I, [2016-08-02T15:29:07.365924 #82906]  INFO -- : Processing by BaselineController#show as HTML
+I, [2016-08-02T15:29:07.366314 #82906]  INFO -- :   Rendered baseline/show.html.erb within layouts/application (0.0ms)
+I, [2016-08-02T15:29:07.366731 #82906]  INFO -- : Completed 200 OK in 1ms (Views: 0.6ms | ActiveRecord: 0.0ms)
+I, [2016-08-02T15:29:07.497249 #82906]  INFO -- : Started GET "/page-1.html" for 127.0.0.1 at 2016-08-02 15:29:07 -0700
+I, [2016-08-02T15:29:07.497815 #82906]  INFO -- : Processing by Mascot::SitemapController#show as HTML
+I, [2016-08-02T15:29:07.497850 #82906]  INFO -- :   Parameters: {"path"=>"page-1.html"}
+I, [2016-08-02T15:29:09.879877 #82906]  INFO -- :   Rendered inline template within layouts/application (1062.0ms)
+I, [2016-08-02T15:29:09.892622 #82906]  INFO -- : Completed 200 OK in 2395ms (Views: 1062.9ms | ActiveRecord: 0.0ms)
+I, [2016-08-02T15:29:10.153048 #82906]  INFO -- : Started GET "/page-9999.html" for 127.0.0.1 at 2016-08-02 15:29:10 -0700
+I, [2016-08-02T15:29:10.153649 #82906]  INFO -- : Processing by Mascot::SitemapController#show as HTML
+I, [2016-08-02T15:29:10.153762 #82906]  INFO -- :   Parameters: {"path"=>"page-9999.html"}
+I, [2016-08-02T15:29:12.455826 #82906]  INFO -- :   Rendered inline template within layouts/application (1021.0ms)
+I, [2016-08-02T15:29:12.457463 #82906]  INFO -- : Completed 200 OK in 2304ms (Views: 1022.7ms | ActiveRecord: 0.0ms)