polymorpheus 2.2.0 → 3.3.0

data/spec/schema_dumper_spec.rb

@@ -1,48 +1,39 @@
-require 'active_record'
 require 'spec_helper'
-require 'sql_logger'
-require 'foreigner'
-require 'foreigner/connection_adapters/mysql2_adapter'
-require 'polymorpheus'
-require 'polymorpheus/trigger'
-require 'stringio'
-
-# this is normally done via a Railtie in non-testing situations
-ActiveRecord::SchemaDumper.class_eval { include Polymorpheus::SchemaDumper }
 
 describe Polymorpheus::SchemaDumper do
-
   let(:connection) { ActiveRecord::Base.connection }
   let(:stream) { StringIO.new }
 
   before do
-    # pretend like we have a trigger defined
-    connection.stub(:triggers).and_return(
-      [Trigger.new(["trigger_name", "INSERT", "pets",
-        %{BEGIN
-            IF(IF(NEW.dog_id IS NULL, 0, 1) + IF(NEW.kitty_id IS NULL, 0, 1)) <> 1 THEN
-              SET NEW = 'Error';
-            END IF;
-          END},
-        "BEFORE", nil, "", "production@%", "utf8", "utf8_general_ci",
-        "utf8_unicode_ci"])]
+    create_table :story_arcs do |t|
+      t.references :hero
+      t.references :villain
+    end
+    create_table :heros
+    create_table :villains
+    ActiveRecord::Base.connection.add_polymorphic_constraints(
+      'story_arcs',
+      { hero_id: 'heros.id', villain_id: 'villains.id' }
     )
 
     ActiveRecord::SchemaDumper.dump(connection, stream)
   end
 
+  after do
+    drop_table :story_arcs # drop first, due to the foreign key
+  end
+
   subject { stream.string }
 
   let(:schema_statement) do
-    %{  add_polymorphic_triggers(:pets, ["dog_id", "kitty_id"])}
+    %{  add_polymorphic_triggers(:story_arcs, ["hero_id", "villain_id"])}
   end
 
   specify "the schema statement is part of the dump" do
-    subject.index(schema_statement).should be_a(Integer)
+    expect(subject.index(schema_statement)).to be_a(Integer)
   end
 
   specify "there is exactly one instance of the schema statement" do
-    subject.index(schema_statement).should == subject.rindex(schema_statement)
+    expect(subject.index(schema_statement)).to eq(subject.rindex(schema_statement))
   end
-
 end

data/spec/spec_helper.rb

@@ -1,2 +1,34 @@
-require 'support/custom_matchers.rb'
-require 'support/db_setup.rb'
+require 'active_record'
+require 'polymorpheus'
+require 'stringio'
+
+require 'support/active_record/connection_adapters/abstract_mysql_adapter'
+
+ActiveRecord::Base.establish_connection({
+  adapter: 'mysql2',
+  username: 'travis',
+  database: 'polymorpheus_test'
+})
+
+Dir[File.dirname(__FILE__) + '/support/*.rb'].sort.each { |path| require path }
+
+Polymorpheus::Adapter.load!
+
+# This is normally done via a Railtie in non-testing situations.
+ActiveRecord::SchemaDumper.class_eval { include Polymorpheus::SchemaDumper }
+ActiveRecord::Migration.verbose = false
+
+RSpec.configure do |config|
+  config.order = :random
+  Kernel.srand config.seed
+
+  config.include ConnectionHelpers
+  config.include SchemaHelpers
+  config.include SqlTestHelpers
+
+  config.after do
+    data_sources.each do |table|
+      ActiveRecord::Base.connection.drop_table(table)
+    end
+  end
+end

data/spec/support/active_record/connection_adapters/abstract_mysql_adapter.rb

@@ -0,0 +1,9 @@
+# Patch support for MySQL 5.7+ onto ActiveRecord < 4.1.
+if ActiveRecord::VERSION::MAJOR < 4 ||
+   (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR < 1)
+
+  require 'active_record/connection_adapters/abstract_mysql_adapter'
+  class ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter
+    NATIVE_DATABASE_TYPES[:primary_key] = "int(11) auto_increment PRIMARY KEY"
+  end
+end

data/spec/support/class_defs.rb

@@ -42,6 +42,11 @@ class Battle < ActiveRecord::Base
   has_many :heros, through: :story_arcs
 end
 
+class Issue < ActiveRecord::Base
+  has_many :story_arcs
+  has_many :heros, through: :story_arcs
+end
+
 # But only super-people have superpowers
 class Superpower < ActiveRecord::Base
   belongs_to_polymorphic :superhero, :supervillain, as: :wielder
@@ -51,3 +56,30 @@ end
 # (Unless this is LOTR, but let's ignore that for now.)
 class Tree < ActiveRecord::Base
 end
+
+class Drawing < ActiveRecord::Base
+  belongs_to_polymorphic :book, :binder, as: :one_way_rel
+end
+class Book < ActiveRecord::Base
+  has_many_as_polymorph :drawings
+end
+class Binder < ActiveRecord::Base
+  has_many_as_polymorph :drawings
+end
+
+class Picture < ActiveRecord::Base
+  belongs_to_polymorphic :web_page, :printed_work, as: :inverted_rel, inverse_of: :pictures
+end
+class WebPage < ActiveRecord::Base
+  has_many_as_polymorph :pictures, inverse_of: :web_page
+end
+class PrintedWork < ActiveRecord::Base
+  has_many_as_polymorph :pictures, inverse_of: :printed_work
+end
+
+class Pet < ActiveRecord::Base
+end
+class Cat < ActiveRecord::Base
+end
+class Dog < ActiveRecord::Base
+end

data/spec/support/connection_helpers.rb

@@ -0,0 +1,21 @@
+module ConnectionHelpers
+  def add_polymorphic_constraints(*args)
+    connection.add_polymorphic_constraints(*args)
+  end
+
+  def data_sources
+    if ActiveRecord::VERSION::MAJOR >= 5
+      ActiveRecord::Base.connection.data_sources
+    else
+      ActiveRecord::Base.connection.tables
+    end
+  end
+
+  def remove_polymorphic_constraints(*args)
+    connection.remove_polymorphic_constraints(*args)
+  end
+
+  def triggers
+    connection.triggers
+  end
+end

data/spec/support/custom_matchers.rb

@@ -1,31 +1,31 @@
 RSpec::Matchers.define :be_association do |association_name|
   match do |actual|
-    actual.should be_instance_of(Polymorpheus::InterfaceBuilder::Association)
-    actual.name.should == association_name.to_s
+    expect(actual).to be_instance_of Polymorpheus::InterfaceBuilder::Association
+    expect(actual.name).to eq association_name.to_s
   end
 end
 
 RSpec::Matchers.define :match_associations do |*association_names|
   match do |actual|
-    actual.length.should == association_names.length
+    expect(actual.length).to eq association_names.length
     actual.each_with_index do |item, ind|
-      item.should be_association(association_names[ind])
+      expect(item).to be_association(association_names[ind])
     end
   end
 end
 
 RSpec::Matchers.define :match_sql do |expected|
   match do |actual|
-    format(expected).should == format(actual)
+    expect(format(expected)).to eq format(actual)
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     "expected the following SQL statements to match:
     #{format(actual)}
     #{format(expected)}"
   end
 
   def format(sql)
-    sql.gsub(/\s+/, ' ')
+    sql.squish
   end
 end

data/spec/support/schema_helpers.rb

@@ -0,0 +1,17 @@
+module SchemaHelpers
+  def create_table(name, options = {})
+    options.merge!(force: true)
+    ActiveRecord::Schema.define do
+      create_table(name, options) do |t|
+        yield(t) if block_given?
+      end
+    end
+    name.to_s.classify.constantize.reset_column_information
+  end
+
+  def drop_table(name)
+    ActiveRecord::Schema.define do
+      drop_table(name)
+    end
+  end
+end

data/spec/{sql_logger.rb → support/sql_logger.rb}

@@ -21,7 +21,7 @@ module Polymorpheus
         @stubbed[sql]
       else
         sql_statements << sql
-        sql
+        original_execute(sql, name)
       end
     end
 

data/spec/support/sql_test_helpers.rb

@@ -0,0 +1,41 @@
+module SqlTestHelpers
+  extend ActiveSupport::Concern
+
+  included do
+    before(:all) do
+      class << ActiveRecord::Base.connection
+        include Polymorpheus::SqlLogger
+        alias_method :original_execute, :execute
+        alias_method :execute, :log_sql_statements
+      end
+    end
+
+    after(:all) do
+      class << ActiveRecord::Base.connection
+        alias_method :execute, :original_execute
+      end
+    end
+
+    let(:connection) { ActiveRecord::Base.connection }
+    let(:sql) { connection.sql_statements }
+
+    def clean_sql(sql_string)
+      sql_string
+        .squish
+        .gsub('`', '')
+        .gsub(/\ FOREIGN KEY/, "\nFOREIGN KEY")
+        .gsub(/\ REFERENCES/, "\nREFERENCES")
+        .gsub(/\ ON DELETE/, "\nON DELETE")
+        .gsub(/\ ON UPDATE/, "\nON UPDATE")
+        .gsub(/([[:alpha:]])\(/, '\1 (')
+    end
+
+    def clear_sql_history
+      connection.clear_sql_history
+    end
+
+    def should_execute_sql(expected)
+      expect(clean_sql(sql.join("\n"))).to include(clean_sql(expected))
+    end
+  end
+end

data/spec/trigger_spec.rb

@@ -1,8 +1,6 @@
-require 'polymorpheus'
-require 'polymorpheus/trigger'
-
-describe Trigger do
+require 'spec_helper'
 
+describe Polymorpheus::Trigger do
   let(:name) { "pets_unique_polyfk_on_INSERT" }
   let(:event) { "INSERT" }
   let(:table) { "pets"}
@@ -21,26 +19,39 @@ describe Trigger do
   let(:collation_connection) { "utf8_general_ci" }
   let(:db_collation) { "utf8_unicode_ci" }
 
-  subject do
-    Trigger.new([name, event, table, statement, timing, created, sql_mode,
-                 definer, charset, collation_connection, db_collation])
+  let(:trigger) do
+    described_class.new(
+      [
+        name,
+        event,
+        table,
+        statement,
+        timing,
+        created,
+        sql_mode,
+        definer,
+        charset,
+        collation_connection,
+        db_collation
+      ]
+    )
   end
 
-  its(:name) { should == name }
-  its(:event) { should == event }
-  its(:table) { should == table }
-  its(:statement) { should == statement }
-  its(:timing) { should == timing }
-  its(:created) { should == created }
-  its(:sql_mode) { should == sql_mode }
-  its(:definer) { should == definer }
-  its(:charset) { should == charset }
-  its(:collation_connection) { should == collation_connection }
-  its(:db_collation) { should == db_collation }
+  specify { expect(trigger.name).to eq name }
+  specify { expect(trigger.event).to eq event }
+  specify { expect(trigger.table).to eq table }
+  specify { expect(trigger.statement).to eq statement }
+  specify { expect(trigger.timing).to eq timing }
+  specify { expect(trigger.created).to eq created }
+  specify { expect(trigger.sql_mode).to eq sql_mode }
+  specify { expect(trigger.definer).to eq definer }
+  specify { expect(trigger.charset).to eq charset }
+  specify { expect(trigger.collation_connection).to eq collation_connection }
+  specify { expect(trigger.db_collation).to eq db_collation }
 
-  its(:columns) { should == %w{dog_id kitty_id} }
+  specify { expect(trigger.columns).to eq %w[dog_id kitty_id] }
 
-  its(:schema_statement) do
-    should == %{  add_polymorphic_triggers(:pets, ["dog_id", "kitty_id"])}
+  specify do
+    expect(trigger.schema_statement).to eq %{  add_polymorphic_triggers(:pets, ["dog_id", "kitty_id"])}
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: polymorpheus
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Barun Singh
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2020-12-08 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: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,49 +29,35 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 10.4.2
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.10
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.10
+        version: 3.9.0
 description: Provides a database-friendly method for polymorphic relationships
 email: bsingh@wegowise.com
 executables: []
@@ -107,6 +79,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
@@ -114,21 +87,26 @@ files:
 - lib/polymorpheus/trigger.rb
 - lib/polymorpheus/version.rb
 - polymorpheus.gemspec
+- spec/interface/belongs_to_polymorphic_spec.rb
+- spec/interface/has_many_as_polymorph_spec.rb
+- spec/interface/validates_polymorph_spec.rb
 - spec/interface_spec.rb
 - spec/mysql2_adapter_spec.rb
 - spec/schema_dumper_spec.rb
-- spec/shared_examples.rb
 - spec/spec_helper.rb
-- spec/sql_logger.rb
+- spec/support/active_record/connection_adapters/abstract_mysql_adapter.rb
 - spec/support/class_defs.rb
+- spec/support/connection_helpers.rb
 - spec/support/custom_matchers.rb
-- spec/support/db_setup.rb
+- spec/support/schema_helpers.rb
+- spec/support/sql_logger.rb
+- spec/support/sql_test_helpers.rb
 - spec/trigger_spec.rb
 homepage: http://github.com/wegowise/polymorpheus
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -143,9 +121,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Provides a database-friendly method for polymorphic relationships
 test_files: []