polymorpheus 3.1.0 → 3.1.1

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
@@ -71,3 +76,10 @@ 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/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.squish))
+    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"}
@@ -22,8 +20,9 @@ describe Trigger do
   let(:db_collation) { "utf8_unicode_ci" }
 
   subject do
-    Trigger.new([name, event, table, statement, timing, created, sql_mode,
-                 definer, charset, collation_connection, db_collation])
+    described_class.new([name, event, table, statement, timing, created,
+                         sql_mode, definer, charset, collation_connection,
+                         db_collation])
   end
 
   its(:name) { should == name }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polymorpheus
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Barun Singh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -45,7 +45,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 10.4.2
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -58,20 +58,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.10
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.10
 description: Provides a database-friendly method for polymorphic relationships
 email: bsingh@wegowise.com
 executables: []
@@ -101,15 +87,20 @@ 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:
@@ -131,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Provides a database-friendly method for polymorphic relationships

data/spec/shared_examples.rb

@@ -1,125 +0,0 @@
-shared_examples_for 'mysql2 add sql for polymorphic constraints' do
-  describe "#add_polymorphic_constraints" do
-    before { connection.add_polymorphic_constraints(table, columns, options) }
-
-    specify 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) }
-
-    specify 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) }
-
-    specify do
-      clean_sql(sql.join("\n")).should == clean_sql(remove_constraints_sql)
-    end
-  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' } }
-  let(:trigger_sql) do
-    %{
-      DROP TRIGGER IF EXISTS pfki_pets_dogid_kittyid
-      DROP TRIGGER IF EXISTS pfku_pets_dogid_kittyid
-      CREATE TRIGGER pfki_pets_dogid_kittyid BEFORE INSERT ON pets
-        FOR EACH ROW
-          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
-      CREATE TRIGGER pfku_pets_dogid_kittyid BEFORE UPDATE ON pets
-        FOR EACH ROW
-          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
-    }
-  end
-  let(:fkey_sql) do
-    %{
-      ALTER TABLE `pets` ADD CONSTRAINT `pets_dog_id_fk` FOREIGN KEY (`dog_id`) REFERENCES `dogs`(id)
-      ALTER TABLE `pets` ADD CONSTRAINT `pets_kitty_id_fk` FOREIGN KEY (`kitty_id`) REFERENCES `cats`(name)
-    }
-  end
-  let(:unique_key_sql) { '' }
-  let(:full_constraints_sql) { trigger_sql + unique_key_sql + fkey_sql }
-  let(:remove_indices_sql) { '' }
-  let(:remove_constraints_sql) do
-    %{
-      DROP TRIGGER IF EXISTS pfki_pets_dogid_kittyid
-      DROP TRIGGER IF EXISTS pfku_pets_dogid_kittyid
-      ALTER TABLE `pets` DROP FOREIGN KEY `pets_kitty_id_fk`
-      ALTER TABLE `pets` DROP FOREIGN KEY `pets_dog_id_fk`
-    } +
-    remove_indices_sql
-  end
-end
-
-shared_context "columns with long names" do
-  let(:table) { 'bicycles' }
-  let(:columns) do
-     { 'im_too_cool_to_vote_and_ill_only_ride_a_fixie' => 'hipster.id',
-       'really_im_not_doping_i_just_practice_a_lot' => 'professional.id' }
-  end
-  let(:options) { {} }
-
-  let(:trigger_sql) do
-    %{
-      DROP TRIGGER IF EXISTS pfki_bicycles_imtoocooltovoteandillonl_reallyimnotdopingijustpr
-      DROP TRIGGER IF EXISTS pfku_bicycles_imtoocooltovoteandillonl_reallyimnotdopingijustpr
-      CREATE TRIGGER pfki_bicycles_imtoocooltovoteandillonl_reallyimnotdopingijustpr BEFORE INSERT ON bicycles
-        FOR EACH ROW
-          BEGIN
-            IF(IF(NEW.im_too_cool_to_vote_and_ill_only_ride_a_fixie IS NULL, 0, 1) + IF(NEW.really_im_not_doping_i_just_practice_a_lot IS NULL, 0, 1)) <> 1 THEN
-              SET NEW = 'Error';
-            END IF;
-          END
-      CREATE TRIGGER pfku_bicycles_imtoocooltovoteandillonl_reallyimnotdopingijustpr BEFORE UPDATE ON bicycles
-        FOR EACH ROW
-          BEGIN
-            IF(IF(NEW.im_too_cool_to_vote_and_ill_only_ride_a_fixie IS NULL, 0, 1) + IF(NEW.really_im_not_doping_i_just_practice_a_lot IS NULL, 0, 1)) <> 1 THEN
-              SET NEW = 'Error';
-            END IF;
-          END
-    }
-  end
-
-  let(:fkey_sql) do
-    %{
-      ALTER TABLE `bicycles` ADD CONSTRAINT `bicycles_im_too_cool_to_vote_and_ill_only_ride_a_fixie_fk` FOREIGN KEY (`im_too_cool_to_vote_and_ill_only_ride_a_fixie`) REFERENCES `hipster`(id)
-      ALTER TABLE `bicycles` ADD CONSTRAINT `bicycles_really_im_not_doping_i_just_practice_a_lot_fk` FOREIGN KEY (`really_im_not_doping_i_just_practice_a_lot`) REFERENCES `professional`(id)
-    }
-  end
-
-  let(:full_constraints_sql) { trigger_sql + fkey_sql }
-  let(:remove_constraints_sql) do
-    %{
-      DROP TRIGGER IF EXISTS pfki_bicycles_imtoocooltovoteandillonl_reallyimnotdopingijustpr
-      DROP TRIGGER IF EXISTS pfku_bicycles_imtoocooltovoteandillonl_reallyimnotdopingijustpr
-      ALTER TABLE `bicycles` DROP FOREIGN KEY `bicycles_im_too_cool_to_vote_and_ill_only_ride_a_fixie_fk`
-      ALTER TABLE `bicycles` DROP FOREIGN KEY `bicycles_really_im_not_doping_i_just_practice_a_lot_fk`
-    }
-  end
-end

data/spec/support/db_setup.rb

@@ -1,38 +0,0 @@
-ActiveRecord::Base.establish_connection({
-  adapter: 'mysql2',
-  username: 'travis',
-  database: 'polymorpheus_test'
-})
-
-ActiveRecord::Base.connection.tables.each do |table|
-  ActiveRecord::Base.connection.drop_table table
-end
-
-ActiveRecord::Schema.define do
-  create_table :heros
-  create_table :villains
-  create_table :superheros
-  create_table :alien_demigods
-  create_table :supervillains
-  create_table :trees
-  create_table :drawings
-  create_table :books
-  create_table :binders
-  create_table :pictures
-  create_table :web_pages
-  create_table :printed_works
-
-  create_table :story_arcs do |t|
-    t.integer :hero_id
-    t.integer :villain_id
-    t.integer :battle_id
-    t.integer :issue_id
-  end
-
-  create_table :battles
-
-  create_table :superpowers do |t|
-    t.integer :superhero_id
-    t.integer :supervillain_id
-  end
-end