schema_plus_foreign_keys 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 161f26b7a83ca42ce9fa30a6132447bbf1ca000e
-  data.tar.gz: 1393641fbdd4843d42558e12cf97d4792a9b3d18
+  metadata.gz: 414ce7516432fbe61314220f49b00d144a9f5af1
+  data.tar.gz: b8fdcfd8a82bc78627fb4c75229b38d25dd3d50e
 SHA512:
-  metadata.gz: 9b0d962d24372f0fa68a9dd6775cb930d929a3dea94a438fc689a52628b1e0d5c24eefe1aefab160137d0355ac230cf15742e27cbce8186658a96e352ad59d35
-  data.tar.gz: 2db8b15e9be4c76bdef4b356882d00abce638585fc613c258ab8d77706ddf9d41dfdf4b455b23b5e738607687e25f13498e44a606a215a807d5a9bf3abd593d6
+  metadata.gz: 96831479e0e83ff566c945c38c6639412e6250a16a4dd02ec37505d2ba53d30025fde92330fb1af9f848ff97423aa448c552158902d36e9ab37f45d2606e854e
+  data.tar.gz: 8cf9d39ac9a408c0e319cdc9b56a6f8506c842161074ff6477671523badb6341645d3adfc7040f6f02ff57d35c27fea4e319a0dbfdf32addd68fc6f01f3ab710

data/README.md

@@ -150,6 +150,7 @@ SchemaPlus::ForeignKeys is tested on:
 
 ## History
 
+* 0.1.4 - Upgrade schema_plus_core dependency
 * 0.1.3 - Support aciverecord 4.2.6.  Thanks to [@btsuhako](https://github.com/SchemaPlus/schema_plus_foreign_keys/issues?q=is%3Apr+is%3Aopen+author%3Abtsuhako) and [@dholdren](https://github.com/SchemaPlus/schema_plus_foreign_keys/issues?q=is%3Apr+is%3Aopen+author%3Adholdren)
 * 0.1.2 - Handle very long names
 * 0.1.1 - Cleanup; use (new) core Migration::RenameTable stack rather than monkey patching.

data/lib/schema_plus/foreign_keys/active_record/connection_adapters/foreign_key_definition.rb

@@ -72,23 +72,19 @@ module SchemaPlus::ForeignKeys
         end
 
         # Dumps a definition of foreign key.
-        def to_dump(column: nil)
-          dump = case
-                 when column then "foreign_key: {references:"
-                 else "add_foreign_key #{from_table.inspect},"
-                 end
-          dump << " #{to_table.inspect}"
-
-          val_or_array = -> val { val.is_a?(Array) ? "[#{val.map(&:inspect).join(', ')}]" : val.inspect }
-
-          dump << ", column: #{val_or_array.call self.column}" unless column
-          dump << ", primary_key: #{val_or_array.call self.primary_key}" if custom_primary_key?
-          dump << ", name: #{name.inspect}" if name
-          dump << ", on_update: #{on_update.inspect}" if on_update
-          dump << ", on_delete: #{on_delete.inspect}" if on_delete
-          dump << ", deferrable: #{deferrable.inspect}" if deferrable
-          dump << "}" if column
-          dump
+        def to_dump
+          opts = {column: self.column}.merge options_for_dump
+          dump = "add_foreign_key #{from_table.inspect}, #{to_table.inspect}, #{opts.to_s.sub(/^{(.*)}$/, '\1')}"
+        end
+
+        def options_for_dump
+          opts = {}
+          opts[:primary_key] = self.primary_key if custom_primary_key?
+          opts[:name] = name if name
+          opts[:on_update] = on_update if on_update
+          opts[:on_delete] = on_delete if on_delete
+          opts[:deferrable] = deferrable if deferrable
+          opts
         end
 
         def to_sql

data/lib/schema_plus/foreign_keys/middleware/dumper.rb

@@ -67,11 +67,11 @@ module SchemaPlus::ForeignKeys
           dumped = {}
           env.table.columns.each do |column|
             if (foreign_key = env.dump.data.inline_fks[env.table.name].find(&its.column.to_s == column.name))
-              column.add_option foreign_key.to_dump(column: true)
+              column.options[:foreign_key] = {references: foreign_key.to_table}.merge foreign_key.options_for_dump
               dumped[foreign_key] = true
             end
             if (foreign_key = env.dump.data.backref_fks.values.flatten.find{|fk| fk.from_table.to_s == env.table.name && fk.column.to_s == column.name})
-              column.add_comment "foreign key references #{foreign_key.to_table.inspect} (below)"
+              column.comments << "foreign key references #{foreign_key.to_table.inspect} (below)"
             end
           end
           env.table.trailer += env.dump.data.inline_fks[env.table.name].map { |foreign_key|

data/lib/schema_plus/foreign_keys/version.rb

@@ -1,5 +1,5 @@
 module SchemaPlus
   module ForeignKeys
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

data/schema_plus_foreign_keys.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency "activerecord", "~> 4.2"
-  gem.add_dependency "schema_plus_core", "~> 0.5"
+  gem.add_dependency "schema_plus_core", "~> 1.0"
   gem.add_dependency "valuable"
 
   gem.add_development_dependency "bundler", "~> 1.7"

data/spec/schema_dumper_spec.rb

@@ -59,13 +59,13 @@ describe "Schema dump" do
 
   it "should include foreign_key name" do
     with_foreign_key Post, :user_id, :users, :id, :name => "yippee" do
-      expect(dump_posts).to match(/user_id.*foreign_key.*users.*name: "yippee"/)
+      expect(dump_posts).to match(/user_id.*foreign_key.*users.*:name=>"yippee"/)
     end
   end
 
   it "should respect foreign key's primary key" do
     with_foreign_key Post, :user_id, :users, :first_post_id do
-      expect(dump_posts).to match(%r{t.integer\s+"user_id".*foreign_key.*primary_key: "first_post_id"})
+      expect(dump_posts).to match(%r{t.integer\s+"user_id".*foreign_key.*:primary_key=>"first_post_id"})
     end
   end
 
@@ -107,7 +107,7 @@ describe "Schema dump" do
 
   it "should include foreign_key options" do
     with_foreign_key Post, :user_id, :users, :id, :on_update => :cascade, :on_delete => :nullify do
-      expect(dump_posts).to match(%q[t.integer\s*"user_id",.*foreign_key: {references: "users", name: "fk_posts_user_id", on_update: :cascade, on_delete: :nullify}])
+      expect(dump_posts).to match(%q[t.integer\s*"user_id",.*:foreign_key=>{:references=>"users", :name=>"fk_posts_user_id", :on_update=>:cascade, :on_delete=>:nullify}])
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_foreign_keys
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: valuable
   requirement: !ruby/object:Gem::Requirement