jeeves 0.2.1 → 0.2.2

data/lib/jeeves/define_imported_method.rb

@@ -0,0 +1,56 @@
+module Jeeves
+  class DefineImportedMethod
+    def call(target, internal_name, options)
+      @target = target
+      @internal_name = internal_name
+      @scope = options.fetch(:from)
+      @external_name = options.fetch(:name)
+      if options[:lazy] == true
+        define_lazy
+      elsif options[:lazy] == false
+        define_non_lazy
+      else
+        define_smart
+      end
+      define_on_instance
+    end
+
+  private
+
+    def define_lazy
+      scope = @scope
+      external_name = @external_name
+      @target.class.send(:define_method, @internal_name) do |*args, &block|
+        delegator = ResolveDependency.call(scope, external_name)
+        delegator.call(*args, &block)
+      end
+    end
+
+    def define_non_lazy
+      delegator = ResolveDependency.call(@scope, @external_name)
+      @target.class.send(:define_method, @internal_name) do |*args, &block|
+        delegator.call(*args, &block)
+      end
+    end
+
+    def define_smart
+      scope = @scope
+      internal_name = @internal_name
+      external_name = @external_name
+      @target.class.send(:define_method, @internal_name) do |*args, &block|
+        delegator = ResolveDependency.call(scope, external_name)
+        self.class.send(:define_method, internal_name) do |*args, &block|
+          delegator.call(*args, &block)
+        end
+        delegator.call(*args, &block)
+      end
+    end
+
+    def define_on_instance
+      internal_name = @internal_name
+      @target.send(:define_method, internal_name) do |*args, &block|
+        self.class.send(internal_name, *args, &block)
+      end
+    end
+  end
+end

data/lib/jeeves/import.rb

@@ -0,0 +1,27 @@
+module Jeeves
+  class Import
+    def call(target, *args)
+      @target = target
+      parse_options(args)
+      @names.each do |external_name, internal_name|
+        DefineImportedMethod.new.call(target, internal_name, from: @scope,
+                                      name: external_name, lazy: @lazy)
+      end
+    end
+
+  private
+
+    def parse_options(args)
+      options = args.last.is_a?(Hash) ? args.pop : {}
+      @names = args.map { |name| name.is_a?(Array) ? name : [name, name] }
+      @scope = options.fetch(:from) { default_scope }
+      @lazy = options.fetch(:lazy, :smart)
+    end
+
+    def default_scope
+      module_names = @target.ancestors.first.to_s.split('::')[0..-2]
+      module_names.inject(Object) { |m, c| m.const_get(c) }
+    end
+  end
+end
+

data/lib/jeeves/resolve_dependency.rb

@@ -10,16 +10,12 @@ module Jeeves
       RESOLVERS.each do |resolver|
         break if delegator = resolver.call(scope, name)
       end
-      delegator = mock(delegator, scope, name) if in_test_framework?
+      delegator = mock(delegator, scope, name) if Jeeves.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)

data/lib/jeeves/stub_scope.rb

@@ -0,0 +1,19 @@
+module Jeeves
+  class StubScope
+    def self.call(name)
+      Module.new do
+        @name = [name]
+        class << self
+          def const_missing(name)
+            @name << name
+            self
+          end
+          def to_s
+            @name.join("::")
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/jeeves/version.rb

@@ -1,4 +1,7 @@
 module Jeeves
-  VERSION = "0.2.1"
+  MAJOR_VERSION = 0
+  MINOR_VERSION = 2
+  PATCH_VERSION = 2
+  VERSION = [MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION].join('.')
 end
 

data/lib/jeeves.rb

@@ -1,36 +1,26 @@
 module Jeeves
-  autoload :ResolveDependency, "jeeves/resolve_dependency"
-  autoload :ResolveMethod,     "jeeves/resolve_method"
-  autoload :ResolveCallable,   "jeeves/resolve_callable"
-  autoload :ResolveConstant,   "jeeves/resolve_constant"
+  autoload :Import,               "jeeves/import"
+  autoload :ResolveDependency,    "jeeves/resolve_dependency"
+  autoload :ResolveMethod,        "jeeves/resolve_method"
+  autoload :ResolveCallable,      "jeeves/resolve_callable"
+  autoload :ResolveConstant,      "jeeves/resolve_constant"
+  autoload :DefineImportedMethod, "jeeves/define_imported_method"
+  autoload :StubScope,            "jeeves/stub_scope"
 
   def import(*args)
-    options = args.last.is_a?(Hash) ? args.pop : {}
-    scope = options.fetch(:from) do
-      module_names = ancestors.first.to_s.split('::')[0..-2]
-      module_names.inject(Object) { |m, c| m.const_get(c) }
-    end
-    args.each do |name|
-      if name.is_a?(Array)
-        external_name, internal_name = *name
-      else
-        external_name = internal_name = name
-      end
-      if options[:lazy]
-        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)
-        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
+    Import.new.call(self, *args)
+  end
+
+  def const_missing(name)
+    if Jeeves.in_test_framework?
+      StubScope.call(name)
+    else
+      super
     end
   end
+
+  def self.in_test_framework?
+    defined?(RSpec) || defined?(Test::Unit)
+  end
 end
 

data/spec/integration/import_spec.rb

@@ -29,10 +29,15 @@ module JeevesTestApp
     class TestSubject
       extend Jeeves
       import :my_method, :my_callable, :my_constant, from: OtherScope
-      import :marco, :static_callable
+      import :marco, :static_callable, lazy: false
       import :lazy_method, lazy: true
+      import :smart_resolver
       import [:marco, :say_polo]
     end
+
+    def self.smart_resolver
+      :acts_smart
+    end
   end
 end
 
@@ -63,8 +68,10 @@ describe "import" do
   end
 
   it "resolves lazy dependencies at call time" do
-    JeevesTestApp::InnerScope.stub(:lazy_method) { :snooze }
-    subject.lazy_method.should == :snooze
+    JeevesTestApp::InnerScope.stub(:lazy_method) { :snooze1 }
+    subject.lazy_method.should == :snooze1
+    JeevesTestApp::InnerScope.stub(:lazy_method) { :snooze2 }
+    subject.lazy_method.should == :snooze2
   end
 
   it "resolves non-lazy dependencies at import time" do
@@ -72,6 +79,12 @@ describe "import" do
     subject.marco.should == :polo
   end
 
+  it "defaults to resolving dependencies once at first call" do
+    subject.smart_resolver
+    JeevesTestApp::InnerScope.stub(:smart_resolver) { :snooze }
+    subject.smart_resolver.should == :acts_smart
+  end
+
   it "imports under an alias" do
     subject.say_polo.should == :polo
   end
@@ -82,10 +95,22 @@ describe "import" do
   end
 
   it "raises an error if no importers can find the dependency" do
-    Jeeves::ResolveDependency.stub(:in_test_framework?) { false } # to avoid RSpec integration
-    expect { subject.class.import :unknown, from: JeevesTestApp::OtherScope }.
-      to raise_error(Jeeves::UnresolvedDependency,
-           "Dependency 'unknown' was not found in JeevesTestApp::OtherScope")
+    Jeeves.stub(:in_test_framework?) { false } # to avoid RSpec integration
+    expect do
+      class JeevesTestApp::InnerScope::TestSubject
+        import :unknown, from: JeevesTestApp::OtherScope, lazy: false
+      end
+    end.to raise_error(Jeeves::UnresolvedDependency,
+                       "Dependency 'unknown' was not found in JeevesTestApp::OtherScope")
+  end
+
+  it "raises an error if the scope is undefined" do
+    Jeeves.stub(:in_test_framework?) { false } # to avoid RSpec integration
+    expect do
+      class JeevesTestApp::InnerScope::TestSubject
+        import :unknown, from: MyUndefined::Scope, lazy: false
+      end
+    end.to raise_error(NameError)
   end
 end
 

data/spec/integration/rspec_spec.rb

@@ -9,6 +9,7 @@ module JeevesTestApp
     class TestSubject
       extend Jeeves
       import :my_mock, :loaded_dependency
+      import :external_mock, from: MyUndefined::Scope
 
       def call
         my_mock(42)
@@ -17,6 +18,10 @@ module JeevesTestApp
       def call_integrated
         loaded_dependency
       end
+
+      def call_external
+        external_mock
+      end
     end
   end
 end
@@ -34,7 +39,7 @@ describe "rspec integration" do
       "Dependency 'my_mock' was not found in JeevesTestApp::InnerScope")
   end
 
-  it "overrides loaded dependencies with mocked methdos on Jeeves" do
+  it "overrides loaded dependencies with mocked methods on Jeeves" do
     Jeeves.stub(:loaded_dependency) { :stubbed_value }
     subject.call_integrated.should == :stubbed_value
   end
@@ -42,5 +47,15 @@ describe "rspec integration" do
   it "uses loaded dependencies if they are not mocked on Jeeves" do
     subject.call_integrated.should == :real_value
   end
+
+  it "treats missing scope as Jeeves" do
+    Jeeves.stub(:external_mock) { :stubbed_value }
+    subject.call_external.should == :stubbed_value
+  end
+
+  it "raises an error if the dependency in missing scope is not mocked" do
+    expect { subject.call_external }.to raise_error(Jeeves::UnresolvedDependency,
+      "Dependency 'external_mock' was not found in MyUndefined::Scope")
+  end
 end
 

data/spec/unit/resolve_callable_spec.rb

@@ -18,7 +18,6 @@ end
 
 module Jeeves
   describe ResolveCallable do
-
     it "returns an anonymous function which delegates to the static call method of the callable" do
       delegator = ResolveCallable.call(JeevesTestApp::CallableTest, :static_callable)
       result = delegator.call(:foo, :bar, :baz) { |s| s.capitalize }
@@ -35,7 +34,6 @@ module Jeeves
       delegator = ResolveCallable.call(JeevesTestApp::CallableTest, :undefined_callable)
       delegator.should be(nil)
     end
-
   end
 end
 

data/spec/unit/resolve_constant_spec.rb

@@ -8,7 +8,6 @@ end
 
 module Jeeves
   describe ResolveConstant do
-
     it "returns an anonymous function which returns the constant" do
       delegator = ResolveConstant.call(JeevesTestApp::ConstantTest, :my_constant)
       delegator.call.should == "MY VALUE"
@@ -18,7 +17,6 @@ module Jeeves
       delegator = ResolveConstant.call(JeevesTestApp::ConstantTest, :undefined_constant)
       delegator.should be(nil)
     end
-
   end
 end
 

data/spec/unit/resolve_dependency_spec.rb

@@ -11,7 +11,7 @@ module Jeeves
     let(:delegator) { stub("delegator") }
 
     before do
-      Jeeves::ResolveDependency.stub(:in_test_framework?) { false } # to avoid RSpec integration
+      Jeeves.stub(:in_test_framework?) { false } # to avoid RSpec integration
       ResolveMethod.stub(:call)
       ResolveCallable.stub(:call)
       ResolveConstant.stub(:call)

data/spec/unit/resolve_method_spec.rb

@@ -10,7 +10,6 @@ end
 
 module Jeeves
   describe ResolveMethod do
-
     it "returns an anonymous function which delegates to the method" do
       delegator = ResolveMethod.call(JeevesTestApp::MethodTest, :my_method)
       result = delegator.call(:foo, :bar, :baz) { |s| s.upcase }
@@ -21,7 +20,6 @@ module Jeeves
       delegator = ResolveMethod.call(JeevesTestApp::MethodTest, :undefined_method)
       delegator.should be(nil)
     end
-
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jeeves
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000 Z
+date: 2012-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -36,10 +36,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/jeeves.rb
+- lib/jeeves/import.rb
+- lib/jeeves/define_imported_method.rb
 - lib/jeeves/resolve_dependency.rb
 - lib/jeeves/version.rb
 - lib/jeeves/resolve_constant.rb
 - lib/jeeves/resolve_method.rb
+- lib/jeeves/stub_scope.rb
 - lib/jeeves/resolve_callable.rb
 - spec/integration/rspec_spec.rb
 - spec/integration/import_spec.rb