Use ruby 1.9 hash syntax

.travis.yml

@@ -1,3 +1,3 @@
 rvm:
-  - 1.9.2
-  - 1.9.3
+  - 1.9.3
+  - 2.0.0

Rakefile

@@ -6,7 +6,7 @@ require 'rake'
 # end
 
 desc 'Default: run unit tests.'
-task :default => :test
+task default: :test
 
 require 'rake/testtask'
 desc 'Test the foreigner plugin.'

lib/foreigner/connection_adapters/mysql2_adapter.rb

@@ -12,7 +12,7 @@ def remove_foreign_key_sql(table, options)
 
         "DROP FOREIGN KEY #{quote_column_name(foreign_key_name)}"
       end
-      
+
       def foreign_keys(table_name)
         fk_info = select_all %{
           SELECT fk.referenced_table_name as 'to_table'
@@ -28,7 +28,7 @@ def foreign_keys(table_name)
         create_table_info = select_one("SHOW CREATE TABLE #{quote_table_name(table_name)}")["Create Table"]
 
         fk_info.map do |row|
-          options = {:column => row['column'], :name => row['name'], :primary_key => row['primary_key']}
+          options = {column: row['column'], name: row['name'], primary_key: row['primary_key']}
 
           if create_table_info =~ /CONSTRAINT #{quote_column_name(row['name'])} FOREIGN KEY .* REFERENCES .* ON DELETE (CASCADE|SET NULL|RESTRICT)/
             options[:dependent] = case $1

lib/foreigner/connection_adapters/postgresql_adapter.rb

@@ -17,9 +17,9 @@ def foreign_keys(table_name)
             AND t3.nspname = ANY (current_schemas(false))
           ORDER BY c.conname
         }
-        
+
         fk_info.map do |row|
-          options = {:column => row['column'], :name => row['name'], :primary_key => row['primary_key']}
+          options = {column: row['column'], name: row['name'], primary_key: row['primary_key']}
 
           options[:dependent] = case row['dependency']
             when 'c' then :delete

lib/foreigner/migration/command_recorder.rb

@@ -14,9 +14,9 @@ def invert_add_foreign_key(args)
         add_options ||= {}
 
         if add_options[:name]
-          options = {:name => add_options[:name]}
+          options = {name: add_options[:name]}
         elsif add_options[:column]
-          options = {:column => add_options[:column]}
+          options = {column: add_options[:column]}
         else
           options = to_table
         end

lib/foreigner/schema_dumper.rb

@@ -10,16 +10,16 @@ module ClassMethods
       def dump_foreign_key(foreign_key)
         statement_parts = [ ('add_foreign_key ' + remove_prefix_and_suffix(foreign_key.from_table).inspect) ]
         statement_parts << remove_prefix_and_suffix(foreign_key.to_table).inspect
-        statement_parts << (':name => ' + foreign_key.options[:name].inspect)
+        statement_parts << ('name: ' + foreign_key.options[:name].inspect)
 
         if foreign_key.options[:column] != "#{remove_prefix_and_suffix(foreign_key.to_table).singularize}_id"
-          statement_parts << (':column => ' + foreign_key.options[:column].inspect)
+          statement_parts << ('column: ' + foreign_key.options[:column].inspect)
         end
         if foreign_key.options[:primary_key] != 'id'
-          statement_parts << (':primary_key => ' + foreign_key.options[:primary_key].inspect)
+          statement_parts << ('primary_key: ' + foreign_key.options[:primary_key].inspect)
         end
         if foreign_key.options[:dependent].present?
-          statement_parts << (':dependent => ' + foreign_key.options[:dependent].inspect)
+          statement_parts << ('dependent: ' + foreign_key.options[:dependent].inspect)
         end
 
         statement_parts.join(', ')

test/foreigner/connection_adapters/mysql2_adapter_test.rb

@@ -17,18 +17,18 @@ class Mysql2Adapter
       @adapter.remove_foreign_key_sql(:suppliers, :companies)
     )
   end
-  
+
   test 'remove_foreign_key_sql by name' do
     assert_equal(
       "DROP FOREIGN KEY `belongs_to_supplier`",
-      @adapter.remove_foreign_key_sql(:suppliers, :name => "belongs_to_supplier")
+      @adapter.remove_foreign_key_sql(:suppliers, name: "belongs_to_supplier")
     )
   end
-  
+
   test 'remove_foreign_key_sql by column' do
     assert_equal(
       "DROP FOREIGN KEY `suppliers_ship_to_id_fk`",
-      @adapter.remove_foreign_key_sql(:suppliers, :column => "ship_to_id")
+      @adapter.remove_foreign_key_sql(:suppliers, column: "ship_to_id")
     )
   end
 end

test/foreigner/connection_adapters/sql2003_test.rb

@@ -26,78 +26,78 @@ class TestAdapter
       @adapter.add_foreign_key(:employees, :companies)
     )
   end
-  
+
   test 'add_with_name' do
     assert_equal(
       "ALTER TABLE `employees` ADD CONSTRAINT `favorite_company_fk` FOREIGN KEY (`company_id`) REFERENCES `companies`(id)",
-      @adapter.add_foreign_key(:employees, :companies, :name => 'favorite_company_fk')
+      @adapter.add_foreign_key(:employees, :companies, name: 'favorite_company_fk')
     )
   end
-  
+
   test 'add_with_column' do
     assert_equal(
       "ALTER TABLE `employees` ADD CONSTRAINT `employees_last_employer_id_fk` FOREIGN KEY (`last_employer_id`) REFERENCES `companies`(id)",
-      @adapter.add_foreign_key(:employees, :companies, :column => 'last_employer_id')
-    ) 
+      @adapter.add_foreign_key(:employees, :companies, column: 'last_employer_id')
+    )
   end
-  
+
   test 'add_with_column_and_name' do
     assert_equal(
       "ALTER TABLE `employees` ADD CONSTRAINT `favorite_company_fk` FOREIGN KEY (`last_employer_id`) REFERENCES `companies`(id)",
-      @adapter.add_foreign_key(:employees, :companies, :column => 'last_employer_id', :name => 'favorite_company_fk')
+      @adapter.add_foreign_key(:employees, :companies, column: 'last_employer_id', name: 'favorite_company_fk')
     )
   end
-  
+
   test 'add_with_delete_dependency' do
     assert_equal(
       "ALTER TABLE `employees` ADD CONSTRAINT `employees_company_id_fk` FOREIGN KEY (`company_id`) REFERENCES `companies`(id) " +
       "ON DELETE CASCADE",
-      @adapter.add_foreign_key(:employees, :companies, :dependent => :delete)
+      @adapter.add_foreign_key(:employees, :companies, dependent: :delete)
     )
   end
-  
+
   test 'add_with_nullify_dependency' do
     assert_equal(
       "ALTER TABLE `employees` ADD CONSTRAINT `employees_company_id_fk` FOREIGN KEY (`company_id`) REFERENCES `companies`(id) " +
       "ON DELETE SET NULL",
-      @adapter.add_foreign_key(:employees, :companies, :dependent => :nullify)
+      @adapter.add_foreign_key(:employees, :companies, dependent: :nullify)
     )
   end
-  
+
   test 'add_with_restrict_dependency' do
     assert_equal(
       "ALTER TABLE `employees` ADD CONSTRAINT `employees_company_id_fk` FOREIGN KEY (`company_id`) REFERENCES `companies`(id) " +
       "ON DELETE RESTRICT",
-      @adapter.add_foreign_key(:employees, :companies, :dependent => :restrict)
+      @adapter.add_foreign_key(:employees, :companies, dependent: :restrict)
     )
   end
 
   test 'add_with_options' do
     assert_equal(
       "ALTER TABLE `employees` ADD CONSTRAINT `employees_company_id_fk` FOREIGN KEY (`company_id`) REFERENCES `companies`(id) " +
       "on delete foo",
-      @adapter.add_foreign_key(:employees, :companies, :options => 'on delete foo')
+      @adapter.add_foreign_key(:employees, :companies, options: 'on delete foo')
     )
   end
-  
+
   test 'remove_by_table' do
     assert_equal(
       "ALTER TABLE `suppliers` DROP CONSTRAINT `suppliers_company_id_fk`",
       @adapter.remove_foreign_key(:suppliers, :companies)
     )
   end
-  
+
   test 'remove_by_name' do
     assert_equal(
       "ALTER TABLE `suppliers` DROP CONSTRAINT `belongs_to_supplier`",
-      @adapter.remove_foreign_key(:suppliers, :name => "belongs_to_supplier")
+      @adapter.remove_foreign_key(:suppliers, name: "belongs_to_supplier")
     )
   end
-  
+
   test 'remove_by_column' do
     assert_equal(
       "ALTER TABLE `suppliers` DROP CONSTRAINT `suppliers_ship_to_id_fk`",
-      @adapter.remove_foreign_key(:suppliers, :column => "ship_to_id")
+      @adapter.remove_foreign_key(:suppliers, column: "ship_to_id")
     )
   end
 end

test/foreigner/migration/command_recorder_test.rb

@@ -21,21 +21,21 @@ class Foreigner::CommandRecorderTest < Foreigner::UnitTest
 
   test 'invert_add_foreign_key with column' do
     @recorder.revert do
-      @recorder.add_foreign_key(:employees, :companies, :column => :place_id)
+      @recorder.add_foreign_key(:employees, :companies, column: :place_id)
     end
 
     assert_equal [
-      [:remove_foreign_key, [:employees, {:column => :place_id}]]
+      [:remove_foreign_key, [:employees, {column: :place_id}]]
     ], @recorder.commands
   end
 
   test 'invert_add_foreign_key with name' do
     @recorder.revert do
-      @recorder.add_foreign_key(:employees, :companies, :name => 'the_best_fk', :column => :place_id)
+      @recorder.add_foreign_key(:employees, :companies, name: 'the_best_fk', column: :place_id)
     end
 
     assert_equal [
-      [:remove_foreign_key, [:employees, {:name => 'the_best_fk'}]]
+      [:remove_foreign_key, [:employees, {name: 'the_best_fk'}]]
     ], @recorder.commands
   end
 

test/foreigner/schema_dumper_test.rb

@@ -28,10 +28,10 @@ def foreign_keys(table, stream)
   end
 
   test 'dump_foreign_key' do
-    assert_dump "add_foreign_key \"foos\", \"bars\", :name => \"lulz\"", Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('foos', 'bars', column: 'bar_id', primary_key: 'id', name: 'lulz')
-    assert_dump "add_foreign_key \"foos\", \"bars\", :name => \"lulz\", :primary_key => \"uuid\"", Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('foos', 'bars', column: 'bar_id', primary_key: 'uuid', name: 'lulz')
-    assert_dump "add_foreign_key \"foos\", \"bars\", :name => \"lulz\", :dependent => :delete", Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('foos', 'bars', column: 'bar_id', primary_key: 'id', name: 'lulz', dependent: :delete)
-    assert_dump "add_foreign_key \"foos\", \"bars\", :name => \"lulz\", :column => \"mamma_id\"", Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('foos', 'bars', column: 'mamma_id', primary_key: 'id', name: 'lulz')
+    assert_dump "add_foreign_key \"foos\", \"bars\", name: \"lulz\"", Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('foos', 'bars', column: 'bar_id', primary_key: 'id', name: 'lulz')
+    assert_dump "add_foreign_key \"foos\", \"bars\", name: \"lulz\", primary_key: \"uuid\"", Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('foos', 'bars', column: 'bar_id', primary_key: 'uuid', name: 'lulz')
+    assert_dump "add_foreign_key \"foos\", \"bars\", name: \"lulz\", dependent: :delete", Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('foos', 'bars', column: 'bar_id', primary_key: 'id', name: 'lulz', dependent: :delete)
+    assert_dump "add_foreign_key \"foos\", \"bars\", name: \"lulz\", column: \"mamma_id\"", Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('foos', 'bars', column: 'mamma_id', primary_key: 'id', name: 'lulz')
   end
 
   test 'all tables' do
@@ -52,7 +52,7 @@ def foreign_keys(table, stream)
     begin
       ActiveRecord::Base.table_name_prefix = 'pre_'
       ActiveRecord::Base.table_name_suffix = '_suf'
-      assert_dump "add_foreign_key \"foos\", \"bars\", :name => \"lulz\"", Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('pre_foos_suf', 'pre_bars_suf', column: 'bar_id', primary_key: 'id', name: 'lulz')
+      assert_dump "add_foreign_key \"foos\", \"bars\", name: \"lulz\"", Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('pre_foos_suf', 'pre_bars_suf', column: 'bar_id', primary_key: 'id', name: 'lulz')
     ensure
       ActiveRecord::Base.table_name_suffix = ActiveRecord::Base.table_name_prefix = ''
     end