thread-inheritable_attributes 1.0.0 → 1.1.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88d5993842aa363e7be7ff1106bc3002eacb4e6f
-  data.tar.gz: 92e4325b4a5a9b1f33cba9f1183db2d2baba4103
+  metadata.gz: 83c5bf46acdb7eece51054d9dbb2d2c8ba5a7cd3
+  data.tar.gz: e1a1e6199bd7630e7ef75d2c35d005e8e0049366
 SHA512:
-  metadata.gz: 13df0749c60e8ec6de808f7259eae4318a616603a8af1012ca766253e689cf7fe28b2972f72ed8cf127acb4123be9c867b5b4601154b0007d352256e8a6a4f81
-  data.tar.gz: 6d39855d5cdf1bcf645d6397a9f67e367256d6200cbd59afd7073217c8179f8a01c21b800b62de64377fd0f1d9fa7a0ca57768786391c29b218d28c33d0c4c62
+  metadata.gz: bfbd56fa3ae6f6ee3033cf2805a2a53f4d998bc208513e8d800da99a4de267e991dea72c70977e152e047f569b87963be85c00efaee180eaa2c4f271f563a239
+  data.tar.gz: dbabee7900d20b1386106ecb4c62c351acae02dd60043a0d67ea042d21a2b302ae08df5c10d32e425c2a1c4d7eed6827759c42b1ad7f212778221a6d2457d9b6

data/CHANGELOG.md

@@ -1,9 +1,19 @@
-## Current Release v1.0.0
+## v1.1.0.beta1 - 2016-06-14
+
+### Fix
+Add request_store gem as an optional dependency for when working within the context of a multi-threaded web server.
+Addresses the use of `Thread.current` and replaces it with `RequestStore` when the gem can be required.
+
+> if you use Thread.current, and you use [a multi-threaded web server] ..., watch out! Values can stick around longer than you'd expect, and this can cause bugs."
+
+> -- <cite>[request_store docs](https://github.com/steveklabnik/request_store#the-problem)</cite>
+
+## v1.0.0 - 2016-05-25
 
 No changes from v0.2.0, but it is being promoted to production ready.
 It's been used on multiple production environments for 3 months without issues.
 
-## Current Release v0.2.0
+## v0.2.0 - 2016-03-14
 
 ### Fix
 - Addressing issue of args not being passed to thread block when creating a Thread and passing args to the initializer.

data/README.md

@@ -10,6 +10,14 @@ Add this line to your application's Gemfile:
 gem "thread-inheritable_attributes"
 ```
 
+[request_store](https://github.com/steveklabnik/request_store) is an optional dependency for when working within the context of a multi-threaded web server. 
+
+If using Rails no config is required, except including the gem. When using other Rack based frameworks see [docs](https://github.com/steveklabnik/request_store#no-rails-no-problem) for including middleware.
+
+```ruby
+gem "request_store"
+```
+
 And then execute:
 
     $ bundle
@@ -41,7 +49,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/thread_variable_cascade. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/zeisler/thread_variable_cascade. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 
 
 ## License

data/lib/thread/inheritable_attributes.rb

@@ -1,13 +1,14 @@
 require "thread"
+require "thread/inheritable_attributes/request_store"
 
 class Thread
   INHERITABLE_ATTRIBUTES_MUTEX = Mutex.new
   alias_method :_initialize, :initialize
 
   def initialize(*args, &block)
-    inheritable_attributes = Thread.current.inheritable_attributes
+    _inheritable_attributes = inheritable_attributes
     _initialize(*args) do |*block_args|
-      Thread.current[:inheritable_attributes] = inheritable_attributes
+      RequestStore[:inheritable_attributes] = _inheritable_attributes
       block.call(block_args)
     end
   end
@@ -27,7 +28,6 @@ class Thread
   protected
 
   def inheritable_attributes
-    self[:inheritable_attributes] ||= {}
+    RequestStore[:inheritable_attributes] ||= {}
   end
-
 end

data/lib/thread/inheritable_attributes/can_be_loaded.rb

@@ -0,0 +1,13 @@
+module CanBeLoaded
+  def self.call(file)
+    loaded = false
+    begin
+      require file
+      loaded = true
+    rescue LoadError => e
+      raise e unless /^cannot load such file -- #{file}$/ =~ e.message
+      false
+    end
+    loaded
+  end
+end

data/lib/thread/inheritable_attributes/request_store.rb

@@ -0,0 +1,14 @@
+require "thread/inheritable_attributes/can_be_loaded"
+
+class Thread
+  if CanBeLoaded.call("request_store") && defined? ::RequestStore
+    request_store_version = Gem::Version.new(::RequestStore::VERSION)
+    if request_store_version >= Gem::Version.new("1.0") && request_store_version < Gem::Version.new("2.0")
+      RequestStore = ::RequestStore
+    else
+      raise "RequestStore version: #{::RequestStore::Version} unsupported"
+    end
+  else
+    RequestStore = Thread.current
+  end
+end

data/lib/thread/inheritable_attributes/version.rb

@@ -1,5 +1,5 @@
 class Thread
   module InheritableAttributes
-    VERSION = "1.0.0"
+    VERSION = "1.1.0.beta1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thread-inheritable_attributes
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0.beta1
 platform: ruby
 authors:
 - Dustin Zeisler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-25 00:00:00.000000000 Z
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,8 @@ files:
 - bin/console
 - bin/setup
 - lib/thread/inheritable_attributes.rb
+- lib/thread/inheritable_attributes/can_be_loaded.rb
+- lib/thread/inheritable_attributes/request_store.rb
 - lib/thread/inheritable_attributes/version.rb
 - thread-inheritable_attributes.gemspec
 homepage: https://github.com/zeisler/thread-inheritable_attributes
@@ -89,9 +91,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.5