conject 0.0.1 → 0.0.3

data/.gitignore

@@ -1,4 +1,6 @@
 /coverage
 tags
 *.swp
+*.swo
+pkg
 /README.html

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    conject (0.0.1)
+    conject (0.0.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/conject.rb

@@ -1,5 +1,16 @@
 require "conject/version"
 
+require 'conject/object_definition'
+require 'conject/extended_metaid'
+require 'conject/class_ext_construct_with'
+require 'conject/object_context'
+require 'conject/object_factory'
+require 'conject/class_finder'
+require 'conject/dependency_resolver'
+require 'conject/utilities'
+require 'conject/composition_error'
+require 'conject/borrowed_active_support_inflector'
+
 module Conject
   #
   # Provide access to the default ObjectContext.  
@@ -11,30 +22,17 @@ module Conject
   end
 
   def self.default_object_factory
-    @default_object_factory ||=  Conject::ObjectFactory.new(
-      :class_finder => Conject::ClassFinder.new,
-      :dependency_resolver => Conject::DependencyResolver.new
+    @default_object_factory ||=  ObjectFactory.new(
+      :class_finder => ClassFinder.new,
+      :dependency_resolver => DependencyResolver.new
     )
   end
 
   def self.create_object_context(parent_context, object_factory=nil)
     object_factory ||= default_object_factory
-    Conject::ObjectContext.new(
+    ObjectContext.new(
       :parent_context => parent_context,
       :object_factory => object_factory
     )
   end
 end
-
-# The rest of the libraries namespace themselves under Conject so
-# they must be required AFTER the initial definition of Conject.
-require 'conject/object_definition'
-require 'conject/extended_metaid'
-require 'conject/class_ext_construct_with'
-require 'conject/object_context'
-require 'conject/object_factory'
-require 'conject/class_finder'
-require 'conject/dependency_resolver'
-require 'conject/utilities'
-require 'conject/composition_error'
-require 'conject/borrowed_active_support_inflector'

data/lib/conject/class_finder.rb

@@ -1,11 +1,13 @@
 
-class Conject::ClassFinder
-  def find_class(name)
-    cname = name.to_s.camelize
-    if Object.const_defined?(cname)
-      Object.const_get(cname)
-    else
-      raise "Could not find class for #{name}"
+module Conject
+  class ClassFinder
+    def find_class(name)
+      cname = name.to_s.camelize
+      if Object.const_defined?(cname)
+        Object.const_get(cname)
+      else
+        raise "Could not find class for #{name}"
+      end
     end
   end
 end

data/lib/conject/composition_error.rb

@@ -1,33 +1,35 @@
 require 'set'
 
-class Conject::CompositionError < ArgumentError
-  def initialize(opts=nil)
-    opts ||= {}
-    object_def = opts[:object_definition]
-    required = nil
-    required = object_def.component_names if object_def
-    provided = opts[:provided] || []
-
-    msg = "Unexpected CompositionError"
-
-    if object_def.nil?
-      msg = "Failed to construct... something."
-      if provided and !provided.empty? 
-        msg << " Provided objects were: #{provided.inspect}"
-      end
+module Conject
+  class CompositionError < ArgumentError
+    def initialize(opts=nil)
+      opts ||= {}
+      object_def = opts[:object_definition]
+      required = nil
+      required = object_def.component_names if object_def
+      provided = opts[:provided] || []
 
-    elsif object_def and required and provided
-      owner = object_def.owner || "object"
-      msg = "Wrong components when building new #{owner}."
+      msg = "Unexpected CompositionError"
 
-      missing = required - provided
-      msg << " Missing required object(s) #{missing.to_a.inspect}." unless missing.empty?
+      if object_def.nil?
+        msg = "Failed to construct... something."
+        if provided and !provided.empty? 
+          msg << " Provided objects were: #{provided.inspect}"
+        end
 
-      unexpected = provided - required
-      msg << " Unexpected object(s) provided #{unexpected.to_a.inspect}." unless unexpected.empty?
+      elsif object_def and required and provided
+        owner = object_def.owner || "object"
+        msg = "Wrong components when building new #{owner}."
 
-    end
+        missing = required - provided
+        msg << " Missing required object(s) #{missing.to_a.inspect}." unless missing.empty?
+
+        unexpected = provided - required
+        msg << " Unexpected object(s) provided #{unexpected.to_a.inspect}." unless unexpected.empty?
 
-    super msg
+      end
+
+      super msg
+    end
   end
 end

data/lib/conject/dependency_resolver.rb

@@ -1,16 +1,18 @@
-class Conject::DependencyResolver
-  #
-  # 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
-  # determined within the ObjectContext) via the provided ObjectContext.
-  #
-  # This method assumes the Class has_object_defintion?  (Client code should
-  # determine that before invoking this method.)
-  #
-  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
+module Conject
+  class DependencyResolver
+    #
+    # 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
+    # determined within the ObjectContext) via the provided ObjectContext.
+    #
+    # This method assumes the Class has_object_defintion?  (Client code should
+    # determine that before invoking this method.)
+    #
+    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
+      end
     end
   end
 end

data/lib/conject/object_context.rb

@@ -1,61 +1,61 @@
-class Conject::ObjectContext
+module Conject
+  class ObjectContext
 
-  construct_with :parent_context, :object_factory
+    construct_with :parent_context, :object_factory
 
-  def initialize
-    @cache = {}
-  end
-
-  # Inject a named object into this context
-  def put(name, object)
-    @cache[name.to_sym] = object
-  end
+    def initialize
+      @cache = { :this_object_context => self }
+    end
 
-  alias_method :[]=, :put
+    # Inject a named object into this context
+    def put(name, object)
+      @cache[name.to_sym] = object
+    end
 
-  # Retrieve a named object from this context.
-  #   If the object is already existant in this context, return it.
-  #   If we have a parent context and it contains the requested object, get and return object from parent context. (Recursive upward search)
-  #   If the object exists nowhere in this or a super context: construct, cache and return a new instance of the requested object using the object factory.
-  def get(name)
-    name = name.to_sym
-    object = @cache[name]
-    return @cache[name] if @cache.keys.include?(name)
-    
-    if parent_context and parent_context.has?(name)
-      return parent_context.get(name)
-    else
-      object = object_factory.construct_new(name,self)
-      @cache[name] = object
-      return object
+    alias_method :[]=, :put
+
+    # Retrieve a named object from this context.
+    #   If the object is already existant in this context, return it.
+    #   If we have a parent context and it contains the requested object, get and return object from parent context. (Recursive upward search)
+    #   If the object exists nowhere in this or a super context: construct, cache and return a new instance of the requested object using the object factory.
+    def get(name)
+      name = name.to_sym
+      object = @cache[name]
+      return @cache[name] if @cache.keys.include?(name)
+      
+      if parent_context and parent_context.has?(name)
+        return parent_context.get(name)
+      else
+        object = object_factory.construct_new(name,self)
+        @cache[name] = object
+        return object
+      end
     end
-  end
 
-  alias_method :[], :get
+    alias_method :[], :get
 
-  # Indicates if this context, or any parent context, contains the requested object in its cache.
-  def has?(name)
-    return true if directly_has?(name)
+    # Indicates if this context, or any parent context, contains the requested object in its cache.
+    def has?(name)
+      return true if directly_has?(name)
 
-    # Ask parent (if i have a parent) if I don't have the object:
-    if !parent_context.nil?
-      return parent_context.has?(name)
-    else
-      # I don't have it, and neither do my ancestors.
-      return false
+      # Ask parent (if i have a parent) if I don't have the object:
+      if !parent_context.nil?
+        return parent_context.has?(name)
+      else
+        # I don't have it, and neither do my ancestors.
+        return false
+      end
+    end
+    
+    # Indicates if this context has the requested object in its own personal cache.
+    # (Does not consult any parent contexts.)
+    def directly_has?(name)
+      @cache.keys.include?(name.to_sym)
     end
-  end
-  
-  # Indicates if this context has the requested object in its own personal cache.
-  # (Does not consult any parent contexts.)
-  def directly_has?(name)
-    @cache.keys.include?(name.to_sym)
-  end
 
-  def in_subcontext
-    yield Conject.create_object_context(self) if block_given?
-  end
+    def in_subcontext
+      yield Conject.create_object_context(self) if block_given?
+    end
 
+  end
 end
-
-

data/lib/conject/object_definition.rb

@@ -1,10 +1,11 @@
+module Conject
 
-class Conject::ObjectDefinition
-  attr_reader :component_names, :owner 
+  class ObjectDefinition
+    attr_reader :component_names, :owner 
 
-  def initialize(opts={})
-    @owner = opts[:owner]
-    @component_names = opts[:component_names] || []
+    def initialize(opts={})
+      @owner = opts[:owner]
+      @component_names = opts[:component_names] || []
+    end
   end
 end
-

data/lib/conject/object_factory.rb

@@ -1,28 +1,30 @@
 
-class Conject::ObjectFactory
-  construct_with :class_finder, :dependency_resolver
+module Conject
+  class ObjectFactory
+    construct_with :class_finder, :dependency_resolver
 
-  def construct_new(name, object_context)
+    def construct_new(name, object_context)
 
-    #
-    # This implementation is what I'm loosely calling "type 1" or "regular" object creation:
-    #  - 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
-    #
+      #
+      # This implementation is what I'm loosely calling "type 1" or "regular" object creation:
+      #  - 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
+      #
 
-    klass = class_finder.find_class(name)
+      klass = class_finder.find_class(name)
 
-    if klass.has_object_definition?
-      object_map = dependency_resolver.resolve_for_class(klass, object_context)
-      return klass.new(object_map)
+      if klass.has_object_definition?
+        object_map = dependency_resolver.resolve_for_class(klass, object_context)
+        return klass.new(object_map)
 
-    elsif Conject::Utilities.has_zero_arg_constructor?(klass)
-      # Default construction
-      return klass.new
-    else
-      # Oops, out of ideas on how to build.
-      raise ArgumentError.new("Class #{klass} has no special component needs, but neither does it have a zero-argument constructor.");
-    end
+      elsif Utilities.has_zero_arg_constructor?(klass)
+        # Default construction
+        return klass.new
+      else
+        # Oops, out of ideas on how to build.
+        raise ArgumentError.new("Class #{klass} has no special component needs, but neither does it have a zero-argument constructor.");
+      end
 
+    end
   end
 end

data/lib/conject/utilities.rb

@@ -1,8 +1,10 @@
-module Conject::Utilities 
-  class << self
-    def has_zero_arg_constructor?(klass)
-      init_arity = klass.instance_method(:initialize).arity
-      init_arity == 0 or (RUBY_VERSION <= "1.9.2" and init_arity == -1)
+module Conject
+  module Utilities 
+    class << self
+      def has_zero_arg_constructor?(klass)
+        init_arity = klass.instance_method(:initialize).arity
+        init_arity == 0 or (RUBY_VERSION <= "1.9.2" and init_arity == -1)
+      end
     end
   end
 end

data/lib/conject/version.rb

@@ -1,3 +1,3 @@
 module Conject
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

data/spec/acceptance/regression/inject_object_context_spec.rb

@@ -0,0 +1,28 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+
+describe "object referencing its own context" do
+  subject { Conject.default_object_context }
+
+  before do
+    append_test_load_path "basic_composition"
+    require 'master_of_puppets'
+  end
+
+  after do
+    restore_load_path
+  end
+
+  it "ObjectContext caches a reference to itself using the name :this_object_context" do
+    subject[:this_object_context].should == subject
+  end
+
+  it "an object can inject :this_object_context as a reference to its constructing ObjectContext" do
+    master = subject.get('master_of_puppets')
+    master.this_object_context.should == subject
+
+    master.this_object_context.get('master_of_puppets').should == master
+  end
+
+
+end
+

data/spec/test_data/basic_composition/master_of_puppets.rb

@@ -0,0 +1,5 @@
+class MasterOfPuppets
+  construct_with :this_object_context
+
+  public :this_object_context
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conject
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000 Z
+date: 2012-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152595540 !ruby/object:Gem::Requirement
+  requirement: &2152364960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152595540
+  version_requirements: *2152364960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152595120 !ruby/object:Gem::Requirement
+  requirement: &2152364540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152595120
+  version_requirements: *2152364540
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2152594640 !ruby/object:Gem::Requirement
+  requirement: &2152364060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152594640
+  version_requirements: *2152364060
 description: Enable Guice-like dependency injection and contextual object interactions.
 email:
 - david.crosby@atomicobject.com
@@ -77,6 +77,7 @@ files:
 - spec/acceptance/regression/README
 - spec/acceptance/regression/basic_composition_spec.rb
 - spec/acceptance/regression/basic_object_creation_spec.rb
+- spec/acceptance/regression/inject_object_context_spec.rb
 - spec/acceptance/regression/nested_contexts_spec.rb
 - spec/conject/borrowed_active_support_inflector_spec.rb
 - spec/conject/class_ext_construct_with_spec.rb
@@ -96,6 +97,7 @@ files:
 - spec/test_data/basic_composition/grass.rb
 - spec/test_data/basic_composition/guest.rb
 - spec/test_data/basic_composition/lobby.rb
+- spec/test_data/basic_composition/master_of_puppets.rb
 - spec/test_data/basic_composition/nails.rb
 - spec/test_data/basic_composition/tv.rb
 - spec/test_data/basic_composition/wood.rb
@@ -140,6 +142,7 @@ test_files:
 - spec/acceptance/regression/README
 - spec/acceptance/regression/basic_composition_spec.rb
 - spec/acceptance/regression/basic_object_creation_spec.rb
+- spec/acceptance/regression/inject_object_context_spec.rb
 - spec/acceptance/regression/nested_contexts_spec.rb
 - spec/conject/borrowed_active_support_inflector_spec.rb
 - spec/conject/class_ext_construct_with_spec.rb
@@ -159,6 +162,7 @@ test_files:
 - spec/test_data/basic_composition/grass.rb
 - spec/test_data/basic_composition/guest.rb
 - spec/test_data/basic_composition/lobby.rb
+- spec/test_data/basic_composition/master_of_puppets.rb
 - spec/test_data/basic_composition/nails.rb
 - spec/test_data/basic_composition/tv.rb
 - spec/test_data/basic_composition/wood.rb