ridgepole 0.5.2.beta → 0.5.2.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e89391bd7d67f71ab9d326e42226fffaa1c23962
-  data.tar.gz: a1966c6828572057af20625308e2cd53c0d1875e
+  metadata.gz: 7736b373af1f2d21a0daac512947613e8b0f177a
+  data.tar.gz: f19ee4c3d025fef7fc6937d7d3f83e7da768a196
 SHA512:
-  metadata.gz: 33d6c97cf20903b6cbaaf4a2d1a15d6e4c49984011fd443a460cdff5b3a63af6cdf55ed2529674a62fbff468f678da4493bfe6994346ef31fe144396d08f34cf
-  data.tar.gz: 4dac5448a53e81c93847ae322e07940ec296627c8162afe62acdc406a4925992ca9d7e1e1414dec67c88494662c01704ca51d7d9af758eec305620c750ff2d02
+  metadata.gz: d8177bba6eaad6aef5bf8dc07384285310ce7672a1f4028722a25fdfe7b26a1435a601debd1a519d98cdaa49f0376eab8f3850e196fcfaed7b510504e2977585
+  data.tar.gz: c8fd2a7892296d7bcb072e1d20fdb047f07a29638d8c74ead934409c77134ba8d6bc254c088920abf4a6249f7a08f3721f42df9f2362e469218e60fdbe404cf1

data/README.md

@@ -58,7 +58,6 @@ Usage: ridgepole [options]
     -e, --export
         --split
         --split-with-dir
-        --without-table-options
     -d, --diff DSL1 DSL2
         --reverse
         --with-apply
@@ -71,6 +70,7 @@ Usage: ridgepole [options]
         --enable-migration-comments
         --enable-mysql-awesome
         --normalize-mysql-float
+        --dump-without-table-options
     -r, --require LIBS
         --log-file LOG_FILE
         --verbose
@@ -183,9 +183,20 @@ create_table "articles", force: true, comment: "table comment" do |t|
 end
 ```
 
+## Collation
+You can use the column collation by passing `--enable-mysql-awesome` ([activerecord-mysql-awesome](https://github.com/kamipo/activerecord-mysql-awesome) is required)
+
+```ruby
+create_table "articles", force: true, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  t.string   "title",                    collation: "ascii_bin"
+  t.text     "text",       null: false,  collation: "utf8mb4_bin"
+  t.datetime "created_at"
+  t.datetime "updated_at"
+endend
+```
+
 ## bigint support
 Export of `bigint` PK is enabled by passing `--enable-mysql-pkdump` ([activerecord-mysql-pkdump](https://github.com/winebarrel/activerecord-mysql-pkdump) is required)
-
 ```ruby
 create_table "books", id: "bigint(20) PRIMARY KEY auto_increment", force: true do |t|
   t.string   "title",      null: false

data/bin/ridgepole

@@ -74,7 +74,6 @@ ARGV.options do |opt|
     opt.on('-e', '--export')                      {    set_mode[:export]                                    }
     opt.on('',   '--split')                       {|v| split = true                                         }
     opt.on('',   '--split-with-dir')              {|v| split = :with_dir                                    }
-    opt.on('',   '--without-table-options')       {    options[:without_table_options] = true               }
     opt.on('-d', '--diff DSL1 DSL2') {|diff_arg1|
       set_mode[:diff]
       diff_arg2 = ARGV.first
@@ -98,6 +97,7 @@ ARGV.options do |opt|
     opt.on('',   '--enable-migration-comments')   {    options[:enable_migration_comments] = true           }
     opt.on('',   '--enable-mysql-awesome')        {    options[:enable_mysql_awesome] = true                }
     opt.on('',   '--normalize-mysql-float')       {    options[:normalize_mysql_float] = true               }
+    opt.on('',   '--dump-without-table-options')  {    options[:dump_without_table_options] = true          }
     opt.on('-r'  , '--require LIBS', Array)       {|v| v.each {|i| require i }                              }
     opt.on(''  , '--log-file LOG_FILE')           {|v| options[:log_file] = v                               }
     opt.on(''  , '--verbose')                     {    Ridgepole::Logger.verbose = true                     }

data/lib/ridgepole/dumper.rb

@@ -35,8 +35,8 @@ class Ridgepole::Dumper
       line !~ /\AActiveRecord::Schema\.define/ &&
       line !~ /\Aend/
     }.map {|line|
-      if @options[:without_table_options] and line =~ /\A  create_table /
-        line.gsub(/, options: "[^"]*"/, '')
+      if @options[:dump_without_table_options] and line =~ /\A  create_table /
+        line.gsub(/, options: ("(?:[^"]|\")*")/, '')
       else
         line
       end

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.5.2.beta'
+  VERSION = '0.5.2.beta2'
 end

data/spec/cli/ridgepole_spec.rb

@@ -23,7 +23,6 @@ describe 'ridgepole' do
         -e, --export
             --split
             --split-with-dir
-            --without-table-options
         -d, --diff DSL1 DSL2
             --reverse
             --with-apply
@@ -36,6 +35,7 @@ describe 'ridgepole' do
             --enable-migration-comments
             --enable-mysql-awesome
             --normalize-mysql-float
+            --dump-without-table-options
         -r, --require LIBS
             --log-file LOG_FILE
             --verbose

data/spec/dump/dump_class_method_spec.rb

@@ -8,7 +8,7 @@ describe 'Ridgepole::Client.dump' do
 
       if mysql_awesome_enabled?
         opts[:enable_mysql_awesome] = true
-        opts[:without_table_options] = true
+        opts[:dump_without_table_options] = true
       else
         opts[:enable_mysql_unsigned] = true
       end

data/spec/dump/dump_without_table_options_spec.rb

@@ -0,0 +1,43 @@
+if mysql_awesome_enabled?
+  describe 'Ridgepole::Client#dump' do
+    let(:actual_dsl) {
+      <<-'RUBY'
+        create_table "books", force: true, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='\"london\" bridge \"is\" falling \"down\"'" do |t|
+          t.string   "title",      null: false
+          t.integer  "author_id",  null: false
+          t.datetime "created_at"
+          t.datetime "updated_at"
+        end
+      RUBY
+    }
+
+    context 'when without table options' do
+      let(:expected_dsl) {
+        <<-RUBY
+          create_table "books", force: true do |t|
+            t.string   "title",      null: false
+            t.integer  "author_id",  null: false
+            t.datetime "created_at"
+            t.datetime "updated_at"
+          end
+        RUBY
+      }
+
+      before { subject.diff(actual_dsl).migrate }
+      subject { client }
+
+      it {
+        expect(subject.dump).to eq expected_dsl.strip_heredoc.strip
+      }
+    end
+
+    context 'when with table options' do
+      before { subject.diff(actual_dsl).migrate }
+      subject { client(dump_without_table_options: false) }
+
+      it {
+        expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
+      }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -55,7 +55,7 @@ def client(options = {}, config = {})
 
   if mysql_awesome_enabled?
     default_options[:enable_mysql_awesome] = true
-    default_options[:without_table_options] = true
+    default_options[:dump_without_table_options] = true
   else
     default_options[:enable_mysql_unsigned] = true
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.5.2.beta
+  version: 0.5.2.beta2
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -207,6 +207,7 @@ files:
 - spec/dump/dump_class_method_spec.rb
 - spec/dump/dump_some_tables_spec.rb
 - spec/dump/dump_spec.rb
+- spec/dump/dump_without_table_options_spec.rb
 - spec/migrate/check_orphan_index_spec.rb
 - spec/migrate/migrate_add_column2_spec.rb
 - spec/migrate/migrate_add_column_spec.rb
@@ -288,6 +289,7 @@ test_files:
 - spec/dump/dump_class_method_spec.rb
 - spec/dump/dump_some_tables_spec.rb
 - spec/dump/dump_spec.rb
+- spec/dump/dump_without_table_options_spec.rb
 - spec/migrate/check_orphan_index_spec.rb
 - spec/migrate/migrate_add_column2_spec.rb
 - spec/migrate/migrate_add_column_spec.rb