jeeves 0.0.1 → 0.1.0

data/lib/jeeves/find_dependencies.rb

@@ -0,0 +1,22 @@
+module Jeeves
+  class FindDependencies
+    def self.call(scope, *names)
+      names.inject({}) do |dependencies, name|
+        dependencies.update(name => delegator_for(name, scope))
+      end
+    end
+
+  private
+
+    IMPORTERS = [ImportMethod, ImportCallable, ImportConstant]
+
+    def self.delegator_for(name, scope)
+      delegator = nil
+      IMPORTERS.each do |importer|
+        break if delegator = importer.call(name, scope)
+      end
+      delegator or raise ArgumentError, "Dependency '#{name}' was not found in #{scope}"
+    end
+  end
+end
+

data/lib/jeeves/version.rb

@@ -1,4 +1,4 @@
 module Jeeves
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end
 

data/lib/jeeves.rb

@@ -1,23 +1,19 @@
 module Jeeves
-  autoload :ImportMethod,   "jeeves/import_method"
-  autoload :ImportCallable, "jeeves/import_callable"
-  autoload :ImportConstant, "jeeves/import_constant"
+  autoload :FindDependencies, "jeeves/find_dependencies"
+  autoload :ImportMethod,     "jeeves/import_method"
+  autoload :ImportCallable,   "jeeves/import_callable"
+  autoload :ImportConstant,   "jeeves/import_constant"
 
-  def import(name, options={})
-    scope = options.fetch(:from)
-    if not define_delegator(name, scope)
-      raise ArgumentError, "Dependency '#{name}' was not found in #{scope}"
+  def import(*args)
+    options = args.last.respond_to?(:fetch) ? 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
-  end
-
-private
-
-  IMPORTERS = [ImportMethod, ImportCallable, ImportConstant]
-
-  def define_delegator(name, scope)
-    callable = IMPORTERS.reduce(nil) { |c, i| c ||= i.call(name, scope) }
-    if callable
-      define_method(name) { |*args, &block| callable.call(*args, &block) }
+    FindDependencies.call(scope, *args).each do |name, delegator|
+      define_method(name) do |*args, &block|
+        delegator.call(*args, &block)
+      end
     end
   end
 end

data/spec/acceptance/import_spec.rb

@@ -16,11 +16,14 @@ module JeevesTestApp
   end
 
   module InnerScope
+    def self.marco
+      :polo
+    end
+
     class TestSubject
       extend Jeeves
-      import :my_method, from: OtherScope
-      import :my_callable, from: OtherScope
-      import :my_constant, from: OtherScope
+      import :my_method, :my_callable, :my_constant, from: OtherScope
+      import :marco
     end
   end
 end
@@ -42,6 +45,10 @@ describe "import" do
     subject.my_constant.should == "MY VALUE"
   end
 
+  it "defaults to the current class's scope" do
+    subject.marco.should == :polo
+  end
+
   it "raises an error if no importers can find the dependency" do
     expect { subject.class.import :unknown, from: JeevesTestApp::OtherScope }.
       to raise_error(ArgumentError,

data/spec/unit/find_dependencies_spec.rb

@@ -0,0 +1,57 @@
+module Jeeves
+  class ImportMethod; end
+  class ImportCallable; end
+  class ImportConstant; end
+end
+require "jeeves/find_dependencies"
+
+module Jeeves
+  describe FindDependencies do
+    let(:scope) { stub("scope", to_s: "ScopeStub") }
+    let(:delegator) { stub("delegator") }
+
+    before do
+      ImportMethod.stub(:call)
+      ImportCallable.stub(:call)
+      ImportConstant.stub(:call)
+    end
+
+    it "maps dependency names to anonymous delegator functions" do
+      ImportMethod.stub(:call).with(:my_dependency, scope) { delegator }
+      FindDependencies.call(scope, :my_dependency).should == {
+        my_dependency: delegator
+      }
+    end
+
+    it "maps multiple dependencies" do
+      delegator2 = stub("delegator 2")
+      ImportMethod.stub(:call).with(:my_dep_1, scope) { delegator }
+      ImportMethod.stub(:call).with(:my_dep_2, scope) { delegator2 }
+      FindDependencies.call(scope, :my_dep_1, :my_dep_2).should == {
+        my_dep_1: delegator,
+        my_dep_2: delegator2
+      }
+    end
+
+    it "uses ImportCallable if ImportMethod fails" do
+      ImportCallable.stub(:call).with(:my_dependency, scope) { delegator }
+      FindDependencies.call(scope, :my_dependency).should == {
+        my_dependency: delegator
+      }
+    end
+
+    it "uses ImportConstant if ImportMethod and ImportCallable fail" do
+      ImportConstant.stub(:call).with(:my_dependency, scope) { delegator }
+      FindDependencies.call(scope, :my_dependency).should == {
+        my_dependency: delegator
+      }
+    end
+
+    it "raises an error if all importers fail" do
+      expect { FindDependencies.call(scope, :my_dependency) }.
+        to raise_error(ArgumentError,
+          "Dependency 'my_dependency' was not found in ScopeStub")
+    end
+  end
+end
+

data/spec/unit/import_callable_spec.rb

@@ -14,14 +14,14 @@ module Jeeves
   describe ImportCallable do
 
     it "returns an anonymous function which delegates to a new instance of the callable" do
-      callable = ImportCallable.call(:my_callable, JeevesTestApp::CallableTest)
-      result = callable.call(:foo, :bar, :baz) { |s| s.upcase }
+      delegator = ImportCallable.call(:my_callable, JeevesTestApp::CallableTest)
+      result = delegator.call(:foo, :bar, :baz) { |s| s.upcase }
       result.should == "FOO-BAR-BAZ"
     end
 
     it "returns nil if the the callable class is not defined" do
-      callable = ImportCallable.call(:undefined_callable, JeevesTestApp::CallableTest)
-      callable.should be(nil)
+      delegator = ImportCallable.call(:undefined_callable, JeevesTestApp::CallableTest)
+      delegator.should be(nil)
     end
 
   end

data/spec/unit/import_constant_spec.rb

@@ -10,13 +10,13 @@ module Jeeves
   describe ImportConstant do
 
     it "returns an anonymous function which returns the constant" do
-      callable = ImportConstant.call(:my_constant, JeevesTestApp::ConstantTest)
-      callable.call.should == "MY VALUE"
+      delegator = ImportConstant.call(:my_constant, JeevesTestApp::ConstantTest)
+      delegator.call.should == "MY VALUE"
     end
 
     it "returns nil if the constant is not defined" do
-      callable = ImportConstant.call(:undefined_constant, JeevesTestApp::ConstantTest)
-      callable.should be(nil)
+      delegator = ImportConstant.call(:undefined_constant, JeevesTestApp::ConstantTest)
+      delegator.should be(nil)
     end
 
   end

data/spec/unit/import_method_spec.rb

@@ -12,14 +12,14 @@ module Jeeves
   describe ImportMethod do
 
     it "returns an anonymous function which delegates to the method" do
-      callable = ImportMethod.call(:my_method, JeevesTestApp::MethodTest)
-      result = callable.call(:foo, :bar, :baz) { |s| s.upcase }
+      delegator = ImportMethod.call(:my_method, JeevesTestApp::MethodTest)
+      result = delegator.call(:foo, :bar, :baz) { |s| s.upcase }
       result.should == "FOO-BAR-BAZ"
     end
 
     it "returns nil if the scope does not respond to the method" do
-      callable = ImportMethod.call(:undefined_method, JeevesTestApp::MethodTest)
-      callable.should be(nil)
+      delegator = ImportMethod.call(:undefined_method, JeevesTestApp::MethodTest)
+      delegator.should be(nil)
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jeeves
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000 Z
+date: 2012-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -37,11 +37,13 @@ files:
 - lib/jeeves.rb
 - lib/jeeves/import_callable.rb
 - lib/jeeves/import_constant.rb
+- lib/jeeves/find_dependencies.rb
 - lib/jeeves/import_method.rb
 - lib/jeeves/version.rb
 - spec/acceptance/import_spec.rb
 - spec/unit/import_callable_spec.rb
 - spec/unit/import_method_spec.rb
+- spec/unit/find_dependencies_spec.rb
 - spec/unit/import_constant_spec.rb
 homepage: http://github.com/ronhopper/jeeves
 licenses: []
@@ -71,4 +73,5 @@ test_files:
 - spec/acceptance/import_spec.rb
 - spec/unit/import_callable_spec.rb
 - spec/unit/import_method_spec.rb
+- spec/unit/find_dependencies_spec.rb
 - spec/unit/import_constant_spec.rb