ridgepole 0.7.3.beta → 0.7.3.beta2

data/spec/mysql/migrate/migrate_change_index5_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change index (unique: false)' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "salaries", force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "salary", null: false
@@ -9,11 +9,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "to_date", null: false
           t.index ["emp_no", "id"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "salaries", force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "salary", null: false
@@ -21,8 +21,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "to_date", null: false
           t.index ["emp_no", "id"], name: "emp_no", unique: false, <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
@@ -34,8 +34,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
   end
 
   context 'when change index (unique: true)' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "salaries", force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "salary", null: false
@@ -43,11 +43,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "to_date", null: false
           t.index ["emp_no", "id"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "salaries", force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "salary", null: false
@@ -55,8 +55,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "to_date", null: false
           t.index ["emp_no", "id"], name: "emp_no", unique: true, <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }

data/spec/mysql/migrate/migrate_change_index6_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change index (use t.index)' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "clubs", force: :cascade do |t|
           t.string "name", default: "", null: false
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
@@ -59,11 +59,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "to_date"
           t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "clubs", force: :cascade do |t|
           t.string "name", default: "", null: false
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
@@ -121,11 +121,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "to_date"
           t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl_using_t_index) {
-      erbh(<<-EOS)
+    let(:expected_dsl_using_t_index) do
+      erbh(<<-ERB)
         create_table "clubs", force: :cascade do |t|
           t.string "name", default: "", null: false
           t.index "name", name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
@@ -183,8 +183,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "to_date"
           t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }

data/spec/mysql/migrate/migrate_change_index7_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change index (length is Numeric) / No update' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -10,11 +10,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date   "hire_date", null: false
           t.index ["first_name", "last_name"], name: "idx_first_name_last_name", length: <%= cond('< 5.2.0.beta2', '{ first_name: 10, last_name: 10 }', 10) %>, <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -23,8 +23,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date   "hire_date", null: false
           t.index ["first_name", "last_name"], name: "idx_first_name_last_name", length: <%= cond('< 5.2.0.beta2', 10, '{ first_name: 10, last_name: 10 }') %>, <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
@@ -37,8 +37,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
   end
 
   context 'when change index (length is Numeric) / Update' do
-    let(:actual_dsl) {
-      <<-EOS
+    let(:actual_dsl) do
+      <<-RUBY
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -46,11 +46,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
         end
-      EOS
-    }
+      RUBY
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -59,15 +59,15 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date   "hire_date", null: false
           t.index ["first_name", "last_name"], name: "idx_first_name_last_name", length: <%= cond('< 5.2.0.beta2', 10, '{ first_name: 10, last_name: 10 }') %>, <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:actual_dsl_plus_index) {
-      actual_dsl.sub(/\bend\b/, erbh(<<-EOS))
+    let(:actual_dsl_plus_index) do
+      actual_dsl.sub(/\bend\b/, erbh(<<-ERB))
           t.index ["first_name", "last_name"], name: "idx_first_name_last_name", length: <%= cond('< 5.2.0.beta2', '{ first_name: 10, last_name: 10 }', 10) %>, <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }

data/spec/mysql/migrate/migrate_change_index8_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change index (length has string keys) / No update' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -10,11 +10,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date   "hire_date", null: false
           t.index ["first_name", "last_name"], name: "idx_first_name_last_name", length: <%= cond('< 5.2.0.beta2', '{ first_name: 10, last_name: 10 }', 10) %>, <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -23,8 +23,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date   "hire_date", null: false
           t.index ["first_name", "last_name"], name: "idx_first_name_last_name", length: <%= cond('< 5.2.0.beta2', 10, '{ "first_name" => 10, "last_name" => 10, "foo" => nil }') %>, <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
@@ -37,8 +37,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
   end
 
   context 'when change index (length has string keys) / Update' do
-    let(:actual_dsl) {
-      <<-EOS
+    let(:actual_dsl) do
+      <<-RUBY
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -46,11 +46,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
         end
-      EOS
-    }
+      RUBY
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -59,15 +59,15 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date   "hire_date", null: false
           t.index ["first_name", "last_name"], name: "idx_first_name_last_name", length: <%= cond('< 5.2.0.beta2', 10, '{ "first_name" => 10, "last_name" => 10 }') %>, <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:actual_dsl_plus_index) {
-      actual_dsl.sub(/\bend\b/, erbh(<<-EOS))
+    let(:actual_dsl_plus_index) do
+      actual_dsl.sub(/\bend\b/, erbh(<<-ERB))
           t.index ["first_name", "last_name"], name: "idx_first_name_last_name", length: <%= cond('< 5.2.0.beta2', '{ first_name: 10, last_name: 10 }', 10) %>, <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }

data/spec/mysql/migrate/migrate_change_index_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change index' do
-    let(:dsl) {
-      erbh(<<-EOS)
+    let(:dsl) do
+      erbh(<<-ERB)
         create_table "clubs", force: :cascade do |t|
           t.string "name", default: "", null: false
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
@@ -59,11 +59,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "to_date"
           t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "clubs", force: :cascade do |t|
           t.string "name", default: "", null: false
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
@@ -121,11 +121,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "to_date"
           t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "clubs", force: :cascade do |t|
           t.string "name", default: "", null: false
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
@@ -183,8 +183,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "to_date"
           t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
@@ -198,10 +198,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
 
     it {
-      delta = client(:bulk_change => true).diff(expected_dsl)
+      delta = client(bulk_change: true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
-      expect(delta.script).to match_fuzzy <<-EOS
+      expect(delta.script).to match_fuzzy <<-RUBY
         change_table("dept_emp", {:bulk => true}) do |t|
           t.remove_index({:name=>"emp_no"})
           t.index(["from_date"], {:name=>"emp_no", :using=>:btree, :unique=>false})
@@ -216,12 +216,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.remove_index({:name=>"emp_no"})
           t.index(["from_date"], {:name=>"emp_no", :using=>:btree, :unique=>false})
         end
-      EOS
+      RUBY
 
       # XXX: Can not add an index of the same name
-      expect {
+      expect do
         delta.migrate
-      }.to raise_error(/Index name 'emp_no' on table 'dept_emp' already exists/)
+      end.to raise_error(/Index name 'emp_no' on table 'dept_emp' already exists/)
     }
   end
 end

data/spec/mysql/migrate/migrate_change_table_comment_spec.rb

@@ -1,6 +1,6 @@
 describe 'Ridgepole::Client#diff -> migrate' do
-  let(:actual_dsl) {
-    erbh(<<-EOS)
+  let(:actual_dsl) do
+    erbh(<<-ERB)
       create_table "employees", force: :cascade, comment: "old comment" do |t|
         t.date   "birth_date", null: false
         t.string "first_name", limit: 14, null: false
@@ -8,11 +8,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         t.string "gender", limit: 1, null: false
         t.date   "hire_date", null: false
       end
-    EOS
-  }
+    ERB
+  end
 
-  let(:expected_dsl) {
-    erbh(<<-EOS)
+  let(:expected_dsl) do
+    erbh(<<-ERB)
       create_table "employees", force: :cascade, comment: "new comment" do |t|
         t.date   "birth_date", null: false
         t.string "first_name", limit: 14, null: false
@@ -20,8 +20,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
         t.string "gender", limit: 1, null: false
         t.date   "hire_date", null: false
       end
-    EOS
-  }
+    ERB
+  end
 
   before { subject.diff(actual_dsl).migrate }
 
@@ -29,11 +29,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
     subject { client }
 
     it {
-      expect(Ridgepole::Logger.instance).to receive(:warn).with(<<-EOS)
+      expect(Ridgepole::Logger.instance).to receive(:warn).with(<<-MSG)
 [WARNING] No difference of schema configuration for table `employees` but table options differ.
   from: {:comment=>"old comment"}
     to: {:comment=>"new comment"}
-      EOS
+      MSG
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_falsey
       expect(subject.dump).to match_ruby actual_dsl

data/spec/mysql/migrate/migrate_change_table_option_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when create_table options are different' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -9,11 +9,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no2", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -21,18 +21,18 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
 
     it {
-      expect(Ridgepole::Logger.instance).to receive(:warn).with(<<-EOS)
+      expect(Ridgepole::Logger.instance).to receive(:warn).with(<<-MSG)
 [WARNING] No difference of schema configuration for table `employees` but table options differ.
   from: {:primary_key=>"emp_no"}
     to: {:primary_key=>"emp_no2"}
-      EOS
+      MSG
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_falsey
       expect(subject.dump).to match_ruby actual_dsl
@@ -42,8 +42,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
   end
 
   context 'when create_table options are different (ignore comment)' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -51,11 +51,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", comment: "my comment", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -63,8 +63,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client(ignore_table_comment: true) }