sinatra-fuzzy_layout 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59c79a758df3a89091e7651f882fb7c33e4493e5
-  data.tar.gz: b0250e34e0f1277847914f6abc8e37a541a40f70
+  metadata.gz: d74b35bd384d72ec9f024c664944effb024bc428
+  data.tar.gz: 5d0d037ef04558e7ce1327c3eb2754fea7e62c6d
 SHA512:
-  metadata.gz: dcad67d2e96111669ddb8c029449edac0d09371f09e9b537e471ef1af84c6e60bed2ede7b7fdd1364e91ecc75d50f4e03b9fedfafd49138298abc7dbf7047fa0
-  data.tar.gz: 3fc6d4d32e10b6e1e1dcbabe8c5e3e9c99c6de7eaa97bb60bab8d916d9c7b14e21f9bb4c0aca13be2ea8dfee20d89235539cd6da80eb61bdebd73f3d3d652883
+  metadata.gz: 20f09b9338826f50aa92c735c8fe1b0a399dc2341f8276d302c06c273b54f3aa26f9cb3ca27c15a04c220646e2f4a9172a5483e2eeed56bb1fd41d5717480a63
+  data.tar.gz: b3ace296e584e4ca6686ba2e499e2a07635d8eb140e3f8075a7113ec675e5400ad3de6dfd6015df21c857c3dcf770125fccd94bf21f90023d0d99050ba487137

data/lib/sinatra/fuzzy_layout.rb

@@ -97,10 +97,11 @@ module Sinatra
       #   A Symbol representing the name of the view. For example, `:index`
 
       def get_new_options_and_template(options, template)
+        old_option = options.fetch(:layout) { false }
         if settings.enable_list.has_the_template?(template)
-          options[:layout] = true
+          options.merge!(:layout => (true && old_option))
         elsif settings.disable_list.has_the_template?(template)
-          options[:layout] = false
+          options.merge!(:layout => (false || old_option))
         end
 
         options
@@ -108,14 +109,16 @@ module Sinatra
     end
 
     def enable_layout_for(*templates)
-      Base.set :enable_list, templates || []
+      settings.enable_list.push(*templates)
     end
 
     def disable_layout_for(*templates)
-      Base.set :disable_list, templates || []
+      settings.disable_list.push(*templates)
     end
 
     def self.registered(app)
+      app.set :enable_list, []
+      app.set :disable_list, []
       app.helpers TemplatesHelpers
     end
   end

data/spec/apps/classic.rb

@@ -0,0 +1,15 @@
+require "sinatra"
+require File.expand_path("../../../lib/sinatra/fuzzy_layout.rb", __FILE__)
+
+enable_layout_for :one
+disable_layout_for "one", :two, /f\w{3}/
+
+get '/' do
+  erb :index, :layout => false
+end
+
+get('/one') { erb :one }
+get('/two') { erb :two }
+get('/three') { erb :three }
+get('/four') { erb :four, :layout => true }
+get('/five') { erb :five, :layout => false }

data/spec/apps/modular.rb

@@ -0,0 +1,20 @@
+require "sinatra/base"
+require File.expand_path("../../../lib/sinatra/fuzzy_layout.rb", __FILE__)
+
+class SampleApp < Sinatra::Base
+  register Sinatra::FuzzyLayout
+
+  enable_layout_for :one
+  disable_layout_for "one"
+  disable_layout_for /f\w{3}/
+
+  get '/' do
+    erb :index, :layout => false
+  end
+
+  get('/one') { erb :one }
+  get('/two') { erb :two }
+  get('/three') { erb :three }
+  get('/four') { erb :four }
+  get('/five') { erb :five }
+end

data/spec/apps/modular_without_enable.rb

@@ -0,0 +1,19 @@
+require "sinatra/base"
+require File.expand_path("../../../lib/sinatra/fuzzy_layout.rb", __FILE__)
+
+class SampleApp < Sinatra::Base
+  register Sinatra::FuzzyLayout
+
+  disable_layout_for "one"
+  disable_layout_for /f\w{3}/
+
+  get '/' do
+    erb :index, :layout => false
+  end
+
+  get('/one') { erb :one }
+  get('/two') { erb :two }
+  get('/three') { erb :three }
+  get('/four') { erb :four }
+  get('/five') { erb :five }
+end

data/spec/apps/views/five.erb

@@ -0,0 +1 @@
+<em>five</em>

data/spec/apps/views/four.erb

@@ -0,0 +1 @@
+<em>four</em>

data/spec/apps/views/index.erb

@@ -0,0 +1 @@
+<em>Spartaa!!</em>

data/spec/apps/views/layout.erb

@@ -0,0 +1 @@
+<h1>This is <%= yield %></h1>

data/spec/apps/views/one.erb

@@ -0,0 +1 @@
+<em>one</em>

data/spec/apps/views/three.erb

@@ -0,0 +1 @@
+<em>three</em>

data/spec/apps/views/two.erb

@@ -0,0 +1 @@
+<em>two</em>

data/spec/classic_app_spec.rb

@@ -0,0 +1,47 @@
+require_relative "spec_helper"
+require_relative "apps/classic"
+
+describe "Classical app structure" do
+
+  def app
+    Sinatra::Application
+  end
+
+  it "should not have a layout for the template 'index.erb'" do
+    get('/')
+    last_response.should be_ok
+    last_response.body.should == "<em>Spartaa!!</em>\n"
+  end
+
+  it "should not have a layout for the template 'one.erb'" do
+    get('/one')
+    last_response.should be_ok
+    last_response.body.should == "<em>one</em>\n"
+  end
+
+  it "should not have a layout for the template 'two.erb'" do
+    get('/two')
+    last_response.should be_ok
+    last_response.body.should == "<em>two</em>\n"
+  end
+
+  it "should have a layout for the template 'three.erb'" do
+    get('/three')
+    last_response.should be_ok
+    last_response.body.should == "<h1>This is <em>three</em>\n</h1>\n"
+  end
+
+  it "should have a layout for the template 'four.erb'" do
+    get('/four')
+    last_response.should be_ok
+    last_response.body.should == "<h1>This is <em>four</em>\n</h1>\n"
+  end
+
+  it "should not have a layout for the template 'five.erb'" do
+    get('/five')
+    last_response.should be_ok
+    last_response.body.should == "<em>five</em>\n"
+  end
+
+end
+

data/spec/modular_app_spec.rb

@@ -0,0 +1,46 @@
+require_relative "spec_helper"
+require_relative "apps/modular"
+
+describe 'Modular Style Application' do
+
+  def app
+    SampleApp
+  end
+
+  it "should not have a layout for the template 'index.erb'" do
+    get('/')
+    last_response.should be_ok
+    last_response.body.should == "<em>Spartaa!!</em>\n"
+  end
+
+  it "should not have a layout for the template 'one.erb'" do
+    get('/one')
+    last_response.should be_ok
+    last_response.body.should == "<em>one</em>\n"
+  end
+
+  it "should have a layout for the template 'two.erb'" do
+    get('/two')
+    last_response.should be_ok
+    last_response.body.should == "<h1>This is <em>two</em>\n</h1>\n"
+  end
+
+  it "should have a layout for the template 'three.erb'" do
+    get('/three')
+    last_response.should be_ok
+    last_response.body.should == "<h1>This is <em>three</em>\n</h1>\n"
+  end
+
+  it "should not have a layout for the template 'four.erb'" do
+    get('/four')
+    last_response.should be_ok
+    last_response.body.should == "<em>four</em>\n"
+  end
+
+  it "should not have a layout for the template 'five.erb'" do
+    get('/five')
+    last_response.should be_ok
+    last_response.body.should == "<em>five</em>\n"
+  end
+
+end

data/spec/modular_app_without_enable_spec.rb

@@ -0,0 +1,46 @@
+require_relative "spec_helper"
+require_relative "apps/modular_without_enable"
+
+describe 'Modular Style Application Without Enable Layouts directive' do
+
+  def app
+    SampleApp
+  end
+
+  it "should not have a layout for the template 'index.erb'" do
+    get('/')
+    last_response.should be_ok
+    last_response.body.should == "<em>Spartaa!!</em>\n"
+  end
+
+  it "should not have a layout for the template 'one.erb'" do
+    get('/one')
+    last_response.should be_ok
+    last_response.body.should == "<em>one</em>\n"
+  end
+
+  it "should have a layout for the template 'two.erb'" do
+    get('/two')
+    last_response.should be_ok
+    last_response.body.should == "<h1>This is <em>two</em>\n</h1>\n"
+  end
+
+  it "should have a layout for the template 'three.erb'" do
+    get('/three')
+    last_response.should be_ok
+    last_response.body.should == "<h1>This is <em>three</em>\n</h1>\n"
+  end
+
+  it "should not have a layout for the template 'four.erb'" do
+    get('/four')
+    last_response.should be_ok
+    last_response.body.should == "<em>four</em>\n"
+  end
+
+  it "should not have a layout for the template 'five.erb'" do
+    get('/five')
+    last_response.should be_ok
+    last_response.body.should == "<em>five</em>\n"
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-fuzzy_layout
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Kashyap
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,24 +81,20 @@ files:
 - lib/sinatra/fuzzy_layout.rb
 - Rakefile
 - README.md
-- spec/fuzzy_layout_spec.rb
-- spec/sample_app.rb
-- spec/sample_app_multiple.rb
+- spec/apps/classic.rb
+- spec/apps/modular.rb
+- spec/apps/modular_without_enable.rb
+- spec/apps/views/five.erb
+- spec/apps/views/four.erb
+- spec/apps/views/index.erb
+- spec/apps/views/layout.erb
+- spec/apps/views/one.erb
+- spec/apps/views/three.erb
+- spec/apps/views/two.erb
+- spec/classic_app_spec.rb
+- spec/modular_app_spec.rb
+- spec/modular_app_without_enable_spec.rb
 - spec/spec_helper.rb
-- spec/views/five.haml
-- spec/views/five.slim
-- spec/views/four.haml
-- spec/views/four.slim
-- spec/views/index.haml
-- spec/views/index.slim
-- spec/views/layout.haml
-- spec/views/layout.slim
-- spec/views/one.haml
-- spec/views/one.slim
-- spec/views/three.haml
-- spec/views/three.slim
-- spec/views/two.haml
-- spec/views/two.slim
 homepage: ''
 licenses:
 - MIT
@@ -127,22 +123,18 @@ summary: In Sinatra, the user can disable the layout  template either globally o
   support to enable or disable the  layout rendering based on Regex description.  Refer
   to Readme for more details
 test_files:
-- spec/fuzzy_layout_spec.rb
-- spec/sample_app.rb
-- spec/sample_app_multiple.rb
+- spec/apps/classic.rb
+- spec/apps/modular.rb
+- spec/apps/modular_without_enable.rb
+- spec/apps/views/five.erb
+- spec/apps/views/four.erb
+- spec/apps/views/index.erb
+- spec/apps/views/layout.erb
+- spec/apps/views/one.erb
+- spec/apps/views/three.erb
+- spec/apps/views/two.erb
+- spec/classic_app_spec.rb
+- spec/modular_app_spec.rb
+- spec/modular_app_without_enable_spec.rb
 - spec/spec_helper.rb
-- spec/views/five.haml
-- spec/views/five.slim
-- spec/views/four.haml
-- spec/views/four.slim
-- spec/views/index.haml
-- spec/views/index.slim
-- spec/views/layout.haml
-- spec/views/layout.slim
-- spec/views/one.haml
-- spec/views/one.slim
-- spec/views/three.haml
-- spec/views/three.slim
-- spec/views/two.haml
-- spec/views/two.slim
 has_rdoc: 

data/spec/fuzzy_layout_spec.rb

@@ -1,85 +0,0 @@
-require_relative "spec_helper"
-require_relative "sample_app"
-require_relative "sample_app_multiple"
-
-describe 'Test App with single declaration of enable or disable directives' do
-
-  def app
-    SampleApp
-  end
-
-  it "disables layout if route level :layout => false is set" do
-    get('/')
-    last_response.should be_ok
-    last_response.body.should == "<em>Spartaa!!</em>\n"
-  end
-
-  it "enables layout when layout is both enabled and disabled" do
-    get('/one')
-    last_response.should be_ok
-    last_response.body.should == "<h1>This is <em>one</em></h1>\n"
-  end
-
-  it "works when template is specified as a string" do
-    get('/two')
-    last_response.should be_ok
-    last_response.body.should == "<em>two</em>\n"
-  end
-
-  context "works when template is specified as a regex" do
-    it "should not have a layout for the route four" do
-      get('/four')
-      last_response.should be_ok
-      last_response.body.should == "<em>four</em>\n"
-    end
-
-    it "should not have a layout for the route five" do
-      get('/five')
-      last_response.should be_ok
-      last_response.body.should == "<em>five</em>\n"
-    end
-  end
-
-end
-
-
-
-describe 'Test App with multiple declarations of enable directives' do
-
-  def app
-    SampleAppMultiple
-  end
-
-  it "disables layout if route level :layout => false is set" do
-    get('/')
-    last_response.should be_ok
-    last_response.body.should == "<em>Spartaa!!</em>\n"
-  end
-
-  it "enables layout when layout is both enabled and disabled" do
-    get('/one')
-    last_response.should be_ok
-    last_response.body.should == "<h1>This is <em>one</em></h1>\n"
-  end
-
-  it "works when template is specified as a string" do
-    get('/two')
-    last_response.should be_ok
-    last_response.body.should == "<em>two</em>\n"
-  end
-
-  context "works when template is specified as a regex" do
-    it "should not have a layout for the route four" do
-      get('/four')
-      last_response.should be_ok
-      last_response.body.should == "<em>four</em>\n"
-    end
-
-    it "should not have a layout for the route five" do
-      get('/five')
-      last_response.should be_ok
-      last_response.body.should == "<em>five</em>\n"
-    end
-  end
-
-end

data/spec/sample_app.rb

@@ -1,20 +0,0 @@
-require "sinatra/base"
-require "haml"
-require File.expand_path("../../lib/sinatra/fuzzy_layout.rb", __FILE__)
-
-class SampleApp < Sinatra::Base
-  register Sinatra::FuzzyLayout
-
-  enable_layout_for :one
-  disable_layout_for "one", "two", /f\w{3}/
-
-  get '/' do 
-    haml :index, :layout => false
-  end
-
-  get('/one') { haml :one }
-  get('/two') { haml :two }
-  get('/three') { haml :three }
-  get('/four') { haml :four }
-  get('/five') { haml :five }
-end

data/spec/sample_app_multiple.rb

@@ -1,21 +0,0 @@
-require "sinatra/base"
-require "haml"
-require File.expand_path("../../lib/sinatra/fuzzy_layout.rb", __FILE__)
-
-class SampleAppMultiple < Sinatra::Base
-  register Sinatra::FuzzyLayout
-
-  enable_layout_for :one
-  disable_layout_for "one"
-  disable_layout_for "two", /f\w{3}/
-
-  get '/' do 
-    haml :index, :layout => false
-  end
-
-  get('/one') { haml :one }
-  get('/two') { haml :two }
-  get('/three') { haml :three }
-  get('/four') { haml :four }
-  get('/five') { haml :five }
-end

data/spec/views/five.haml

@@ -1 +0,0 @@
-%em five

data/spec/views/five.slim

@@ -1 +0,0 @@
-em five

data/spec/views/four.haml

@@ -1 +0,0 @@
-%em four

data/spec/views/four.slim

@@ -1 +0,0 @@
-em four

data/spec/views/index.haml

@@ -1 +0,0 @@
-%em Spartaa!!

data/spec/views/index.slim

@@ -1 +0,0 @@
-em Spartaa!!

data/spec/views/layout.haml

@@ -1 +0,0 @@
-%h1 This is #{yield}

data/spec/views/layout.slim

@@ -1 +0,0 @@
-h1 This is #{yield}

data/spec/views/one.haml

@@ -1 +0,0 @@
-%em one

data/spec/views/one.slim

@@ -1 +0,0 @@
-em one

data/spec/views/three.haml

@@ -1 +0,0 @@
-%em three

data/spec/views/three.slim

@@ -1 +0,0 @@
-em three

data/spec/views/two.haml

@@ -1 +0,0 @@
-%em two

data/spec/views/two.slim

@@ -1 +0,0 @@
-em two