embulk-filter-ruby_proc 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7745c13afc58b5b1e5257cf7f1025fc3292b8103
-  data.tar.gz: fc8310448ff1cadba48dfb3cf59b64048749fc70
+  metadata.gz: 754bf37f61d14a24054997630406b8c9b02e7aff
+  data.tar.gz: c47c596b3745548ac8919e7be92727e6157bfd70
 SHA512:
-  metadata.gz: 9ca41e0fff89bb94f82f1c5035682ee48203ccae6e6493bd8867f6da3eaef1580618a15e442776ad21280d9cf96c8e8e5c5381a0ac1fbe811fb843702b38ca28
-  data.tar.gz: 8ba158fad7a3a5570bfdb3ad5186381cec5cf4a86eb927c022989e59a1e782fb5efa835ddc5d6470160b16edc28d1612402ad06ae2ce2be3019507b994422680
+  metadata.gz: acf1ee4540152e40b7e706466b67f1f4f48eb23d200c988a3d46fe21dce669c19897c8f000cfbcf55f600c7c908a9accd7b51b268ecc7c9ad92f1cf1c5a733df
+  data.tar.gz: d3757d66ef78d46463a533b436fb4ae58c2e8a7fe09c9baad6c238eaca5204a5d6b76de095c7733ffa6e9f289056d7879e6e2e6fe534a82c7c83cbe55bde5fa6

data/embulk-filter-ruby_proc.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-filter-ruby_proc"
-  spec.version       = "0.6.0"
+  spec.version       = "0.7.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

@@ -113,9 +113,39 @@ module Embulk
         @row_proc_store
       end
 
+      def self.parse_col_procs(columns, evaluator_binding)
+        Hash[columns.map {|col|
+          if col["proc"]
+            [col["name"], eval(col["proc"], evaluator_binding)]
+          else
+            [col["name"], eval(File.read(col["proc_file"]), evaluator_binding, File.expand_path(col["proc_file"]))]
+          end
+        }]
+      end
+
+      def self.parse_row_procs(rows, evaluator_binding)
+        rows.map {|rowdef|
+          if rowdef["proc"]
+            eval(rowdef["proc"], evaluator_binding)
+          else
+            eval(File.read(rowdef["proc_file"]), evaluator_binding, File.expand_path(rowdef["proc_file"]))
+          end
+        }.compact
+      end
+
       def init
-        @procs = self.class.proc_store[task["transaction_id"]]
-        @row_procs = self.class.row_proc_store[task["transaction_id"]]
+        task["requires"].each do |lib|
+          require lib
+        end
+
+        if self.class.proc_store.nil? || self.class.row_proc_store.nil?
+          evaluator_binding = Evaluator.new(task["variables"]).get_binding
+          @procs = self.class.parse_col_procs(task["columns"], evaluator_binding)
+          @row_procs = self.class.parse_row_procs(task["rows"], evaluator_binding)
+        else
+          @procs = self.class.proc_store[task["transaction_id"]]
+          @row_procs = self.class.row_proc_store[task["transaction_id"]]
+        end
         @skip_nils = Hash[task["columns"].map {|col|
           [col["name"], col["skip_nil"].nil? ? true : !!col["skip_nil"]]
         }]

metadata

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