thread_attr_accessor 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9799a38f085c32f2cda8a9f59dd80a38306aa949
-  data.tar.gz: 4e5e96c47926aee33179fa291c6fc6dbf97168e2
+  metadata.gz: a4b351b621718a171e16dbddbfc528d221f1d1c3
+  data.tar.gz: 35592bc912b26fc5a2f6f9f3039a04433c21b580
 SHA512:
-  metadata.gz: c00ade061a7ff933fa3819aa2af0ab04deba068b168ce05501138391da2a350f058424a907fb07d624e179980e753943194f03d6d3d52ae49709f93742037597
-  data.tar.gz: 8cdacf0a89aa6dc976fffd4acebc39a87338d93a8d583a884ffb68717f34828c8bc53eab7c34018a565719618b9a56e24aae886a0743ca5e2f3348c4797d5852
+  metadata.gz: 76a0c55f20268e3a3dab3e19a2d9a4ce76864baec23f4ac2f971010d12b7a61903c4a709041641958ed3f6459c901237bea7d65ed8b9ac37d8ceaffdf46f617d
+  data.tar.gz: e7224b12d3a2f1d9b1e9b8f887b15091c14900b50fa1246807401a1ce7f09f57841ddc87f02bc7e87bebb464b9ca9432f692893333e55fca5acc91ae0fefe8a4

data/Gemfile

@@ -1,4 +1,9 @@
 source 'https://rubygems.org'
 
+gem 'pry'
+gem 'pry-doc'
+gem 'pry-byebug'
+gem 'pry-stack_explorer'
+
 # Specify your gem's dependencies in thread_attr_accessor.gemspec
 gemspec

data/lib/core_ext/fiber/parent_fiber.rb

@@ -0,0 +1,16 @@
+# Ruby doesn't provide a standard way to look up a fiber's parent
+
+require 'fiber'
+
+class Fiber
+  module ParentFiber
+    attr_reader :parent_fiber
+
+    def initialize(&block)
+      @parent_fiber = Fiber.current
+      super(&block)
+    end
+  end
+
+  prepend ParentFiber
+end

data/lib/core_ext/fiber/storage.rb

@@ -0,0 +1,26 @@
+# Ruby doesn't provide a standard way to access another fiber's variables
+
+require 'hamster'
+
+class Fiber
+  module Storage
+    def storage
+      @storage ||= Hamster.hash
+    end
+
+    def fiber_variable?(key)
+      storage.has_key?(key)
+    end
+
+    def fiber_variable_set(key, value)
+      @storage = storage.put(key, value)
+      value
+    end
+
+    def fiber_variable_get(key)
+      storage.get(key)
+    end
+  end
+
+  prepend Storage
+end

data/lib/thread_attr_accessor.rb

@@ -1,5 +1,9 @@
+require 'fiber'
+
 require_relative "thread_attr_accessor/version"
 require_relative 'core_ext/thread/parent_thread'
+require_relative 'core_ext/fiber/parent_fiber'
+require_relative 'core_ext/fiber/storage'
 
 # `extend` this module on your class/module to get per-thread class attribute
 # accessors. Example:
@@ -24,14 +28,75 @@ module ThreadAttrAccessor
     "#{base.name}.#{name}"
   end
 
+  class FiberStorage
+    attr_reader :fiber, :thread
+    def initialize(fiber = Fiber.current, thread = Thread.current)
+      @fiber  = fiber
+      @thread = thread
+    end
+
+    def [](key)
+      fiber.fiber_variable_get(key)
+    end
+
+    def []=(key, value)
+      fiber.fiber_variable_set(key, value)
+      if fiber.parent_fiber.nil?
+        thread.thread_variable_set(key, value)
+      end
+
+      value
+    end
+
+    def has_key?(key)
+      fiber.fiber_variable?(key)
+    end
+  end
+
+  class ThreadStorage
+    attr_reader :thread
+    def initialize(thread)
+      @thread = thread
+    end
+
+    def [](key)
+      thread.thread_variable_get(key)
+    end
+
+    def []=(key, value)
+      thread.thread_variable_set(key, value)
+    end
+
+    def has_key?(key)
+      !!thread.thread_variable_get(key)
+    end
+  end
+
   def self.search_in_ancestor_threads(key)
-    ancestor = Thread.current.parent_thread
+    fiber  = Fiber.current
+    thread = Thread.current
 
-    until ancestor.nil? || (ancestor_value = ancestor.thread_variable_get(key))
-      ancestor = ancestor.parent_thread
+    until fiber.nil?
+      storage = FiberStorage.new(fiber, thread)
+
+      if storage.has_key?(key)
+        return storage[key]
+      else
+        fiber = fiber.parent_fiber
+      end
+    end
+
+    until thread.nil?
+      storage = ThreadStorage.new(thread)
+
+      if storage.has_key?(key)
+        return storage[key]
+      else
+        thread = thread.parent_thread
+      end
     end
 
-    ancestor_value
+    nil
   end
 
   def self.extended(base)
@@ -50,7 +115,8 @@ module ThreadAttrAccessor
       thread_key = ThreadAttrAccessor.thread_accessor_key(self, name)
 
       mod.send(:define_method, "#{name}=") do |value|
-        Thread.current.thread_variable_set(thread_key, value)
+        FiberStorage.new[thread_key] = value
+        value
       end
 
       if private
@@ -73,17 +139,12 @@ module ThreadAttrAccessor
 
     if get_default
       get_value = ->(thread_key) {
-        if value = Thread.current.thread_variable_get(thread_key)
-          value
-        else
-          default_value = get_default.call(thread_key)
-          Thread.current.thread_variable_set(thread_key, default_value)
-          default_value
-        end
+        storage = FiberStorage.new
+        storage[thread_key] ||= get_default.call(thread_key)
       }
     else
       get_value = ->(thread_key) {
-        Thread.current.thread_variable_get(thread_key)
+        FiberStorage.new[thread_key]
       }
     end
 

data/lib/thread_attr_accessor/version.rb

@@ -1,3 +1,3 @@
 module ThreadAttrAccessor
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/thread_attr_accessor.gemspec

@@ -19,6 +19,9 @@ Gem::Specification.new do |spec|
   spec.executables   = []
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "hamster", "~> 1.0"
+
   spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thread_attr_accessor
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Renato Zannon
@@ -10,6 +10,20 @@ bindir: exe
 cert_chain: []
 date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: hamster
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: 
 email:
 - zannon@tn.com.br
@@ -54,6 +82,8 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- lib/core_ext/fiber/parent_fiber.rb
+- lib/core_ext/fiber/storage.rb
 - lib/core_ext/thread/parent_thread.rb
 - lib/thread_attr_accessor.rb
 - lib/thread_attr_accessor/version.rb
@@ -83,3 +113,4 @@ signing_key:
 specification_version: 4
 summary: A thread-aware module-level attr_accessor
 test_files: []
+has_rdoc: