hero 0.1.1 → 0.1.2

data/lib/hero/observer.rb

@@ -39,12 +39,29 @@ module Hero
     #     end
     #   end
     #
-    #   add_step(:my_step, MyStep)
+    #   add_step(MyStep)
     #
-    # @param [Symbol, String] name The name of the step.
+    # @param optional [Symbol, String] name The name of the step.
     # @param optional [Object] step The step to be executed.
     # @block optional [Object] A block to use as the step to be executed.
-    def add_step(name, step=nil, &block)
+    def add_step(*args, &block)
+      if block_given?
+        raise ArgumentError unless args.length == 1
+        name = args.first
+        step = block
+      else
+        raise ArgumentError if args.length > 2
+        if args.length == 1
+          step = args.first
+        elsif args.length == 2
+          name = args.first
+          step = args.last
+        end
+      end
+
+      name ||= step.name if step.is_a? Class
+      name ||= step.class.name
+
       steps.delete_if { |s| s.first == name }
       step ||= block if block_given?
       steps << [name, step]
@@ -72,6 +89,7 @@ module Hero
 
     private
 
+
     # Logs a step to the registered Hero.logger.
     # @note Users info for the log level.
     # @param [Symbol, String] id The identifier for the step. [:before, :after]

data/spec/formula_spec.rb

@@ -8,6 +8,56 @@ describe Hero::Formula do
     Hero::Formula.reset
   end
 
+  it "should not allow anonymous steps" do
+    assert_raise ArgumentError do
+      Hero::Formula[:test_formula].add_step() {}
+    end
+  end
+
+  it "should allow unnamed Class steps" do
+    class MyStep
+      def self.call(*args); end
+    end
+    Hero::Formula[:test_formula].add_step MyStep
+    assert Hero::Formula[:test_formula].steps.map{|s| s.first}.include?("MyStep")
+    assert Hero::Formula[:test_formula].steps.map{|s| s.last}.include?(MyStep)
+  end
+
+  it "should allow named Class steps" do
+    class MyStep
+      def self.call(*args); end
+    end
+    Hero::Formula[:test_formula].add_step :foo, MyStep
+    assert Hero::Formula[:test_formula].steps.map{|s| s.first}.include?(:foo)
+    assert Hero::Formula[:test_formula].steps.map{|s| s.last}.include?(MyStep)
+  end
+
+  it "should allow unnamed instance steps" do
+    class MyStep
+      def call(*args); end
+    end
+    step = MyStep.new
+    Hero::Formula[:test_formula].add_step step
+    names = Hero::Formula[:test_formula].steps.map{|s| s.first}
+    steps = Hero::Formula[:test_formula].steps.map{|s| s.last}
+    steps.each { |s| assert s.is_a? MyStep }
+    assert names.include?("MyStep")
+    assert steps.include?(step)
+  end
+
+  it "should allow named instance steps" do
+    class MyStep
+      def call(*args); end
+    end
+    step = MyStep.new
+    Hero::Formula[:test_formula].add_step :foo, step
+    names = Hero::Formula[:test_formula].steps.map{|s| s.first}
+    steps = Hero::Formula[:test_formula].steps.map{|s| s.last}
+    steps.each { |s| assert s.is_a? MyStep }
+    assert names.include?(:foo)
+    assert steps.include?(step)
+  end
+
   it "should create a named class" do
     Hero::Formula[:my_formula]
     assert Object.const_defined?("HeroFormulaMyFormula")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hero
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-03 00:00:00.000000000 Z
+date: 2012-09-11 00:00:00.000000000 Z
 dependencies: []
 description: ! '    Simplify your app by effectively modeling business processes within
   it.