masamune 0.18.9 → 0.18.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10fd270314dd717896ad16248ae4dbeafa652b1f
-  data.tar.gz: a9573d012b827f91ab454a3a8cdf72e1815b0501
+  metadata.gz: bca0112699121f9c35cbccfed47361e7defc2478
+  data.tar.gz: 153874a0d4c2d826435bd8287937980f398d4b38
 SHA512:
-  metadata.gz: a0f38ca8a6af51eaef4272130e866e070397e31f84d43b8f1190edb51da847f064eeefccf8c3bd8ac126067ca66e9f287884097479ac931ae2e63c8621ec7e2f
-  data.tar.gz: a3e360dc2ef4613dba3bf6f38ac2bfc9c0c7f5a7494be5dc6910602a28ab53806335e31df7c8117737bd9ecfbfc623f3a1e079a19b087e66a3f6d4decfb077fd
+  metadata.gz: dadcc2005177b8e661b4eeb5c09ba26209e4685ecfa61c0fd008df4409743ac0e2488b7b03374be0d9b47b8bad98483ce8c14069a0e45fb95fb0d02e1020ffe7
+  data.tar.gz: 2ca09ebf967d47edc04d8e5d12455201faceafd10eca5ade719f003c88143822a0a5df06a8e2a00b6ecd82daba9a9744302cdc37f6e28c9556956c6be778fade

data/lib/masamune/schema/column.rb

@@ -278,7 +278,7 @@ module Masamune::Schema
         when Hash
           value
         when String
-          YAML.safe_load(value, [Symbol])
+          YAML.safe_load(value, allowed_yaml_sub_type)
         when nil
           {}
         end
@@ -492,5 +492,9 @@ module Masamune::Schema
         [ruby_value(value, false)].to_json
       end
     end
+
+    def allowed_yaml_sub_type
+      @allowed_yaml_sub_type ||= [Symbol] + Array.wrap(sub_type)
+    end
   end
 end

data/lib/masamune/version.rb

@@ -21,5 +21,5 @@
 #  THE SOFTWARE.
 
 module Masamune
-  VERSION = '0.18.9'.freeze
+  VERSION = '0.18.10'.freeze
 end

data/spec/masamune/schema/map_spec.rb

@@ -446,6 +446,151 @@ describe Masamune::Schema::Map do
       it_behaves_like 'apply input/output'
     end
 
+    context 'from csv file to tsv file with unknown yaml sub_type' do
+      before do
+        expect(environment.logger).to receive(:warn).with(/Could not coerce/).ordered
+        expect(environment.logger).to receive(:debug).with(
+          message: "Could not coerce '--- !map:ActiveSupport::HashWithIndifferentAccess\nenabled: true\n' into :yaml for column 'preferences'",
+          source: 'input_stage',
+          target: 'output_stage',
+          file: input.path,
+          line: 1,
+          row: {
+            'id'          => '2',
+            'tenant_id'   => '40',
+            'deleted_at'  => '2014-02-26T18:15:51.000Z',
+            'admin'       => 'FALSE',
+            'preferences' => "--- !map:ActiveSupport::HashWithIndifferentAccess\nenabled: true\n"
+          }
+        ).ordered
+      end
+
+      before do
+        catalog.schema :files do
+          file 'input', format: :csv, headers: true, json_encoding: :quoted do
+            column 'id', type: :integer
+            column 'tenant_id', type: :integer
+            column 'admin', type: :boolean
+            column 'preferences', type: :yaml
+            column 'deleted_at', type: :timestamp, null: true
+          end
+
+          file 'output', format: :tsv, headers: false do
+            column 'id', type: :integer
+            column 'tenant_id', type: :integer
+            column 'admin', type: :boolean
+            column 'preferences', type: :json
+            column 'deleted_at', type: :timestamp, null: true
+          end
+
+          map from: files.input, to: files.output do |row|
+            {
+              'id'          => row[:id],
+              'tenant_id'   => row[:tenant_id],
+              'deleted_at'  => row[:deleted_at],
+              'admin'       => row[:admin],
+              'preferences' => row[:preferences]
+            }
+          end
+        end
+      end
+
+      let(:source) do
+        catalog.files.input
+      end
+
+      let(:target) do
+        catalog.files.output
+      end
+
+      let(:source_data) do
+        <<-EOS.strip_heredoc
+          id,tenant_id,deleted_at,admin,preferences
+          1,30,,FALSE,"--- {}
+          "
+          2,40,2014-02-26T18:15:51.000Z,FALSE,"--- !map:ActiveSupport::HashWithIndifferentAccess
+          enabled: true
+          "
+        EOS
+      end
+
+      let(:target_data) do
+        <<-EOS.strip_heredoc
+          1	30		FALSE	{}
+        EOS
+      end
+
+      it 'should match target data' do
+        is_expected.to eq(target_data)
+      end
+
+      it_behaves_like 'apply input/output'
+    end
+
+    context 'from csv file to tsv file with yaml sub_type' do
+      before do
+        catalog.schema :files do
+          file 'input', format: :csv, headers: true, json_encoding: :quoted do
+            column 'id', type: :integer
+            column 'tenant_id', type: :integer
+            column 'admin', type: :boolean
+            column 'preferences', type: :yaml, sub_type: ActiveSupport::HashWithIndifferentAccess
+            column 'deleted_at', type: :timestamp, null: true
+          end
+
+          file 'output', format: :tsv, headers: false do
+            column 'id', type: :integer
+            column 'tenant_id', type: :integer
+            column 'admin', type: :boolean
+            column 'preferences', type: :json
+            column 'deleted_at', type: :timestamp, null: true
+          end
+
+          map from: files.input, to: files.output do |row|
+            {
+              'id'          => row[:id],
+              'tenant_id'   => row[:tenant_id],
+              'deleted_at'  => row[:deleted_at],
+              'admin'       => row[:admin],
+              'preferences' => row[:preferences]
+            }
+          end
+        end
+      end
+
+      let(:source) do
+        catalog.files.input
+      end
+
+      let(:target) do
+        catalog.files.output
+      end
+
+      let(:source_data) do
+        <<-EOS.strip_heredoc
+          id,tenant_id,deleted_at,admin,preferences
+          1,30,,FALSE,"--- {}
+          "
+          2,40,2014-02-26T18:15:51.000Z,FALSE,"--- !map:ActiveSupport::HashWithIndifferentAccess
+          enabled: true
+          "
+        EOS
+      end
+
+      let(:target_data) do
+        <<-EOS.strip_heredoc
+          1	30		FALSE	{}
+          2	40	2014-02-26T18:15:51.000Z	FALSE	"{""enabled"":true}"
+        EOS
+      end
+
+      it 'should match target data' do
+        is_expected.to eq(target_data)
+      end
+
+      it_behaves_like 'apply input/output'
+    end
+
     context 'with multiple outputs' do
       before do
         catalog.schema :files do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masamune
 version: !ruby/object:Gem::Version
-  version: 0.18.9
+  version: 0.18.10
 platform: ruby
 authors:
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor