request_store 1.0.5 → 1.0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: df9be17564fafde0934eac75799b5180b42d34cf
+  data.tar.gz: d0e4d1969cdc9a15f82b04e34922e6b8b08fb83f
+SHA512:
+  metadata.gz: ff57c6bc11afb5bf2526e0a03046b56aa544eeaa9b54a97e0c79c7a85c0c1fffeca9872ec5ff7965d33651dacc728c32aa12a7b657a7baf3a4dbcdc595f1d898
+  data.tar.gz: 755394f8fae9ae418599a2b453037b1e8da11a7a9c245de6387cb533ad0cb89eca3b5cd72afc59286f6b26121620d1e537ebecd82d7ef9571f6a4ab07c9fb3ed

data/.travis.yml

@@ -1,9 +1,17 @@
 language: ruby
 rvm:
-  - 1.9.3
+  - 1.8.7
   - 1.9.2
-  - rbx-19mode
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - jruby-18mode
   - jruby-19mode
+  - rbx-2
   - ruby-head
-  - 1.8.7
+  - jruby-head
   - ree
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head

data/README.md

@@ -1,9 +1,9 @@
-# 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)
+# 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/github/steveklabnik/request_store.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 global state, you've probably reached for `Thread.current`. Like this:
 
-```
+```ruby
 def self.foo
   Thread.current[:foo] ||= 0
 end
@@ -23,7 +23,7 @@ and you use one of those servers, watch out! Values can stick around longer
 than you'd expect, and this can cause bugs. For example, if we had this in
 our controller:
 
-```
+```ruby
 def index
   Thread.current[:counter] ||= 0
   Thread.current[:counter] += 1
@@ -39,11 +39,13 @@ you run it with Thin, you get `1`, then `2`, then `3`...
 
 Add this line to your application's Gemfile:
 
-    gem 'request_store'
+```ruby
+gem 'request_store'
+```
 
 And change the code to this:
 
-```
+```ruby
 def index
   RequestStore.store[:foo] ||= 0
   RequestStore.store[:foo] += 1
@@ -63,7 +65,7 @@ apps, but if your app is tied to an older (2.x) version, you will have to
 manually add the middleware yourself.  Typically this should just be a matter
 of adding:
 
-```
+```ruby
 config.middleware.use RequestStore::Middleware
 ```
 
@@ -75,7 +77,7 @@ A Railtie is added that configures the Middleware for you, but if you're not
 using Rails, no biggie! Just use the Middleware yourself, however you need.
 You'll probably have to shove this somewhere:
 
-```
+```ruby
 use RequestStore::Middleware
 ```
 

data/lib/request_store.rb

@@ -3,11 +3,36 @@ require "request_store/middleware"
 require "request_store/railtie" if defined?(Rails::Railtie)
 
 module RequestStore
-  def self.store
-    Thread.current[:request_store] ||= {}
-  end
+	def self.store
+		Thread.current[:request_store] ||= {}
+	end
 
-  def self.clear!
-    Thread.current[:request_store] = {}
-  end
+	def self.clear!
+		Thread.current[:request_store] = {}
+	end
+
+	def self.read(key)
+		store[key]
+	end
+
+	def self.[](key)
+		store[key]
+	end
+
+	def self.write(key, value)
+		store[key] = value
+	end
+
+	def self.[]=(key, value)
+		store[key] = value
+	end
+
+	def self.exist?(key)
+		store.key?(key)
+	end
+
+	def self.fetch(key, &block)
+		store[key] = yield unless exist?(key)
+		store[key]
+	end
 end

data/lib/request_store/middleware.rb

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

data/lib/request_store/railtie.rb

@@ -1,7 +1,7 @@
 module RequestStore
   class Railtie < ::Rails::Railtie
     initializer "request_store.insert_middleware" do |app|
-      app.config.middleware.use RequestStore::Middleware
+      app.config.middleware.insert_after Rack::MethodOverride, RequestStore::Middleware
     end
   end
 end

data/lib/request_store/version.rb

@@ -1,3 +1,3 @@
 module RequestStore
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/test/middleware_test.rb

@@ -3,13 +3,27 @@ require 'minitest/autorun'
 require 'request_store'
 
 class MiddlewareTest < Minitest::Unit::TestCase
+  def setup
+    @app = RackApp.new
+    @middleware = RequestStore::Middleware.new(@app)
+  end
+
   def test_middleware_resets_store
-    app = RackApp.new
-    middleware = RequestStore::Middleware.new(app)
+    2.times { @middleware.call({}) }
+
+    assert_equal 1, @app.last_value
+    assert_equal({}, RequestStore.store)
+  end
 
-    middleware.call({})
-    middleware.call({})
+  def test_middleware_resets_store_on_error
+    errors = []
+    begin
+      @middleware.call({:error => true})
+    rescue => e
+      errors << e
+    end
 
-    assert_equal 1, RequestStore.store[:foo]
+    assert_equal ['FAIL'], errors.map(&:message)
+    assert_equal({}, RequestStore.store)
   end
 end

data/test/request_store_test.rb

@@ -27,6 +27,27 @@ class RequestStoreTest < Minitest::Unit::TestCase
     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
+    assert_equal 2, RequestStore.store[:foo]
+  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_delegates_to_thread
     RequestStore.clear!
     RequestStore.store[:foo] = 1

data/test/test_helper.rb

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

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: request_store
 version: !ruby/object:Gem::Version
-  version: 1.0.5
-  prerelease: 
+  version: 1.0.6
 platform: ruby
 authors:
 - Steve Klabnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 description: RequestStore gives you per-request global storage.
@@ -50,8 +45,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -66,30 +61,28 @@ files:
 - test/test_helper.rb
 homepage: http://github.com/steveklabnik/request_store
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 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: