sinatra-extension 0.4.0 → 0.5.0

data/README.md

@@ -26,7 +26,8 @@ Example
         "bar"
       end
       
-      enabled :fancy_mode do
+      # there also is on_set and on_disable
+      on_enable :fancy_mode do
         use VeryFancyMiddleware
         get '/fancy' do
           "fancy!"

data/lib/sinatra/extension.rb

@@ -41,19 +41,26 @@ module Sinatra
       register_hooks << block
     end
 
-    def enabled(option, &block)
+    def on_set(option, default_value = nil, &block)
       mod = Module.new
       mod.extend Sinatra::Extension
-      define_method(option) { nil }
-      define_method("#{option}?") { false }
+      define_method(option) { default_value }
+      define_method("#{option}?") { !!__send__(option) }
       define_method("#{option}=") do |value|
         metadef(option) { value }
-        return value unless value
-        metadef("#{option}?") { true }
+        metadef("#{option}?") { !!value }
         instance_yield block
       end
     end
 
+    def on_disable(option, &block)
+      on_set(option, true) { instance_yield block unless __send__ option }
+    end
+
+    def on_enable(option, &block)
+      on_set(option, false) { instance_yield block if __send__ option }
+    end
+
     def register(*extensions)
       on_register { register(*extensions) }
     end

data/spec/sinatra/extension_spec.rb

@@ -21,7 +21,10 @@ module Sinatra
       def foo(value) value end
     end
 
-    enabled :special_foo do
+    set :counter, 0
+    on_set(:trigger) { set :counter, counter + 1 }
+
+    on_enable :special_foo do
       helpers do
         def foo(value) 42 end
       end
@@ -57,9 +60,26 @@ describe Sinatra::Extension do
     app.new.foo(10).should == 10
   end
 
-  it "should apply enabled blocks only if given option has been enabled" do
+  it "should trigger on_set block" do
+    app.set :counter, 0
+    app.counter.should == 0
+    app.enable :trigger
+    app.counter.should == 1
+    app.disable :trigger
+    app.counter.should == 2
+    app.set :trigger, :foo
+    app.counter.should == 3
+    app.trigger = 42
+    app.counter.should == 4
+  end
+
+  it "should apply on_enable blocks only if given option has been enabled" do
+    app.should_not be_special_foo
+    app.special_foo.should be_false
+    app.new.foo(10).should == 10
+    app.disable :special_foo
     app.should_not be_special_foo
-    app.special_foo.should be_nil
+    app.special_foo.should be_false
     app.new.foo(10).should == 10
     app.enable :special_foo
     app.should be_special_foo

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-extension
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Konstantin Haase
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-07 00:00:00 +02:00
+date: 2010-07-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 11
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 11
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -58,12 +58,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 11
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
+        version: 0.5.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency