ridgepole 0.7.3.beta → 0.7.3.beta2

data/spec/mysql/migrate/migrate_with_pre_post_query_spec.rb

@@ -1,8 +1,8 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'migrate with pre/post query' do
     let(:actual_dsl) { '' }
-    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) %>
@@ -60,11 +60,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) %>
@@ -130,15 +130,15 @@ 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
 
-    subject {
+    subject do
       client(
-        :pre_query  => 'create table pre  (id int)',
-        :post_query => 'create table post (id int)',
+        pre_query: 'create table pre  (id int)',
+        post_query: 'create table post (id int)'
       )
-    }
+    end
 
     it {
       delta = subject.diff(dsl)

data/spec/mysql/migrate/migrate_with_tables_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when with tables option (same)' do
-    let(:current_schema) {
-      <<-EOS
+    let(:current_schema) 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
@@ -18,11 +18,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["salary"], name: "emp_no", using: :btree
-      EOS
-    }
+      RUBY
+    end
 
-    let(:dsl) {
-      <<-EOS
+    let(: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
@@ -39,11 +39,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
-      EOS
-    }
+      RUBY
+    end
 
-    let(:expected_dsl) {
-      <<-EOS
+    let(:expected_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
@@ -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
-    }
+      RUBY
+    end
 
     before { subject.diff(current_schema).migrate }
-    subject { client(tables: ['employees'] ) }
+    subject { client(tables: ['employees']) }
 
     it {
       delta = subject.diff(dsl)
@@ -67,8 +67,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
   end
 
   context 'when with tables option (differ)' do
-    let(:current_schema) {
-      <<-EOS
+    let(:current_schema) 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
@@ -85,11 +85,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["salary"], name: "emp_no", using: :btree
-      EOS
-    }
+      RUBY
+    end
 
-    let(:dsl) {
-      <<-EOS
+    let(: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: 15, null: false
@@ -106,11 +106,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
-      EOS
-    }
+      RUBY
+    end
 
-    let(:before_dsl) {
-      <<-EOS
+    let(:before_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
@@ -118,11 +118,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(:after_dsl) {
-      <<-EOS
+    let(:after_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: 15, null: false
@@ -130,8 +130,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
         end
-      EOS
-    }
+      RUBY
+    end
 
     before { subject.diff(current_schema).migrate }
     subject { client(tables: ['employees']) }

data/spec/mysql/migrate/migrate_with_verbose_log_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'with verbose log' 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_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -21,15 +21,15 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender2", limit: 1, null: false
           t.date   "hire_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
 
     it {
       verbose_infos = []
-      allow(Ridgepole::Logger.instance).to receive(:verbose_info) {|m| verbose_infos << m }
+      allow(Ridgepole::Logger.instance).to receive(:verbose_info) { |m| verbose_infos << m }
 
       Ridgepole::Logger.verbose = true
       delta = subject.diff(expected_dsl)
@@ -40,16 +40,16 @@ describe 'Ridgepole::Client#diff -> migrate' do
       Ridgepole::Logger.verbose = false
 
       expected_verbose_infos = [
-        "# Parse DSL",
-        "# Load tables",
-        "#   employees",
-        "# Compare definitions",
-        "#   employees",
+        '# Parse DSL',
+        '# Load tables',
+        '#   employees',
+        '# Compare definitions',
+        '#   employees',
         " {:definition=>\n   {\"birth_date\"=>{:options=>{:null=>false}, :type=>:date},\n    \"first_name\"=>{:options=>{:limit=>14, :null=>false}, :type=>:string},\n-   \"gender\"=>{:options=>{:limit=>1, :null=>false}, :type=>:string},\n+   \"gender2\"=>{:options=>{:limit=>1, :null=>false}, :type=>:string},\n    \"hire_date\"=>{:options=>{:null=>false}, :type=>:date},\n    \"last_name\"=>{:options=>{:limit=>16, :null=>false}, :type=>:string}},\n  :options=>{:primary_key=>\"emp_no\"}}",
-        "# Load tables",
-        "#   employees",
-        "# Load tables",
-        "#   employees",
+        '# Load tables',
+        '#   employees',
+        '# Load tables',
+        '#   employees'
       ]
 
       expect(verbose_infos).to match_array expected_verbose_infos

data/spec/mysql/migrate_/migrate_create_index_with_alter_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when create 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
         end
@@ -118,8 +118,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "from_date", null: false
           t.date    "to_date"
         end
-      EOS
-    }
+      ERB
+    end
 
     let(:expected_dsl) { dsl }
 

data/spec/mysql/migrate_/migrate_drop_index_with_alter_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when drop 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,13 +59,13 @@ 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) { dsl }
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "clubs", force: :cascade do |t|
           t.string "name", default: "", null: false
         end
@@ -120,8 +120,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "from_date", null: false
           t.date    "to_date"
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client(mysql_use_alter: true) }

data/spec/mysql/text_blob_types/text_blob_types_spec.rb

@@ -3,7 +3,7 @@ describe 'Ridgepole::Client (with new text/blob types)' do
     subject { client }
 
     it do
-      delta = subject.diff(<<-EOS)
+      delta = subject.diff(<<-RUBY)
         create_table :foos, id: :unsigned_integer do |t|
           t.blob             :blob
           t.tinyblob         :tiny_blob
@@ -17,12 +17,12 @@ describe 'Ridgepole::Client (with new text/blob types)' do
           t.unsigned_bigint  :unsigned_bigint
           t.unsigned_integer :unsigned_integer
         end
-      EOS
+      RUBY
 
       expect(delta.differ?).to be_truthy
       delta.migrate
 
-      expect(subject.dump).to match_fuzzy erbh(<<-EOS)
+      expect(subject.dump).to match_fuzzy erbh(<<-ERB)
         create_table "foos", id: :integer, unsigned: true, force: :cascade do |t|
           t.binary  "blob", <%= i cond(5.0, limit: 65535) %>
           t.blob    "tiny_blob", limit: 255
@@ -36,7 +36,7 @@ describe 'Ridgepole::Client (with new text/blob types)' do
           t.bigint  "unsigned_bigint", unsigned: true
           t.integer "unsigned_integer", unsigned: true
         end
-      EOS
+      ERB
     end
   end
 
@@ -44,7 +44,7 @@ describe 'Ridgepole::Client (with new text/blob types)' do
     subject { client }
 
     before do
-      subject.diff(<<-EOS).migrate
+      subject.diff(<<-RUBY).migrate
         create_table :foos do |t|
           t.blob             :blob
           t.tinyblob         :tiny_blob
@@ -58,11 +58,11 @@ describe 'Ridgepole::Client (with new text/blob types)' do
           t.unsigned_bigint  :unsigned_bigint
           t.unsigned_integer :unsigned_integer
         end
-      EOS
+      RUBY
     end
 
     it do
-      delta = subject.diff(<<-EOS)
+      delta = subject.diff(<<-RUBY)
         create_table :foos do |t|
           t.blob             :blob
           t.tinyblob         :tiny_blob
@@ -76,7 +76,7 @@ describe 'Ridgepole::Client (with new text/blob types)' do
           t.unsigned_bigint  :unsigned_bigint
           t.unsigned_integer :unsigned_integer
         end
-      EOS
+      RUBY
 
       expect(delta.differ?).to be_falsey
     end

data/spec/mysql/~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", <%= i cond('>= 5.1',id: :integer) %>, 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/mysql/~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", <%= i cond('>= 5.1',id: :integer) %>, 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", <%= i cond('>= 5.1',id: :integer) %>, 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
 
     subject { client(dump_with_default_fk_name: true) }
 
@@ -83,8 +83,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", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
         end
@@ -97,35 +97,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", <%= i cond('>= 5.1',id: :integer) %>, 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