public_activity 1.4.3 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 133186d2fb5149e6b12c499d588cafb173fa840c
-  data.tar.gz: 9dfa82ab740c143daa9d3c833bc15d2c7efd4604
+  metadata.gz: 111fe89197635000ddcdf89d3d534f9cb00c3443
+  data.tar.gz: ab11f3c49c42d58ba8af32a325874c83f5c634db
 SHA512:
-  metadata.gz: dada05aea04f8bc8f20e9d474317bffff945d38da725c579feb960498bb7c12990ffd81d58b58448c177a7b20f1ac289b294cd5ef322c499ab9b09e5b8db4532
-  data.tar.gz: b0d35c25b9f8834fbb6f0fa9f6b3cde6936e3fdeba387b8c3eb2c595fc0ae886dce19e786a862588f2f3008117f75c0044dbdef17055b9d9dc088f12f2e5c043
+  metadata.gz: 41d3b14a7bd58a3c321b52f6fb423b5f612e4f5a8c2881a03dbed893bd352ad0a596ad9e4f64d6cb49289d08fa8c780554dde54dc79b20962dd8e59ef10cad58
+  data.tar.gz: df0ba2f1a81173d47c9b750696e7e8eab2af04b0eb8483ceefb1c6c86ebd5e79f811672bba60c4caac8b436f60b2500d1346613c5a7c53c35a31467a17186750

data/lib/public_activity/utility/store_controller.rb

@@ -1,23 +1,13 @@
 module PublicActivity
-  # @private
-  @@controllers = Hash.new
-  # Lambda called after the thread is destroyed.
-  Finalizer = lambda { |id|
-    @@controllers.delete id
-  }
-
   class << self
     # Setter for remembering controller instance
     def set_controller(controller)
-      unless @@controllers.has_key?(Thread.current.object_id)
-        ObjectSpace.define_finalizer Thread.current, Finalizer
-      end if RUBY_VERSION != "1.9.3"
-      @@controllers[Thread.current.object_id] = controller
+      Thread.current[:public_activity_controller] = controller
     end
 
     # Getter for accessing the controller instance
     def get_controller
-      @@controllers[Thread.current.object_id]
+      Thread.current[:public_activity_controller]
     end
   end
 
@@ -26,17 +16,15 @@ module PublicActivity
     extend ActiveSupport::Concern
 
     included do
-      # use :before_action instead of deprecated before_filter
-      if respond_to? :before_action
-        before_action :store_controller_for_public_activity
-      else
-        before_filter :store_controller_for_public_activity
-      end
+      around_action :store_controller_for_public_activity if     respond_to?(:around_action)
+      around_filter :store_controller_for_public_activity unless respond_to?(:around_action)
     end
 
-    # Before filter executed to remember current controller
     def store_controller_for_public_activity
       PublicActivity.set_controller(self)
+      yield
+    ensure
+      PublicActivity.set_controller(nil)
     end
   end
 end

data/lib/public_activity/version.rb

@@ -1,4 +1,4 @@
 module PublicActivity
   # A constant with gem's version
-  VERSION = '1.4.3'
+  VERSION = '1.5.0'
 end

data/test/test_controller_integration.rb

@@ -9,33 +9,32 @@ describe PublicActivity::StoreController do
   it 'stores controller' do
     controller = StoringController.new
     PublicActivity.set_controller(controller)
-    controller.must_be_same_as PublicActivity.instance_eval { class_variable_get(:@@controllers)[Thread.current.object_id] }
+    controller.must_be_same_as Thread.current[:public_activity_controller]
     controller.must_be_same_as PublicActivity.get_controller
   end
 
   it 'stores controller with a filter in controller' do
     controller = StoringController.new
-    controller._process_action_callbacks.select {|c| c.kind == :before}.map(&:filter).must_include :store_controller_for_public_activity
-    controller.instance_eval { store_controller_for_public_activity }
-    controller.must_be_same_as PublicActivity.class_eval { class_variable_get(:@@controllers)[Thread.current.object_id] }
+    controller._process_action_callbacks.select {|c| c.kind == :around}.map(&:filter).must_include :store_controller_for_public_activity
+    controller.instance_eval do
+      store_controller_for_public_activity do
+        controller.must_be_same_as PublicActivity.get_controller
+      end
+    end
   end
 
   it 'stores controller in a threadsafe way' do
-    reset_controllers
     PublicActivity.set_controller(1)
     PublicActivity.get_controller.must_equal 1
 
     a = Thread.new {
       PublicActivity.set_controller(2)
       PublicActivity.get_controller.must_equal 2
+      PublicActivity.set_controller(nil)
     }
 
     PublicActivity.get_controller.must_equal 1
-    # cant really test finalizers though
-  end
 
-  private
-  def reset_controllers
-    PublicActivity.class_eval { class_variable_set(:@@controllers, {}) }
+    PublicActivity.set_controller(nil)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: public_activity
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
 platform: ruby
 authors:
 - Piotrek Okoński
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -255,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Easy activity tracking for ActiveRecord models
@@ -279,4 +279,3 @@ test_files:
 - test/views/custom/_test.erb
 - test/views/layouts/_activity.erb
 - test/views/public_activity/_test.erb
-has_rdoc: