idregistry 0.1.1 → 0.1.2

data/History.rdoc

@@ -1,3 +1,7 @@
+=== 0.1.2 / 2012-08-03
+
+* Added :before_request option to ClearRegistry middleware task.
+
 === 0.1.1 / 2012-08-01
 
 * Forgot to declare blockenspiel as a gem dependency. Fixed.

data/Version

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/idregistry/configuration.rb

@@ -260,10 +260,6 @@ module IDRegistry
     #   Add a simple pattern, using the given proc to generate objects
     #   matching that pattern.
     #
-    # [<tt>add_pattern( <i>pattern</i>, <i>to_generate_object</i>, <i>to_generate_tuple</i> )</tt>]
-    #   Add a simple pattern, using the given proc to generate objects
-    #   matching that pattern, and to generate a tuple from an object.
-    #
     # [<tt>add_pattern( <i>pattern</i>, <i>type</i>, <i>to_generate_object</i>, <i>to_generate_tuple</i> )</tt>]
     #   Add a pattern for the given type. You should provide both a proc
     #   to generate objects, and a proc to generate a tuple from an object.

data/lib/idregistry/middleware.rb

@@ -61,19 +61,25 @@ module IDRegistry
 
       # Create a new ClearRegistry task. You must provide the registry
       # and an optional condition block.
-      def initialize(registry_, &condition_)
+      # If you set the <tt>:before_request</tt> option to true, the
+      # registry clearing will take place at the beginning of the request
+      # rather than the end.
+      def initialize(registry_, opts_={}, &condition_)
         @condition = condition_
         @registry = registry_
+        @before = opts_[:before_request]
       end
 
-      # The pre method for this task does nothing.
+      # The pre method applies if <tt>:before_request</tt> is set.
       def pre(env_)
+        if @before && (!@condition || @condition.call(env_))
+          @registry.clear
+        end
       end
 
-      # The post method for this task clears the registry if the
-      # condition block passes
+      # The pre method applies if <tt>:before_request</tt> is not set.
       def post(env_)
-        if !@condition || @condition.call(env_)
+        if !@before && (!@condition || @condition.call(env_))
           @registry.clear
         end
       end

data/lib/idregistry/railtie.rb

@@ -64,7 +64,7 @@ module IDRegistry
 
       def initialize  # :nodoc:
         @tasks = []
-        @after_middleware = nil
+        @before_middleware = nil
       end
 
 
@@ -82,9 +82,13 @@ module IDRegistry
       # Rack environment. The registry is cleared only if the block
       # returns a true value. If no block is provided, the registry is
       # always cleared at the end of a request.
+      #
+      # If you set the <tt>:before_request</tt> option to true, the
+      # registry clearing will take place at the beginning of the request
+      # rather than the end.
 
-      def clear_registry(reg_, &condition_)
-        @tasks << RegistryMiddleware::ClearRegistry.new(reg_, &condition_)
+      def clear_registry(reg_, opts_={}, &condition_)
+        @tasks << RegistryMiddleware::ClearRegistry.new(reg_, opts_, &condition_)
         self
       end
 

data/test/tc_middleware.rb

@@ -77,6 +77,7 @@ module IDRegistry
         @registry.lookup(:hello, 1)
         assert_equal(1, @registry.size)
         task_.pre({})
+        assert_equal(1, @registry.size)
         task_.post({})
         assert_equal(0, @registry.size)
       end
@@ -97,6 +98,17 @@ module IDRegistry
       end
 
 
+      def test_clear_registry_task_before_request
+        task_ = RegistryMiddleware::ClearRegistry.new(@registry, :before_request => true)
+        @registry.lookup(:hello, 1)
+        assert_equal(1, @registry.size)
+        task_.pre({})
+        assert_equal(0, @registry.size)
+        task_.post({})
+        assert_equal(0, @registry.size)
+      end
+
+
       def test_spawn_registry_task
         task_ = RegistryMiddleware::SpawnRegistry.new(@registry.config.lock, :reg)
         obj1_ = @registry.lookup(:hello, 1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: idregistry
 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-08-02 00:00:00.000000000 Z
+date: 2012-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blockenspiel