dizzy 1.0.0.alpha.1 → 1.0.0.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c43df022ef1a289584a66cf8143b6ed7c850c4f
-  data.tar.gz: c9659f5c7095fe456c4770412bb521df44fa7ed9
+  metadata.gz: d8498ff85f380ec402c59a51a764ab1824499e31
+  data.tar.gz: 59eefacc9cff7add29254feab943b8c31f420740
 SHA512:
-  metadata.gz: 3bb5848677977e34edc588055da8c6d65d4a44330c2cc19f9b9f607a76e23b7af1b821f4defda0546fc08df2b6542ca9c9e8e808047f17ecb3a297d5c5422857
-  data.tar.gz: 0f6526c2ba17d5a839a11eb78027bc38a1454e596e92b6db223deea744396089cc30d13088884269b77e402d231c169090c9d4e9a631f2c8ccc5da7125cfa2ae
+  metadata.gz: 3667a62381e8a0a5f0a809c852c1ad8efa69f1eb18da4eae680c0dc21894c7bcd4d82a00a2464c3b6a5a020a9a6209b48286aecdd9db5fdac36084cb48cc2cc5
+  data.tar.gz: 5a50bafd5e268cbfd3b2e0763f3a760e63fb62bbfb0e66d0461a7d327199af5fb5caf6643817edd0f1d50f512027f781f7036e306b401d3b997efc9ae02b148a

data/lib/dizzy/dsl.rb

@@ -1,56 +1,69 @@
 
 require 'dizzy/core'
-require 'dizzy/rule'
 
 module Dizzy::DSL
 
   class RuleContext
 
-    attr_reader :rule
-
-    def initialize(rule)
-      @rule = rule
-    end
+    attr_accessor :init_proc, :wire_proc
 
     def init(&block)
-      rule.init_proc = block
+      @init_proc = block
     end
 
     def wire(&block)
-      rule.wire_proc = block
+      @wire_proc = block
     end
   end
 
 
-  def di(name, clazz = nil, *args, &block)
-    ___method_name   = name.to_sym
-    ___variable_name = "@#{name}".to_sym
-
-
-    rule = Dizzy::Rule.new
 
-    if clazz
-      rule.init_proc = lambda{ clazz.new(*args) }
-      rule.wire_proc = block || lambda{|x| }
-    else
-      rc   = ::Dizzy::DSL::RuleContext.new(rule)
-      rc.instance_exec(&block)
+  def di_define_method(__di__method_name, __di__init_proc, __di__wire_proc)
+    unless __di__init_proc
+      raise ArgumentError.new("No init proc was specified for: #{__di__method_name}")
     end
 
+    # If wire_proc wasn't specified, then just no-op
+    __di__wire_proc ||= lambda{|x| }    
 
-    define_method ___method_name do
-      unless instance_variable_defined? ___variable_name
-        value = self.instance_exec(&rule.init_proc)
-        instance_variable_set(___variable_name, value)
+    __di__variable_name = "@#{__di__method_name}".to_sym
 
-        self.instance_exec(value, &rule.wire_proc)
+    define_method __di__method_name do
+      unless instance_variable_defined? __di__variable_name
+        value = self.instance_exec(&__di__init_proc)
+        instance_variable_set(__di__variable_name, value)
+
+        self.instance_exec(value, &__di__wire_proc)
       end
-      instance_variable_get(___variable_name)
+      instance_variable_get(__di__variable_name)
     end
+  end
+
 
+  # Use this when you need to both init and wire
+  # your object.
+  def di(name, &block)
+    rc   = ::Dizzy::DSL::RuleContext.new
+    rc.instance_exec(&block)
+
+    di_define_method(name, rc.init_proc, rc.wire_proc)
+  end
+
+
+  # Use this when you only need to init an object
+  def di_init(name, &block)
+    di_define_method(name, block, nil)
   end
 
 
+  # Use this when the init logic is uninteresting.
+  # For example: you're just creating an instance
+  # of a class w/ a hard-coded set of arguments.
+  def di_wire(name, clazz, *args, &block)
+    init_proc = lambda{ clazz.new(*args) }
+    di_define_method(name, init_proc, block)
+  end
+
 
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dizzy
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.1
+  version: 1.0.0.alpha.2
 platform: ruby
 authors:
 - Brian Lauber
@@ -19,7 +19,6 @@ files:
 - lib/dizzy.rb
 - lib/dizzy/core.rb
 - lib/dizzy/dsl.rb
-- lib/dizzy/rule.rb
 homepage: 
 licenses:
 - MIT

data/lib/dizzy/rule.rb

@@ -1,13 +0,0 @@
-
-require 'dizzy/core'
-
-class Dizzy::Rule
-
-  attr_accessor :init_proc, :wire_proc
-
-  def initialize(options = {})
-    @init_proc = lambda{}
-    @wire_proc = lambda{|x| }
-  end
-
-end