ridgepole 0.7.3.beta → 0.7.3.beta2

data/spec/postgresql/migrate/migrate_add_column_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when add 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) %>
@@ -57,11 +57,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) %>
@@ -120,8 +120,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,10 +135,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("employee_clubs", {:bulk => true}) do |t|
           t.column("any_col", :string, {:limit=>255, :null=>false})
         end
@@ -147,26 +147,26 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.column("age", :integer, {:null=>false})
           t.column("updated_at", :date, {})
         end
-      EOS
+      RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl
     }
   end
 
   context 'when add column (int/noop)' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "dept_emp", id: false, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.string  "dept_no", limit: 4, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "dept_emp", id: false, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "emp_no2", null: false
@@ -174,8 +174,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
@@ -184,11 +184,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
-      migrated, sql = delta.migrate(:noop => true)
+      migrated, sql = delta.migrate(noop: true)
       expect(migrated).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
 
-      expect(sql).to match_fuzzy("ALTER TABLE \"dept_emp\" ADD \"emp_no2\" integer NOT NULL")
+      expect(sql).to match_fuzzy('ALTER TABLE "dept_emp" ADD "emp_no2" integer NOT NULL')
     }
   end
 end

data/spec/postgresql/migrate/migrate_add_expression_index_spec.rb

@@ -3,14 +3,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
   context 'when add_index contains expression' do
     let(:actual_dsl) { '' }
-    let(:expected_dsl) { erbh(<<-EOS) }
+    let(:expected_dsl) { erbh(<<-ERB) }
       create_table "users", force: :cascade do |t|
         t.string "name", null: false
         t.datetime "created_at", null: false
         t.datetime "updated_at", null: false
         t.index "lower((name)::text)", name: "index_users_on_lower_name", <%= i cond(5.0, using: :btree) %>
       end
-    EOS
+    ERB
 
     specify do
       delta = subject.diff(expected_dsl)

data/spec/postgresql/migrate/migrate_bigint_spec.rb

@@ -2,13 +2,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when add bigint column' do
     let(:actual_dsl) { '' }
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "bigint_test", id: false, force: :cascade do |t|
           t.bigint "b"
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
@@ -22,21 +22,21 @@ describe 'Ridgepole::Client#diff -> migrate' do
   end
 
   context 'when no change' do
-    let(:dsl) {
-      erbh(<<-EOS)
+    let(:dsl) do
+      erbh(<<-ERB)
         create_table "bigint_test", id: false, force: :cascade do |t|
           t.bigint "b"
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "bigint_test", id: false, force: :cascade do |t|
           t.bigint "b"
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(dsl).migrate }
     subject { client }

data/spec/postgresql/migrate/migrate_change_column_default_spec.rb

@@ -1,26 +1,26 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change column' do
-    let(:actual_dsl) {
-      <<-EOS
+    let(:actual_dsl) do
+      <<-RUBY
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", default: 0, null: false
           t.integer "salary", null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
-      EOS
-    }
+      RUBY
+    end
 
-    let(:expected_dsl) {
-      <<-EOS
+    let(:expected_dsl) do
+      <<-RUBY
         create_table "salaries", id: false, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "salary", null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
         end
-      EOS
-    }
+      RUBY
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }

data/spec/postgresql/migrate/migrate_change_column_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change 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) %>
@@ -57,11 +57,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) %>
@@ -117,8 +117,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 }
@@ -132,10 +132,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("employee_clubs", {:bulk => true}) do |t|
           t.change("club_id", :integer, {:null=>true, :default=>nil})
         end
@@ -143,30 +143,30 @@ describe 'Ridgepole::Client#diff -> migrate' do
         change_table("employees", {:bulk => true}) do |t|
           t.change("last_name", :string, {:limit=>20, :default=>"XXX"})
         end
-      EOS
+      RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl
     }
   end
 
   context 'when string/text without limit (no change)' 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.text "desc"
         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.text "desc"
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }

data/spec/postgresql/migrate/migrate_change_index_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change index' 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.remove_index({:name=>"idx_dept_emp_emp_no"})
           t.index(["from_date"], {:name=>"idx_dept_emp_emp_no", :using=>:btree, :unique=>false})
@@ -152,11 +152,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.remove_index({:name=>"idx_salaries_emp_no"})
           t.index(["from_date"], {:name=>"idx_salaries_emp_no", :using=>:btree, :unique=>false})
         end
-      EOS
+      RUBY
 
-      expect {
+      expect do
         delta.migrate
-      }.to_not raise_error
+      end.to_not raise_error
     }
   end
 end

data/spec/postgresql/migrate/migrate_check_relation_column_type_spec.rb

@@ -1,7 +1,7 @@
-describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
+describe 'Ridgepole::Client#diff -> migrate', condition: '>= 5.1.0' do
   context 'with warning' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "dept_manager", force: :cascade do |t|
           t.string  "dept_no", limit: 4, null: false
           t.date    "from_date", null: false
@@ -16,11 +16,11 @@ describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 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 "dept_manager", force: :cascade do |t|
           t.string  "dept_no", limit: 4, null: false
           t.date    "from_date", null: false
@@ -36,18 +36,18 @@ describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 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(check_relation_type: 'bigserial') }
 
     it {
-      expect(Ridgepole::Logger.instance).to receive(:warn).with(<<-EOS)
+      expect(Ridgepole::Logger.instance).to receive(:warn).with(<<-MSG)
 [WARNING] Relation column type is different.
               employees.id: {:type=>:integer}
   dept_manager.employee_id: {:type=>:bigint}
-      EOS
+      MSG
 
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
@@ -58,8 +58,8 @@ describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
   end
 
   context 'with warning' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "dept_manager", force: :cascade do |t|
           t.string  "dept_no", limit: 4, null: false
           t.date    "from_date", null: false
@@ -74,11 +74,11 @@ describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 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 "dept_manager", force: :cascade do |t|
           t.string  "dept_no", limit: 4, null: false
           t.date    "from_date", null: false
@@ -94,8 +94,8 @@ describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 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(check_relation_type: 'bigserial') }

data/spec/postgresql/migrate/migrate_create_table_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when create table' do
-    let(:dsl) {
-      erbh(<<-EOS)
+    let(: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) %>
@@ -57,11 +57,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(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "departments", primary_key: "dept_no", force: :cascade do |t|
           t.string "dept_name", limit: 40, null: false
         end
@@ -99,8 +99,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
 
     let(:expected_dsl) { dsl }