request_store 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f330736e888660271d908162a43f5a277ac12f9
-  data.tar.gz: ceb6fb78c39700c7647fe94a52275941f9aeb16b
+  metadata.gz: 743e2b453797cff390b0811b3f0f4fb13eebf15a
+  data.tar.gz: 00809cfc84d6a74f4358c63445403f42d938b2d5
 SHA512:
-  metadata.gz: 5389ea2f73f3324cfaf1cd05866fd2d025a153c98d17b6aa0011ec86631b5b21582bc52cacf6089f64d0445c2af6524ab80bbb4dbad2727930cbd341cde25128
-  data.tar.gz: ff40c52f1ca83f3503ee0703c5298508f3b4c6cc5f4a349c37aff8b71b8c336c34109f93afb8b69be4d9b0a2b7ffdc975ca59d7a710ad3db7208c7e98e5d0142
+  metadata.gz: 2682121838ae3862866cf8a65e76d12d34010cc89a2d7a5f89fe42531670ec2a40bba9647503d14f6906619c84a74f1c6483bdd7f09096521b93aceff2f537c0
+  data.tar.gz: 50eef4bb4582b09c1a9c20aa74614213cb8d3e24602804f84efb52b3adc01e0c8c5c9924e2d93c20eff4a533dac8d8d017ece682e3134e68270fc9491215ba47

data/lib/request_store.rb

@@ -11,6 +11,18 @@ module RequestStore
     Thread.current[:request_store] = {}
   end
 
+  def self.begin!
+    Thread.current[:request_store_active] = true
+  end
+
+  def self.end!
+    Thread.current[:request_store_active] = false
+  end
+
+  def self.active?
+    Thread.current[:request_store_active] || false
+  end
+
   def self.read(key)
     store[key]
   end

data/lib/request_store/middleware.rb

@@ -5,8 +5,10 @@ module RequestStore
     end
 
     def call(env)
+      RequestStore.begin!
       @app.call(env)
     ensure
+      RequestStore.end!
       RequestStore.clear!
     end
   end

data/lib/request_store/version.rb

@@ -1,3 +1,3 @@
 module RequestStore
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/test/middleware_test.rb

@@ -24,4 +24,22 @@ class MiddlewareTest < Minitest::Test
     assert_equal 'FAIL', e.message
     assert_equal({}, RequestStore.store)
   end
+
+  def test_middleware_begins_store
+    @middleware.call({})
+    assert_equal true, @app.store_active
+  end
+
+  def test_middleware_ends_store
+    @middleware.call({})
+    assert_equal false, RequestStore.active?
+  end
+
+  def test_middleware_ends_store_on_error
+    assert_raises RuntimeError do
+      @middleware.call({:error => true})
+    end
+
+    assert_equal false, RequestStore.active?
+  end
 end

data/test/request_store_test.rb

@@ -56,4 +56,14 @@ class RequestStoreTest < Minitest::Test
     RequestStore.store[:foo] = 1
     assert_equal 1, Thread.current[:request_store][:foo]
   end
+
+  def test_active_state
+    assert_equal false, RequestStore.active?
+
+    RequestStore.begin!
+    assert_equal true, RequestStore.active?
+
+    RequestStore.end!
+    assert_equal false, RequestStore.active?
+  end
 end

data/test/test_helper.rb

@@ -1,10 +1,11 @@
 class RackApp
-  attr_reader :last_value
+  attr_reader :last_value, :store_active
 
   def call(env)
     RequestStore.store[:foo] ||= 0
     RequestStore.store[:foo] += 1
     @last_value = RequestStore.store[:foo]
+    @store_active = RequestStore.active?
     raise 'FAIL' if env[:error]
   end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: request_store
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Steve Klabnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
 description: RequestStore gives you per-request global storage.
@@ -45,8 +45,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -69,17 +69,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: RequestStore gives you per-request global storage.