condi 0.0.7 → 0.0.8

data/lib/condi.rb

@@ -30,24 +30,32 @@ module Condi
   # @param [Proc] block {} or do...end block.
   # @note A *synonym* is an alias for defining methods that return values other than true or false.
   # @note You are not required to end a predicate with a question mark, however it is conventional in Ruby to do so.
-  # @note Predicates can only be called during the request context they are defined in, otherwise a RuntimeError is raised. This restriction prevents the associated closures from inadvertently leaking previous request data when the controller classes are cached (i.e. in production).
+  # @note Predicates can only be called during the request scope they are defined in, otherwise a RuntimeError is raised. This restriction prevents the associated closures from inadvertently leaking previous request data when the controller classes are cached (i.e. in production).
+  # @note Predicates are semantically lambdas and may contain returns.
   # @see the full example in the <a href="index.html">README</a>. 
   def predicate(method_name, &block)
     self.class.instance_eval do
       # this is the request id at the moment the predicate is defined
       request_id = eval("request.object_id",block.binding)
 
+      # We need to keep the block impl as a method/lambda so that it supports returns 
+      # by using this particular invocation of define_method...
+      method_name_impl = "impl_#{method_name}".to_sym
+      define_method(method_name_impl, &block)
+
+      # Next, this invocation of define_method creates a Proc, which
+      # wraps the impl and allows us to check the request id.
       define_method(method_name) do |*args|
         # this is the request id at the moment the predicate is called
         check_request_id = request.object_id
-
         # if they don't match, raise an error!
         unless check_request_id == request_id
-          #debugger
-          raise RuntimeError, "predicate '#{method_name}' cannot be called outside of the request it was defined in (#{request_id}). please redefine the predicate in this request (#{check_request_id}).", caller(2)
+          raise RuntimeError, "predicate '#{method_name}' cannot be called outside of the request scope it was defined in (#{request_id}). please redefine the predicate in this request scope (#{check_request_id}).", caller(2)
         end
-        block.call(*args)
+        send(method_name_impl, *args)
       end
+
+      # finally, expose the wrapped predicate to the view.
       helper_method(method_name)
     end
   end

data/test/test_condi.rb

@@ -142,7 +142,7 @@ class CondiTest < Test::Unit::TestCase
   end
   
 
-  # fix for https://github.com/coldnebo/condi/issues/1
+  # test for https://github.com/coldnebo/condi/issues/1
   def test_lifespan
     @controller_instance.request = Object.new   # simulate the first request
     @controller_instance.instance_eval do 
@@ -160,4 +160,30 @@ class CondiTest < Test::Unit::TestCase
     end
   end
 
-end
+
+  # test for https://github.com/coldnebo/condi/issues/2
+  def test_returns
+    @controller_instance.instance_eval do 
+      def my_action
+        first_path = true
+        predicate(:can_return?) do 
+          if first_path
+            return true
+          else
+            return false
+          end
+        end
+      end
+    end
+    @controller_instance.my_action
+
+    # don't raise a LocalJumpError: unexpected return!
+    assert_nothing_raised do
+      @controller_instance.can_return?
+    end
+
+    # also ensure the correct value was returned.
+    assert @controller_instance.can_return? == true
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: condi
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2574211362377765017
+      hash: 737326911507565152
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: