conject 0.0.5 → 0.0.7

data/CHANGELOG

@@ -0,0 +1,21 @@
+Conject v0.0.7
+  (re-release due to release automation fail on my part)
+Conject v0.0.6
+  * .construct_with now suppost modules - lets you references module-scoped classes like Deeply::Nested::Bird as 'deeply/nested/bird'
+
+Conject v0.0.5
+  * ObjectContext.configure_objects 
+	* ... support :cache => false for objects, causing them to be non-singletons in context
+	* ... support :construct => lambda do |name, context| Something.new end
+
+Conject v0.0.4
+  * Bug fixes / support for dealing with inheritance, ie, objects that inherit
+	from Conjected objects etc
+
+Conject v0.0.3
+	* ObjectContext now caches self reference with key 'this_object_context'
+	allowing context injection into objects
+
+Conject v0.0.1
+	* Automatic Type 1 object construction
+	* Nested ObjectContexts

data/README.md

@@ -2,7 +2,39 @@
 
 Retrieve and relate objects within contexts.  Provides dependency injection convenience inspired by the simplicity of Google's Guice.
 
-# VERY ALPHA #
+# Example: Basic composition #
 
+    require 'conject'
 
+    class Wood
+      def to_s; "Wood"; end
+    end
+
+    class Nails
+      def to_s; "Nails"; end
+    end
+
+    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"
+
+# Example: Modules as namespaces #
+
+    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
+    end
 

data/TODO

@@ -1,3 +1,6 @@
+ISSUE 2012-04-25: construct_with cyclic dependency checking!  Eg. Presenter construc_with :presenter -> stack overlow
+
+
 Features:
   customer construction lambda via configure_objects
 

data/lib/conject/class_ext_construct_with.rb

@@ -1,4 +1,4 @@
-
+require 'conject/utilities'
 class Class
 
   def construct_with(*syms)
@@ -38,7 +38,8 @@ class Class
 
     # Define an internal reader method per dependency:
     syms.each do |object_name|
-      class_def_private object_name do
+      mname = Conject::Utilities.generate_accessor_method_name(object_name)
+      class_def_private mname do
         components[object_name]
       end
     end

data/lib/conject/class_finder.rb

@@ -3,11 +3,29 @@ module Conject
   class ClassFinder
     def find_class(name)
       cname = name.to_s.camelize
-      if Object.const_defined?(cname)
-        Object.const_get(cname)
+      cname_components = cname.split("::")
+      dig_for_class Object, cname_components
+    end
+
+    private
+
+    def dig_for_class(within, steps)
+      a = steps.shift
+      const = get_constant(within, a)
+      if steps.nil? or steps.empty?
+        const
+      else
+        dig_for_class(const, steps)
+      end
+    end
+
+    def get_constant(within, name)
+      if within.const_defined?(name)
+        within.const_get(name)
       else
-        raise "Could not find class for #{name}"
+        raise "Could not find class or module named #{name} within #{within}"
       end
     end
+
   end
 end

data/lib/conject/utilities.rb

@@ -5,6 +5,10 @@ module Conject
         init_arity = klass.instance_method(:initialize).arity
         init_arity == 0 or (RUBY_VERSION <= "1.9.2" and init_arity == -1)
       end
+
+      def generate_accessor_method_name(object_name)
+        object_name.to_s.split("/").last.to_sym
+      end
     end
   end
 end

data/lib/conject/version.rb

@@ -1,3 +1,3 @@
 module Conject
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

data/spec/acceptance/regression/module_scoping_spec.rb

@@ -0,0 +1,45 @@
+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
+

data/spec/conject/class_finder_spec.rb

@@ -3,7 +3,10 @@ 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
 
   after do
@@ -25,12 +28,32 @@ describe Conject::ClassFinder do
   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.*something_undefined/i)
+    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.*something_undefined/i)
+    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 "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

data/spec/conject/utilities_spec.rb

@@ -27,4 +27,24 @@ describe Conject::Utilities do
     end
   end
 
+  describe ".generate_accessor_method_name" do
+    context "simple object names" do
+      it "returns symbol names straight up" do
+        subject.generate_accessor_method_name(:another_item).should == :another_item
+      end
+      it "converts strings to symbols" do
+        subject.generate_accessor_method_name("the_object").should == :the_object
+      end
+    end
+
+    context "namespaced object names" do
+      it "returns only the last step in the name" do
+        subject.generate_accessor_method_name(:'one/two/three').should == :three
+      end
+      it "converts strings to symbols" do
+        subject.generate_accessor_method_name("/aye/bee/cee").should == :cee
+      end
+    end
+  end
+
 end

data/spec/test_data/namespace/chart/presenter.rb

@@ -1,7 +1,5 @@
 module Chart
   class Presenter
-    construct_with :chart__model, :chart__view
-
-    public :model, :view
+    construct_with 'chart/model', 'chart/view'
   end
 end

data/spec/test_data/namespace/somewhere/deep/inside/the/earth.rb

@@ -0,0 +1,10 @@
+module Somewhere
+  module Deep
+    module Inside
+      module The
+        class Earth
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conject
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000 Z
+date: 2012-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152736840 !ruby/object:Gem::Requirement
+  requirement: &70218584593060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152736840
+  version_requirements: *70218584593060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152736400 !ruby/object:Gem::Requirement
+  requirement: &70218584592640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152736400
+  version_requirements: *70218584592640
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2152735900 !ruby/object:Gem::Requirement
+  requirement: &70218584592140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152735900
+  version_requirements: *70218584592140
 description: Enable Guice-like dependency injection and contextual object interactions.
 email:
 - david.crosby@atomicobject.com
@@ -53,8 +53,8 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- CHANGELOG
 - Gemfile
-- Gemfile.lock
 - NOTES.txt
 - README.md
 - Rakefile
@@ -94,6 +94,7 @@ 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/conject/borrowed_active_support_inflector_spec.rb
@@ -130,6 +131,7 @@ 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/somewhere/deep/inside/the/earth.rb
 - spec/test_data/simple_stuff/some_random_class.rb
 - src/user_model.rb
 - src/user_presenter.rb
@@ -154,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Enable Guice-like dependency injection and contextual object interactions.
@@ -167,6 +169,7 @@ 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/conject/borrowed_active_support_inflector_spec.rb
@@ -203,4 +206,5 @@ 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/somewhere/deep/inside/the/earth.rb
 - spec/test_data/simple_stuff/some_random_class.rb