diy 1.0.3 → 1.1

data/History.txt

@@ -1,3 +1,6 @@
+== 1.1 / 2008-05-20
+  * Added 'method' directive for building a bounded method from an object defined in diy
+
 == 1.0.3 / 2007-12-11
 
 * The 1.0.1 release had a load-path search in it that resulted in requiring files with full path names (rooted in loadpath entries).  This is unintuitive, and will almost always result in a double "require" if the application code ever requires a library.  The "require" for library loading now relies implicitly on the load path (just like normal human-coded requires.)

data/Manifest.txt

@@ -2,7 +2,23 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
+TODO.txt
+homepage/Notes.txt
+homepage/Rakefile
+homepage/diy_example.png
+homepage/index.erb
+homepage/index.html
+homepage/objects_yml.png
+homepage/page_header.graffle
+homepage/page_header.html
+homepage/page_header.png
 lib/diy.rb
+sample_code/car.rb
+sample_code/chassis.rb
+sample_code/diy_example.rb
+sample_code/engine.rb
+sample_code/objects.yml
+test/constructor.rb
 test/diy_test.rb
 test/files/broken_construction.yml
 test/files/cat/cat.rb
@@ -20,6 +36,11 @@ test/files/donkey/foo.rb
 test/files/donkey/foo/bar/qux.rb
 test/files/fud/objects.yml
 test/files/fud/toy.rb
+test/files/functions/invalid_method.yml
+test/files/functions/nonsingleton_objects.yml
+test/files/functions/objects.yml
+test/files/functions/thing.rb
+test/files/functions/thing_builder.rb
 test/files/gnu/objects.yml
 test/files/gnu/thinger.rb
 test/files/goat/base.rb
@@ -32,6 +53,18 @@ test/files/goat/shirt.rb
 test/files/goat/wings.rb
 test/files/horse/holder_thing.rb
 test/files/horse/objects.yml
+test/files/namespace/animal/bird.rb
+test/files/namespace/animal/cat.rb
+test/files/namespace/animal/reptile/hardshell/turtle.rb
+test/files/namespace/animal/reptile/lizard.rb
+test/files/namespace/bad_module_specified.yml
+test/files/namespace/class_name_combine.yml
+test/files/namespace/hello.txt
+test/files/namespace/no_module_specified.yml
+test/files/namespace/objects.yml
+test/files/namespace/road.rb
+test/files/namespace/sky.rb
+test/files/namespace/subcontext.yml
 test/files/non_singleton/air.rb
 test/files/non_singleton/fat_cat.rb
 test/files/non_singleton/objects.yml

data/README.txt

@@ -182,6 +182,17 @@ a per-object override (handled in the context YAML):
   engine:
     auto_require: false
 
+=== Method Directive
+  This introduces the concept of first class methods. An object can now be constructed with a method bound to
+  a particular object in the diy context.
+  
+  ---
+  trinket_builder:
+
+  method build_trinket:
+      object: trinket_builder
+      method: build
+       
 == LICENSE:
 
 (The MIT License)

data/Rakefile

@@ -16,13 +16,14 @@ Hoe.new('diy', DIY::VERSION) do |p|
   p.extra_deps << ['constructor', '>= 1.0.0']
 end
 
-load "../tools/tasks/homepage.rake"
+if File.exists?("../tools/")
+  load "../tools/tasks/homepage.rake"
+  load "../tools/tasks/release_tagging.rake"
+  ReleaseTagging.new do |t|
+    t.package = "diy"
+    t.version = DIY::VERSION
+  end
 
-load "../tools/tasks/release_tagging.rake"
-ReleaseTagging.new do |t|
-  t.package = "diy"
-  t.version = DIY::VERSION
+  desc "Release package to Rubyforge, tag the release in svn, and publish documentation"
+  task :release_full => [ :release, :tag_release, :publish_docs ] 
 end
-
-desc "Release package to Rubyforge, tag the release in svn, and publish documentation"
-task :release_full => [ :release, :tag_release, :publish_docs ] 

data/TODO.txt

@@ -0,0 +1,9 @@
+Sun Dec  2 19:59:16 EST 2007
+crosby
+
+Features from FRE's rogue diy.rb (inside Injection) that need to be
+incorporated into trunk:
+
+* auto_require
+* use_class_directly
+

data/homepage/Notes.txt

@@ -0,0 +1,27 @@
+Wed Nov 21 21:49:27 EST 2007
+crosby
+
+1. Edit page_header.graffle
+2. Export as HTML imagemap
+3. Open ../sample_code/synopsis.rb
+4. Screen shot, save as sample_code.png
+5. rake (rewrites index.html)
+6. cd ..
+7. rake publish_docs
+
+page_header.graffle
+  Export-as-HTML-Imagemap
+  Use png
+  Use 125% scale
+  Remember to use the style inspector to assign actions to things that should be links.
+
+rake index
+  Rewrites index.html using index.erb and page_header.html (and some values in the Rakefile)
+
+The code sample screenshot:
+  Taken with Snapz Pro X (this is important, as Snapz is providing the
+  dropshadow and about 28 extra pixels widthwise)
+
+  Should be 650 px wide to line up with the page header.
+
+  Transparency: be conscious of WHAT'S IN THE BACKGROUND

data/homepage/Rakefile

@@ -0,0 +1,14 @@
+desc "Rewrite index.html using index.erb and publisher_homepage.html"
+task :index do
+  require 'erb'
+  @title = "DIY - atomicobject.rb"
+  @header_html = File.read("page_header.html")
+  html = ERB.new(File.read("index.erb")).result(binding)
+  fname = "index.html"
+  File.open(fname,"w") do |f|
+    f.print html
+  end
+  puts "Wrote #{fname}"
+end
+
+task :default => :index

data/homepage/index.erb

@@ -0,0 +1,36 @@
+<html>
+  <head>
+    <title><%= @title %></title>
+    <style>
+      .code_sample_title {
+        border-top: 1px solid grey;
+        width: 625px;
+        font: bold 12pt Trebuchet MS;
+        text-align:left;
+        margin: 5px;
+        padding-top: 5px;
+      }
+    </style>
+  </head>
+
+  <body>
+
+    <div align="center">
+
+      <%= @header_html  %>
+
+      <div class="code_sample_title">
+        objects.yml:
+      </div>
+      <a href="rdoc/index.html"><img border="0" src="objects_yml.png"></a>
+
+      <div class="code_sample_title">
+        diy_example.rb:
+      </div>
+      <a href="rdoc/index.html"><img border="0" src="diy_example.png"></a>
+    </div>
+
+
+
+  </body>
+</html>

data/homepage/index.html

@@ -0,0 +1,45 @@
+<html>
+  <head>
+    <title>DIY - atomicobject.rb</title>
+    <style>
+      .code_sample_title {
+        border-top: 1px solid grey;
+        width: 625px;
+        font: bold 12pt Trebuchet MS;
+        text-align:left;
+        margin: 5px;
+        padding-top: 5px;
+      }
+    </style>
+  </head>
+
+  <body>
+
+    <div align="center">
+
+      <map name="GraffleExport">
+	<area shape=rect coords="486,91,635,108" href="http://atomicobjectrb.rubyforge.org/">
+	<area shape=rect coords="485,120,635,187" href="rdoc/index.html">
+	<area shape=rect coords="310,120,463,187" href="http://rubyforge.org/frs/?group_id=4897&release_id=16546">
+	<area shape=rect coords="14,91,206,108" href="http://atomicobject.com">
+	<area shape=rect coords="572,16,627,71" href="http://atomicobjectrb.rubyforge.org/">
+	<area shape=rect coords="21,13,83,75" href="http://atomicobject.com">
+</map>
+<img border=0 src="page_header.png" usemap="#GraffleExport">
+
+
+      <div class="code_sample_title">
+        objects.yml:
+      </div>
+      <a href="rdoc/index.html"><img border="0" src="objects_yml.png"></a>
+
+      <div class="code_sample_title">
+        diy_example.rb:
+      </div>
+      <a href="rdoc/index.html"><img border="0" src="diy_example.png"></a>
+    </div>
+
+
+
+  </body>
+</html>

data/homepage/page_header.html

@@ -0,0 +1,9 @@
+<map name="GraffleExport">
+	<area shape=rect coords="486,91,635,108" href="http://atomicobjectrb.rubyforge.org/">
+	<area shape=rect coords="485,120,635,187" href="rdoc/index.html">
+	<area shape=rect coords="310,120,463,187" href="http://rubyforge.org/frs/?group_id=4897&release_id=16546">
+	<area shape=rect coords="14,91,206,108" href="http://atomicobject.com">
+	<area shape=rect coords="572,16,627,71" href="http://atomicobjectrb.rubyforge.org/">
+	<area shape=rect coords="21,13,83,75" href="http://atomicobject.com">
+</map>
+<img border=0 src="page_header.png" usemap="#GraffleExport">

data/lib/diy.rb

@@ -2,7 +2,7 @@ require 'yaml'
 require 'set'
 
 module DIY #:nodoc:#
-  VERSION = '1.0.3'
+  VERSION = '1.1'
 	class Context
 
     class << self
@@ -24,7 +24,7 @@ module DIY #:nodoc:#
 
 			# store extra inputs
 			if extra_inputs.kind_of?(Hash)
-				@extra_inputs = {}
+				@extra_inputs= {}
 				extra_inputs.each { |k,v| @extra_inputs[k.to_s] = v } # smooth out the names
 			else
 				@extra_inputs = extra_inputs
@@ -62,8 +62,13 @@ module DIY #:nodoc:#
 				end
 			end
 			unless obj
-				obj = construct_object(key)
-				@cache[key] = obj if @defs[key].singleton?
+			  case @defs[key]
+		    when MethodDef
+		      @cache[key] = construct_method(key)
+		    else
+		      obj = construct_object(key)
+  				@cache[key] = obj if @defs[key].singleton?
+		    end
 			end
 			obj
 		end
@@ -130,7 +135,11 @@ module DIY #:nodoc:#
           # namespace: use a module(s) prefix for the classname of contained object defs
           # NOTE: namespacing is NOT scope... it's just a convenient way to setup class names for a group of objects.
           get_defs_from info, parse_namespace(name)
-
+        when /^method/
+          key_name = name.gsub(/^method\s/, "")
+          @defs[key_name] = MethodDef.new(:name => key_name, 
+                                      :object => info['object'], 
+                                      :method => info['method'])
         else 
           # Normal object def
           info ||= {}
@@ -154,14 +163,21 @@ module DIY #:nodoc:#
       end
     end
 
-
+    
+    def construct_method(key)
+      method_definition = @defs[key]
+      object = get_object(method_definition.object)
+      return object.method(method_definition.method)
+    rescue Exception => oops
+      build_and_raise_construction_error(key, oops)
+    end
+    
 		def construct_object(key)
 			# Find the object definition
 			obj_def = @defs[key]
 			raise "No object definition for '#{key}'" unless obj_def
-
 			# If object def mentions a library, load it
-      require obj_def.library if obj_def.library
+      require obj_def.library	if obj_def.library
 
 			# Resolve all components for the object
 			arg_hash = {}
@@ -186,11 +202,15 @@ module DIY #:nodoc:#
 				return big_c.new
 			end
 		rescue Exception => oops
-			cerr = ConstructionError.new(key,oops)
+		  build_and_raise_construction_error(key, oops)
+		end
+		
+		def build_and_raise_construction_error(key, oops)
+		  cerr = ConstructionError.new(key,oops)
 			cerr.set_backtrace(oops.backtrace)
 			raise cerr
 		end
-
+			
 		def get_class_for_name_with_module_delimeters(class_name)
 			class_name.split(/::/).inject(Object) do |mod,const_name| mod.const_get(const_name) end
 		end
@@ -206,7 +226,7 @@ module DIY #:nodoc:#
       Namespace.new(str)
     end
 	end
-
+  
   class Namespace #:nodoc:#
     def initialize(str)
       # 'using_namespace Animal Reptile'
@@ -234,7 +254,15 @@ module DIY #:nodoc:#
 			@name = obj_name
 		end
 	end
-
+  
+  class MethodDef
+    attr_accessor :name, :object, :method
+    
+    def initialize(opts)
+      @name, @object, @method = opts[:name], opts[:object], opts[:method]
+    end
+  end
+  
 	class ObjectDef #:nodoc:
 		attr_accessor :name, :class_name, :library, :components
 		def initialize(opts)

data/sample_code/car.rb

@@ -0,0 +1,7 @@
+class Car
+  attr_reader :engine, :chassis
+  def initialize(arg_hash)
+    @engine = arg_hash[:engine]
+    @chassis = arg_hash[:chassis]
+  end
+end

data/sample_code/chassis.rb

@@ -0,0 +1,5 @@
+class Chassis
+  def to_s
+    "Chassis"
+  end
+end

data/sample_code/diy_example.rb

@@ -0,0 +1,26 @@
+require "rubygems"
+require "diy"
+
+class Car
+  attr_reader :engine, :chassis
+  def initialize(arg_hash)
+    @engine = arg_hash[:engine]
+    @chassis = arg_hash[:chassis]
+  end
+end
+
+class Chassis
+  def to_s
+    "Chassis"
+  end
+end
+
+class Engine
+  def to_s
+    "Engine"
+  end
+end
+
+context = DIY::Context.from_file("objects.yml")
+car = context['car']
+puts "Car is made of: #{car.engine} and #{car.chassis}"

data/sample_code/engine.rb

@@ -0,0 +1,5 @@
+class Engine
+  def to_s
+    "Engine"
+  end
+end

data/sample_code/objects.yml

@@ -0,0 +1,10 @@
+---
+car:
+  compose:
+    - engine
+    - chassis
+
+engine:
+
+chassis:
+

data/test/constructor.rb

@@ -0,0 +1,119 @@
+CONSTRUCTOR_VERSION = '1.0.2' #:nodoc:#
+
+class Class #:nodoc:#
+  def constructor(*attrs, &block)
+    call_block = ''
+    if block_given?
+      @constructor_block = block
+      call_block = 'self.instance_eval(&self.class.constructor_block)'
+    end
+    # Look for embedded options in the listing:
+    opts = attrs.find { |a| a.kind_of?(Hash) and attrs.delete(a) } 
+    do_acc = opts.nil? ? false : opts[:accessors] == true
+    require_args = opts.nil? ? true : opts[:strict] != false
+    super_args = opts.nil? ? nil : opts[:super]
+
+    # Incorporate superclass's constructor keys, if our superclass
+    if superclass.constructor_keys
+      similar_keys = superclass.constructor_keys & attrs
+      raise "Base class already has keys #{similar_keys.inspect}" unless similar_keys.empty?
+      attrs = [attrs,superclass.constructor_keys].flatten
+    end
+    # Generate ivar assigner code lines
+    assigns = ''
+    attrs.each do |k|
+      assigns += "@#{k.to_s} = args[:#{k.to_s}]\n"
+    end 
+
+    # If accessors option is on, declare accessors for the attributes:
+    if do_acc
+      self.class_eval "attr_accessor " + attrs.map {|x| ":#{x.to_s}"}.join(',')
+    end
+
+    # If user supplied super-constructor hints:
+    super_call = ''
+    if super_args
+      list = super_args.map do |a|
+        case a
+        when String
+          %|"#{a}"|
+        when Symbol
+          %|:#{a}|
+        end
+      end
+      super_call  = %|super(#{list.join(',')})|
+    end
+
+    # If strict is on, define the constructor argument validator method,
+    # and setup the initializer to invoke the validator method.
+    # Otherwise, insert lax code into the initializer.
+    validation_code = "return if args.nil?"
+    if require_args
+      self.class_eval do 
+        def _validate_constructor_args(args)
+          # First, make sure we've got args of some kind
+          unless args and args.keys and args.keys.size > 0 
+            raise ConstructorArgumentError.new(self.class.constructor_keys)
+          end
+          # Scan for missing keys in the argument hash
+          a_keys = args.keys
+          missing = []
+          self.class.constructor_keys.each do |ck|
+            unless a_keys.member?(ck)
+              missing << ck
+            end
+            a_keys.delete(ck) # Delete inbound keys as we address them
+          end
+          if missing.size > 0 || a_keys.size > 0
+            raise ConstructorArgumentError.new(missing,a_keys)
+          end
+        end
+      end
+      # Setup the code to insert into the initializer:
+      validation_code = "_validate_constructor_args args "
+    end
+
+    # Generate the initializer code
+    self.class_eval %{
+      def initialize(args=nil)
+        #{super_call}
+        #{validation_code}
+        #{assigns}
+        setup if respond_to?(:setup)
+        #{call_block}
+      end
+    }
+
+    # Remember our constructor keys
+    @_ctor_keys = attrs
+  end
+
+  # Access the constructor keys for this class
+  def constructor_keys; @_ctor_keys ||=[]; end
+
+  def constructor_block #:nodoc:#
+    @constructor_block
+  end
+
+end
+
+# Fancy validation exception, based on missing and extraneous keys.
+class ConstructorArgumentError < RuntimeError #:nodoc:#
+  def initialize(missing,rejected=[])
+    err_msg = ''
+    if missing.size > 0
+      err_msg = "Missing constructor args [#{missing.join(',')}]"
+    end
+    if rejected.size > 0
+      # Some inbound keys were not addressed earlier; this means they're unwanted
+      if err_msg
+        err_msg << "; " # Appending to earlier message about missing items
+      else
+        err_msg = ''
+      end
+      # Enumerate the rejected key names
+      err_msg << "Rejected constructor args [#{rejected.join(',')}]"
+    end
+    super err_msg
+  end
+end

data/test/diy_test.rb

@@ -7,7 +7,7 @@ class DIYTest < Test::Unit::TestCase
 
   def setup
     # Add load paths:
-    %w|gnu dog cat yak donkey goat horse fud non_singleton namespace|.each do |p|
+    %w|gnu dog cat yak donkey goat horse fud non_singleton namespace functions|.each do |p|
       libdir = path_to_test_file(p)
       $: << libdir unless $:.member?(libdir)
     end
@@ -74,7 +74,7 @@ class DIYTest < Test::Unit::TestCase
     @diy.build_everything
     assert_not_nil @diy['foo/bar/qux'], "Should have got my qux (which is hiding in a couple modules)"
   end
-
+    
   def test_keys
     load_context "dog/simple.yml"
     assert_equal %w|dog_model dog_presenter dog_view file_resolver other_thing|, @diy.keys.sort
@@ -492,7 +492,7 @@ class DIYTest < Test::Unit::TestCase
     assert_same sky, bird.sky, "Bird has wrong Sky"
     assert_same bird, lizard.bird, "Lizard has wrong Bird"
   end
-
+  
   def test_should_combine_a_given_class_name_with_the_namespace
     load_context "namespace/class_name_combine.yml"
     assert_not_nil @diy['garfield'], "No garfield"
@@ -533,6 +533,44 @@ class DIYTest < Test::Unit::TestCase
     assert_match(/no such file to load -- fuzzy_creature\/bird/, ex.message)
   end
 
+  def test_should_be_able_define_and_access_bounded_methods
+    load_context "functions/objects.yml"
+    @diy.build_everything
+    build_thing = @diy['build_thing']
+    
+    assert_not_nil build_thing, "should not be nil"
+    assert_kind_of(Method, build_thing)
+    assert_same(build_thing, @diy['build_thing'])
+  end
+  
+  def test_bounded_method_can_be_used
+    load_context "functions/objects.yml"
+    @diy.build_everything
+    build_thing = @diy['build_thing']
+    
+    thing = build_thing["the name", "flying"]
+    
+    assert_equal("the name", thing.name)
+    assert_equal("flying", thing.ability)
+  end
+  
+  def test_building_bounded_method_uses_object_in_diy_context_correctly
+    load_context "functions/objects.yml"
+    @diy.build_everything
+    assert_equal(@diy['build_thing'], @diy['thing_builder'].method(:build))
+    
+    load_context "functions/nonsingleton_objects.yml"
+    @diy.build_everything
+    assert_not_equal(@diy['build_thing'], @diy['thing_builder'].method(:build))
+  end
+  
+  def test_raises_construction_error_if_invalid_method_specified
+    load_context "functions/invalid_method.yml"
+    assert_raises DIY::ConstructionError do
+      @diy.build_everything
+    end
+  end
+  
   #
   # HELPERS
   #

data/test/files/functions/invalid_method.yml

@@ -0,0 +1,5 @@
+thing_builder:
+  
+method build_thing:
+    object: thing_builder
+    method: no_exist

data/test/files/functions/nonsingleton_objects.yml

@@ -0,0 +1,6 @@
+thing_builder:
+  singleton: false
+  
+method build_thing:
+    object: thing_builder
+    method: build

data/test/files/functions/objects.yml

@@ -0,0 +1,5 @@
+thing_builder:
+
+method build_thing:
+    object: thing_builder
+    method: build

data/test/files/functions/thing.rb

@@ -0,0 +1,3 @@
+class Thing
+  constructor :name, :ability, :accessors => true
+end

data/test/files/functions/thing_builder.rb

@@ -0,0 +1,21 @@
+require 'thing'
+
+class ThingBuilder
+  @@builder_count = 0
+  
+  def self.reset_builder_count
+    @@builder_count = 0
+  end
+  
+  def self.builder_count
+    @@builder_count
+  end
+  
+  def initialize
+    @@builder_count += 1
+  end
+  
+  def build(name, ability)
+    Thing.new(:name => name, :ability => ability)
+  end  
+end

data/test/files/namespace/animal/bird.rb

@@ -0,0 +1,5 @@
+module Animal
+  class Bird
+    constructor :sky, :accessors => true
+  end
+end

data/test/files/namespace/animal/cat.rb

@@ -0,0 +1,5 @@
+module Animal
+  class Cat
+    constructor :road, :accessors => true
+  end
+end

data/test/files/namespace/animal/reptile/hardshell/turtle.rb

@@ -0,0 +1,8 @@
+module Animal
+  module Reptile
+    module Hardshell
+      class Turtle
+      end
+    end
+  end
+end

data/test/files/namespace/animal/reptile/lizard.rb

@@ -0,0 +1,7 @@
+module Animal
+  module Reptile
+    class Lizard
+      constructor :bird, :accessors => true
+    end
+  end
+end

data/test/files/namespace/bad_module_specified.yml

@@ -0,0 +1,8 @@
+
+sky:
+
+using_namespace FuzzyCreature:
+
+  bird:
+    compose: sky
+

data/test/files/namespace/class_name_combine.yml

@@ -0,0 +1,8 @@
+road:
+
+using_namespace Animal:
+
+  garfield:
+    class: Cat
+    compose: road
+

data/test/files/namespace/hello.txt

@@ -0,0 +1 @@
+this is the info

data/test/files/namespace/no_module_specified.yml

@@ -0,0 +1,8 @@
+
+sky:
+
+using_namespace:
+
+  bird:
+    compose: sky
+

data/test/files/namespace/objects.yml

@@ -0,0 +1,21 @@
+road:
+
+sky:
+
+using_namespace Animal:
+
+  cat:
+    compose: road
+
+  bird:
+    compose: sky    
+
+using_namespace Animal Reptile:
+
+  lizard:
+    compose: bird
+
+using_namespace Animal::Reptile::Hardshell:
+
+  turtle:
+

data/test/files/namespace/road.rb

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

data/test/files/namespace/sky.rb

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

data/test/files/namespace/subcontext.yml

@@ -0,0 +1,22 @@
+road:
+
+sky:
+
+using_namespace Animal:
+
+  cat:
+    compose: road
+
+
++aviary:
+  using_namespace Animal:
+    bird:
+      compose: sky    
+
+  using_namespace Animal Reptile:
+    lizard:
+      compose: bird
+
+using_namespace Animal::Reptile::Hardshell:
+  turtle:
+

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: diy
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
-platform: ""
+  version: "1.1"
+platform: ruby
 authors: 
 - Atomic Object
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2007-12-11 00:00:00 -05:00
+date: 2008-05-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,7 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.0
+        version: 1.5.1
     version: 
 description: "== DESCRIPTION:  DIY (Dependency Injection in YAML) is a simple dependency injection library which focuses on declarative composition of objects through constructor injection.  == INSTALL:  * gem install diy"
 email: dev@atomicobject.com
@@ -40,12 +40,31 @@ extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.txt
+- TODO.txt
+- homepage/Notes.txt
+- test/files/namespace/hello.txt
 files: 
 - History.txt
 - Manifest.txt
 - README.txt
 - Rakefile
+- TODO.txt
+- homepage/Notes.txt
+- homepage/Rakefile
+- homepage/diy_example.png
+- homepage/index.erb
+- homepage/index.html
+- homepage/objects_yml.png
+- homepage/page_header.graffle
+- homepage/page_header.html
+- homepage/page_header.png
 - lib/diy.rb
+- sample_code/car.rb
+- sample_code/chassis.rb
+- sample_code/diy_example.rb
+- sample_code/engine.rb
+- sample_code/objects.yml
+- test/constructor.rb
 - test/diy_test.rb
 - test/files/broken_construction.yml
 - test/files/cat/cat.rb
@@ -63,6 +82,11 @@ files:
 - test/files/donkey/foo/bar/qux.rb
 - test/files/fud/objects.yml
 - test/files/fud/toy.rb
+- test/files/functions/invalid_method.yml
+- test/files/functions/nonsingleton_objects.yml
+- test/files/functions/objects.yml
+- test/files/functions/thing.rb
+- test/files/functions/thing_builder.rb
 - test/files/gnu/objects.yml
 - test/files/gnu/thinger.rb
 - test/files/goat/base.rb
@@ -75,6 +99,18 @@ files:
 - test/files/goat/wings.rb
 - test/files/horse/holder_thing.rb
 - test/files/horse/objects.yml
+- test/files/namespace/animal/bird.rb
+- test/files/namespace/animal/cat.rb
+- test/files/namespace/animal/reptile/hardshell/turtle.rb
+- test/files/namespace/animal/reptile/lizard.rb
+- test/files/namespace/bad_module_specified.yml
+- test/files/namespace/class_name_combine.yml
+- test/files/namespace/hello.txt
+- test/files/namespace/no_module_specified.yml
+- test/files/namespace/objects.yml
+- test/files/namespace/road.rb
+- test/files/namespace/sky.rb
+- test/files/namespace/subcontext.yml
 - test/files/non_singleton/air.rb
 - test/files/non_singleton/fat_cat.rb
 - test/files/non_singleton/objects.yml
@@ -117,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: atomicobjectrb
-rubygems_version: 0.9.5
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: Constructor-based dependency injection container using YAML input.