polymorpheus 2.2.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b4fa428b1261c05072970feddd72eca1d4e0d70
-  data.tar.gz: 189801e622b209426bb6e39b86a32b7c34bbc954
+  metadata.gz: d0a7b04ed03c563cb471078e8595129ea9e429a7
+  data.tar.gz: 912c0b0dbf5690c3fdf0ae34b62acec60849203b
 SHA512:
-  metadata.gz: 1624b4a33ce2a7875acda4688ebad9662e2f6201e01d329196cee018acfcbec0bafe86f3d07c732c383525e13b96e3fda65b510f29201615aa7637803300b32c
-  data.tar.gz: f207481aef2d8e20c22c7efb2d86691c2d9ed6ba241356e7eb977a27c3d7c90c1f9aceab5f3b4972956f730ca0baa850d6c5b3e0a38866f54a478e6b8daaeb29
+  metadata.gz: cb4cb74d2cb1381f91478899fe4a5d4bd9d9b8a522cd6410ef2ddc144c1e3750e46f24006a082bd28b5a3907eae06469e45afc6e0ea75bc1013dd3edb15306a0
+  data.tar.gz: 5d64aae54b033191a7b134c61a7d2bcb2072ba236f2d897021fcb5c71212202c833f02ee873fb38b394be91485b8087e9f40966d360979479020ee6634384d67

data/README.md

@@ -5,6 +5,23 @@
 **Polymorphic relationships in Rails that keep your database happy with almost
 no setup**
 
+### Installation
+
+If you are using Bundler, you can add the gem to your Gemfile:
+
+```ruby
+# with Rails >= 4.2
+gem 'polymorpheus'
+```
+
+Or:
+
+```ruby
+# with Rails < 4.2
+gem 'foreigner'
+gem 'polymorpheus'
+```
+
 ### Background
 * **What is polymorphism?** [Rails Guides has a great overview of what
   polymorphic relationships are and how Rails handles them](
@@ -196,7 +213,7 @@ pic.polymorpheus.query_condition
 
 * This gem was written by [Barun Singh](https://github.com/barunio)
 * It uses the [Foreigner gem](https://github.com/matthuhiggins/foreigner) under
-  the hood for a few things
+  the hood for Rails < 4.2.
 
 polymorpheus is Copyright © 2011-2015 Barun Singh and [WegoWise](
 http://wegowise.com). It is free software, and may be redistributed under the

data/lib/polymorpheus.rb

@@ -23,8 +23,15 @@ module Polymorpheus
   module ConnectionAdapters
     autoload :SchemaStatements, 'polymorpheus/schema_statements'
   end
+
+  def self.require_foreigner?
+    !(::ActiveRecord::VERSION::MAJOR >= 4 &&
+      ::ActiveRecord::VERSION::MINOR >= 2)
+  end
 end
 
+require 'foreigner' if ::Polymorpheus.require_foreigner?
+
 Polymorpheus::Adapter.register 'mysql2', 'polymorpheus/mysql_adapter'
 Polymorpheus::Adapter.register 'postgresql', 'polymorpheus/postgresql_adapter'
 

data/lib/polymorpheus/mysql_adapter.rb

@@ -66,19 +66,22 @@ module Polymorpheus
         if options[:unique].present?
           poly_create_indexes(table, column_names, Array(options[:unique]))
         end
+
         column_names.each do |col_name|
           ref_table, ref_col = columns[col_name].to_s.split('.')
-          add_foreign_key table, ref_table,
-                                 :column => col_name,
-                                 :primary_key => (ref_col || 'id'),
-                                 :options => generate_constraints(options)
+          fk_options = {
+            :column => col_name,
+            :name => "#{table}_#{col_name}_fk",
+            :primary_key => (ref_col || 'id' )
+          }.merge(generate_constraints(options))
+          add_foreign_key(table, ref_table, fk_options)
         end
       end
 
       def remove_polymorphic_constraints(table, columns, options = {})
         poly_drop_triggers(table, columns.keys.sort)
         columns.each do |(col, reference)|
-          remove_foreign_key table, :column => col
+          remove_foreign_key table, :column => col, :name => "#{table}_#{col}_fk"
         end
         if options[:unique].present?
           poly_remove_indexes(table, columns.keys, Array(options[:unique]))
@@ -191,26 +194,8 @@ module Polymorpheus
       end
 
       def generate_constraints(options)
-        constraints = []
-
-        ['delete', 'update'].each do |event|
-          option = "on_#{event}".to_sym
-          next unless options.has_key?(option) &&
-                      options[option].respond_to?(:to_sym)
-
-          action = case options[option].to_sym
-            when :nullify then 'SET NULL'
-            when :cascade then 'CASCADE'
-            when :restrict then 'RESTRICT'
-          end
-          next unless action
-
-          constraints << "ON #{event.upcase} #{action}"
-        end
-
-        constraints.join(' ')
+        options.slice(:on_delete, :on_update)
       end
-
     end
   end
 end
@@ -223,3 +208,8 @@ end
   rescue
   end
 end
+
+if ::Polymorpheus.require_foreigner?
+  require 'foreigner/connection_adapters/mysql2_adapter'
+  require 'polymorpheus/mysql_adapter/foreigner_constraints'
+end

data/lib/polymorpheus/mysql_adapter/foreigner_constraints.rb

@@ -0,0 +1,30 @@
+module Polymorpheus
+  module ConnectionAdapters
+    module MysqlAdapter
+      def generate_constraints(options)
+        constraints = []
+
+        ['delete', 'update'].each do |event|
+          option = "on_#{event}".to_sym
+          next unless options.has_key?(option) &&
+                      options[option].respond_to?(:to_sym)
+
+          action = case options[option].to_sym
+            when :nullify then 'SET NULL'
+            when :cascade then 'CASCADE'
+            when :restrict then 'RESTRICT'
+            else
+              fail ArgumentError, <<-EOS
+'#{options[option]}' is not supported for :on_update or :on_delete.
+Supported values are: :nullify, :cascade, :restrict
+              EOS
+          end
+
+          constraints << "ON #{event.upcase} #{action}"
+        end
+
+        { :options => constraints.join(' ') }
+      end
+    end
+  end
+end

data/lib/polymorpheus/version.rb

@@ -1,3 +1,3 @@
 module Polymorpheus
-  VERSION = '2.2.0'
+  VERSION = '3.0.0'
 end

data/polymorpheus.gemspec

@@ -17,8 +17,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ["README.md", "LICENSE.txt"]
   s.license = 'MIT'
 
-  s.add_dependency('foreigner')
-  s.add_dependency('activerecord', '>= 3.2', '< 4.2')
+  s.add_dependency('activerecord', '>= 3.2', '< 5')
 
   s.add_development_dependency('rake', '~> 10.4.2')
   s.add_development_dependency('rspec-rails', '~> 2.14.0')

data/spec/mysql2_adapter_spec.rb

@@ -1,8 +1,6 @@
 require 'active_record'
 require 'spec_helper'
 require 'sql_logger'
-require 'foreigner'
-require 'foreigner/connection_adapters/mysql2_adapter'
 require 'polymorpheus'
 require 'polymorpheus/trigger'
 require 'shared_examples'
@@ -35,6 +33,12 @@ describe Polymorpheus::ConnectionAdapters::MysqlAdapter do
   def clean_sql(sql_string)
     sql_string.gsub(/^\n\s*/,'').gsub(/\s*\n\s*$/,'')
       .gsub(/\n\s*/,"\n").gsub(/\s*$/,"")
+      .gsub('`', '')
+      .gsub(/\ FOREIGN KEY/, "\nFOREIGN KEY")
+      .gsub(/\ REFERENCES/, "\nREFERENCES")
+      .gsub(/\ ON DELETE/, "\nON DELETE")
+      .gsub(/\ ON UPDATE/, "\nON UPDATE")
+      .gsub(/([[:alpha:]])\(/, '\1 (')
   end
 
   before do
@@ -129,7 +133,14 @@ describe Polymorpheus::ConnectionAdapters::MysqlAdapter do
            ALTER TABLE `pets` ADD CONSTRAINT `pets_kitty_id_fk` FOREIGN KEY (`kitty_id`) REFERENCES `cats`(name) }
       end
 
-      it_behaves_like "mysql2 migration statements"
+      it "#add_polymorphic_constraints raises an argument error" do
+        expect do
+          connection.add_polymorphic_constraints(table, columns, options)
+        end.to raise_error ArgumentError
+      end
+
+      it_behaves_like 'mysql2 add sql for polymorphic triggers'
+      it_behaves_like 'mysql2 remove sql for polymorphic constraints'
     end
 
     context "when table and column names combined are very long" do

data/spec/schema_dumper_spec.rb

@@ -1,8 +1,6 @@
 require 'active_record'
 require 'spec_helper'
 require 'sql_logger'
-require 'foreigner'
-require 'foreigner/connection_adapters/mysql2_adapter'
 require 'polymorpheus'
 require 'polymorpheus/trigger'
 require 'stringio'

data/spec/shared_examples.rb

@@ -1,4 +1,4 @@
-shared_examples_for "mysql2 migration statements" do
+shared_examples_for 'mysql2 add sql for polymorphic constraints' do
   describe "#add_polymorphic_constraints" do
     before { connection.add_polymorphic_constraints(table, columns, options) }
 
@@ -6,7 +6,9 @@ shared_examples_for "mysql2 migration statements" do
       clean_sql(sql.join("\n")).should == clean_sql(full_constraints_sql)
     end
   end
+end
 
+shared_examples_for 'mysql2 add sql for polymorphic triggers' do
   describe "#add_polymorphic_triggers" do
     before { connection.add_polymorphic_triggers(table, columns.keys) }
 
@@ -14,7 +16,9 @@ shared_examples_for "mysql2 migration statements" do
       clean_sql(sql.join("\n")).should == clean_sql(trigger_sql)
     end
   end
+end
 
+shared_examples_for 'mysql2 remove sql for polymorphic constraints' do
   describe "#remove_polymorphic_constraints" do
     before { connection.remove_polymorphic_constraints(table, columns, options) }
 
@@ -24,6 +28,12 @@ shared_examples_for "mysql2 migration statements" do
   end
 end
 
+shared_examples_for "mysql2 migration statements" do
+  it_behaves_like 'mysql2 add sql for polymorphic constraints'
+  it_behaves_like 'mysql2 add sql for polymorphic triggers'
+  it_behaves_like 'mysql2 remove sql for polymorphic constraints'
+end
+
 shared_context "columns with short names" do
   let(:table) { 'pets' }
   let(:columns) { { 'kitty_id' => 'cats.name', 'dog_id' => 'dogs.id' } }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polymorpheus
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Barun Singh
@@ -10,20 +10,6 @@ bindir: bin
 cert_chain: []
 date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: foreigner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -33,7 +19,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +29,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +93,7 @@ files:
 - lib/polymorpheus/interface_builder.rb
 - lib/polymorpheus/interface_builder/association.rb
 - lib/polymorpheus/mysql_adapter.rb
+- lib/polymorpheus/mysql_adapter/foreigner_constraints.rb
 - lib/polymorpheus/postgresql_adapter.rb
 - lib/polymorpheus/railtie.rb
 - lib/polymorpheus/schema_dumper.rb