parallel_minion 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4ec6fafacfe5cf2b3e090a1e1ed733fd6c3bc33
-  data.tar.gz: a054a763962d6ee10fb8bc75587ec4d1c5f3d456
+  metadata.gz: ec80ef2321aa78ba6f8b6dc7b16452f1ccb15a9b
+  data.tar.gz: f3a394698da183ce6e64c8137ac7cf50cae98943
 SHA512:
-  metadata.gz: 13909e2ad5221826dd9ac6cbbd15364566e4cf6b76fc33bc77d7cc8c35acc6ddb06cc3b53845bb6df053b031a13fb20808ce10c7e2f7bbb141912e2a86a03aff
-  data.tar.gz: 01b7b72f77160109e4bfa9ab995c6f98be128a7e837bc284d3932f399cdae9389b866d83a534d5ec618425c201d3607d5ff19b06bf803a3054da4edc409bcaa5
+  metadata.gz: 946b4306251796613bf5a44b89d32016aa0a9133048caaaa698206151aeb5e9dc4684e377230d767b2fb8bcc2f952a83c18c140f96bcb7e5c44fdee10f88c16c
+  data.tar.gz: 1f52084ea14e186ff3796f8276fbc879bb99ada6d0b05fead4513b26a4611a471064c2ebbbc0cdb27ced7e1e9a41135674083436b2737108a54b921f640fb1fc

data/lib/parallel_minion/minion.rb

@@ -313,20 +313,21 @@ module ParallelMinion
         Thread.current.name = "#{description}-#{Thread.current.object_id}"
 
         # Copy logging tags from parent thread, if any
-        proc                = Proc.new { run_in_scope(scopes, &block) }
-        proc2               = tags ? Proc.new { SemanticLogger.tagged(*tags, &proc) } : proc
-        proc3               = named_tags ? Proc.new { SemanticLogger.named_tagged(named_tags, &proc2) } : proc2
-
-        logger.public_send(self.class.started_log_level, "Started #{description}")
-        begin
-          logger.measure(self.class.completed_log_level, "Completed #{description}", log_exception: log_exception, metric: metric, &proc3)
-        rescue Exception => exc
-          @exception = exc
-          nil
-        ensure
-          @duration = Time.now - start_time
-          # Return any database connections used by this thread back to the pool
-          ActiveRecord::Base.clear_active_connections! if defined?(ActiveRecord::Base)
+        SemanticLogger.tagged(*tags) do
+          SemanticLogger.named_tagged(named_tags) do
+            logger.public_send(self.class.started_log_level, "Started #{description}")
+            begin
+              proc = Proc.new { run_in_scope(scopes, &block) }
+              logger.measure(self.class.completed_log_level, "Completed #{description}", log_exception: log_exception, metric: metric, &proc)
+            rescue Exception => exc
+              @exception = exc
+              nil
+            ensure
+              @duration = Time.now - start_time
+              # Return any database connections used by this thread back to the pool
+              ActiveRecord::Base.clear_active_connections! if defined?(ActiveRecord::Base)
+            end
+          end
         end
       end
     end

data/lib/parallel_minion/version.rb

@@ -1,3 +1,3 @@
 module ParallelMinion #:nodoc
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/test/minion_scope_test.rb

@@ -1,4 +1,4 @@
-require_relative './test_helper'
+require_relative 'test_helper'
 require 'erb'
 require 'active_record'
 

data/test/minion_test.rb

@@ -11,7 +11,7 @@ class MinionTest < Minitest::Test
       describe enabled ? 'enabled' : 'disabled' do
         before do
           ParallelMinion::Minion.enabled = enabled
-          $log_structs                   = []
+          $log_structs.clear
         end
 
         it 'without parameters' do
@@ -73,12 +73,43 @@ class MinionTest < Minitest::Test
           SemanticLogger.tagged('TAG') do
             assert_equal 'TAG', SemanticLogger.tags.last
             minion = ParallelMinion::Minion.new(description: 'Tag Test') do
+              logger.info "Tag Test"
               logger.tags.last
             end
           end
           assert_equal 'TAG', minion.result
         end
 
+        it 'copy across named tags' do
+          minion = nil
+          SemanticLogger.named_tagged(tag: 'TAG') do
+            assert_equal({tag: 'TAG'}, SemanticLogger.named_tags)
+            minion = ParallelMinion::Minion.new(description: 'Named Tags Test') do
+              logger.info "Named Tags Test"
+              SemanticLogger.named_tags
+            end
+          end
+          assert_equal({tag: 'TAG'}, minion.result)
+        end
+
+        it 'copy across tags and named tags' do
+          minion = nil
+          SemanticLogger.tagged('TAG') do
+            SemanticLogger.named_tagged(tag: 'TAG') do
+              assert_equal({tag: 'TAG'}, SemanticLogger.named_tags)
+              assert_equal 'TAG', SemanticLogger.tags.last
+              minion = ParallelMinion::Minion.new(description: 'Tags Test') do
+                logger.info "Tags Test"
+                [SemanticLogger.named_tags, SemanticLogger.tags.last]
+              end
+
+              assert_equal({tag: 'TAG'}, minion.result.first)
+              assert_equal 'TAG', minion.result.last
+            end
+          end
+
+        end
+
         it 'include metric' do
           metric_name = 'model/method'
           hash        = {value: 23}

data/test/test_helper.rb

@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+#$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 
 require 'minitest/autorun'
 require 'parallel_minion'
@@ -8,6 +8,7 @@ SemanticLogger.default_level = :trace
 SemanticLogger.add_appender(file_name: 'test.log', formatter: :color)
 
 # Setup global callback for metric so that it can be tested below
+$log_structs = []
 SemanticLogger.on_metric do |log_struct|
-  ($log_structs ||= []) << log_struct.dup
+  $log_structs << log_struct.dup
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel_minion
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-24 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic_logger