polymorpheus 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ab6587aad06136dbdf95584bba576349fc9731187a60dd6945d74bcb400b025
-  data.tar.gz: b83008d22a38740f1ef2909971e5fd662ed8ac5297449ddd1dd405af43a4d792
+  metadata.gz: 60273820617c2e5ef7e4eab45965a2729ae9ecb3e8ba05357cf9c0ae432d36be
+  data.tar.gz: 156743a57b80836a20280d0bdef6bd4e3f895e79cbf93aac60b986fe5deb4bac
 SHA512:
-  metadata.gz: 476c715b239796573c7a2de566a4dd52507445c68227c4559cb7ec9a443ab707f48d31ad1477edfcfa52183e18634eac329bbe7d7c4bdbf006d620544c9d88b8
-  data.tar.gz: a778788d64292837ad5ed6e4a4a4b4fbc9e2fcdd5f38d1c99088c3fa2e7d838b07e20e1df3cae0cb0c7bf6c9e537c0c1d90c3c1ac17fcd8b5db2076def0194b0
+  metadata.gz: 5bb967919da9877c1129879492445d4972aff408399c0c6da01804cc4848382e9565b1cf32aa72c63101cf791ef331e5382cededa0a146e0d439a828f34fade2
+  data.tar.gz: cb3b1f649f7317ef555b78b6932a5385c8f78ba7e8b5bbdb3d37a552a4b4c20dce0ef72fd1deb410745744885020766e674acd50a1826989b720fe99abe71e65

data/README.md

@@ -1,4 +1,3 @@
-[![Build Status](https://travis-ci.org/wegowise/polymorpheus.png?branch=master)](https://travis-ci.org/wegowise/polymorpheus)
 [![Code Climate](https://codeclimate.com/github/wegowise/polymorpheus.png)](https://codeclimate.com/github/wegowise/polymorpheus)
 
 # Polymorpheus
@@ -10,15 +9,6 @@ no setup**
 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'
 ```
 
@@ -212,8 +202,8 @@ pic.polymorpheus.query_condition
 ## Credits and License
 
 * 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 Rails < 4.2.
+* Older, unsupported versions of this gem use [Foreigner gem](https://github.com/matthuhiggins/foreigner)
+  under 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/adapter.rb

@@ -15,7 +15,11 @@ module Polymorpheus
       end
 
       def configured_adapter
-        ActiveRecord::Base.connection_pool.spec.config[:adapter]
+        if ActiveRecord::Base.respond_to?(:connection_db_config)
+          ActiveRecord::Base.connection_db_config.adapter # ActiveRecord >= 6.1
+        else
+          ActiveRecord::Base.connection_pool.spec.config[:adapter]
+        end
       end
     end
 

data/lib/polymorpheus/interface/belongs_to_polymorphic.rb

@@ -21,7 +21,7 @@ module Polymorpheus
 
         # Set belongs_to associations
         builder.associations.each do |association|
-          belongs_to association.name.to_sym, association.options
+          belongs_to association.name.to_sym, **association.options
         end
 
         # Exposed interface for introspection

data/lib/polymorpheus/interface/{rails4/has_many_as_polymorph.rb → has_many_as_polymorph.rb}

@@ -25,7 +25,7 @@ module Polymorpheus
           relation
         end
 
-        has_many association, conditions, options
+        has_many association, conditions, **options
       end
     end
   end

data/lib/polymorpheus/mysql_adapter.rb

@@ -74,7 +74,7 @@ module Polymorpheus
             :name => "#{table}_#{col_name}_fk",
             :primary_key => (ref_col || 'id' )
           }.merge(generate_constraints(options))
-          add_foreign_key(table, ref_table, fk_options)
+          add_foreign_key(table, ref_table, **fk_options)
         end
       end
 
@@ -208,8 +208,3 @@ end
   rescue
   end
 end
-
-if ::Polymorpheus.require_foreigner?
-  require 'foreigner/connection_adapters/mysql2_adapter'
-  require 'polymorpheus/mysql_adapter/foreigner_constraints'
-end

data/lib/polymorpheus/version.rb

@@ -1,3 +1,3 @@
 module Polymorpheus
-  VERSION = '3.3.0'
+  VERSION = '3.4.0'
 end

data/lib/polymorpheus.rb

@@ -8,12 +8,7 @@ module Polymorpheus
   module Interface
     autoload :BelongsToPolymorphic, 'polymorpheus/interface/belongs_to_polymorphic'
     autoload :ValidatesPolymorph, 'polymorpheus/interface/validates_polymorph'
-
-    if ActiveRecord::VERSION::MAJOR >= 4
-      autoload :HasManyAsPolymorph, 'polymorpheus/interface/rails4/has_many_as_polymorph'
-    else
-      autoload :HasManyAsPolymorph, 'polymorpheus/interface/rails3/has_many_as_polymorph'
-    end
+    autoload :HasManyAsPolymorph, 'polymorpheus/interface/has_many_as_polymorph'
   end
 
   class InterfaceBuilder
@@ -23,16 +18,8 @@ module Polymorpheus
   module ConnectionAdapters
     autoload :SchemaStatements, 'polymorpheus/schema_statements'
   end
-
-  def self.require_foreigner?
-    ActiveRecord::VERSION::MAJOR < 5 &&
-    !(::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/polymorpheus.gemspec

@@ -12,12 +12,13 @@ Gem::Specification.new do |s|
   s.summary     = "Provides a database-friendly method for polymorphic relationships"
   s.description = "Provides a database-friendly method for polymorphic relationships"
 
+  s.required_ruby_version = ">= 2.6"
   s.required_rubygems_version = ">= 1.3.6"
   s.files = Dir.glob(%w[{lib,spec}/**/*.rb [A-Z]*.{txt,rdoc,md} *.gemspec]) + %w{Rakefile}
   s.extra_rdoc_files = ["README.md", "LICENSE.txt"]
   s.license = 'MIT'
 
-  s.add_dependency('activerecord', '>= 3.2', '< 6.1')
+  s.add_dependency('activerecord', '>= 5.2', '< 7.1')
 
   s.add_development_dependency('rake', '~> 12.3.3')
   s.add_development_dependency('rspec', '~> 3.9.0')

data/spec/spec_helper.rb

@@ -2,13 +2,14 @@ require 'active_record'
 require 'polymorpheus'
 require 'stringio'
 
-require 'support/active_record/connection_adapters/abstract_mysql_adapter'
-
-ActiveRecord::Base.establish_connection({
+ActiveRecord::Base.establish_connection(
   adapter: 'mysql2',
-  username: 'travis',
-  database: 'polymorpheus_test'
-})
+  database: ENV.fetch('DB_NAME', 'polymorpheus_test'),
+  host: ENV.fetch('DB_HOST', '127.0.0.1'),
+  password: ENV.fetch('DB_PASSWORD', ''),
+  port: ENV.fetch('DB_PORT', '3306'),
+  username: ENV.fetch('DB_USERNAME', 'root')
+)
 
 Dir[File.dirname(__FILE__) + '/support/*.rb'].sort.each { |path| require path }
 
@@ -27,7 +28,7 @@ RSpec.configure do |config|
   config.include SqlTestHelpers
 
   config.after do
-    data_sources.each do |table|
+    ActiveRecord::Base.connection.tables.each do |table|
       ActiveRecord::Base.connection.drop_table(table)
     end
   end

data/spec/support/connection_helpers.rb

@@ -3,14 +3,6 @@ module ConnectionHelpers
     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

data/spec/support/schema_helpers.rb

@@ -2,7 +2,7 @@ module SchemaHelpers
   def create_table(name, options = {})
     options.merge!(force: true)
     ActiveRecord::Schema.define do
-      create_table(name, options) do |t|
+      create_table(name, **options) do |t|
         yield(t) if block_given?
       end
     end

data/spec/support/sql_query_subscriber.rb

@@ -0,0 +1,17 @@
+module Polymorpheus
+  class SqlQuerySubscriber
+    attr_reader :sql_statements
+
+    def initialize
+      @sql_statements = []
+    end
+
+    def call(_name, _start, _finish, _id, payload)
+      sql_statements << payload[:sql]
+    end
+
+    def clear_sql_history
+      @sql_statements.clear
+    end
+  end
+end

data/spec/support/sql_test_helpers.rb

@@ -2,22 +2,16 @@ 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
+    before do
+      ActiveSupport::Notifications.subscribe('sql.active_record', sql_logger)
     end
 
-    after(:all) do
-      class << ActiveRecord::Base.connection
-        alias_method :execute, :original_execute
-      end
+    after do
+      ActiveSupport::Notifications.unsubscribe(sql_logger)
     end
 
     let(:connection) { ActiveRecord::Base.connection }
-    let(:sql) { connection.sql_statements }
+    let(:sql_logger) { Polymorpheus::SqlQuerySubscriber.new }
 
     def clean_sql(sql_string)
       sql_string
@@ -31,11 +25,15 @@ module SqlTestHelpers
     end
 
     def clear_sql_history
-      connection.clear_sql_history
+      sql_logger.clear_sql_history
     end
 
     def should_execute_sql(expected)
       expect(clean_sql(sql.join("\n"))).to include(clean_sql(expected))
     end
+
+    def sql
+      sql_logger.sql_statements
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polymorpheus
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Barun Singh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-08 00:00:00.000000000 Z
+date: 2022-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -73,13 +73,11 @@ files:
 - lib/polymorpheus/adapter.rb
 - lib/polymorpheus/interface.rb
 - lib/polymorpheus/interface/belongs_to_polymorphic.rb
-- lib/polymorpheus/interface/rails3/has_many_as_polymorph.rb
-- lib/polymorpheus/interface/rails4/has_many_as_polymorph.rb
+- lib/polymorpheus/interface/has_many_as_polymorph.rb
 - lib/polymorpheus/interface/validates_polymorph.rb
 - 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
@@ -94,12 +92,11 @@ files:
 - spec/mysql2_adapter_spec.rb
 - spec/schema_dumper_spec.rb
 - spec/spec_helper.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/schema_helpers.rb
-- spec/support/sql_logger.rb
+- spec/support/sql_query_subscriber.rb
 - spec/support/sql_test_helpers.rb
 - spec/trigger_spec.rb
 homepage: http://github.com/wegowise/polymorpheus
@@ -114,14 +111,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.6
 signing_key:
 specification_version: 4
 summary: Provides a database-friendly method for polymorphic relationships

data/lib/polymorpheus/interface/rails3/has_many_as_polymorph.rb

@@ -1,29 +0,0 @@
-module Polymorpheus
-  module Interface
-    module HasManyAsPolymorph
-      def has_many_as_polymorph(association, options = {})
-        options.symbolize_keys!
-        fkey = name.foreign_key
-
-        class_name = options[:class_name] || association.to_s.classify
-
-        options[:conditions] = proc do
-          keys = class_name.constantize
-                  .const_get('POLYMORPHEUS_ASSOCIATIONS')
-                  .map(&:foreign_key)
-          keys.delete(fkey)
-
-          nil_columns = keys.reduce({}) { |hash, key| hash.merge!(key => nil) }
-
-          if self.is_a?(ActiveRecord::Associations::JoinDependency::JoinAssociation)
-            { aliased_table_name => nil_columns }
-          else
-            { association => nil_columns }
-          end
-        end
-
-        has_many association, options
-      end
-    end
-  end
-end

data/lib/polymorpheus/mysql_adapter/foreigner_constraints.rb

@@ -1,30 +0,0 @@
-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/spec/support/active_record/connection_adapters/abstract_mysql_adapter.rb

@@ -1,9 +0,0 @@
-# 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/sql_logger.rb

@@ -1,30 +0,0 @@
-module Polymorpheus
-  module SqlLogger
-
-    def sql_statements
-      @sql_statements ||= []
-    end
-
-    def clear_sql_history
-      @sql_statements = nil
-    end
-
-    def stub_sql(statement, response)
-      @stubbed ||= {}
-      @stubbed[statement] = response
-    end
-
-    private
-
-    def log_sql_statements(sql, name = nil)
-      if @stubbed && @stubbed.has_key?(sql)
-        @stubbed[sql]
-      else
-        sql_statements << sql
-        original_execute(sql, name)
-      end
-    end
-
-  end
-end
-