sitepress-rails 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5642d02208d5027bbd4f1d35f55049cdfc540c4
-  data.tar.gz: a1ac9327949772a43277b0676ec28d07d34dc9d1
+  metadata.gz: 89e2092d8248342bf625c8a29089055564aaa324
+  data.tar.gz: e1602ac7344029a4194a6830be120c6df1947fcc
 SHA512:
-  metadata.gz: 1c399dd3b015e20d6c4b9c0df4528585162167a35fe5e5579d32df38505be8e95e23a1236c2f01ec6c952f4d5902980154fbc55066827953a465c7e2991e8082
-  data.tar.gz: 665acace5540f665c0f469f9d306512bee70090b526c85c862765f1203a0f79eacbdcd0fac02ff638cb306b6c3eb484916528ffaf982183c7b302f7159cebdce
+  metadata.gz: 64b2be3393caeef5f52868493a0c7db54625ffa5796e3bf2a606f1ccf3539e4ac621dac630b41e34fa6ff3f10455ff4e88c7824a0b54e452b563214efd593502
+  data.tar.gz: b65ebdf75334f2d712fad08469130a33f2cb50e55d218801ed32f3b61f533ed936ed47cd0ba5d82fa3441ef7b4ac89b4a1f3bcfd793babbfac14bb7e47cae53f

data/lib/sitepress/engine.rb

@@ -1,9 +1,11 @@
 module Sitepress
   class Engine < ::Rails::Engine
     config.before_configuration do |app|
-      app.paths["app/helpers"].push Sitepress.site.root_path.join("helpers")
-      app.paths["app/assets"].push Sitepress.site.root_path.join("assets")
-      app.paths["app/views"].push Sitepress.site.root_path
+      Sitepress.configure do |config|
+        app.paths["app/helpers"].push config.site.root_path.join("helpers")
+        app.paths["app/assets"].push config.site.root_path.join("assets")
+        app.paths["app/views"].push config.site.root_path
+      end
 
       # Setup concerns paths for Rails 4 (doesn't automatically populate)
       concerns_path = "app/controllers/concerns"
@@ -11,5 +13,12 @@ module Sitepress
         app.paths.add(concerns_path)
       end
     end
+
+    initializer "sitepress.configure" do |app|
+      Sitepress.configure do |config|
+        config.parent_engine = app
+        config.cache_resources = app.config.cache_classes
+      end
+    end
   end
 end

data/lib/sitepress/rails_configuration.rb

@@ -15,8 +15,10 @@ module Sitepress
     # Set defaults.
     def initialize
       self.routes = true
-      self.parent_engine = Rails.application
-      self.cache_resources = !!parent_engine.config.cache_classes
+    end
+
+    def parent_engine
+      @parent_engine ||= Rails.application
     end
 
     def site

data/lib/sitepress/route_constraint.rb

@@ -1,12 +1,12 @@
 module Sitepress
   # Route constraint for rails routes.rb file.
   class RouteConstraint
-    def initialize(resources: Sitepress.site.resources)
-      @resources = resources
+    def initialize(site: Sitepress.site)
+      @site = site
     end
 
     def matches?(request)
-      !!@resources.get(request.path)
+      !!@site.resources.get(request.path)
     end
   end
 end

data/spec/dummy/log/production.log

@@ -334,3 +334,59 @@ I, [2016-10-30T00:54:50.747688 #72487]  INFO -- : Processing by Sitepress::SiteC
 I, [2016-10-30T00:54:50.747736 #72487]  INFO -- :   Parameters: {"resource_path"=>"page-9999.html"}
 I, [2016-10-30T00:54:57.255036 #72487]  INFO -- :   Rendered inline template within layouts/application (4906.7ms)
 I, [2016-10-30T00:54:57.256676 #72487]  INFO -- : Completed 200 OK in 6509ms (Views: 4908.3ms | ActiveRecord: 0.0ms)
+I, [2016-11-04T14:26:01.023011 #33176]  INFO -- : Started GET "/baseline/render" for 127.0.0.1 at 2016-11-04 14:26:01 -0700
+I, [2016-11-04T14:26:01.037152 #33176]  INFO -- : Processing by BaselineController#show as HTML
+I, [2016-11-04T14:26:01.044659 #33176]  INFO -- :   Rendered baseline/show.html.erb within layouts/application (0.4ms)
+I, [2016-11-04T14:26:01.051659 #33176]  INFO -- : Completed 200 OK in 14ms (Views: 14.1ms | ActiveRecord: 0.0ms)
+I, [2016-11-04T14:26:01.054928 #33176]  INFO -- : Started GET "/page-1.html" for 127.0.0.1 at 2016-11-04 14:26:01 -0700
+I, [2016-11-04T14:26:01.056223 #33176]  INFO -- : Processing by Sitepress::SiteController#show as HTML
+I, [2016-11-04T14:26:01.056265 #33176]  INFO -- :   Parameters: {"resource_path"=>"page-1.html"}
+I, [2016-11-04T14:26:02.533755 #33176]  INFO -- :   Rendered inline template within layouts/application (1472.3ms)
+I, [2016-11-04T14:26:02.536156 #33176]  INFO -- : Completed 200 OK in 1480ms (Views: 1477.3ms | ActiveRecord: 0.0ms)
+I, [2016-11-04T14:26:02.539657 #33176]  INFO -- : Started GET "/page-9999.html" for 127.0.0.1 at 2016-11-04 14:26:02 -0700
+I, [2016-11-04T14:26:02.540346 #33176]  INFO -- : Processing by Sitepress::SiteController#show as HTML
+I, [2016-11-04T14:26:02.540382 #33176]  INFO -- :   Parameters: {"resource_path"=>"page-9999.html"}
+I, [2016-11-04T14:26:02.898415 #33176]  INFO -- :   Rendered inline template within layouts/application (357.1ms)
+I, [2016-11-04T14:26:02.899834 #33176]  INFO -- : Completed 200 OK in 359ms (Views: 359.0ms | ActiveRecord: 0.0ms)
+I, [2016-11-04T14:26:03.123811 #33176]  INFO -- : Started GET "/baseline/render" for 127.0.0.1 at 2016-11-04 14:26:03 -0700
+I, [2016-11-04T14:26:03.124455 #33176]  INFO -- : Processing by BaselineController#show as HTML
+I, [2016-11-04T14:26:03.124832 #33176]  INFO -- :   Rendered baseline/show.html.erb within layouts/application (0.0ms)
+I, [2016-11-04T14:26:03.125392 #33176]  INFO -- : Completed 200 OK in 1ms (Views: 0.7ms | ActiveRecord: 0.0ms)
+I, [2016-11-04T14:26:03.193300 #33176]  INFO -- : Started GET "/page-1.html" for 127.0.0.1 at 2016-11-04 14:26:03 -0700
+I, [2016-11-04T14:26:03.193796 #33176]  INFO -- : Processing by Sitepress::SiteController#show as HTML
+I, [2016-11-04T14:26:03.193828 #33176]  INFO -- :   Parameters: {"resource_path"=>"page-1.html"}
+I, [2016-11-04T14:26:03.393249 #33176]  INFO -- :   Rendered inline template within layouts/application (199.0ms)
+I, [2016-11-04T14:26:03.394013 #33176]  INFO -- : Completed 200 OK in 200ms (Views: 199.9ms | ActiveRecord: 0.0ms)
+I, [2016-11-04T14:26:03.473757 #33176]  INFO -- : Started GET "/page-9999.html" for 127.0.0.1 at 2016-11-04 14:26:03 -0700
+I, [2016-11-04T14:26:03.474371 #33176]  INFO -- : Processing by Sitepress::SiteController#show as HTML
+I, [2016-11-04T14:26:03.474409 #33176]  INFO -- :   Parameters: {"resource_path"=>"page-9999.html"}
+I, [2016-11-04T14:26:03.670317 #33176]  INFO -- :   Rendered inline template within layouts/application (195.5ms)
+I, [2016-11-04T14:26:03.671044 #33176]  INFO -- : Completed 200 OK in 197ms (Views: 196.3ms | ActiveRecord: 0.0ms)
+I, [2016-11-04T14:26:07.409683 #33176]  INFO -- : Started GET "/baseline/render" for 127.0.0.1 at 2016-11-04 14:26:07 -0700
+I, [2016-11-04T14:26:07.410324 #33176]  INFO -- : Processing by BaselineController#show as HTML
+I, [2016-11-04T14:26:07.410705 #33176]  INFO -- :   Rendered baseline/show.html.erb within layouts/application (0.1ms)
+I, [2016-11-04T14:26:07.411154 #33176]  INFO -- : Completed 200 OK in 1ms (Views: 0.7ms | ActiveRecord: 0.0ms)
+I, [2016-11-04T14:26:07.412192 #33176]  INFO -- : Started GET "/page-1.html" for 127.0.0.1 at 2016-11-04 14:26:07 -0700
+I, [2016-11-04T14:26:09.775058 #33176]  INFO -- : Processing by Sitepress::SiteController#show as HTML
+I, [2016-11-04T14:26:09.775117 #33176]  INFO -- :   Parameters: {"resource_path"=>"page-1.html"}
+I, [2016-11-04T14:26:19.754950 #33176]  INFO -- :   Rendered inline template within layouts/application (7510.0ms)
+I, [2016-11-04T14:26:19.756618 #33176]  INFO -- : Completed 200 OK in 9981ms (Views: 7511.8ms | ActiveRecord: 0.0ms)
+I, [2016-11-04T14:26:19.760259 #33176]  INFO -- : Started GET "/page-9999.html" for 127.0.0.1 at 2016-11-04 14:26:19 -0700
+I, [2016-11-04T14:26:21.871391 #33176]  INFO -- : Processing by Sitepress::SiteController#show as HTML
+I, [2016-11-04T14:26:21.871463 #33176]  INFO -- :   Parameters: {"resource_path"=>"page-9999.html"}
+I, [2016-11-04T14:26:31.559809 #33176]  INFO -- :   Rendered inline template within layouts/application (7949.0ms)
+I, [2016-11-04T14:26:31.560950 #33176]  INFO -- : Completed 200 OK in 9689ms (Views: 7950.3ms | ActiveRecord: 0.0ms)
+I, [2016-11-04T14:26:36.741458 #33176]  INFO -- : Started GET "/baseline/render" for 127.0.0.1 at 2016-11-04 14:26:36 -0700
+I, [2016-11-04T14:26:36.742048 #33176]  INFO -- : Processing by BaselineController#show as HTML
+I, [2016-11-04T14:26:36.742402 #33176]  INFO -- :   Rendered baseline/show.html.erb within layouts/application (0.0ms)
+I, [2016-11-04T14:26:36.742845 #33176]  INFO -- : Completed 200 OK in 1ms (Views: 0.6ms | ActiveRecord: 0.0ms)
+I, [2016-11-04T14:26:36.885105 #33176]  INFO -- : Started GET "/page-1.html" for 127.0.0.1 at 2016-11-04 14:26:36 -0700
+I, [2016-11-04T14:26:39.958111 #33176]  INFO -- : Processing by Sitepress::SiteController#show as HTML
+I, [2016-11-04T14:26:39.958187 #33176]  INFO -- :   Parameters: {"resource_path"=>"page-1.html"}
+I, [2016-11-04T14:26:49.226907 #33176]  INFO -- :   Rendered inline template within layouts/application (7301.4ms)
+I, [2016-11-04T14:26:49.227823 #33176]  INFO -- : Completed 200 OK in 9270ms (Views: 7302.6ms | ActiveRecord: 0.0ms)
+I, [2016-11-04T14:26:49.694364 #33176]  INFO -- : Started GET "/page-9999.html" for 127.0.0.1 at 2016-11-04 14:26:49 -0700
+I, [2016-11-04T14:26:51.740173 #33176]  INFO -- : Processing by Sitepress::SiteController#show as HTML
+I, [2016-11-04T14:26:51.740236 #33176]  INFO -- :   Parameters: {"resource_path"=>"page-9999.html"}
+I, [2016-11-04T14:27:02.514913 #33176]  INFO -- :   Rendered inline template within layouts/application (8493.2ms)
+I, [2016-11-04T14:27:02.515947 #33176]  INFO -- : Completed 200 OK in 10776ms (Views: 8494.3ms | ActiveRecord: 0.0ms)