condi 0.0.6 → 0.0.7

data/README.md

@@ -112,7 +112,7 @@ returns the css class we need for a given item?
 
 `app/views/store/_item.html.erb:`
     
-    <tr class="<%= css_for_item_status %>">
+    <tr class="<%= css_for_item_status(item) %>">
       <td><%= item.to_s %></td>
     </tr>
 

data/lib/condi.rb

@@ -30,10 +30,24 @@ 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).
   # @see the full example in the <a href="index.html">README</a>. 
   def predicate(method_name, &block)
     self.class.instance_eval do
-      define_method(method_name, &block)
+      # this is the request id at the moment the predicate is defined
+      request_id = eval("request.object_id",block.binding)
+
+      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)
+        end
+        block.call(*args)
+      end
       helper_method(method_name)
     end
   end

data/test/test_condi.rb

@@ -9,7 +9,7 @@ require 'condi'
 
 require 'ostruct'
 
-#require 'ruby-debug'
+#require 'debugger'
 
 
 class CondiTest < Test::Unit::TestCase
@@ -142,4 +142,22 @@ class CondiTest < Test::Unit::TestCase
   end
   
 
+  # fix 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 
+      predicate(:always_be_true?) { true }
+    end
+
+    assert @controller_instance.respond_to?(:always_be_true?)
+    assert @controller_instance.always_be_true? == true
+
+    @controller_instance.request = Object.new   # simulate a second request
+
+    # now, if a view calls the predicate, we shouldn't allow it!
+    assert_raise RuntimeError do
+      @controller_instance.always_be_true? 
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: condi
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-14 00:00:00.000000000 Z
+date: 2012-06-14 00:00:00.000000000 Z
 dependencies: []
 description: Conditional UI predicates for Rails - a clean and simple approach to
   separate business logic from your views and models.
@@ -34,6 +34,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2574211362377765017
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -43,7 +46,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - rails
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Condi