conject 0.1.7 → 0.1.8

data/CHANGELOG

@@ -1,3 +1,7 @@
+Conject v0.1.8
+  * Fixed: bug in class finder when resolving module-namespaced objects
+  * Added: LICENSE
+
 Conject v0.1.7
   * Added :class and :specialize object configurations
   * Fixed a bug in the error handler that catches exceptions in object constructors

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2013 David Crosby
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -6,29 +6,29 @@ Retrieve and relate objects within contexts.  Provides dependency injection conv
 
 Declare required component objects for a class using .construct_with
 
+```ruby
+require 'conject'
 
-    require 'conject'
+class Wood
+  def to_s; "Wood"; end
+end
 
-    class Wood
-      def to_s; "Wood"; end
-    end
-
-    class Nails
-      def to_s; "Nails"; end
-    end
+class Nails
+  def to_s; "Nails"; end
+end
 
-    class Fence
-      construct_with :wood, :nails
+class Fence
+  construct_with :wood, :nails
 
-      def to_s
-        "I'm made of #{wood} and #{nails}"
-      end
-    end
-
-    fence = Conject.default_object_context.get(:fence)
-    puts fence
-    #=> "I'm made of Wood and Nails"
+  def to_s
+    "I'm made of #{wood} and #{nails}"
+  end
+end
 
+fence = Conject.default_object_context.get(:fence)
+puts fence
+#=> "I'm made of Wood and Nails"
+```
 # Configuring objects #
 
 Call #configure_object or #configure_objects to configure one or more objects wrt
@@ -47,39 +47,43 @@ Eg.
 
 # Modules as namespaces #
 
-    module Chart
-      class Presenter
-        construct_with 'chart/model', 'chart/view'
+```ruby
+module Chart
+  class Presenter
+    construct_with 'chart/model', 'chart/view'
 
-        def to_s
-          "I'm a Chart::Presenter composed of a #{model} and a #{view}"
-        end
-      end
+    def to_s
+      "I'm a Chart::Presenter composed of a #{model} and a #{view}"
     end
-
+  end
+end
+```
 # Subcontexts #
 
-    first_fence = nil
-    second_fence = nil
+```ruby
+first_fence = nil
+second_fence = nil
 
-    Conject.default_object_context.in_subcontext do |sub|
-      first_fence = sub[:fence]
-    end
-
-    Conject.default_object_context.in_subcontext do |sub|
-      second_fence = sub[:fence]
-    end
+Conject.default_object_context.in_subcontext do |sub|
+  first_fence = sub[:fence]
+end
 
-    # second_fence != first_fence
+Conject.default_object_context.in_subcontext do |sub|
+  second_fence = sub[:fence]
+end
 
+# second_fence != first_fence
+```
 If you'd like to ensure that certain dependencies needed by objects built in subcontexts are actually housed in the parent context, but they
 have not necessarily been cached or injected in advance, AND you've got an "owner"-like object living in that context, you can declare 
 object peers within the class definition of that owner object.  This ensures that collaborators in the subcontext will not cause the peer
 objects to be instantiated in those subcontexts as well. 
 
-    class Game
-      object_peers: :missile_coordinator, :wind_affector
-    end
+```ruby
+class Game
+  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"
 in the same context as the game instance, meaning they prefer to be instantiated here, if needed by any objects in this same context or any
@@ -94,12 +98,16 @@ is available as early as the call to #initialize.
 The following will cause one object to be fulfilled by another.  In this case, 'album' is not expected to be built
 as an instance of the Album class, but rather will be set up as another name for 'and_justice_for_all':
 
-    context.configure_objects album: { is: 'and_justice_for_all' }
+```ruby
+context.configure_objects album: { is: 'and_justice_for_all' }
+```
 
 Both 'album' and 'and_justice_for_all' will be built in the context when 'album' is first requested.
 This is more or less expressive shorthand for:
 
-    context['album'] = context['and_justice_for_all'] 
+```ruby
+context['album'] = context['and_justice_for_all'] 
+```
 
 ...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.
@@ -109,18 +117,20 @@ is requested or composed into another object.
 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" }}
-    })
+```ruby
+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.

data/lib/conject/class_finder.rb

@@ -28,8 +28,8 @@ module Conject
     end
 
     def get_constant(within, name)
-      if within.const_defined?(name)
-        within.const_get(name)
+      if within.const_defined?(name, false)
+        within.const_get(name, false)
       else
         raise "Could not find class or module named #{name} within #{within}"
       end

data/lib/conject/version.rb

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

data/spec/acceptance/regression/module_scoping_spec.rb

@@ -10,6 +10,9 @@ describe "module scoping" do
       require 'chart/model'
       require 'chart/presenter'
       require 'chart/view'
+      require 'showing/no/subject'
+      require 'showing/ancestor'
+      require 'showing/no/fear/fear'
     end
 
     after do
@@ -28,6 +31,12 @@ describe "module scoping" do
       obj.class.should == Chart::Model
     end
 
+    it "correctly finds a dependency for modules at different levels" do
+      obj1 = subject.get('showing/no/subject')
+      obj2 = subject.get('showing/no/fear/fear')
+      obj1.send(:ancestor).should == obj2.send(:ancestor)
+    end
+
     it "lets objects depend on module-namespaced components" do
       obj = subject.get('chart/presenter')
       obj.should_not be_nil

data/spec/conject/class_finder_spec.rb

@@ -8,6 +8,8 @@ describe Conject::ClassFinder do
       require 'some_random_class'
       require 'chart/model'
       require 'somewhere/deep/inside/the/earth'
+      require 'showing/no/subject'
+      require 'showing/ancestor'
     end
 
     after do
@@ -51,6 +53,12 @@ describe Conject::ClassFinder do
         c.should == Somewhere::Deep::Inside::The::Earth
       end
 
+      it "does not search for ancestors" do
+        lambda do 
+          subject.find_class("showing/no/showing/ancestor")
+        end.should raise_error(/Could not find class.*/) 
+      end
+
       it "raises an error for a misstep along the way" do
         lambda do
           subject.find_class("somewhere/deep/above/the/earth")

data/spec/conject/dependency_resolver_spec.rb

@@ -24,7 +24,7 @@ describe Conject::DependencyResolver do
 
   let :object_context do StubbedObjectContext.new(oc_objects) end
 
-  let :class_finder do mock("class finder") end
+  let :class_finder do double("class finder") end
 
   before do
     class_finder.stub(:get_module_path)

data/spec/conject/object_context_spec.rb

@@ -5,8 +5,8 @@ describe Conject::ObjectContext do
     Conject::ObjectContext.new(:parent_context => parent_context, :object_factory => object_factory)
   end
 
-  let :parent_context do mock(:parent_context) end
-  let :object_factory do mock(:object_factory) end
+  let :parent_context do double(:parent_context) end
+  let :object_factory do double(:object_factory) end
 
   describe "#get" do
     describe "when an object has been #put" do

data/spec/conject/object_factory_spec.rb

@@ -12,14 +12,14 @@ describe Conject::ObjectFactory do
 
   let :my_object_name do :my_object_name end
 
-  let :class_finder do mock(:class_finder) end
-  let :dependency_resolver do mock(:dependency_resolver) end
+  let :class_finder do double(:class_finder) end
+  let :dependency_resolver do double(:dependency_resolver) end
 
-  let :object_context do mock(:object_context) end
+  let :object_context do double(:object_context) 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
+  let :my_object do double(:my_object) end
+  let :my_objects_components do double(:my_objects_components) end
 
   describe "#construct_new" do
     describe "for Type 1 object construction" do

data/spec/test_data/namespace/showing/ancestor.rb

@@ -0,0 +1,4 @@
+module Showing 
+  class Ancestor 
+  end
+end

data/spec/test_data/namespace/showing/no/fear/fear.rb

@@ -0,0 +1,9 @@
+module Showing
+  module No
+    module Fear
+     class Fear
+       construct_with "showing/ancestor"
+      end
+    end
+  end
+end

data/spec/test_data/namespace/showing/no/subject.rb

@@ -0,0 +1,7 @@
+module Showing
+  module No
+    class Subject
+      construct_with "showing/ancestor"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conject
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -84,6 +84,7 @@ extra_rdoc_files: []
 files:
 - CHANGELOG
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - conject.gemspec
@@ -177,6 +178,9 @@ files:
 - 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/showing/ancestor.rb
+- spec/test_data/namespace/showing/no/fear/fear.rb
+- spec/test_data/namespace/showing/no/subject.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
@@ -206,21 +210,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2747476053760078928
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2747476053760078928
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Enable Guice-like dependency injection and contextual object interactions.
@@ -284,6 +282,9 @@ test_files:
 - 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/showing/ancestor.rb
+- spec/test_data/namespace/showing/no/fear/fear.rb
+- spec/test_data/namespace/showing/no/subject.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