cases 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1ff1b176f95aee6273a5c6430aeb8526556d86d
-  data.tar.gz: d000af86cf1971ae3eab07daa4eabc1d4efc9d47
+  metadata.gz: adf9c289386b87ace3d0f17b7eebc933cbccfbf1
+  data.tar.gz: cbcc803fb733d19c427d7d2d988ad03bb6dbf762
 SHA512:
-  metadata.gz: 012aa1a1164f252d9acb9005f3de8fb76cdf2f00cb019216ea3fa09f5ac561fcfaece33eb3efe3fbda85335a8eb8bbf23313ab138790a9292e236e5b4df49205
-  data.tar.gz: 3c3d4398e97b29311a030d305cb15a7c24924919e2e9670febdaf1d52743dbf346c06bf2b874c733ee9d59f142aed8cf944d95c556611b7019446fe02a7a7f1e
+  metadata.gz: 77a44291c3382c283e21771ef13b960c88e3af55b3a45d68081b947b65f8648a112973d4681e3066c9c3516f1df5e00e3f8d25d3c4f7961b19f394f2272b41ed
+  data.tar.gz: 3df9092cde054df3786bc60db2d2f3b473759da2b979829806245fe0c38b6582ff5f199d0a7e654c5b3ed5477beef35e4e92d1cb355532f753945d5cc9da4855

data/README.md

@@ -88,8 +88,8 @@ end
 > test_case.test_without_block
  => "success message from cased object"
 > test_case.test_caseable do |on|
-    on.success? { |response| "#{response.success_message} through caseable"
-    on.failed? { |response| "#{response.failed_message} through caseable"
+    on.success? { |response| "#{response.success_message} through caseable" }
+    on.failed? { |response| "#{response.failed_message} through caseable" }
   end
  => "success message from test response through caseable"
 >
@@ -101,8 +101,8 @@ end
 > test_case.test_without_block
  => "failed message from cased object"
 > test_case.test_caseable do |on|
-    on.success? { |response| "#{response.success_message} through caseable"
-    on.failed? { |response| "#{response.failed_message} through caseable"
+    on.success? { |response| "#{response.success_message} through caseable" }
+    on.failed? { |response| "#{response.failed_message} through caseable" }
   end
  => "failed message from test response through caseable"
 ```

data/lib/cases/case.rb

@@ -1,17 +1,17 @@
 module Cases
   class Case
     attr_accessor :result
-    attr_reader :method, :event, :options, :block
+    attr_reader :method, :event, :options, :action_block
 
     def self.all
       @_all ||= {}
     end
 
-    def initialize(method, event, options = {}, &block)
+    def initialize(method, event, options = {}, &action_block)
       @method = method
       @event = event
-      @block = block
       @options = options
+      @action_block = action_block
 
       register
     end
@@ -24,7 +24,7 @@ module Cases
     def execute(object, result)
       return if !result.send(event)
 
-      self.result = block.call(options[:on_self] ? object : result)
+      self.result = action_block.call(options[:on_self] ? object : result)
     end
 
     private

data/lib/cases/caseable.rb

@@ -1,27 +1,26 @@
-class Caseable
-  attr_reader :object
+module Cases
+  class Caseable
+    attr_reader :object, :runtime_block
 
-  def self.execute(result, &block)
-    new(result).execute(result, &block)
-  end
+    def initialize(object, &runtime_block)
+      @object = object
+      @runtime_block = runtime_block
+    end
 
-  def initialize(object)
-    @object = object
-  end
+    def execute
+      runtime_block.call(self)
+      case_blocks.reduce(object) { |result, case_block| case_block.call(result) }
+    end
 
-  def execute(original_result, &block)
-    block.call(self)
-    case_blocks.reduce(original_result) { |result, case_block| case_block.call(result) }
-  end
-
-  def method_missing(method, &block)
-    case_blocks << block if object.send(method)
-    case_blocks
-  end
+    def method_missing(method, &case_block)
+      case_blocks << case_block if object.send(method)
+      case_blocks
+    end
 
-  private
+    private
 
-  def case_blocks
-    @_case_blocks ||= []
+    def case_blocks
+      @_case_blocks ||= []
+    end
   end
 end

data/lib/cases/version.rb

@@ -1,3 +1,3 @@
 module Cases
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/cases.rb

@@ -10,38 +10,34 @@ module Cases
   end
 
   module ClassMethods
-    def define_case(method, cases)
-      if block_given?
-        define_case_with_block(method, cases, &Proc.new)
-      else
-        cases.each_pair do |event, action|
-          Case.new(method, event, { on_self: true }, &Proc.new { |object| object.send(action) })
-        end
-      end
+    def define_case(method, kase)
+      block_given? ? __cases_define_with_block(method, kase, &Proc.new) : __cases_define_without_block(method, kase)
 
-      define_execute_cases(method)
+      __cases_define_execute_cases(method)
     end
 
     def define_caseable(method)
-      proxy_result(method) { |result, &block| Caseable.execute(result, &block) }
-    end
-
-    def cases
-      Case.all
+      proxy_result(method) { |result, &runtime_block| Cases::Caseable.new(result, &runtime_block).execute }
     end
 
     private
 
-    def define_case_with_block(method, event, &block)
-      Case.new(method, event, &block)
+    def __cases_define_with_block(method, *events, &action_block)
+      events.each { |event| Cases::Case.new(method, event, &action_block) }
+    end
+
+    def __cases_define_without_block(method, kase)
+      kase.each_pair do |event, action|
+        Cases::Case.new(method, event, { on_self: true }, &Proc.new { |object| object.send(action) })
+      end
     end
 
-    def define_execute_cases(method)
-      define_method "execute_#{method}_cases" do |&block|
-        self.class.cases[method].find { |kase| kase.execute(self, block.call) }.result
+    def __cases_define_execute_cases(method)
+      define_method "__cases_execute_#{method}_cases" do |&block|
+        Cases::Case.all[method].find { |kase| kase.execute(self, block.call) }.result
       end
 
-      around_method(method, "execute_#{method}_cases")
+      around_method(method, "__cases_execute_#{method}_cases")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cases
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Morgan Showman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement