request_store 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f85cc719e97b2fd7d14f66225abf332e8f6a1248
-  data.tar.gz: 8b850f88cdaff14f6150e8799a931d85935402e6
+  metadata.gz: 348deb2b9d7db6347123b67d18b5d4eb2c8001ed
+  data.tar.gz: 8296b65a72b085eec44e257b018340e392d787ee
 SHA512:
-  metadata.gz: 6628a9dbf581592b306082f4782d44c0577b34eea89dbe3d231ece2b069a7b8b5b51dc9a6993df058dd989aeeda2a26e7dc35f5d7ca0f8353cbc1a918502322f
-  data.tar.gz: d18615c3d9a6cd02bea10a119b549690d15cf87fbb0e9b3d62947ce7d004e55952124f5f7172a404b976bdaa7e2659ba135fca6ecc92563084d3edc3451d39df
+  metadata.gz: b7fe4a75ba1e5a5bd6c578c822b12d1982118178f95a391ac6a716e7364241e1b41e98eb4193032765c6a31103366fd497ccad181ee3d10aa44fbc4284175905
+  data.tar.gz: 645b2404581a8f991e38f4a83cf0fee31f4444ba7fddb2beaea8f0bd5e1f15ab16af281ee85acb105035e21308a011ecc1977ca35851b66d2f45411471ad8c54

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+sudo: false
 rvm:
   - 1.8.7
   - 1.9.2

data/README.md

@@ -81,6 +81,23 @@ You'll probably have to shove this somewhere:
 use RequestStore::Middleware
 ```
 
+#### No Rails + Rack::Test
+
+In order to have `RequestStore` storage cleared between requests, add it to the
+`app`:
+
+```ruby
+# spec_helper.rb
+
+def app
+  Rack::Builder.new do
+    use RequestStore::Middleware
+    run MyApp
+  end
+end
+```
+
+
 ## Contributing
 
 1. Fork it

data/lib/request_store/railtie.rb

@@ -6,6 +6,12 @@ module RequestStore
       else
         app.config.middleware.insert_after Rack::MethodOverride, RequestStore::Middleware
       end
+
+      if ActionDispatch.const_defined?(:Reloader) && ActionDispatch::Reloader.respond_to?(:to_cleanup)
+        ActionDispatch::Reloader.to_cleanup do
+          RequestStore.clear!
+        end
+      end
     end
   end
 end

data/lib/request_store/version.rb

@@ -1,3 +1,3 @@
 module RequestStore
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/request_store.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_development_dependency "rake"
-  gem.add_development_dependency 'minitest', '~> 3.0'
+  gem.add_development_dependency "minitest", "~> 5.0"
 end

data/test/middleware_test.rb

@@ -1,8 +1,9 @@
+require 'minitest/test'
 require 'minitest/autorun'
 
 require 'request_store'
 
-class MiddlewareTest < Minitest::Unit::TestCase
+class MiddlewareTest < Minitest::Test
   def setup
     @app = RackApp.new
     @middleware = RequestStore::Middleware.new(@app)
@@ -16,14 +17,11 @@ class MiddlewareTest < Minitest::Unit::TestCase
   end
 
   def test_middleware_resets_store_on_error
-    errors = []
-    begin
+    e = assert_raises RuntimeError do
       @middleware.call({:error => true})
-    rescue => e
-      errors << e
     end
 
-    assert_equal ['FAIL'], errors.map(&:message)
+    assert_equal 'FAIL', e.message
     assert_equal({}, RequestStore.store)
   end
 end

data/test/request_store_test.rb

@@ -2,40 +2,39 @@ require 'minitest/autorun'
 
 require 'request_store'
 
-class RequestStoreTest < Minitest::Unit::TestCase
+class RequestStoreTest < Minitest::Test
+  def setup
+    RequestStore.clear!
+  end
+
   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_read
-    RequestStore.clear!
     RequestStore.store[:foo] = 1
     assert_equal 1, RequestStore.read(:foo)
     assert_equal 1, RequestStore[:foo]
   end
 
   def test_write
-    RequestStore.clear!
     RequestStore.write(:foo, 1)
     assert_equal 1, RequestStore.store[:foo]
     RequestStore[:foo] = 2
@@ -43,20 +42,17 @@ class RequestStoreTest < Minitest::Unit::TestCase
   end
 
   def test_fetch
-    RequestStore.clear!
     assert_equal 2, RequestStore.fetch(:foo) { 1 + 1 }
     assert_equal 2, RequestStore.fetch(:foo) { 2 + 2 }
   end
 
   def test_delete
-    RequestStore.clear!
     assert_equal 2, RequestStore.fetch(:foo) { 1 + 1 }
     assert_equal 2, RequestStore.delete(:foo) { 2 + 2 }
     assert_equal 4, RequestStore.delete(:foo) { 2 + 2 }
   end
 
   def test_delegates_to_thread
-    RequestStore.clear!
     RequestStore.store[:foo] = 1
     assert_equal 1, Thread.current[:request_store][:foo]
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: request_store
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Steve Klabnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
+date: 2015-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
 description: RequestStore gives you per-request global storage.
 email:
 - steve@steveklabnik.com