conject 0.1.2 → 0.1.3

data/CHANGELOG

@@ -1,3 +1,6 @@
+Conject v0.1.3
+  * Changed the way Class.construct_with rewrites Class.new().  It is now safe to re-load the source code of a class that uses construct_with.
+
 Conject v0.1.2
   * Aliasing objects via 'is', eg: context.configure_objects album: { is: "and_justice_for_all" }
 Conject v0.1.1

data/lib/conject/class_ext_construct_with.rb

@@ -78,63 +78,30 @@ class Class
     end
     klass.meta_eval do private :object_context_prep end
     
-    unless klass.methods.include?(:actual_new) # only do this once per family tree (subclasses will inherit the Conjected .new)
-      # Alias :new such that we can wrap and invoke it later
-      klass.meta_eval do 
-        alias_method :actual_new, :new
+    klass.meta_def :new do |component_map|
+      obj = allocate
+      if has_object_definition?
+        # Apply the given components
+        obj.send(:set_components, component_map)
+      else
+        raise "#{self.class} has an ancestor that uses construct_with, but has not declared any component dependencies.  Will not be able to instantiate!"
       end
 
-      # Override default :new behavior for this class.
-      #
-      # The .new method is rewritten to accept a single argument:
-      #   component_map: a Hash containing all required objects to construct a new instance.
-      #                  Keys are expected to be symbols.
-      # 
-      # If user defines their own #initialize method, all components sent into .new
-      # will be installed BEFORE the user-defined #initialize, and it may accept arguments thusly:
-      # * zero args.  Nothing will be passed to #initialize
-      # * single arg. The component_map will be passed.
-      # * var args (eg, def initialize(*args)).  args[0] will be the component map.  NO OTHER ARGS WILL BE PASSED. See Footnote a)
-      #
-      klass.meta_def :new do |component_map|
-        # We only want to do the following one time, but we've waited until now
-        # in order to make sure our metaprogramming didn't get ahead of the user's
-        # own definition of initialize:
-        unless object_context_prep[:initialize_has_been_wrapped]
-          # Define a new wrapper'd version of initialize that accepts and uses a component map
-          init_alias = "original_#{self.name}_initialize".to_sym
-          alias_method init_alias, :initialize
-          class_def :initialize do |component_map|
-            if self.class.has_object_definition?
-              # Apply the given components
-              set_components component_map
-            else
-              raise "#{self.class} has an ancestor that uses construct_with, but has not declared any component dependencies.  Will not be able to instantiate!"
-            end
-
-            # Invoke the normal initialize method.
-            # User-defined initialize method may accept 0 args, or it may accept a single arg
-            # which will be the component map.
-            arg_count = method(init_alias).arity
-            case arg_count
-            when 0
-              self.send init_alias
-
-            when 1, -1  # See Footnote a) at the bottom of this file
-              self.send init_alias, component_map
-
-            else
-              # We're not equipped to handle this
-              raise "User-defined initialize method defined with #{arg_count} parameters; must either be 0, other wise 1 or -1 (varargs) to receive the component map."
-            end
-          end
-          # Make a note that the initialize wrapper has been applied
-          object_context_prep[:initialize_has_been_wrapped] = true
-        end
+      arg_count = obj.method(:initialize).arity
+      case arg_count
+      when 0
+        obj.send :initialize
+
+      when 1, -1  # See Footnote a) at the bottom of this file
+        obj.send :initialize, component_map
 
-        # Instantiate an instance
-        actual_new component_map 
+      else
+        # We're not equipped to handle this
+        raise "User-defined initialize method defined with #{arg_count} parameters; must either be 0, other wise 1 or -1 (varargs) to receive the component map."
       end
+
+      obj
+      
     end
   end
 

data/lib/conject/version.rb

@@ -1,3 +1,3 @@
 module Conject
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/scratch/car.rb

@@ -0,0 +1,18 @@
+class Car
+  construct_with :engine, :chassis
+  def initialize
+    # puts "(car being constructed with #{engine} and #{chassis})#{caller.join("\n")}"
+    puts "(car being constructed with #{engine} and #{chassis})"
+  end
+  def to_s
+    "Car has #{engine} and #{chassis}"
+  end
+end
+
+class Engine
+  def to_s; "Engine!"; end
+end
+
+class Chassis
+  def to_s; "Chassis!"; end
+end

data/scratch/different_way.rb

@@ -0,0 +1,81 @@
+$: << File.expand_path(File.dirname(__FILE__) + "/../lib")
+require 'conject/extended_metaid.rb'
+
+# module CJ
+#   class DepDef
+#     attr_reader :object_name, :constructor_time
+# 
+#     def initialize(opts)
+#       @object_name = opts[:object_name]
+#       @constructor_time = opts[:constructor_time] || false
+#     end
+# 
+#     def constructor_time?
+#       @constructor_time
+#     end
+#   end
+# end
+
+class Class
+  def construct_with(*object_names)
+    klass = self
+    @_conject_construct_with = object_names
+
+    self.
+    object_names.each do |n|
+      self.class_def_private n do
+        components[n]
+      end
+    end
+
+
+    # @dep_defs = object_names.map do |x| CJ::DepDef.new(object_name: x, constructor_time: true) end
+
+  end
+
+  def constructor_dependencies
+    @_conject_construct_with
+  end
+
+  # def self.new
+  #   puts "?"
+  # end
+end
+
+class Class
+  def new(*a)
+    puts "?"
+    obj = allocate
+    obj.initialize
+    obj
+  end
+    # raise "No!"
+end
+
+class Car
+  construct_with :engine, :chassis
+  def initialize
+    puts "Car#initialize"
+  end
+
+  def hi
+    puts "hi"
+  end
+end
+
+class Engine
+end
+
+class Chassis
+end
+
+c = Car.new
+c.hi
+
+
+# class Dog
+#   def initialize
+#     puts "Dog initialize"
+#   end
+# end
+# 

data/scratch/reloading.rb

@@ -0,0 +1,20 @@
+here = File.expand_path(File.dirname(__FILE__))
+$: << here + "/../lib"
+
+require 'conject'
+
+load here + "/car.rb"
+
+# puts Car.respond_to?(:conject_new)
+# puts String.respond_to?(:conject_new)
+# 
+context = Conject.default_object_context
+context.configure_objects car: { cache: false }
+car = context[:car]
+puts car
+
+load here + "/car.rb"
+
+car = context[:car]
+puts car
+

data/spec/acceptance/regression/inherited_dependencies_spec.rb

@@ -72,7 +72,7 @@ describe "basic inheritance" do
           attr_accessor :got_map
           def initialize(map)
             @got_map = map
-            super
+            super() # YOU GOTTA USE PARENS LIKE THIS TO INDICATE THAT YOU DON'T INTEND TO PASS ARGS TO SUPER CONSTRUCTOR
           end
         end
 
@@ -95,7 +95,7 @@ describe "basic inheritance" do
           attr_accessor :legs
           def initialize
             @legs = 4
-            super :whoa_there # superclass has a Conjected #initialize which requires the component map arg, though it's not used.  Ugh.
+            super 
           end
         end
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conject
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
+date: 2013-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -106,14 +106,17 @@ files:
 - lib/conject/version.rb
 - rake_tasks/rspec.rake
 - scratch/arity_funny_business_in_different_ruby_versions.rb
+- scratch/car.rb
 - scratch/class_singletons.rb
 - scratch/depends_on_spike.rb
+- scratch/different_way.rb
 - scratch/donkey_fail.rb
 - scratch/donkey_journey.rb
 - scratch/go.rb
 - scratch/metaid.rb
 - scratch/namespace_support.rb
 - scratch/object_definition.rb
+- scratch/reloading.rb
 - scratch/sample.rb
 - scratch/special_construct.rb
 - spec/acceptance/dev/README
@@ -198,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -606989410081679107
+      hash: 4140830812471281535
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -207,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -606989410081679107
+      hash: 4140830812471281535
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24