dependor-sinatra 0.0.1 → 0.0.2

data/examples/hello.rb

@@ -15,3 +15,9 @@ end
 get "/hello/:name" do |greeter|
   greeter.greet
 end
+
+without_dependor do
+  get %r{/bye/(\w+)} do |name|
+    "bye #{name}"
+  end
+end

data/lib/dependor-sinatra.rb

@@ -3,6 +3,7 @@ require "dependor"
 
 require "dependor-sinatra/block_wrapper"
 require "dependor-sinatra/enabler"
+require "dependor-sinatra/without_dependor"
 require "dependor-sinatra/has_injector"
 require "dependor-sinatra/objects"
 require "dependor-sinatra/version"

data/lib/dependor-sinatra/enabler.rb

@@ -1,13 +1,15 @@
 module Dependor
   module Sinatra
     module Enabler
-      def enable_dependor(method)
+      def enable_dependor_for_method(method)
         without_dependor = :"#{method}_without_dependor"
 
         # the only way to alias a private method
         instance_eval("alias #{without_dependor} #{method}")
 
         define_singleton_method(method) do |*args, &block|
+          return __send__(without_dependor, *args, &block) if dependor_disabled?
+
           wrapped_block = Dependor::Sinatra::BlockWrapper.wrap(block)
           __send__(without_dependor, *args) do
             instance_eval(&wrapped_block)

data/lib/dependor-sinatra/monkey_patches.rb

@@ -1,9 +1,11 @@
 class Sinatra::Base
   include Dependor::Sinatra::HasInjector
   extend Dependor::Sinatra::Enabler
-  enable_dependor :route
-  enable_dependor :add_filter
-  enable_dependor :condition
+  extend Dependor::Sinatra::WithoutDependor
+  enable_dependor_for_method :route
+  enable_dependor_for_method :add_filter
+  enable_dependor_for_method :condition
 end
 
 Sinatra::Delegator.delegate :injector
+Sinatra::Delegator.delegate :without_dependor

data/lib/dependor-sinatra/version.rb

@@ -1,5 +1,5 @@
 module Dependor
   module Sinatra
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/dependor-sinatra/without_dependor.rb

@@ -0,0 +1,23 @@
+module Dependor
+  module Sinatra
+    module WithoutDependor
+      def disable_dependor
+        @dependor_disabled = true
+      end
+
+      def enable_dependor
+        @dependor_disabled = false
+      end
+
+      def dependor_disabled?
+        @dependor_disabled
+      end
+
+      def without_dependor(&block)
+        disable_dependor
+        block.call
+        enable_dependor
+      end
+    end
+  end
+end

data/spec/integration/disabling_dependor_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+class SomeDependency
+  def foo(str)
+    "foo - #{str}"
+  end
+end
+
+class AppWithDependencyInjectionDisabled < Sinatra::Base
+  set :environment, :test
+
+  without_dependor do
+    get %r{/bye/(\w+)} do |name|
+      "bye - #{name}"
+    end
+  end
+
+  get %r{/hello/(\w+)} do |some_dependency|
+    name = params[:captures].first
+    some_dependency.foo(name)
+  end
+end
+
+describe "Disabling dependency injection using without_dependor" do
+  let(:app) { AppWithDependencyInjectionDisabled }
+
+  it "injects the actions that are outside of without_dependor block" do
+    get "/hello/adam"
+
+    last_response.body.should == "foo - adam"
+  end
+
+  it "does not try to inject dependencies within actions defined in without_dependor block" do
+    get "/bye/adam"
+
+    last_response.body.should == "bye - adam"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependor-sinatra
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependor
@@ -211,9 +211,11 @@ files:
 - lib/dependor-sinatra/monkey_patches.rb
 - lib/dependor-sinatra/objects.rb
 - lib/dependor-sinatra/version.rb
+- lib/dependor-sinatra/without_dependor.rb
 - spec/integration/before_and_after_filters_spec.rb
 - spec/integration/conditions_spec.rb
 - spec/integration/custom_injector_spec.rb
+- spec/integration/disabling_dependor_spec.rb
 - spec/integration/injecting_sinatra_provided_data_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/psyho/dependor-sinatra
@@ -230,7 +232,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 206932367
+      hash: 2355277459473621292
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -239,10 +241,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 206932367
+      hash: 2355277459473621292
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: An extension to Sinatra enabling dependency injection
@@ -250,5 +252,6 @@ test_files:
 - spec/integration/before_and_after_filters_spec.rb
 - spec/integration/conditions_spec.rb
 - spec/integration/custom_injector_spec.rb
+- spec/integration/disabling_dependor_spec.rb
 - spec/integration/injecting_sinatra_provided_data_spec.rb
 - spec/spec_helper.rb