kase 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e196cce0e928c43b3b1fed7042abbe6f99e975c
-  data.tar.gz: 2b8cfd61df68dc2cb32bfad689e7f4151ed94bb0
+  metadata.gz: 8246d6d187ce89e4d5949b8822802a0ebed2373f
+  data.tar.gz: fb36c07046d8f881ad58145a18a9cf0766d6edfd
 SHA512:
-  metadata.gz: f9dffb5a26c729de9f6a6f8984a126708035034b544fe3d626073a1a01f86b83f244150e3ae2923ddef3b0bcbd839990b25402d56717d4a6f8fa59b24e00edd2
-  data.tar.gz: 8dcd7eb8dceebe67c2e0487b77d7095b0535eb431409d21141ac0aa07d2fa2a05a9af5c79927634ba4c31833ff4f25db4d5cbabc72eafcf8fd67f61757371ad5
+  metadata.gz: 4c30df36d99464959b9e431eb2cf531d013de3f8a48ca8ad0993ead3abaf6b0f353a1bd16f9f39a4e9b4f67a97ddb11ac00ca2376333f4f7fbf5435ff787372b
+  data.tar.gz: 813455dd6fdabff84994e2d5274ab8c56f85c4c1ca34721889036ae9130ae2f55a8f5f17e2791f293389ec7b844ee839d90be30771badd6b281526461b4efab2

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 * (Your contributions here)
 
+# Version 0.1.3 (2016-04-10)
+
+* Simpler and safer DSL that runs in the context of the calling code,
+[#6](https://github.com/lasseebert/kase/issues/6),
+[lasseebert](https://github.com/lasseebert) and [hosh](https://github.com/hosh)
+
 # Version 0.1.2 (2016-04-06)
 
 * Fixed instance variables lookup inside DSL, [#4](https://github.com/lasseebert/kase/issues/4), [lasseebert](https://github.com/lasseebert)

data/README.md

@@ -16,28 +16,24 @@ The idea is inspired by Elixir in which many functions returns something like
 In Ruby we would usually handle those kind of return values like this:
 
 ```ruby
-class Orders
-  def process(cart)
-    status, result, message = complete_order(cart)
-
-    case status
-    when :ok
-      order = result
-      process_order(order)
-    when :error
-      error_kind = result
-      case error_kind
-      when :not_found
-        [404, {}, "Not found"]
-      when :invalid_state
-        [400, {}, "Invalid request: #{message}"]
-      else
-        raise "Unhandled error kind: #{error_kind}"
-      end
-    else
-      raise "Unhandles status: #{status}"
-    end
+status, result, message = complete_order(cart)
+
+case status
+when :ok
+  order = result
+  process_order(order)
+when :error
+  error_kind = result
+  case error_kind
+  when :not_found
+    [404, {}, "Not found"]
+  when :invalid_state
+    [400, {}, "Invalid request: #{message}"]
+  else
+    raise "Unhandled error kind: #{error_kind}"
   end
+else
+  raise "Unhandles status: #{status}"
 end
 ```
 
@@ -50,25 +46,17 @@ handled that specific status or error_kind).
 With Kase we can do this instead, which is equivalent to the above:
 
 ```ruby
-require "kase"
-
-class Orders
-  include Kase
-
-  def process(cart)
-    kase complete_order(cart) do
-      on :ok do |order|
-        process_order(order)
-      end
+kase complete_order(cart) do
+  on :ok do |order|
+    process_order(order)
+  end
 
-      on :error, :not_found do
-        [404, {}, "Not found"]
-      end
+  on :error, :not_found do
+    [404, {}, "Not found"]
+  end
 
-      on :error, :invalid_state do |message|
-        [400, {}, "Invalid request: #{message}"]
-      end
-    end
+  on :error, :invalid_state do |message|
+    [400, {}, "Invalid request: #{message}"]
   end
 end
 ```
@@ -112,7 +100,9 @@ pattern. E.g. if `[:ok, "THE RESULT"]` is matched with `on(:ok, &block)`,
 #### Simple examples:
 
 ```ruby
-kase process_order do
+require "kase"
+
+Kase.kase process_order do
   on :ok do
     puts "Great success!"
   end
@@ -140,7 +130,9 @@ than one value is returned.
 All values that are not part of the pattern will be yielded to the given block:
 
 ```ruby
-kase process_order do
+require "kase"
+
+Kase.kase process_order do
   on :ok do |order|
     puts "Great success: #{order.inspect}"
   end
@@ -159,6 +151,8 @@ be able to catch and use the values.
 We can match on multiple values, but only from the left:
 
 ```ruby
+require "kase"
+
 kase process_order do
   on :ok do |order|
     puts "Great success: #{order.inspect}"
@@ -201,6 +195,20 @@ ok! something do |result|
 end
 ```
 
+Or this:
+
+```ruby
+result = kase something do
+  on(:ok) { |result| result }
+end
+```
+
+To this:
+
+```ruby
+result = ok! something
+```
+
 ### Include or module_function
 
 Kase is a module with helper methods. You can either include it in your own
@@ -228,6 +236,9 @@ class MySecondClass
 end
 ```
 
+Note that `#kase` is aliased to `#call` so you can use the shorthand
+`Kase.(values)`.
+
 All the logic resides in the Kase::Switcher class which you can use directly if
 you need to:
 
@@ -248,9 +259,6 @@ result = Kase.kase :ok, "RESULT" do
 end
 ```
 
-Note that `#kase` is aliased to `#call` so you can use the shorthand
-`Kase.(values)`.
-
 ## Development
 
 * Install development dependencies with `bundle`
@@ -271,8 +279,8 @@ A pull request should consist of
 
 * At least one failing test that proves the bug or documents the feature.
 * The implementation of the bugfix or feature
-* A line in the `CHANGELOG.md` with a description of the change, a link to the pull
-request and a link to your github user.
+* A line in the `CHANGELOG.md` with a description of the change, a link to your
+github user and, if this closes or references an issue, a link to the issue.
 
 ## Contact
 

data/lib/kase/switcher.rb

@@ -34,39 +34,45 @@ module Kase
     end
 
     def switch(&block)
-      context = eval("self", block.binding)
-      dsl = DSL.new(self, context)
-      dsl.__call(&block)
+      DSL.call(self, &block)
       validate!
       result
     end
 
-    class DSL
-      def initialize(switcher, context)
-        @__switcher = switcher
-        @__context = context
-      end
+    module DSL
+      module_function
 
-      def __call(&block)
-        @__context.instance_variables.each do |name|
-          next if name.to_s =~ /^@__/
-          instance_variable_set(name, @__context.instance_variable_get(name))
-        end
+      def call(switcher, &block)
+        context = eval("self", block.binding)
+        original_on_method = context.method(:on) if defined? context.on
+        new_on_method = nil
+
+        # Define a new :on method for the caller context
+        context.define_singleton_method(:on) do |*pattern, &inner_block|
 
-        instance_eval(&block)
+          new_inner_block = proc do |*args|
+            # Use the original :on method inside the inner blocks
+            DSL.set_on_method(context, original_on_method)
+            result = inner_block.call(*args)
+            DSL.set_on_method(context, new_on_method)
+            result
+          end
 
-        instance_variables.each do |name|
-          next if name.to_s =~ /^@__/
-          @__context.instance_variable_set(name, instance_variable_get(name))
+          switcher.on(*pattern, &new_inner_block)
         end
-      end
+        new_on_method = context.method(:on)
 
-      def on(*args, &block)
-        @__switcher.on(*args, &block)
+        block.call
+      ensure
+        DSL.set_on_method(context, original_on_method)
       end
 
-      def method_missing(method, *args, &block)
-        @__context.send(method, *args, &block)
+      def set_on_method(context, method)
+        if method
+          context.define_singleton_method(:on, method)
+        else
+          context.instance_eval { undef :on if defined? on }
+        end
       end
     end
   end

data/lib/kase/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kase
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Lasse Skindstad Ebert
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler