conject 0.1.6 → 0.1.7

data/CHANGELOG

@@ -1,3 +1,7 @@
+Conject v0.1.7
+  * Added :class and :specialize object configurations
+  * Fixed a bug in the error handler that catches exceptions in object constructors
+
 Conject v0.1.6
   * Object#contextual_name provides the string name of an object as it is keyed in its context
 
@@ -25,7 +29,7 @@ Conject v0.0.9
   * Classes with module namespaces can now refer to collaborators in construct_with by omitting the full path corresponding to the object namespace
 
 Conject v0.0.8
-  * peer_objects lets you declare within one object that if some subcontext should request an object, that object should be instantiated in THIS context
+  * object_peers lets you declare within one object that if some subcontext should request an object, that object should be instantiated in THIS context
 
 Conject v0.0.7
   (re-release due to release automation fail on my part)

data/README.md

@@ -78,7 +78,7 @@ object peers within the class definition of that owner object.  This ensures tha
 objects to be instantiated in those subcontexts as well. 
 
     class Game
-      peer_objects :missile_coordinator, :wind_affector
+      object_peers: :missile_coordinator, :wind_affector
     end
 
 In this example, the instantiation of a Game instance in an object context will cause missile coordinator and wind affector to be "anchored"
@@ -104,3 +104,26 @@ This is more or less expressive shorthand for:
 ...EXCEPT that it's a lazy approach: using 'is' means nothing actually gets built or set in the context before it
 is requested or composed into another object.
 
+# Specialization via Composition#
+
+To declare objects as instances of a specific class, you may specify the :class of the object via #configure_objects.
+Furthermore, you can specialize the instance by indicating which specific objects you would like to supply as the object's collaborators:
+
+    context.configure_objects({
+      adventure_time: {
+        class: Team, 
+        specialize: { 
+          hero: "finn",
+          sidekick: "jake" }},
+      dark_knight: {
+        class: Team,
+        specialize: {
+          hero: "batman",
+          sidekick: "robin" }}
+    })
+
+The keys in :specialize match some or all of the keys defined in the class (in this case, the Team class is defined to be #construct_with :hero, :sidekick, :clock.
+The values are object names within the ObjectContext; they will be resolved in the usual manner.
+Components that a Class wants to be built with, but which you omit from the :specialize Hash, will be resolved in the usual way.
+
+Using :class and :specialize is NOT THE SAME as building objects within a subcontext.  Objects mentioned here are expected to be found and kept within the defining ObjectContext.

data/lib/conject/dependency_resolver.rb

@@ -9,9 +9,10 @@ module Conject
     # This method assumes the Class has_object_defintion?  (Client code should
     # determine that before invoking this method.)
     #
-    def resolve_for_class(klass, object_context)
+    def resolve_for_class(klass, object_context, remapping=nil)
+      remapping ||= {}
       klass.object_definition.component_names.inject({}) do |obj_map, name|
-        obj_map[name] = search_for(klass, object_context, name)
+        obj_map[name] = search_for(klass, object_context, remapping[name.to_sym] || remapping[name.to_s] || name)
         obj_map
       end
     end

data/lib/conject/object_factory.rb

@@ -8,12 +8,16 @@ module Conject
       config = object_context.get_object_config(name)
       lambda_constructor = config[:construct]
       alias_for = config[:is]
+      klass = config[:class]
+      raise "#{klass.inspect} is not a Class" if klass and !(Class === klass)
       if alias_for
+        # This object is defined as simply being another name for a different object
         begin
           object = object_context.get(alias_for)
         rescue Exception => ex
           raise "(When attempting to fill alias '#{name}' with actual object '#{alias_for}') #{ex.message}"
         end
+
       elsif lambda_constructor
         case lambda_constructor.arity
         when 0
@@ -25,8 +29,12 @@ module Conject
         else
           raise "Constructor lambda takes 0, 1 or 2 params; this lambda takes #{lambda_constructor.arity}"
         end
+
+      elsif klass
+        # This object has a specified class
+        object = type_1_constructor(klass, name, object_context, config[:specialize]) # Specify class 
       else
-        object = type_1_constructor(name, object_context)
+        object = type_1_constructor(nil, name, object_context, config[:specialize]) # Let class be determined by name
       end
 
       # Stuff an internal back reference to the object context into the new object:
@@ -42,8 +50,8 @@ module Conject
     #  - Assume we're looking for a class to create an instance with
     #  - it may or may not have a declared list of named objects it needs to be constructed with
     #
-    def type_1_constructor(name, object_context)
-      klass = class_finder.find_class(name)
+    def type_1_constructor(klass, name, object_context, overrides=nil)
+      klass ||= class_finder.find_class(name)
 
       if !klass.object_peers.empty?
         anchor_object_peers object_context, klass.object_peers
@@ -51,7 +59,7 @@ module Conject
 
       constructor_func = nil
       if klass.has_object_definition?
-        object_map = dependency_resolver.resolve_for_class(klass, object_context)
+        object_map = dependency_resolver.resolve_for_class(klass, object_context, overrides)
         constructor_func = lambda do klass.new(object_map) end
 
       elsif Utilities.has_zero_arg_constructor?(klass)
@@ -67,7 +75,8 @@ module Conject
         begin
           object = constructor_func.call
         rescue Exception => ex
-          origin = "#{e.message}\n\t#{e.backtrace.join("\n\t")}"
+          origin = "#{ex.message}\n\t#{ex.backtrace.join("\n\t")}"
+          name ||= "(no name)"
           raise "Error while constructing object '#{name}' of class #{klass}: #{origin}"
         end
       end

data/lib/conject/version.rb

@@ -1,3 +1,3 @@
 module Conject
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/acceptance/regression/specialize_spec.rb

@@ -0,0 +1,60 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+
+describe "object specialization" do
+  subject { new_object_context }
+
+  before do
+    append_test_load_path "specialization"
+    require 'finn'
+    require 'jake'
+    require 'batman'
+    require 'robin'
+    require 'clock'
+    require 'team'
+    require 'floor'
+  end
+
+  after do
+    restore_load_path
+  end
+
+
+  it "lets you define an object by class and a subset of specialized components" do
+    subject.configure_objects({
+      adventure_time: {
+        class: Team, 
+        specialize: { 
+          hero: "finn",
+          sidekick: "jake" }},
+      dark_knight: {
+        class: Team,
+        specialize: {
+          hero: "batman",
+          sidekick: "robin" }}
+    })
+
+    adventure_time = subject[:adventure_time]
+    adventure_time.class.should == Team
+    adventure_time.hero.should be
+    adventure_time.hero.should == subject[:finn]
+    adventure_time.hero.floor.should == subject[:floor]
+    adventure_time.sidekick.should be
+    adventure_time.sidekick.should == subject[:jake]
+    adventure_time.sidekick.floor.should == subject[:floor]
+    adventure_time.clock.should be
+    adventure_time.clock.should == subject[:clock]
+
+    dark_knight = subject[:dark_knight]
+    dark_knight.class.should == Team
+    dark_knight.hero.should be
+    dark_knight.hero.should == subject[:batman]
+    dark_knight.hero.floor.should == subject[:floor]
+    dark_knight.sidekick.should be
+    dark_knight.sidekick.should == subject[:robin]
+    dark_knight.sidekick.floor.should == subject[:floor]
+    dark_knight.clock.should be
+    dark_knight.clock.should == subject[:clock]
+  end
+
+end
+

data/spec/conject/dependency_resolver_spec.rb

@@ -10,7 +10,7 @@ describe Conject::DependencyResolver do
       @objects = objects
     end
     def get(name)
-      @objects[name]
+      @objects[name.to_sym] || @object[name.to_s]
     end
   end
 
@@ -20,7 +20,7 @@ describe Conject::DependencyResolver do
     end
   end
 
-  let :oc_objects do { cow: "the cow", dog: "the dog" } end
+  let :oc_objects do { cow: "the cow", dog: "the dog", bessy: "the bessy", rover: "the rover" } end
 
   let :object_context do StubbedObjectContext.new(oc_objects) end
 
@@ -37,6 +37,22 @@ describe Conject::DependencyResolver do
     }
   end
 
+  it "uses optional remapping to look for different object names" do
+    remapping = {dog: :rover}
+    subject.resolve_for_class(klass, object_context, remapping).should == {
+      cow: "the cow",
+      dog: "the rover"
+    }
+  end
+
+  it "optional remapping is string/symbol insensitive" do
+    remapping = {dog: "rover", cow: :bessy}
+    subject.resolve_for_class(klass, object_context, remapping).should == {
+      cow: "the bessy",
+      dog: "the rover"
+    }
+  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")
@@ -50,8 +66,6 @@ describe Conject::DependencyResolver do
         dog: "the relative dog",
       }
     end
-
-
   end
 end
 

data/spec/conject/object_factory_spec.rb

@@ -17,18 +17,18 @@ describe Conject::ObjectFactory do
 
   let :object_context do mock(:object_context) end
 
-  let :my_object_class do mock(:my_object_class) end
+  let :my_object_class do Class.new end
   let :my_object do mock(:my_object) end
   let :my_objects_components do mock(:my_objects_components) end
 
   describe "#construct_new" do
     describe "for Type 1 object construction" do
+      let(:object_config) do {} end
       before do
-        object_context.stub(:get_object_config).and_return({})
+        object_context.stub(:get_object_config).and_return(object_config)
         my_object_class.stub(:class_def_private) # the effect of this is tested in acceptance tests
         my_object_class.stub(:object_peers).and_return([]) # the effect of this is tested in acceptance tests
 
-        class_finder.should_receive(:find_class).with(my_object_name).and_return my_object_class
         Conject::Utilities.stub(:has_zero_arg_constructor?).and_return true
       end
 
@@ -36,18 +36,58 @@ describe Conject::ObjectFactory do
         before do
           my_object_class.should_receive(:has_object_definition?).and_return true
         end
+        describe "and no specialization has been made" do
+          before do class_finder.should_receive(:find_class).with(my_object_name).and_return my_object_class end
+          it "finds the object definition, pulls its deps, and instantiates a new instance" do
+            dependency_resolver.should_receive(:resolve_for_class).with(my_object_class, object_context, nil).and_return my_objects_components
+            my_object_class.should_receive(:new).with(my_objects_components).and_return(my_object)
+
+            subject.construct_new(my_object_name, object_context).should == my_object
+          end
+        end
 
-        it "finds the object definition, pulls its deps, and instantiates a new instance" do
-          dependency_resolver.should_receive(:resolve_for_class).with(my_object_class, object_context).and_return my_objects_components
-          my_object_class.should_receive(:new).with(my_objects_components).and_return(my_object)
+        describe "when specialization is provided" do
+          let(:overrides) do { remapped: "names" } end
+          let(:object_config) do { :class => my_object_class, :specialize => overrides } end
 
-          subject.construct_new(my_object_name, object_context).should == my_object
+          before do
+            class_finder.should_not_receive(:find_class)#.with(my_object_name).and_return my_object_class
+          end
+
+          it "uses the specified class and remapped objects to reolve and build the object" do
+            dependency_resolver.should_receive(:resolve_for_class).with(my_object_class, object_context, overrides).and_return my_objects_components
+            my_object_class.should_receive(:new).with(my_objects_components).and_return(my_object)
+            subject.construct_new(my_object_name, object_context).should == my_object
+          end
         end
+
+        describe "when :class is configured" do
+          let(:object_config) do { :class => my_object_class } end
+
+          before do
+            class_finder.should_not_receive(:find_class)#.with(my_object_name).and_return my_object_class
+          end
+
+          it "uses the specified class to build the object" do
+            dependency_resolver.should_receive(:resolve_for_class).with(my_object_class, object_context, nil).and_return my_objects_components
+            my_object_class.should_receive(:new).with(my_objects_components).and_return(my_object)
+            subject.construct_new(my_object_name, object_context).should == my_object
+          end
+
+        end
+        
       end
+        describe "when :class is not a Class" do
+          let(:object_config) do { :class => "Oops! not a Class" } end
+          it "raises" do
+            lambda do subject.construct_new(my_object_name, object_context) end.should raise_error(/is not a Class/)
+          end
+        end
 
       describe "when target class has no object definition" do
         before do
           my_object_class.should_receive(:has_object_definition?).and_return false
+          class_finder.should_receive(:find_class).with(my_object_name).and_return my_object_class
         end
 
         it "creates a new instance of the class without any arguments" do
@@ -60,6 +100,7 @@ describe Conject::ObjectFactory do
         before do
           my_object_class.should_receive(:has_object_definition?).and_return false
           Conject::Utilities.stub(:has_zero_arg_constructor?).and_return false
+          class_finder.should_receive(:find_class).with(my_object_name).and_return my_object_class
         end
 
         it "raises a CompositionError" do
@@ -67,9 +108,23 @@ describe Conject::ObjectFactory do
             subject.construct_new(my_object_name, object_context)
           end.should raise_error(ArgumentError)
         end
+
+      end
+
+      describe "when target constructor raises an error" do
+        it "re-raises with an explanation" do
+          class_finder.should_receive(:find_class).with(my_object_name).and_return my_object_class
+          my_object_class.stub(:has_object_definition?).and_return false
+          my_object_class.should_receive(:new).and_raise("BOOM")
+          lambda do
+            subject.construct_new(my_object_name, object_context)
+          end.should raise_error(/Error while constructing object '#{my_object_name}'.*BOOM/)
+        end
       end
     end
 
+
+
     describe "for custom lambda construction" do
       let(:object_config) do { :construct => lambda do "The Object" end } end
       let(:object_config2) do { :construct => lambda do |object_context| { :the_oc => object_context } end } end

data/spec/test_data/specialization/batman.rb

@@ -0,0 +1,4 @@
+class Batman
+  construct_with :floor
+  public :floor
+end

data/spec/test_data/specialization/clock.rb

@@ -0,0 +1,2 @@
+class Clock
+end

data/spec/test_data/specialization/finn.rb

@@ -0,0 +1,4 @@
+class Finn
+  construct_with :floor
+  public :floor
+end

data/spec/test_data/specialization/floor.rb

@@ -0,0 +1,2 @@
+class Floor
+end

data/spec/test_data/specialization/jake.rb

@@ -0,0 +1,4 @@
+class Jake
+  construct_with :floor
+  public :floor
+end

data/spec/test_data/specialization/robin.rb

@@ -0,0 +1,4 @@
+class Robin
+  construct_with :floor
+  public :floor
+end

data/spec/test_data/specialization/team.rb

@@ -0,0 +1,5 @@
+class Team
+  construct_with :hero, :sidekick, :clock
+
+  public :hero, :sidekick, :clock
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conject
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -133,6 +133,7 @@ files:
 - spec/acceptance/regression/nested_contexts_spec.rb
 - spec/acceptance/regression/non_singleton_spec.rb
 - spec/acceptance/regression/object_peers_spec.rb
+- spec/acceptance/regression/specialize_spec.rb
 - spec/conject/class_ext_construct_with_spec.rb
 - spec/conject/class_finder_spec.rb
 - spec/conject/composition_error_spec.rb
@@ -183,6 +184,13 @@ files:
 - spec/test_data/object_peers/game.rb
 - spec/test_data/simple_stuff/class_that_uses_context_in_init.rb
 - spec/test_data/simple_stuff/some_random_class.rb
+- spec/test_data/specialization/batman.rb
+- spec/test_data/specialization/clock.rb
+- spec/test_data/specialization/finn.rb
+- spec/test_data/specialization/floor.rb
+- spec/test_data/specialization/jake.rb
+- spec/test_data/specialization/robin.rb
+- spec/test_data/specialization/team.rb
 - src/user_model.rb
 - src/user_presenter.rb
 - src/user_view.rb
@@ -200,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2147591316143027162
+      hash: -2747476053760078928
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -209,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2147591316143027162
+      hash: -2747476053760078928
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -232,6 +240,7 @@ test_files:
 - spec/acceptance/regression/nested_contexts_spec.rb
 - spec/acceptance/regression/non_singleton_spec.rb
 - spec/acceptance/regression/object_peers_spec.rb
+- spec/acceptance/regression/specialize_spec.rb
 - spec/conject/class_ext_construct_with_spec.rb
 - spec/conject/class_finder_spec.rb
 - spec/conject/composition_error_spec.rb
@@ -282,3 +291,10 @@ test_files:
 - spec/test_data/object_peers/game.rb
 - spec/test_data/simple_stuff/class_that_uses_context_in_init.rb
 - spec/test_data/simple_stuff/some_random_class.rb
+- spec/test_data/specialization/batman.rb
+- spec/test_data/specialization/clock.rb
+- spec/test_data/specialization/finn.rb
+- spec/test_data/specialization/floor.rb
+- spec/test_data/specialization/jake.rb
+- spec/test_data/specialization/robin.rb
+- spec/test_data/specialization/team.rb