conject 0.0.8 → 0.0.9

data/lib/conject.rb

@@ -23,9 +23,10 @@ module Conject
   end
 
   def self.default_object_factory
+    class_finder = ClassFinder.new
     @default_object_factory ||=  ObjectFactory.new(
-      :class_finder => ClassFinder.new,
-      :dependency_resolver => DependencyResolver.new
+      :class_finder => class_finder,
+      :dependency_resolver => DependencyResolver.new(:class_finder => class_finder)
     )
   end
 

data/lib/conject/class_ext_construct_with.rb

@@ -96,7 +96,6 @@ class Class
       # * var args (eg, def initialize(*args)).  args[0] will be the component map.  NO OTHER ARGS WILL BE PASSED. See Footnote a)
       #
       klass.meta_def :new do |component_map|
-
         # We only want to do the following one time, but we've waited until now
         # in order to make sure our metaprogramming didn't get ahead of the user's
         # own definition of initialize:

data/lib/conject/class_finder.rb

@@ -7,6 +7,14 @@ module Conject
       dig_for_class Object, cname_components
     end
 
+    def get_module_path(klass)
+      cname = klass.name
+      return nil unless cname =~ /::/
+      cname_components = cname.split("::")
+      cname_components.pop
+      cname_components.join("::").underscore
+    end
+
     private
 
     def dig_for_class(within, steps)

data/lib/conject/dependency_resolver.rb

@@ -1,5 +1,6 @@
 module Conject
   class DependencyResolver
+    construct_with :class_finder
     #
     # Given a Class, generate a map of dependencies needed to construct a new
     # instance of that class. Dependencies are looked up (and/or instantiated, as
@@ -10,9 +11,29 @@ module Conject
     #
     def resolve_for_class(klass, object_context)
       klass.object_definition.component_names.inject({}) do |obj_map, name|
-        obj_map[name] = object_context.get(name)
+        obj_map[name] = search_for(klass, object_context, name)
         obj_map
       end
     end
+
+
+    private
+
+    def search_for(klass, object_context, name)
+      object = nil
+      # If the asking class has a module namespace, first try looking relative 
+      # to that module:
+      if module_path = class_finder.get_module_path(klass)
+        qualified_name = "#{module_path}/#{name}"
+        begin
+          object = object_context.get(qualified_name)
+        rescue 
+          # This means there's no relative object, which might be ok.
+          # Fallback is to look for the requested object in the global namespace.
+        end
+      end
+      # Search for the object by the specified name
+      object ||= object_context.get(name)
+    end
   end
 end

data/lib/conject/version.rb

@@ -1,3 +1,3 @@
 module Conject
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/acceptance/dev/module_scoping_spec.rb

@@ -0,0 +1,78 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+
+
+describe "module scoping" do
+  subject { new_object_context }
+
+  describe "using fully qualified object name" do
+    before do
+      append_test_load_path "namespace"
+      require 'chart/model'
+      require 'chart/presenter'
+      require 'chart/view'
+    end
+
+    after do
+      restore_load_path
+    end
+
+    it "constructs objects with module-scoped classes" do
+      obj = subject.get('chart/model')
+      obj.should_not be_nil
+      obj.class.should == Chart::Model
+    end
+
+    it "supports symbols as keys" do
+      obj = subject.get(:'chart/model')
+      obj.should_not be_nil
+      obj.class.should == Chart::Model
+    end
+
+    it "lets objects depend on module-namespaced components" do
+      obj = subject.get('chart/presenter')
+      obj.should_not be_nil
+      obj.class.should == Chart::Presenter
+
+      model = obj.send(:model)
+      model.should be
+      model.class.should == Chart::Model
+
+      view = obj.send(:view)
+      view.should be
+      view.class.should == Chart::View
+    end
+  end
+
+  describe "using module-relative object names" do
+    before do
+      append_test_load_path "namespace"
+      require 'deeply_nested/ez_chart/model'
+      require 'deeply_nested/ez_chart/presenter'
+      require 'deeply_nested/ez_chart/view'
+    end
+
+    after do
+      restore_load_path
+    end
+
+    it "lets objects depend on module-namespaced components" do
+      obj = subject.get('deeply_nested/ez_chart/presenter')
+      obj.should_not be_nil
+      obj.class.should == DeeplyNested::EzChart::Presenter
+
+      model = obj.send(:model)
+      model.should be
+      model.class.should == DeeplyNested::EzChart::Model
+
+      view = obj.send(:view)
+      view.should be
+      view.class.should == DeeplyNested::EzChart::View
+
+      subject.directly_has?("deeply_nested/ez_chart/model").should be_true
+      subject.directly_has?("deeply_nested/ez_chart/view").should be_true
+    end
+  end
+
+
+end
+

data/spec/conject/class_finder_spec.rb

@@ -1,59 +1,77 @@
 require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Conject::ClassFinder do
-  before do
-    append_test_load_path "simple_stuff"
-    append_test_load_path "namespace"
-    require 'some_random_class'
-    require 'chart/model'
-    require 'somewhere/deep/inside/the/earth'
-  end
+  describe "#find_class" do
+    before do
+      append_test_load_path "simple_stuff"
+      append_test_load_path "namespace"
+      require 'some_random_class'
+      require 'chart/model'
+      require 'somewhere/deep/inside/the/earth'
+    end
 
-  after do
-    restore_load_path
-  end
+    after do
+      restore_load_path
+    end
 
-  it "returns the class implied by the given name" do
-    c = subject.find_class('some_random_class')
-    c.should_not be_nil
-    c.should == SomeRandomClass
-  end
+    it "returns the class implied by the given name" do
+      c = subject.find_class('some_random_class')
+      c.should_not be_nil
+      c.should == SomeRandomClass
+    end
 
-  it "can accept symbols for object names" do
-    c = subject.find_class(:some_random_class)
-    c.should_not be_nil
-    c.should == SomeRandomClass
-  end
+    it "can accept symbols for object names" do
+      c = subject.find_class(:some_random_class)
+      c.should_not be_nil
+      c.should == SomeRandomClass
+    end
 
-  it "raises an error if the name doesn't imply a regular class in the current runtime" do
-    lambda do
-      subject.find_class('something_undefined')
-    end.should raise_error(/could not find class.*SomethingUndefined/i)
-  end
+    it "raises an error if the name doesn't imply a regular class in the current runtime" do
+      lambda do
+        subject.find_class('something_undefined')
+      end.should raise_error(/could not find class.*SomethingUndefined/i)
+    end
+
+    it "raises an error for nil input" do
+      lambda do
+        subject.find_class('something_undefined')
+      end.should raise_error(/could not find class.*SomethingUndefined/i)
+    end
+
+    context "namespaced" do
+      it "can find namespaced classes for objects with / in name" do
+        c = subject.find_class("chart/model")
+        c.should_not be_nil
+        c.should == Chart::Model
+      end
 
-  it "raises an error for nil input" do
-    lambda do
-      subject.find_class('something_undefined')
-    end.should raise_error(/could not find class.*SomethingUndefined/i)
+      it "can find deeply namespaced classes for objects with / in name" do
+        c = subject.find_class("somewhere/deep/inside/the/earth")
+        c.should_not be_nil
+        c.should == Somewhere::Deep::Inside::The::Earth
+      end
+
+      it "raises an error for a misstep along the way" do
+        lambda do
+          subject.find_class("somewhere/deep/above/the/earth")
+        end.should raise_error(/could not find.*Above within Somewhere::Deep/i)
+      end
+    end
   end
 
-  context "namespaced" do
-    it "can find namespaced classes for objects with / in name" do
-      c = subject.find_class("chart/model")
-      c.should_not be_nil
-      c.should == Chart::Model
+  describe "#get_module_path" do
+    before do
+      append_test_load_path "namespace"
+      require 'deeply_nested/ez_chart/presenter'
     end
 
-    it "can find deeply namespaced classes for objects with / in name" do
-      c = subject.find_class("somewhere/deep/inside/the/earth")
-      c.should_not be_nil
-      c.should == Somewhere::Deep::Inside::The::Earth
+    it "returns nil if given class doesn't have :: symbols in it" do
+      subject.get_module_path(Object).should be_nil
     end
 
-    it "raises an error for a misstep along the way" do
-      lambda do
-        subject.find_class("somewhere/deep/above/the/earth")
-      end.should raise_error(/could not find.*Above within Somewhere::Deep/i)
+    it "returns the underscored pathname of the module for the given class" do
+      subject.get_module_path(Conject::ObjectContext).should == "conject"
+      subject.get_module_path(DeeplyNested::EzChart::Presenter).should == "deeply_nested/ez_chart"
     end
   end
 end

data/spec/conject/dependency_resolver_spec.rb

@@ -2,6 +2,8 @@ require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Conject::DependencyResolver do
 
+  subject { described_class.new(:class_finder => class_finder) }
+
   class StubbedObjectContext
     attr_accessor :objects
     def initialize(objects)
@@ -22,11 +24,34 @@ describe Conject::DependencyResolver do
 
   let :object_context do StubbedObjectContext.new(oc_objects) end
 
+  let :class_finder do mock("class finder") end
+
+  before do
+    class_finder.stub(:get_module_path)
+  end
+
   it "maps the object definition component names of the given class to a set of objects gotten from the object context" do
     subject.resolve_for_class(klass, object_context).should == {
       cow: "the cow",
       dog: "the dog"
     }
   end
+
+  describe "when the class is in a module" do
+    before do
+      class_finder.stub(:get_module_path).with(klass).and_return("a/module/path")
+      object_context.stub(:get).with("a/module/path/cow").and_return "the relative cow"
+      object_context.stub(:get).with("a/module/path/dog").and_return "the relative dog"
+    end
+
+    it "first tries to lookup relative component names" do
+      subject.resolve_for_class(klass, object_context).should == {
+        cow: "the relative cow",
+        dog: "the relative dog",
+      }
+    end
+
+
+  end
 end
 

data/spec/test_data/namespace/deeply_nested/ez_chart/model.rb

@@ -0,0 +1,6 @@
+module DeeplyNested
+  module EzChart
+    class Model
+    end
+  end
+end

data/spec/test_data/namespace/deeply_nested/ez_chart/presenter.rb

@@ -0,0 +1,7 @@
+module DeeplyNested
+  module EzChart
+    class Presenter
+      construct_with 'model', 'view'
+    end
+  end
+end

data/spec/test_data/namespace/deeply_nested/ez_chart/view.rb

@@ -0,0 +1,6 @@
+module DeeplyNested
+  module EzChart
+    class View
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conject
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -118,7 +118,7 @@ files:
 - scratch/sample.rb
 - scratch/special_construct.rb
 - spec/acceptance/dev/README
-- spec/acceptance/dev/object_peers_spec.rb
+- spec/acceptance/dev/module_scoping_spec.rb
 - spec/acceptance/regression/README
 - spec/acceptance/regression/basic_composition_spec.rb
 - spec/acceptance/regression/basic_object_creation_spec.rb
@@ -126,9 +126,9 @@ files:
 - spec/acceptance/regression/default_object_context_spec.rb
 - spec/acceptance/regression/inherited_dependencies_spec.rb
 - spec/acceptance/regression/inject_object_context_spec.rb
-- spec/acceptance/regression/module_scoping_spec.rb
 - spec/acceptance/regression/nested_contexts_spec.rb
 - spec/acceptance/regression/non_singleton_spec.rb
+- spec/acceptance/regression/object_peers_spec.rb
 - spec/conject/borrowed_active_support_inflector_spec.rb
 - spec/conject/class_ext_construct_with_spec.rb
 - spec/conject/class_finder_spec.rb
@@ -165,6 +165,9 @@ files:
 - spec/test_data/namespace/chart/model.rb
 - spec/test_data/namespace/chart/presenter.rb
 - spec/test_data/namespace/chart/view.rb
+- spec/test_data/namespace/deeply_nested/ez_chart/model.rb
+- spec/test_data/namespace/deeply_nested/ez_chart/presenter.rb
+- spec/test_data/namespace/deeply_nested/ez_chart/view.rb
 - spec/test_data/namespace/somewhere/deep/inside/the/earth.rb
 - spec/test_data/object_peers/alt_game.rb
 - spec/test_data/object_peers/bullet.rb
@@ -189,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3446257381673869502
+      hash: -1030399323888719184
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -198,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3446257381673869502
+      hash: -1030399323888719184
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -207,7 +210,7 @@ specification_version: 3
 summary: Enable Guice-like dependency injection and contextual object interactions.
 test_files:
 - spec/acceptance/dev/README
-- spec/acceptance/dev/object_peers_spec.rb
+- spec/acceptance/dev/module_scoping_spec.rb
 - spec/acceptance/regression/README
 - spec/acceptance/regression/basic_composition_spec.rb
 - spec/acceptance/regression/basic_object_creation_spec.rb
@@ -215,9 +218,9 @@ test_files:
 - spec/acceptance/regression/default_object_context_spec.rb
 - spec/acceptance/regression/inherited_dependencies_spec.rb
 - spec/acceptance/regression/inject_object_context_spec.rb
-- spec/acceptance/regression/module_scoping_spec.rb
 - spec/acceptance/regression/nested_contexts_spec.rb
 - spec/acceptance/regression/non_singleton_spec.rb
+- spec/acceptance/regression/object_peers_spec.rb
 - spec/conject/borrowed_active_support_inflector_spec.rb
 - spec/conject/class_ext_construct_with_spec.rb
 - spec/conject/class_finder_spec.rb
@@ -254,6 +257,9 @@ test_files:
 - spec/test_data/namespace/chart/model.rb
 - spec/test_data/namespace/chart/presenter.rb
 - spec/test_data/namespace/chart/view.rb
+- spec/test_data/namespace/deeply_nested/ez_chart/model.rb
+- spec/test_data/namespace/deeply_nested/ez_chart/presenter.rb
+- spec/test_data/namespace/deeply_nested/ez_chart/view.rb
 - spec/test_data/namespace/somewhere/deep/inside/the/earth.rb
 - spec/test_data/object_peers/alt_game.rb
 - spec/test_data/object_peers/bullet.rb

data/spec/acceptance/regression/module_scoping_spec.rb

@@ -1,45 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
-
-
-describe "module scoping" do
-  subject { new_object_context }
-
-  before do
-    append_test_load_path "namespace"
-    require 'chart/model'
-    require 'chart/presenter'
-    require 'chart/view'
-  end
-
-  after do
-    restore_load_path
-  end
-
-  it "constructs objects with module-scoped classes" do
-    obj = subject.get('chart/model')
-    obj.should_not be_nil
-    obj.class.should == Chart::Model
-  end
-
-  it "supports symbols as keys" do
-    obj = subject.get(:'chart/model')
-    obj.should_not be_nil
-    obj.class.should == Chart::Model
-  end
-
-  it "lets objects depend on module-namespaced components" do
-    obj = subject.get('chart/presenter')
-    obj.should_not be_nil
-    obj.class.should == Chart::Presenter
-
-    model = obj.send(:model)
-    model.should be
-    model.class.should == Chart::Model
-
-    view = obj.send(:view)
-    view.should be
-    view.class.should == Chart::View
-  end
-
-end
-