jeeves 0.2.0 → 0.2.1

data/lib/jeeves/resolve_dependency.rb

@@ -1,13 +1,39 @@
 module Jeeves
+  class UnresolvedDependency < StandardError
+  end
+
   class ResolveDependency
-    RESOLVERS = [ResolveMethod, ResolveCallable, ResolveConstant, ResolveMock]
+    RESOLVERS = [ResolveMethod, ResolveCallable, ResolveConstant]
 
     def self.call(scope, name)
       delegator = nil
       RESOLVERS.each do |resolver|
         break if delegator = resolver.call(scope, name)
       end
-      delegator or raise ArgumentError, "Dependency '#{name}' was not found in #{scope}"
+      delegator = mock(delegator, scope, name) if in_test_framework?
+      delegator or unresolved(scope, name)
+    end
+
+  private
+
+    def self.in_test_framework?
+      defined?(RSpec) || defined?(Test::Unit)
+    end
+
+    def self.mock(delegator, scope, name)
+      lambda do |*args, &block|
+        if Jeeves.respond_to?(name)
+          Jeeves.send(name, *args, &block)
+        elsif delegator
+          delegator.call(*args, &block)
+        else
+          unresolved(scope, name)
+        end
+      end
+    end
+
+    def self.unresolved(scope, name)
+      raise UnresolvedDependency, "Dependency '#{name}' was not found in #{scope}"
     end
   end
 end

data/lib/jeeves/version.rb

@@ -1,4 +1,4 @@
 module Jeeves
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end
 

data/lib/jeeves.rb

@@ -3,7 +3,6 @@ module Jeeves
   autoload :ResolveMethod,     "jeeves/resolve_method"
   autoload :ResolveCallable,   "jeeves/resolve_callable"
   autoload :ResolveConstant,   "jeeves/resolve_constant"
-  autoload :ResolveMock,       "jeeves/resolve_mock"
 
   def import(*args)
     options = args.last.is_a?(Hash) ? args.pop : {}
@@ -18,16 +17,19 @@ module Jeeves
         external_name = internal_name = name
       end
       if options[:lazy]
-        define_method(internal_name) do |*args, &block|
+        self.class.send(:define_method, internal_name) do |*args, &block|
           delegator = ResolveDependency.call(scope, external_name)
           delegator.call(*args, &block)
         end
       else
         delegator = ResolveDependency.call(scope, external_name)
-        define_method(internal_name) do |*args, &block|
+        self.class.send(:define_method, internal_name) do |*args, &block|
           delegator.call(*args, &block)
         end
       end
+      define_method(internal_name) do |*args, &block|
+        self.class.send(internal_name, *args, &block)
+      end
     end
   end
 end

data/spec/integration/import_spec.rb

@@ -76,10 +76,15 @@ describe "import" do
     subject.say_polo.should == :polo
   end
 
+  it "also imports into as a class method" do
+    result = subject.class.my_method(:foo, :bar, :baz) { |s| s.upcase }
+    result.should == "FOO-BAR-BAZ"
+  end
+
   it "raises an error if no importers can find the dependency" do
-    Jeeves::ResolveMock.stub(:call) # to avoid RSpec integration
+    Jeeves::ResolveDependency.stub(:in_test_framework?) { false } # to avoid RSpec integration
     expect { subject.class.import :unknown, from: JeevesTestApp::OtherScope }.
-      to raise_error(ArgumentError,
+      to raise_error(Jeeves::UnresolvedDependency,
            "Dependency 'unknown' was not found in JeevesTestApp::OtherScope")
   end
 end

data/spec/integration/rspec_spec.rb

@@ -2,13 +2,21 @@ require "jeeves"
 
 module JeevesTestApp
   module InnerScope
+    def self.loaded_dependency
+      :real_value
+    end
+
     class TestSubject
       extend Jeeves
-      import :my_mock
+      import :my_mock, :loaded_dependency
 
       def call
         my_mock(42)
       end
+
+      def call_integrated
+        loaded_dependency
+      end
     end
   end
 end
@@ -22,8 +30,17 @@ describe "rspec integration" do
   end
 
   it "raises an error if the dependency is not mocked" do
-    expect { subject.call }.to raise_error(ArgumentError,
+    expect { subject.call }.to raise_error(Jeeves::UnresolvedDependency,
       "Dependency 'my_mock' was not found in JeevesTestApp::InnerScope")
   end
+
+  it "overrides loaded dependencies with mocked methdos on Jeeves" do
+    Jeeves.stub(:loaded_dependency) { :stubbed_value }
+    subject.call_integrated.should == :stubbed_value
+  end
+
+  it "uses loaded dependencies if they are not mocked on Jeeves" do
+    subject.call_integrated.should == :real_value
+  end
 end
 

data/spec/unit/resolve_dependency_spec.rb

@@ -2,7 +2,6 @@ module Jeeves
   class ResolveMethod; end
   class ResolveCallable; end
   class ResolveConstant; end
-  class ResolveMock; end
 end
 require "jeeves/resolve_dependency"
 
@@ -12,6 +11,7 @@ module Jeeves
     let(:delegator) { stub("delegator") }
 
     before do
+      Jeeves::ResolveDependency.stub(:in_test_framework?) { false } # to avoid RSpec integration
       ResolveMethod.stub(:call)
       ResolveCallable.stub(:call)
       ResolveConstant.stub(:call)
@@ -32,15 +32,9 @@ module Jeeves
       ResolveDependency.call(scope, :my_dependency).should be(delegator)
     end
 
-    it "uses ResolveMock as a last resort" do
-      ResolveMock.stub(:call).with(scope, :my_dependency) { delegator }
-      ResolveDependency.call(scope, :my_dependency).should be(delegator)
-    end
-
     it "raises an error if all importers fail" do
-      Jeeves::ResolveMock.stub(:call) # to avoid RSpec integration
       expect { ResolveDependency.call(scope, :my_dependency) }.
-        to raise_error(ArgumentError,
+        to raise_error(Jeeves::UnresolvedDependency,
           "Dependency 'my_dependency' was not found in ScopeStub")
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jeeves
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-16 00:00:00.000000000 Z
+date: 2012-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -27,9 +27,10 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.8'
-description: 
-email:
-- rchopper@gmail.com
+description: Jeeves is a personal valet for your Ruby code. It is used to manage dependencies
+  between loosely coupled classes via explicit declaraion. It is _not_ a traditional
+  dependency injection framework, although it can easily fill that role.
+email: rchopper@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -39,7 +40,6 @@ files:
 - lib/jeeves/version.rb
 - lib/jeeves/resolve_constant.rb
 - lib/jeeves/resolve_method.rb
-- lib/jeeves/resolve_mock.rb
 - lib/jeeves/resolve_callable.rb
 - spec/integration/rspec_spec.rb
 - spec/integration/import_spec.rb
@@ -48,7 +48,8 @@ files:
 - spec/unit/resolve_constant_spec.rb
 - spec/unit/resolve_dependency_spec.rb
 homepage: http://github.com/ronhopper/jeeves
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:

data/lib/jeeves/resolve_mock.rb

@@ -1,22 +0,0 @@
-module Jeeves
-  class ResolveMock
-    def self.call(scope, name)
-      if in_test_framework?
-        lambda do |*args, &block|
-          if Jeeves.respond_to?(name)
-            Jeeves.public_send(name, *args, &block)
-          else
-            raise ArgumentError, "Dependency '#{name}' was not found in #{scope}"
-          end
-        end
-      end
-    end
-
-  private
-
-    def self.in_test_framework?
-      defined?(RSpec) || defined?(Test::Unit)
-    end
-  end
-end
-