masamune 0.17.12 → 0.17.13

data/spec/masamune/schema/table_spec.rb

@@ -70,8 +70,8 @@ describe Masamune::Schema::Table do
     let(:table) do
       described_class.new id: 'user',
         columns: [
-          Masamune::Schema::Column.new(id: 'tenant_id', index: ['tenant_id', 'shared']),
-          Masamune::Schema::Column.new(id: 'user_id', index: ['user_id', 'shared'])
+          Masamune::Schema::Column.new(id: 'tenant_id', index: %w(tenant_id shared)),
+          Masamune::Schema::Column.new(id: 'user_id', index: %w(user_id shared))
         ]
     end
 
@@ -83,7 +83,7 @@ describe Masamune::Schema::Table do
       described_class.new id: 'user',
         columns: [
           Masamune::Schema::Column.new(id: 'tenant_id', unique: ['shared']),
-          Masamune::Schema::Column.new(id: 'user_id', unique: ['user_id', 'shared'])
+          Masamune::Schema::Column.new(id: 'user_id', unique: %w(user_id shared))
         ]
     end
 
@@ -135,7 +135,7 @@ describe Masamune::Schema::Table do
         ]
     end
 
-    it { expect { table }.to raise_error /contains undefined columns/ }
+    it { expect { table }.to raise_error(/contains undefined columns/) }
   end
 
   context 'with partial values' do
@@ -182,11 +182,11 @@ describe Masamune::Schema::Table do
         rows: [
           Masamune::Schema::Row.new(values: {
             tenant_id: 'default_tenant_id()',
-            user_id: -1,
+            user_id: -1
           }, default: true),
           Masamune::Schema::Row.new(values: {
             tenant_id: 'default_tenant_id()',
-            user_id: -2,
+            user_id: -2
           }, id: 'unknown')
         ]
     end
@@ -208,7 +208,7 @@ describe Masamune::Schema::Table do
           }),
           Masamune::Schema::Row.new(values: {
             name: 'active',
-            description: 'Active',
+            description: 'Active'
           }, default: true),
           Masamune::Schema::Row.new(values: {
             name: 'inactive',
@@ -236,15 +236,15 @@ describe Masamune::Schema::Table do
           Masamune::Schema::Column.new(id: 'description', type: :string)
         ],
         rows: [
-          Masamune::Schema::Row.new(values: {name: 'active'}, default: true)
+          Masamune::Schema::Row.new(values: { name: 'active' }, default: true)
         ]
     end
 
     let(:table) do
       described_class.new id: 'user', references: [
-          Masamune::Schema::TableReference.new(mini_table),
-          Masamune::Schema::TableReference.new(mini_table, label: 'actor', null: true, default: :null)
-        ],
+        Masamune::Schema::TableReference.new(mini_table),
+        Masamune::Schema::TableReference.new(mini_table, label: 'actor', null: true, default: :null)
+      ],
         columns: [
           Masamune::Schema::Column.new(id: 'name', type: :string)
         ]
@@ -286,9 +286,9 @@ describe Masamune::Schema::Table do
 
     let(:table) do
       described_class.new id: 'user', references: [
-          Masamune::Schema::TableReference.new(mini_table),
-          Masamune::Schema::TableReference.new(mini_table, label: 'hr')
-        ],
+        Masamune::Schema::TableReference.new(mini_table),
+        Masamune::Schema::TableReference.new(mini_table, label: 'hr')
+      ],
         columns: [
           Masamune::Schema::Column.new(id: 'user_id', type: :integer),
           Masamune::Schema::Column.new(id: 'name', type: :string),
@@ -384,8 +384,8 @@ describe Masamune::Schema::Table do
     context 'with specified target table (referenced tables)' do
       let(:target) do
         described_class.new id: 'user_data', references: [
-            Masamune::Schema::TableReference.new(mini_table, label: 'hr')
-          ],
+          Masamune::Schema::TableReference.new(mini_table, label: 'hr')
+        ],
           columns: [
             Masamune::Schema::Column.new(id: 'user_id', type: :integer),
             Masamune::Schema::Column.new(id: 'name', type: :string)

data/spec/masamune/string_format_spec.rb

@@ -27,13 +27,13 @@ describe Masamune::StringFormat do
     subject { instance.strip_sql(input) }
 
     context 'with quoted sql' do
-      let(:input) { %q('SELECT * FROM table;') }
-      it { is_expected.to eq(%q(SELECT * FROM table;)) }
+      let(:input) { "'SELECT * FROM table;'" }
+      it { is_expected.to eq('SELECT * FROM table;') }
     end
 
     context 'with ; terminated sql' do
-      let(:input) { %q(SELECT * FROM table;;) }
-      it { is_expected.to eq(%q(SELECT * FROM table;)) }
+      let(:input) { 'SELECT * FROM table;;' }
+      it { is_expected.to eq('SELECT * FROM table;') }
     end
 
     context 'with multi line sql' do
@@ -47,12 +47,12 @@ describe Masamune::StringFormat do
 
         EOS
       end
-      it { is_expected.to eq(%q(SELECT * FROM table;)) }
+      it { is_expected.to eq('SELECT * FROM table;') }
     end
 
     context 'with un-quoted sql' do
-      let(:input) { %q(SELECT * FROM table) }
-      it { is_expected.to eq(%q(SELECT * FROM table;)) }
+      let(:input) { 'SELECT * FROM table' }
+      it { is_expected.to eq('SELECT * FROM table;') }
     end
   end
 end

data/spec/masamune/tasks/dump_thor_spec.rb

@@ -44,7 +44,7 @@ describe Masamune::Tasks::DumpThor do
 
   context 'with --type=unknown' do
     let(:options) { ['--type=unknown'] }
-    it_behaves_like 'raises Thor::MalformattedArgumentError', %q{Expected '--type' to be one of psql, hql; got unknown}
+    it_behaves_like 'raises Thor::MalformattedArgumentError', "Expected '--type' to be one of psql, hql; got unknown"
   end
 
   context 'with --section=pre' do
@@ -64,7 +64,7 @@ describe Masamune::Tasks::DumpThor do
 
   context 'with --section=unknown' do
     let(:options) { ['--section=unknown'] }
-    it_behaves_like 'raises Thor::MalformattedArgumentError', %q{Expected '--section' to be one of pre, post, all; got unknown}
+    it_behaves_like 'raises Thor::MalformattedArgumentError', "Expected '--section' to be one of pre, post, all; got unknown"
   end
 
   context 'with --skip-indexes' do
@@ -77,13 +77,13 @@ describe Masamune::Tasks::DumpThor do
     it_behaves_like 'executes with success'
   end
 
-  context %q{with --exclude='.*dimension'} do
-    let(:options) { [%q{--exclude='.*dimension'}] }
+  context "with --exclude='.*dimension'" do
+    let(:options) { ["--exclude='.*dimension'"] }
     it_behaves_like 'executes with success'
   end
 
-  context %q{with --exclude='.*dimension' '.*fact'} do
-    let(:options) { [%q{--exclude='.*dimension' '.*fact'}] }
+  context "with --exclude='.*dimension' '.*fact'" do
+    let(:options) { ["--exclude='.*dimension' '.*fact'"] }
     it_behaves_like 'executes with success'
   end
 

data/spec/masamune/tasks/hive_thor_spec.rb

@@ -69,7 +69,7 @@ describe Masamune::Tasks::HiveThor do
   context 'with --variables=YEAR:2015 MONTH:1' do
     let(:options) { ['--variables=YEAR:2015', 'MONTH:1'] }
     it do
-      expect_any_instance_of(described_class).to receive(:hive).with(hash_including(variables: { 'YEAR' => '2015', 'MONTH' => '1'})).once.and_return(mock_success)
+      expect_any_instance_of(described_class).to receive(:hive).with(hash_including(variables: { 'YEAR' => '2015', 'MONTH' => '1' })).once.and_return(mock_success)
       cli_invocation
     end
   end
@@ -77,7 +77,7 @@ describe Masamune::Tasks::HiveThor do
   context 'with -X YEAR:2015 MONTH:1' do
     let(:options) { ['-X', 'YEAR:2015', 'MONTH:1'] }
     it do
-      expect_any_instance_of(described_class).to receive(:hive).with(hash_including(variables: { 'YEAR' => '2015', 'MONTH' => '1'})).once.and_return(mock_success)
+      expect_any_instance_of(described_class).to receive(:hive).with(hash_including(variables: { 'YEAR' => '2015', 'MONTH' => '1' })).once.and_return(mock_success)
       cli_invocation
     end
   end

data/spec/masamune/template_spec.rb

@@ -40,7 +40,7 @@ describe Masamune::Template do
 
     context 'with simple template' do
       let(:template) { File.expand_path('../../fixtures/simple.sql.erb', __FILE__) }
-      let(:parameters) { {table: 'zombo'} }
+      let(:parameters) { { table: 'zombo' } }
 
       it { is_expected.to eq("SELECT * FROM zombo;\n") }
     end
@@ -59,7 +59,8 @@ describe Masamune::Template do
     context 'with aggregate template' do
       let(:template) { File.expand_path('../../fixtures/aggregate.sql.erb', __FILE__) }
 
-      it do is_expected.to eq <<-EOS.gsub(/^\s*/,'')
+      it do
+        is_expected.to eq <<-EOS.gsub(/^\s*/, '')
         SHOW TABLES;
         SELECT * FROM foo;
         SELECT * FROM bar;

data/spec/masamune/thor_spec.rb

@@ -29,8 +29,8 @@ describe Masamune::Thor do
       namespace :example
 
       desc 'command', 'command'
-      target path: fs.path(:tmp_dir, "target/%Y-%m-%d")
-      source path: fs.path(:tmp_dir, "source/%Y%m%d*.log")
+      target path: fs.path(:tmp_dir, 'target/%Y-%m-%d')
+      source path: fs.path(:tmp_dir, 'source/%Y%m%d*.log')
       def command_task
         # NOP
       end
@@ -48,8 +48,8 @@ describe Masamune::Thor do
       end
 
       desc 'unknown', 'unknown'
-      target path: fs.path(:unknown_dir, "target/%Y-%m-%d")
-      source path: fs.path(:unknown_dir, "source/%Y%m%d*.log")
+      target path: fs.path(:unknown_dir, 'target/%Y-%m-%d')
+      source path: fs.path(:unknown_dir, 'source/%Y%m%d*.log')
       def unknown_task
         # NOP
       end
@@ -188,7 +188,7 @@ describe Masamune::Thor do
         expect_any_instance_of(Logger).to receive(:error).with(/random exception/)
         allow(thor_class).to receive(:dispatch).and_raise('random exception')
       end
-      it { expect { cli_invocation }.to raise_error /random exception/ }
+      it { expect { cli_invocation }.to raise_error(/random exception/) }
     end
 
     context 'with command that raises exception after initialization' do
@@ -198,7 +198,7 @@ describe Masamune::Thor do
         expect_any_instance_of(Logger).to receive(:error).with(/random exception/)
         allow(thor_class).to receive(:after_initialize_invoke).and_raise('random exception')
       end
-      it { expect { cli_invocation }.to raise_error /random exception/ }
+      it { expect { cli_invocation }.to raise_error(/random exception/) }
     end
 
     context 'with command that raises exception during execution' do
@@ -243,12 +243,12 @@ describe Masamune::Thor do
 
     context 'without --' do
       let(:argv) { ['--flag', 'true'] }
-      it { is_expected.to eq([['--flag', 'true'],[]]) }
+      it { is_expected.to eq([['--flag', 'true'], []]) }
     end
 
     context 'with -- and no following arguments' do
       let(:argv) { ['--flag', 'true', '--'] }
-      it { is_expected.to eq([['--flag', 'true'],[]]) }
+      it { is_expected.to eq([['--flag', 'true'], []]) }
     end
 
     context 'with -- and a single extra argument' do

data/spec/masamune/transform/bulk_upsert.dimension_spec.rb

@@ -28,14 +28,14 @@ describe Masamune::Transform::BulkUpsert do
       dimension 'cluster', type: :mini do
         column 'id', type: :integer, surrogate_key: true, auto: true
         column 'name', type: :string, unique: true
-        row name: 'default', attributes: {default: true}
+        row name: 'default', attributes: { default: true }
       end
 
       dimension 'user_account_state', type: :mini do
         column 'name', type: :string, unique: true
         column 'description', type: :string
         row name: 'registered', description: 'Registered'
-        row name: 'active', description: 'Active', attributes: {default: true}
+        row name: 'active', description: 'Active', attributes: { default: true }
         row name: 'inactive', description: 'Inactive'
       end
 
@@ -43,7 +43,7 @@ describe Masamune::Transform::BulkUpsert do
         references :cluster
         column 'tenant_id', type: :integer, unique: true, natural_key: true
         column 'department_id', type: :integer, unique: true, natural_key: true
-        row tenant_id: -1, department_id: -1, attributes: {default: true}
+        row tenant_id: -1, department_id: -1, attributes: { default: true }
       end
 
       dimension 'user', type: :four do

data/spec/masamune/transform/define_table.dimension_spec.rb

@@ -239,13 +239,13 @@ describe Masamune::Transform::DefineTable do
         dimension 'cluster', type: :mini do
           column 'id', type: :integer, surrogate_key: true, auto: true
           column 'name', type: :string, unique: true
-          row name: 'default', attributes: {default: true}
+          row name: 'default', attributes: { default: true }
         end
 
         dimension 'user_account_state', type: :mini do
           column 'name', type: :string, unique: true
           column 'description', type: :string
-          row name: 'active', description: 'Active', attributes: {default: true}
+          row name: 'active', description: 'Active', attributes: { default: true }
         end
 
         dimension 'user', type: :four do
@@ -380,7 +380,7 @@ describe Masamune::Transform::DefineTable do
         dimension 'user_account_state', type: :mini do
           column 'name', type: :string, unique: true
           column 'description', type: :string
-          row name: 'active', description: 'Active', attributes: {default: true}
+          row name: 'active', description: 'Active', attributes: { default: true }
         end
 
         dimension 'user', type: :four do

data/spec/masamune/transform/define_table.fact_spec.rb

@@ -27,7 +27,7 @@ describe Masamune::Transform::DefineTable do
         column 'id', type: :sequence, surrogate_key: true, auto: true
         column 'name', type: :string
 
-        row name: 'current_database()', attributes: {default: true}
+        row name: 'current_database()', attributes: { default: true }
       end
 
       dimension 'date', type: :date do
@@ -150,11 +150,11 @@ describe Masamune::Transform::DefineTable do
   context 'for postgres fact partition with :post' do
     let(:target) { catalog.postgres.visits_fact.partition_table(Date.civil(2015, 01, 01)) }
 
-    let(:options)  { {section: :post} }
+    let(:options)  { { section: :post } }
 
     it 'should eq render table template' do
-      is_expected.to match /ALTER TABLE visits_fact_y2015m01 INHERIT visits_fact;/
-      is_expected.to match /ALTER TABLE visits_fact_y2015m01 ADD CONSTRAINT visits_fact_y2015m01_time_key_check CHECK \(time_key >= 1420070400 AND time_key < 1422748800\);/
+      is_expected.to match(/ALTER TABLE visits_fact_y2015m01 INHERIT visits_fact;/)
+      is_expected.to match(/ALTER TABLE visits_fact_y2015m01 ADD CONSTRAINT visits_fact_y2015m01_time_key_check CHECK \(time_key >= 1420070400 AND time_key < 1422748800\);/)
     end
   end
 
@@ -163,7 +163,7 @@ describe Masamune::Transform::DefineTable do
     let(:intermediate) { catalog.postgres.visits_fact }
     let(:source) { catalog.postgres.visits_file }
     let(:target) { source.stage_table(suffix: 'file', table: intermediate, inherit: false) }
-    let(:options) { { files: files} }
+    let(:options) { { files: files } }
 
     it 'should eq render table template' do
       is_expected.to eq <<-EOS.strip_heredoc

data/spec/masamune/transform/define_table.table_spec.rb

@@ -101,8 +101,8 @@ describe Masamune::Transform::DefineTable do
     before do
       catalog.schema :postgres do
         table 'user' do
-          column 'tenant_id', index: ['tenant_id', 'shared']
-          column 'user_id', index: ['user_id', 'shared']
+          column 'tenant_id', index: %w(tenant_id shared)
+          column 'user_id', index: %w(user_id shared)
         end
       end
     end
@@ -146,7 +146,7 @@ describe Masamune::Transform::DefineTable do
       catalog.schema :postgres do
         table 'user' do
           column 'tenant_id', unique: ['shared']
-          column 'user_id', unique: ['user_id', 'shared']
+          column 'user_id', unique: %w(user_id shared)
         end
       end
     end
@@ -525,8 +525,8 @@ describe Masamune::Transform::DefineTable do
         table 'user' do
           column 'tenant_id', type: :integer, natural_key: true
           column 'user_id', type: :integer, natural_key: true
-          row tenant_id: 'default_tenant_id()', user_id: -1, attributes: {default: true}
-          row tenant_id: 'default_tenant_id()', user_id: -2, attributes: {id: 'unknown'}
+          row tenant_id: 'default_tenant_id()', user_id: -1, attributes: { default: true }
+          row tenant_id: 'default_tenant_id()', user_id: -2, attributes: { id: 'unknown' }
         end
       end
     end
@@ -885,7 +885,7 @@ describe Masamune::Transform::DefineTable do
           column 'name', type: :string, unique: true
           column 'description', type: :string
           row name: 'registered', description: 'Registered'
-          row name: 'active', description: 'Active', attributes: {default: true}
+          row name: 'active', description: 'Active', attributes: { default: true }
           row name: 'inactive', description: 'Inactive'
         end
       end

data/spec/masamune/transform/denormalize_table_spec.rb

@@ -27,7 +27,7 @@ describe Masamune::Transform::DenormalizeTable do
         column 'id', type: :sequence, surrogate_key: true, auto: true
         column 'name', type: :string
 
-        row name: 'current_database()', attributes: {default: true}
+        row name: 'current_database()', attributes: { default: true }
       end
 
       dimension 'date', type: :date do
@@ -73,7 +73,7 @@ describe Masamune::Transform::DenormalizeTable do
 
   context 'with postgres dimension' do
     let(:target) { catalog.postgres.user_dimension }
-    let(:options) { { } }
+    let(:options) { {} }
 
     it 'should eq render denormalize_table template' do
       is_expected.to eq <<-EOS.strip_heredoc
@@ -106,7 +106,7 @@ describe Masamune::Transform::DenormalizeTable do
 
   context 'with postgres fact without :columns' do
     let(:target) { catalog.postgres.visits_fact }
-    let(:options) { { } }
+    let(:options) { {} }
 
     it 'should eq render denormalize_table template' do
       is_expected.to eq <<-EOS.strip_heredoc
@@ -322,18 +322,18 @@ describe Masamune::Transform::DenormalizeTable do
 
     let(:options) do
       {
-        columns: [
-          'tenant_id',
-          'tenant_account_state',
-          'tenant_premium_state',
-          'preferences',
-          'y',
-          'm'
-        ],
-        order: [
-          'tenant_id',
-          'start_at'
-        ]
+        columns: %w(
+          tenant_id
+          tenant_account_state
+          tenant_premium_state
+          preferences
+          y
+          m
+        ),
+        order: %w(
+          tenant_id
+          start_at
+        )
       }
     end
 

data/spec/masamune/transform/insert_reference_values.dimension_spec.rb

@@ -28,7 +28,7 @@ describe Masamune::Transform::InsertReferenceValues do
       dimension 'department', type: :mini do
         column 'tenant_id', type: :integer, unique: true, natural_key: true
         column 'department_id', type: :integer, unique: true, natural_key: true
-        row tenant_id: -1, department_id: -1, attributes: {default: true}
+        row tenant_id: -1, department_id: -1, attributes: { default: true }
       end
 
       dimension 'user', type: :four do

data/spec/masamune/transform/load_dimension_spec.rb

@@ -31,7 +31,7 @@ describe Masamune::Transform::LoadDimension do
       dimension 'department', type: :mini do
         column 'tenant_id', type: :integer, unique: true, natural_key: true
         column 'department_id', type: :integer, unique: true, natural_key: true
-        row tenant_id: -1, department_id: -1, attributes: {default: true}
+        row tenant_id: -1, department_id: -1, attributes: { default: true }
       end
 
       dimension 'user', type: :four do