mascot-rails 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d01108d929b171be4baedad66287fe49624c625
-  data.tar.gz: 5756960e8c3ff99aff2ad75ef1a6f7ead99e0c33
+  metadata.gz: caeb4e9d3358795caca308e4bcde64aedcfc3c53
+  data.tar.gz: 3bd5459e233d6aaf63cd0688cbe49b8e03607bf4
 SHA512:
-  metadata.gz: 7a60470d2fa4ef0787d25ae7f64833bfb624d5488d7d865646c2c42fd176840e109e262c6d5dc4a13029fd4ca715d94b8457a7436a5dd3b8fe51d69ba15c7e56
-  data.tar.gz: 5c0e8b15656a400a986369d2bc630bc399267dfd886691089c850c1c63c9fd746963f15627c0f414f5d5672d99e48c1de3056232bea18d0a9c105586e7aef834
+  metadata.gz: 949e6a663e31606e5108ce3001a7f90b760908f98e69090bad9833f1724312bb1c00210e771a7944ae985931a871b2fed85083d56b215e95d5777c79a6a4f44b
+  data.tar.gz: d93dbfcfd1db87a8d9a7d5793e02f64cc2ca1b01870f4b40dea99c8db3d9e93b8ed5c1838d93d073f2e181a0b22bee93ac46e9007d5b0d56b03d2896c0b6434c

data/lib/mascot/extensions/layouts.rb

@@ -17,7 +17,7 @@ module Mascot
         resources.each do |resource|
           @rules.each do |rule|
             if rule.processor.call(resource)
-              resource.data["layout"] = rule.layout
+              resource.data["layout"] ||= rule.layout
             end
           end
         end

data/spec/dummy/log/test.log

@@ -16752,3 +16752,415 @@ Processing by Mascot::SitemapController#show as HTML
   Parameters: {"resource_path"=>"/non-existent"}
 Completed 404 Not Found in 0ms (ActiveRecord: 0.0ms)
    (0.1ms)  rollback transaction
+   (0.4ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.2ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/hi"}
+  Rendered inline template within layouts/application (1.3ms)
+Completed 200 OK in 13ms (Views: 9.9ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/hi"}
+  Rendered inline template within layouts/application (0.2ms)
+Completed 200 OK in 1ms (Views: 0.5ms | ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/hi"}
+  Rendered inline template within layouts/application (0.2ms)
+Completed 200 OK in 1ms (Views: 0.6ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/hi"}
+  Rendered inline template within layouts/application (0.2ms)
+Completed 200 OK in 1ms (Views: 0.5ms | ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/non-existent"}
+Completed 404 Not Found in 0ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendered inline template within layouts/application (0.4ms)
+Completed 200 OK in 1ms (Views: 0.7ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendered inline template within layouts/application (0.3ms)
+Completed 200 OK in 1ms (Views: 0.7ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendered inline template within layouts/application (0.3ms)
+Completed 200 OK in 1ms (Views: 0.6ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendered inline template within layouts/application (0.4ms)
+Completed 200 OK in 1ms (Views: 0.7ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendered inline template within layouts/application (0.4ms)
+Completed 200 OK in 1ms (Views: 0.7ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendered inline template within layouts/application (0.3ms)
+Completed 200 OK in 1ms (Views: 0.7ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.3ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/non-existent"}
+Completed 404 Not Found in 0ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendered inline template within layouts/application (0.9ms)
+Completed 200 OK in 9ms (Views: 7.0ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendered inline template within layouts/application (0.4ms)
+Completed 200 OK in 1ms (Views: 0.7ms | ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendered inline template within layouts/application (0.3ms)
+Completed 200 OK in 1ms (Views: 0.6ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendered inline template within layouts/application (0.3ms)
+Completed 200 OK in 1ms (Views: 0.6ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendered inline template within layouts/application (0.4ms)
+Completed 200 OK in 1ms (Views: 0.7ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendered inline template within layouts/application (0.3ms)
+Completed 200 OK in 1ms (Views: 0.7ms | ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/hi"}
+  Rendered inline template within layouts/application (0.3ms)
+Completed 200 OK in 1ms (Views: 0.6ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/hi"}
+  Rendered inline template within layouts/application (0.2ms)
+Completed 200 OK in 1ms (Views: 0.7ms | ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/hi"}
+  Rendered inline template within layouts/application (0.2ms)
+Completed 200 OK in 1ms (Views: 0.5ms | ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/hi"}
+  Rendered inline template within layouts/application (0.2ms)
+Completed 200 OK in 1ms (Views: 0.6ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.4ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendered inline template within layouts/application (1.0ms)
+Completed 200 OK in 10ms (Views: 7.4ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendered inline template within layouts/application (0.3ms)
+Completed 200 OK in 1ms (Views: 0.6ms | ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendered inline template within layouts/application (0.3ms)
+Completed 200 OK in 1ms (Views: 0.7ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendered inline template within layouts/application (0.4ms)
+Completed 200 OK in 1ms (Views: 0.7ms | ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendered inline template within layouts/application (0.3ms)
+Completed 200 OK in 1ms (Views: 0.6ms | ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendered inline template within layouts/application (0.3ms)
+Completed 200 OK in 1ms (Views: 0.7ms | ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/non-existent"}
+Completed 404 Not Found in 0ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/hi"}
+  Rendered inline template within layouts/application (0.3ms)
+Completed 200 OK in 1ms (Views: 0.6ms | ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/hi"}
+  Rendered inline template within layouts/application (0.2ms)
+Completed 200 OK in 1ms (Views: 0.6ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/hi"}
+  Rendered inline template within layouts/application (1.4ms)
+Completed 200 OK in 4ms (Views: 3.1ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/hi"}
+  Rendered inline template within layouts/application (0.3ms)
+Completed 200 OK in 1ms (Views: 0.7ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.3ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/hi"}
+  Rendered inline template within layouts/application (0.8ms)
+Completed 200 OK in 13ms (Views: 8.3ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/hi"}
+  Rendered inline template within layouts/application (0.2ms)
+Completed 200 OK in 1ms (Views: 0.5ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/hi"}
+  Rendered inline template within layouts/application (0.2ms)
+Completed 200 OK in 1ms (Views: 0.6ms | ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/hi"}
+  Rendered inline template within layouts/application (0.2ms)
+Completed 200 OK in 1ms (Views: 0.5ms | ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/non-existent"}
+Completed 404 Not Found in 0ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendered inline template within layouts/application (0.4ms)
+Completed 200 OK in 1ms (Views: 0.7ms | ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendered inline template within layouts/application (0.3ms)
+Completed 200 OK in 1ms (Views: 0.6ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendered inline template within layouts/application (0.3ms)
+Completed 200 OK in 1ms (Views: 0.7ms | ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendered inline template within layouts/application (0.4ms)
+Completed 200 OK in 7ms (Views: 0.8ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendered inline template within layouts/application (0.3ms)
+Completed 200 OK in 1ms (Views: 0.6ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Mascot::SitemapController#show as HTML
+  Parameters: {"resource_path"=>"/time"}
+  Rendered inline template within layouts/application (0.3ms)
+Completed 200 OK in 1ms (Views: 0.7ms | ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.2ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.3ms)  begin transaction
+   (0.1ms)  rollback transaction

data/spec/mascot/extensions/layouts_spec.rb

@@ -8,7 +8,15 @@ describe Mascot::Extensions::Layouts do
     subject.layout("blah-set-by-rspec"){ |r| r == resource }
     subject.process_resources resources
   end
-  it "sets resource.data['layout'] key" do
-    expect(resource.data['layout']).to eql("blah-set-by-rspec")
+  context "without layout in frontmatter" do
+    it "sets resource.data['layout'] key" do
+      expect(resource.data['layout']).to eql("blah-set-by-rspec")
+    end
+  end
+  context "with layout in frontmatter" do
+    let(:resource) { resources.first.tap{ |r| r.data["layout"] = "kung-fu"} }
+    it "does not set resource.data['layout'] key" do
+      expect(resource.data['layout']).to eql("kung-fu")
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mascot-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Brad Gessler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.1.10
 description: 
 email:
 - bradgessler@gmail.com