diy 1.1.1 → 1.1.2

data/History.txt

@@ -1,3 +1,8 @@
+== 1.1.2 / 2009-11-30
+  * Converted to Jeweler for gem packaging
+  * diy/factory.rb was somehow missing from the 1.1.1 gem on gemcutter. This has been fixed as part of the Jeweler changeover.
+  * Rebuilt homepage http://atomicobject.github.com/diy
+
 == 1.1.1 / 2008-05-21
   * Fixed bug that did not allow a method to be properly injected into an object
 

data/{README.txt → README.rdoc}

@@ -1,7 +1,6 @@
 == DIY
 
-* http://atomicobjectrb.rubyforge.org/diy
-* http://rubyforge.org/projects/atomicobjectrb/
+* http://atomicobject.github.com/diy
 
 == DESCRIPTION:
 
@@ -59,8 +58,6 @@ Sample code for Engine's constructor:
 Writing code like that is repetetive; that's why we created the Constructor gem, which lets you
 specify object components using the "constructor" class method:
 
-* http://atomicobjectrb.rubyforge.org/constructor
-
 Using constructor, you can write Engine like this:
 
   class Engine

data/Rakefile

@@ -1,32 +1,33 @@
 require 'rubygems'
-require 'hoe'
-
-
-$: << "lib"
-require 'diy.rb'
 
 task :default => [ :test ]
 
-Hoe.new('diy', DIY::VERSION) do |p|
-  p.rubyforge_name = 'atomicobjectrb'
-  p.author = 'Atomic Object'
-  p.email = 'dev@atomicobject.com'
-  p.summary = 'Constructor-based dependency injection container using YAML input.'
-  p.description = p.paragraphs_of('README.txt', 3).join("\n\n")
-  p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1]
-  p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
-  p.test_globs = 'test/*_test.rb'
-  p.extra_deps << ['constructor', '>= 1.0.0']
+require 'rake/testtask'
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/**/*_test.rb']
+  t.verbose = true
 end
 
-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
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
+    $: << "lib"
+    require 'diy.rb'
+    gemspec.name = 'diy'
+    gemspec.version = DIY::VERSION
+    gemspec.summary = 'Constructor-based dependency injection container using YAML input.'
+    gemspec.description = 'Constructor-based dependency injection container using YAML input.'
+    gemspec.homepage = 'http://atomicobject.github.com/diy'
+    gemspec.authors = 'Atomic Object'
+    gemspec.email = 'github@atomicobject.com'
+    gemspec.test_files = FileList['test/*_test.rb']
+    gemspec.add_dependency 'constructor', '>= 1.0.0'
   end
 
-  desc "Release package to Rubyforge, tag the release in svn, and publish documentation"
-  task :release_full => [ :release, :tag_release, :publish_docs ] 
+  Jeweler::GemcutterTasks.new
+
+rescue LoadError
+  puts "(jeweler not installed)"
 end

data/diy.gemspec

@@ -0,0 +1,131 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{diy}
+  s.version = "1.1.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Atomic Object"]
+  s.date = %q{2009-12-01}
+  s.description = %q{Constructor-based dependency injection container using YAML input.}
+  s.email = %q{github@atomicobject.com}
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    "History.txt",
+     "README.rdoc",
+     "Rakefile",
+     "TODO.txt",
+     "diy.gemspec",
+     "lib/diy.rb",
+     "lib/diy/factory.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/factory_test.rb",
+     "test/files/broken_construction.yml",
+     "test/files/cat/cat.rb",
+     "test/files/cat/extra_conflict.yml",
+     "test/files/cat/heritage.rb",
+     "test/files/cat/needs_input.yml",
+     "test/files/cat/the_cat_lineage.rb",
+     "test/files/dog/dog_model.rb",
+     "test/files/dog/dog_presenter.rb",
+     "test/files/dog/dog_view.rb",
+     "test/files/dog/file_resolver.rb",
+     "test/files/dog/other_thing.rb",
+     "test/files/dog/simple.yml",
+     "test/files/donkey/foo.rb",
+     "test/files/donkey/foo/bar/qux.rb",
+     "test/files/factory/beef.rb",
+     "test/files/factory/dog.rb",
+     "test/files/factory/factory.yml",
+     "test/files/factory/farm/llama.rb",
+     "test/files/factory/farm/pork.rb",
+     "test/files/factory/kitten.rb",
+     "test/files/fud/objects.yml",
+     "test/files/fud/toy.rb",
+     "test/files/functions/attached_things_builder.rb",
+     "test/files/functions/invalid_method.yml",
+     "test/files/functions/method_extractor.rb",
+     "test/files/functions/nonsingleton_objects.yml",
+     "test/files/functions/objects.yml",
+     "test/files/functions/thing.rb",
+     "test/files/functions/thing_builder.rb",
+     "test/files/functions/things_builder.rb",
+     "test/files/gnu/objects.yml",
+     "test/files/gnu/thinger.rb",
+     "test/files/goat/base.rb",
+     "test/files/goat/can.rb",
+     "test/files/goat/goat.rb",
+     "test/files/goat/objects.yml",
+     "test/files/goat/paper.rb",
+     "test/files/goat/plane.rb",
+     "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",
+     "test/files/non_singleton/pig.rb",
+     "test/files/non_singleton/thread_spinner.rb",
+     "test/files/non_singleton/tick.rb",
+     "test/files/non_singleton/yard.rb",
+     "test/files/yak/core_model.rb",
+     "test/files/yak/core_presenter.rb",
+     "test/files/yak/core_view.rb",
+     "test/files/yak/data_source.rb",
+     "test/files/yak/fringe_model.rb",
+     "test/files/yak/fringe_presenter.rb",
+     "test/files/yak/fringe_view.rb",
+     "test/files/yak/giant_squid.rb",
+     "test/files/yak/krill.rb",
+     "test/files/yak/my_objects.yml",
+     "test/files/yak/sub_sub_context_test.yml",
+     "test/test_helper.rb"
+  ]
+  s.homepage = %q{http://atomicobject.github.com/diy}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Constructor-based dependency injection container using YAML input.}
+  s.test_files = [
+    "test/diy_test.rb",
+     "test/factory_test.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<constructor>, [">= 1.0.0"])
+    else
+      s.add_dependency(%q<constructor>, [">= 1.0.0"])
+    end
+  else
+    s.add_dependency(%q<constructor>, [">= 1.0.0"])
+  end
+end
+

data/lib/diy.rb

@@ -3,7 +3,7 @@ require 'yaml'
 require 'set'
 
 module DIY #:nodoc:#
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
   class Context
 
     class << self

data/lib/diy/factory.rb

@@ -0,0 +1,36 @@
+module DIY #:nodoc:#
+  class FactoryDef #:nodoc:
+    attr_accessor :name, :target, :class_name, :library
+    
+    def initialize(opts)
+      @name, @target, @library, @auto_require =
+        opts[:name], opts[:target], opts[:library], opts[:auto_require]
+
+			@class_name = Infl.camelize(@target)
+			@library ||= Infl.underscore(@class_name) if @auto_require
+    end
+  end
+  
+	class Context
+    def construct_factory(key)
+      factory_def = @defs[key]
+#      puts "requiring #{factory_def.library}"
+      require factory_def.library	if factory_def.library
+
+			big_c = get_class_for_name_with_module_delimeters(factory_def.class_name)
+
+      FactoryFactory.new(big_c)
+    end
+  end
+
+  class FactoryFactory
+    def initialize(clazz)
+      @class_to_create = clazz
+    end
+
+    def create *args
+      @class_to_create.new *args
+    end
+  end
+end
+

data/test/files/factory/beef.rb

@@ -0,0 +1,5 @@
+class Beef
+  def cook
+    return "rare"
+  end
+end

data/test/files/factory/dog.rb

@@ -0,0 +1,6 @@
+class Dog
+  def woof
+    "woof"
+  end
+end
+

data/test/files/factory/factory.yml

@@ -0,0 +1,19 @@
+cat_factory:
+  builds: kitten
+  library: kitten
+
+dog_factory:
+  builds: dog
+
+using_namespace Farm:
+  llama_factory:
+    builds: llama
+
++inny:
+  bull_factory:
+    builds: beef
+
++congress:
+  using_namespace Farm:
+    politician:
+      builds: pork

data/test/files/factory/farm/llama.rb

@@ -0,0 +1,7 @@
+module Farm
+  class Llama
+    def make_llama_noise
+      "?"
+    end
+  end
+end

data/test/files/factory/farm/pork.rb

@@ -0,0 +1,7 @@
+module Farm
+  class Pork
+    def oink
+      "money!"
+    end
+  end
+end

data/test/files/factory/kitten.rb

@@ -0,0 +1,13 @@
+class Kitten
+  attr_accessor :a,:b
+
+  def initialize(a, b)
+    @a = a
+    @b = b
+  end
+
+  def meow
+    "meow"
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: diy
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - Atomic Object
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-01 01:00:00 -04:00
+date: 2009-12-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,46 +22,22 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.0
     version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
-description: |-
-  DIY (Dependency Injection in YAML) is a simple dependency injection library
-  which focuses on declarative composition of objects through constructor injection.
-email: dev@atomicobject.com
+description: Constructor-based dependency injection container using YAML input.
+email: github@atomicobject.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
-- TODO.txt
-- homepage/Notes.txt
+- README.rdoc
 files: 
 - History.txt
-- Manifest.txt
-- README.txt
+- README.rdoc
 - 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
+- diy.gemspec
 - lib/diy.rb
+- lib/diy/factory.rb
 - sample_code/car.rb
 - sample_code/chassis.rb
 - sample_code/diy_example.rb
@@ -69,6 +45,7 @@ files:
 - sample_code/objects.yml
 - test/constructor.rb
 - test/diy_test.rb
+- test/factory_test.rb
 - test/files/broken_construction.yml
 - test/files/cat/cat.rb
 - test/files/cat/extra_conflict.yml
@@ -83,6 +60,12 @@ files:
 - test/files/dog/simple.yml
 - test/files/donkey/foo.rb
 - test/files/donkey/foo/bar/qux.rb
+- test/files/factory/beef.rb
+- test/files/factory/dog.rb
+- test/files/factory/factory.yml
+- test/files/factory/farm/llama.rb
+- test/files/factory/farm/pork.rb
+- test/files/factory/kitten.rb
 - test/files/fud/objects.yml
 - test/files/fud/toy.rb
 - test/files/functions/attached_things_builder.rb
@@ -137,13 +120,12 @@ files:
 - test/files/yak/sub_sub_context_test.yml
 - test/test_helper.rb
 has_rdoc: true
-homepage: 
+homepage: http://atomicobject.github.com/diy
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -160,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: atomicobjectrb
+rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3

data/Manifest.txt

@@ -1,89 +0,0 @@
-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
-test/files/cat/extra_conflict.yml
-test/files/cat/heritage.rb
-test/files/cat/needs_input.yml
-test/files/cat/the_cat_lineage.rb
-test/files/dog/dog_model.rb
-test/files/dog/dog_presenter.rb
-test/files/dog/dog_view.rb
-test/files/dog/file_resolver.rb
-test/files/dog/other_thing.rb
-test/files/dog/simple.yml
-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/attached_things_builder.rb
-test/files/functions/invalid_method.yml
-test/files/functions/method_extractor.rb
-test/files/functions/nonsingleton_objects.yml
-test/files/functions/objects.yml
-test/files/functions/thing.rb
-test/files/functions/thing_builder.rb
-test/files/functions/things_builder.rb
-test/files/gnu/objects.yml
-test/files/gnu/thinger.rb
-test/files/goat/base.rb
-test/files/goat/can.rb
-test/files/goat/goat.rb
-test/files/goat/objects.yml
-test/files/goat/paper.rb
-test/files/goat/plane.rb
-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
-test/files/non_singleton/pig.rb
-test/files/non_singleton/thread_spinner.rb
-test/files/non_singleton/tick.rb
-test/files/non_singleton/yard.rb
-test/files/yak/core_model.rb
-test/files/yak/core_presenter.rb
-test/files/yak/core_view.rb
-test/files/yak/data_source.rb
-test/files/yak/fringe_model.rb
-test/files/yak/fringe_presenter.rb
-test/files/yak/fringe_view.rb
-test/files/yak/giant_squid.rb
-test/files/yak/krill.rb
-test/files/yak/my_objects.yml
-test/files/yak/sub_sub_context_test.yml
-test/test_helper.rb

data/homepage/Notes.txt

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

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

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

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

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