embulk-filter-ruby_proc 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdbf816d489067e98ddf890834db3e5b33dc642b
-  data.tar.gz: 7f89a9363155021e12340b55fc4bf9352d46b903
+  metadata.gz: bdb10f169cbbee39d9e79d590ba36cd7bc43e739
+  data.tar.gz: 9d734ba55ecd29f87afcb340c968b6d066b308d1
 SHA512:
-  metadata.gz: 3d1313e8cfcdc2947413d4c6f8cfee0a5760cba39e13ee7920b68bc4bdec7a40d3c6f5cd1a058eefc4e3c069b5f00e7a4349eb6209ce86a403ff7f8557f723c2
-  data.tar.gz: e2bfdec507468c0f42c1fc2a8369404250872920faca084cf840c9f88d7b8dd851a4de9cdcb4d98275474c015697b8862cfc39bcd76fa3d19f385705ef7deb73
+  metadata.gz: 2778a56657b6b19743ec75021c0a9dbeee32015dd10b315a85d7ac669acfef0218b045cb17c7e60303edb6c54d7737f2329acb936d2bed5e4651778f8e6e1d2d
+  data.tar.gz: 6f97934d1f9e6c6f656aa0739790f58258db028857b84f254007a0ba2e538bcc896c4ec8eec3229699971130d273501ee79f5747300d895373ee79e43bd9b1ad

data/embulk-filter-ruby_proc.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-filter-ruby_proc"
-  spec.version       = "0.4.1"
+  spec.version       = "0.5.0"
   spec.authors       = ["joker1007"]
   spec.summary       = "Ruby Proc filter plugin for Embulk"
   spec.description   = "Filter each record by ruby proc"

data/lib/embulk/filter/ruby_proc.rb

@@ -1,18 +1,31 @@
+require 'thread'
+
 module Embulk
   module Filter
 
-    class Evaluator
-      attr_reader :variables
-      def initialize(variables)
-        @variables = variables
-      end
+    class RubyProc < FilterPlugin
+
+      class Evaluator
+        attr_reader :variables
+        @mutex = Mutex.new
+
+        def self.mutex
+          @mutex
+        end
+
+        def initialize(variables)
+          @variables = variables
+        end
 
-      def get_binding
-        binding
+        def get_binding
+          binding
+        end
+
+        def mutex
+          self.class.mutex
+        end
       end
-    end
 
-    class RubyProc < FilterPlugin
       Plugin.register_filter("ruby_proc", self)
 
       def self.transaction(config, in_schema, &control)
@@ -33,16 +46,13 @@ module Embulk
           end
         end
 
-        yield(task, out_columns)
-      end
-
-      def init
         task["requires"].each do |lib|
           require lib
         end
 
         evaluator_binding = Evaluator.new(task["variables"]).get_binding
 
+        # In order to avoid multithread probrem, initialize procs here
         @procs = Hash[task["columns"].map {|col|
           if col["proc"]
             [col["name"], eval(col["proc"], evaluator_binding)]
@@ -59,6 +69,18 @@ module Embulk
         }.compact
         raise "Need columns or rows parameter" if @row_procs.empty? && @procs.empty?
 
+        yield(task, out_columns)
+      end
+
+      def self.procs
+        @procs
+      end
+
+      def self.row_procs
+        @row_procs
+      end
+
+      def init
         @skip_nils = Hash[task["columns"].map {|col|
           [col["name"], col["skip_nil"].nil? ? true : !!col["skip_nil"]]
         }]
@@ -69,10 +91,10 @@ module Embulk
 
       def add(page)
         page.each do |record|
-          if @row_procs.empty?
+          if row_procs.empty?
             record_hashes = [hashrize(record)]
           else
-            record_hashes = @row_procs.each_with_object([]) do |pr, arr|
+            record_hashes = row_procs.each_with_object([]) do |pr, arr|
               result = pr.call(hashrize(record))
               case result
               when Array
@@ -88,9 +110,9 @@ module Embulk
           end
 
           record_hashes.each do |record_hash|
-            @procs.each do |col, pr|
+            procs.each do |col, pr|
               next unless record_hash.has_key?(col)
-              next if record_hash[col].nil? && @skip_nils[col]
+              next if record_hash[col].nil? && skip_nils[col]
 
               if pr.arity == 1
                 record_hash[col] = pr.call(record_hash[col])
@@ -112,6 +134,18 @@ module Embulk
       def hashrize(record)
         Hash[in_schema.names.zip(record)]
       end
+
+      def procs
+        self.class.procs
+      end
+
+      def row_procs
+        self.class.row_procs
+      end
+
+      def skip_nils
+        @skip_nils
+      end
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-ruby_proc
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - joker1007
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: embulk