ridgepole 0.7.3.beta → 0.7.3.beta2

data/spec/postgresql/migrate/migrate_references_spec.rb

@@ -1,23 +1,23 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when use references (no change)' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.<%= cond('>= 5.1','bigint', 'integer') %> "products_id"
           t.<%= cond('>= 5.1','bigint', 'integer') %> "user_id"
           t.index "products_id"
           t.index "user_id"
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      <<-EOS
+    let(:expected_dsl) do
+      <<-RUBY
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.references :products, :user, index: true
         end
-      EOS
-    }
+      RUBY
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
@@ -29,8 +29,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
   end
 
   context 'when use references with polymorphic (no change)' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.<%= cond('>= 5.1','bigint', 'integer') %> "products_id"
           t.string "products_type"
@@ -39,16 +39,16 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.index ["products_type", "products_id"]
           t.index ["user_type", "user_id"]
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      <<-EOS
+    let(:expected_dsl) do
+      <<-RUBY
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.references :products, :user, index: true, polymorphic: true
         end
-      EOS
-    }
+      RUBY
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
@@ -60,22 +60,22 @@ describe 'Ridgepole::Client#diff -> migrate' do
   end
 
   context 'when use references with index false (no change)' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.<%= cond('>= 5.1','bigint', 'integer') %> "products_id"
           t.<%= cond('>= 5.1','bigint', 'integer') %> "user_id"
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      <<-EOS
+    let(:expected_dsl) do
+      <<-RUBY
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.references :products, :user, index: false
         end
-      EOS
-    }
+      RUBY
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }

data/spec/postgresql/migrate/migrate_rename_column_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when rename column' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "clubs", force: :cascade do |t|
           t.string "name", limit: 255, default: "", null: false
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
@@ -58,11 +58,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "to_date"
           t.index ["emp_no"], name: "idx_titles_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", limit: 255, default: "", null: false
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
@@ -119,8 +119,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "to_date"
           t.index ["emp_no"], name: "idx_titles_emp_no", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
@@ -134,10 +134,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.rename("from_date", "from_date2")
         end
@@ -145,7 +145,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         change_table("dept_manager", {:bulk => true}) do |t|
           t.rename("to_date", "to_date2")
         end
-      EOS
+      RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl.gsub(/\s*,\s*renamed_from:.*$/, '')
     }

data/spec/postgresql/migrate/migrate_rename_table_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when rename table' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "clubs", force: :cascade do |t|
           t.string "name", limit: 255, default: "", null: false
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
@@ -58,11 +58,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "to_date"
           t.index ["emp_no"], name: "idx_titles_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", limit: 255, default: "", null: false
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
@@ -119,8 +119,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "to_date"
           t.index ["emp_no"], name: "idx_titles_emp_no", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
@@ -135,8 +135,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
   end
 
   context 'when rename table (dry-run)' 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
@@ -144,11 +144,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date   "hire_date", null: false
           t.index ["first_name"], name: "first_name", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "employees2", primary_key: "emp_no", force: :cascade, renamed_from: 'employees' do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -156,8 +156,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date   "hire_date", null: false
           t.index ["first_name"], name: "first_name", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }

data/spec/postgresql/migrate/migrate_same_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when database and definition are same' do
-    let(:dsl) {
-      erbh(<<-EOS)
+    let(:dsl) do
+      erbh(<<-ERB)
         create_table "clubs", <%= i cond('>= 5.1',id: :serial) + {force: :cascade} %> do |t|
           t.string "name", limit: 255, default: "", null: false
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
@@ -58,8 +58,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "to_date"
           t.index ["emp_no"], name: "idx_titles_emp_no", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
     before { restore_tables }
     subject { client }

data/spec/postgresql/~default_name_fk/migrate_change_fk_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change fk' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "parent", force: :cascade do |t|
         end
 
@@ -11,11 +11,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc", on_delete: :cascade
-      EOS
-    }
+      ERB
+    end
 
-    let(:sorted_actual_dsl) {
-      erbh(<<-EOS)
+    let(:sorted_actual_dsl) do
+      erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
           t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
@@ -25,11 +25,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc", on_delete: :cascade
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
           t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
@@ -39,8 +39,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
 

data/spec/postgresql/~default_name_fk/migrate_create_fk_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when create fk' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
           t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
@@ -9,14 +9,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         create_table "parent", force: :cascade do |t|
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      actual_dsl + (<<-EOS)
+    let(:expected_dsl) do
+      actual_dsl + <<-RUBY
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
-      EOS
-    }
+      RUBY
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client(dump_with_default_fk_name: true) }
@@ -33,17 +33,17 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta = client(bulk_change: true, dump_with_default_fk_name: 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
         add_foreign_key("child", "parent", {:name=>"fk_rails_e74ce85cbc"})
-      EOS
+      RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl
     }
   end
 
   context 'when create fk when create table' do
-    let(:dsl) {
-      erbh(<<-EOS)
+    let(:dsl) do
+      erbh(<<-ERB)
         # Define parent before child
         create_table "parent", force: :cascade do |t|
         end
@@ -54,11 +54,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
-      EOS
-    }
+      ERB
+    end
 
-    let(:sorted_dsl) {
-      erbh(<<-EOS)
+    let(:sorted_dsl) do
+      erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
           t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
@@ -68,8 +68,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
-      EOS
-    }
+      ERB
+    end
 
     before { client.diff('').migrate }
     subject { client(dump_with_default_fk_name: true) }
@@ -84,8 +84,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
   end
 
   context 'already defined' do
-    let(:dsl) {
-      erbh(<<-EOS)
+    let(:dsl) do
+      erbh(<<-ERB)
         # Define parent before child
         create_table "parent", force: :cascade do |t|
         end
@@ -98,35 +98,35 @@ describe 'Ridgepole::Client#diff -> migrate' do
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
-      EOS
-    }
+      ERB
+    end
 
     subject { client(dump_with_default_fk_name: true) }
 
     it {
-      expect {
+      expect do
         subject.diff(dsl)
-      }.to raise_error('Foreign Key `child(fk_rails_e74ce85cbc)` already defined')
+      end.to raise_error('Foreign Key `child(fk_rails_e74ce85cbc)` already defined')
     }
   end
 
   context 'orphan fk' do
-    let(:dsl) {
-      erbh(<<-EOS)
+    let(:dsl) do
+      erbh(<<-ERB)
         # Define parent before child
         create_table "parent", force: :cascade do |t|
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
-      EOS
-    }
+      ERB
+    end
 
     subject { client(dump_with_default_fk_name: true) }
 
     it {
-      expect {
+      expect do
         subject.diff(dsl)
-      }.to raise_error('Table `child` to create the foreign key is not defined: fk_rails_e74ce85cbc')
+      end.to raise_error('Table `child` to create the foreign key is not defined: fk_rails_e74ce85cbc')
     }
   end
 end

data/spec/postgresql/~default_name_fk/migrate_drop_fk_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when drop fk' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "parent", force: :cascade do |t|
         end
 
@@ -11,17 +11,17 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
-      EOS
-    }
+      ERB
+    end
 
-    let(:sorted_actual_dsl) {
-      expected_dsl + (<<-EOS)
+    let(:sorted_actual_dsl) do
+      expected_dsl + <<-RUBY
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
-      EOS
-    }
+      RUBY
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
           t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
@@ -29,8 +29,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         create_table "parent", force: :cascade do |t|
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client(dump_with_default_fk_name: true) }
@@ -47,17 +47,17 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta = client(bulk_change: true, dump_with_default_fk_name: true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy sorted_actual_dsl
-      expect(delta.script).to match_fuzzy <<-EOS
+      expect(delta.script).to match_fuzzy <<-RUBY
         remove_foreign_key("child", {:name=>"fk_rails_e74ce85cbc"})
-      EOS
+      RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl
     }
   end
 
   context 'when drop fk when drop table' do
-    let(:dsl) {
-      erbh(<<-EOS)
+    let(:dsl) do
+      erbh(<<-ERB)
         create_table "parent", force: :cascade do |t|
         end
 
@@ -67,11 +67,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
-      EOS
-    }
+      ERB
+    end
 
-    let(:sorted_dsl) {
-      erbh(<<-EOS)
+    let(:sorted_dsl) do
+      erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
           t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
@@ -81,8 +81,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(dsl).migrate }
     subject { client(dump_with_default_fk_name: true) }