request_store 1.0.2 → 1.0.3

data/README.md

@@ -1,7 +1,7 @@
-# RequestStore [![build status](https://secure.travis-ci.org/steveklabnik/request_store.png?branch=master)](https://secure.travis-ci.org/steveklabnik/request_store) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/steveklabnik/request_store)
+# RequestStore [![build status](https://travis-ci.org/steveklabnik/request_store.png?branch=master)](https://travis-ci.org/steveklabnik/request_store) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/steveklabnik/request_store)
 
 Ever needed to use a global variable in Rails? Ugh, that's the worst. If you
-need gobal state, you've probably reached for `Thread.current`. Like this:
+need global state, you've probably reached for `Thread.current`. Like this:
 
 ```
 def self.foo
@@ -66,6 +66,14 @@ You'll probably have to shove this somewhere:
 use RequestStore::Middleware
 ```
 
+### No Rack? No Problem!
+
+If you don't use the Middleware, for example in a raketask or test, you need to do this before first usage:
+
+```
+RequestStore.clear!
+```
+
 ## Contributing
 
 1. Fork it

data/lib/request_store.rb

@@ -1,20 +1,13 @@
 require "request_store/version"
-
+require "request_store/middleware"
 require "request_store/railtie" if defined?(Rails)
 
 module RequestStore
   def self.store
-    Thread.current[:request_store]
+    Thread.current[:request_store] ||= {}
   end
 
-  class Middleware
-    def initialize(app)
-      @app = app
-    end
-    
-    def call(env)
-      Thread.current[:request_store] = {}
-      @app.call(env)
-    end
+  def self.clear!
+    Thread.current[:request_store] = {}
   end
 end

data/lib/request_store/middleware.rb

@@ -0,0 +1,12 @@
+module RequestStore
+  class Middleware
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      RequestStore.clear!
+      @app.call(env)
+    end
+  end
+end

data/lib/request_store/version.rb

@@ -1,3 +1,3 @@
 module RequestStore
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/test/middleware_test.rb

@@ -0,0 +1,15 @@
+require 'minitest/autorun'
+
+require 'request_store'
+
+class MiddlewareTest < Minitest::Unit::TestCase
+  def test_middleware_resets_store
+    app = RackApp.new
+    middleware = RequestStore::Middleware.new(app)
+
+    middleware.call({})
+    middleware.call({})
+
+    assert_equal 1, RequestStore.store[:foo]
+  end
+end

data/test/request_store_test.rb

@@ -3,26 +3,33 @@ require 'minitest/autorun'
 require 'request_store'
 
 class RequestStoreTest < Minitest::Unit::TestCase
+  def test_initial_state
+    Thread.current[:request_store] = nil
+    assert_equal RequestStore.store, Hash.new
+  end
+
+  def test_init_with_hash
+    RequestStore.clear!
+    assert_equal Hash.new, RequestStore.store
+  end
+
+  def test_clear
+    RequestStore.clear!
+    RequestStore.store[:foo] = 1
+    RequestStore.clear!
+    assert_equal Hash.new, RequestStore.store
+  end
+
   def test_quacks_like_hash
+    RequestStore.clear!
     RequestStore.store[:foo] = 1
     assert_equal 1, RequestStore.store[:foo]
     assert_equal 1, RequestStore.store.fetch(:foo)
   end
 
   def test_delegates_to_thread
+    RequestStore.clear!
     RequestStore.store[:foo] = 1
     assert_equal 1, Thread.current[:request_store][:foo]
   end
 end
-
-class MiddlewareTest < Minitest::Unit::TestCase
-  def test_middleware_resets_store
-    app = RackApp.new
-    middleware = RequestStore::Middleware.new(app)
-
-    middleware.call({})
-    middleware.call({})
-
-    assert_equal 1, Thread.current[:request_store][:foo]
-  end
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: request_store
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2012-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -57,9 +57,11 @@ files:
 - README.md
 - Rakefile
 - lib/request_store.rb
+- lib/request_store/middleware.rb
 - lib/request_store/railtie.rb
 - lib/request_store/version.rb
 - request_store.gemspec
+- test/middleware_test.rb
 - test/request_store_test.rb
 - test/test_helper.rb
 homepage: http://github.com/steveklabnik/request_store
@@ -87,6 +89,7 @@ signing_key:
 specification_version: 3
 summary: RequestStore gives you per-request global storage.
 test_files:
+- test/middleware_test.rb
 - test/request_store_test.rb
 - test/test_helper.rb
 has_rdoc: