schema_associations 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c080f0a0fd14c82a61269dc1eb6e1e111ed1c331
-  data.tar.gz: 6e0a834bf340751c07ec3614ca34a712c35e884e
+SHA256:
+  metadata.gz: 44cb70a92c74e94032088d96228cf1622875c341c4e4f5b9d7563786dde6cf0d
+  data.tar.gz: 2a8fa7848d6fc166fc648ed761e075a508b14ed9b31b4dd64364bb76ae221205
 SHA512:
-  metadata.gz: 06b8e5871f6cb1ee9751571a739a05560c2f5f6d787450e3c69d893e3fa2cb43875778e1f7022c6d5436baba937ddbb29e903bba0de1798904bb7743c9fa3328
-  data.tar.gz: 4101db526873abab3e101e0bf8852f55372c272fe9c116169243a676d278455defe4c18b752c6fcf71d6ba99c54154084fe8dc851b792bb2af8aa5b860d8ddc4
+  metadata.gz: 78104847107eef1060cbb84245730fe60e2c900f1416b969cfb9d3e2359db705d53a150f9e3435422cee7d67c7ae4cca4cfedf8fbdbe73f642c12a2da794a68a
+  data.tar.gz: cbe12ce462e1faeb6db6f45fd0fc902a61348e65093ade4ca453943b855928a16cc5b67324fc3b8dc358e697ef4af3da5b69eb37d7a15f5d4fc586dd901da3cf

data/.travis.yml

@@ -13,6 +13,12 @@ gemfile:
 - gemfiles/activerecord-5.0/Gemfile.mysql2
 - gemfiles/activerecord-5.0/Gemfile.postgresql
 - gemfiles/activerecord-5.0/Gemfile.sqlite3
+- gemfiles/activerecord-5.1/Gemfile.mysql2
+- gemfiles/activerecord-5.1/Gemfile.postgresql
+- gemfiles/activerecord-5.1/Gemfile.sqlite3
+- gemfiles/activerecord-5.2/Gemfile.mysql2
+- gemfiles/activerecord-5.2/Gemfile.postgresql
+- gemfiles/activerecord-5.2/Gemfile.sqlite3
 env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
 addons:
   postgresql: '9.4'

data/README.md

@@ -205,7 +205,7 @@ If your forward relation is named "parent", SchemaAssociations names the
 reverse relation "child" or "children".  That is, if you have:
 
 ```ruby
-create_table :nodes
+create_table :nodes do |t|
     t.integer :parent_id         # schema_plus assumes it's a reference to this table
 end
 ```
@@ -225,14 +225,14 @@ For modularity in your tables and classes, you might  use a common prefix for
 related objects.  For example, you may have widgets each of which has a color, and each widget might have one frob that has a top color and a bottom color--all from the same set of colors.
 
 ```ruby
-create_table :widget_colors |t|
+create_table :widget_colors do |t|
 end
 
 create_table :widgets do |t|
     t.integer   :widget_color_id
 end
 
-create_table :widget_frobs
+create_table :widget_frobs do |t|
     t.integer :widget_id, index: :unique
     t.integer :top_widget_color_id,    references: :widget_colors
     t.integer :bottom_widget_color_id, references: :widget_colors
@@ -420,6 +420,8 @@ SchemaAssociations is tested on all combinations of:
 <!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
 * ruby **2.3.1** with activerecord **4.2**, using **mysql2**, **postgresql** or **sqlite3**
 * ruby **2.3.1** with activerecord **5.0**, using **mysql2**, **postgresql** or **sqlite3**
+* ruby **2.3.1** with activerecord **5.1**, using **mysql2**, **postgresql** or **sqlite3**
+* ruby **2.3.1** with activerecord **5.2**, using **mysql2**, **postgresql** or **sqlite3**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
     
@@ -454,6 +456,10 @@ Code coverage results will be in coverage/index.html -- it should be at 100% cov
 
 ## Release notes:
 
+### 1.2.7
+
+* add in auto deferring of has_* :through associations manually defined on the model so they work in AR 5.1+ 
+
 ### 1.2.6
 
 * Support for AR5 (Rails 5).

data/gemfiles/activerecord-4.2/Gemfile.postgresql

@@ -2,9 +2,9 @@ require "pathname"
 eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
 
 platform :ruby do
-  gem "pg"
+  gem "pg", "< 1"
 end
 
 platform :jruby do
   gem 'activerecord-jdbcpostgresql-adapter'
-end
+end

data/gemfiles/activerecord-5.0/Gemfile.base

@@ -1,3 +1,3 @@
 eval File.read File.expand_path('../../Gemfile.base', __FILE__)
 
-gem "activerecord", "~> 5.0.0"
+gem "activerecord", "~> 5.0.1"

data/gemfiles/activerecord-5.0/Gemfile.postgresql

@@ -2,9 +2,9 @@ require "pathname"
 eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
 
 platform :ruby do
-  gem "pg"
+  gem "pg", "< 1"
 end
 
 platform :jruby do
   gem 'activerecord-jdbcpostgresql-adapter'
-end
+end

data/gemfiles/activerecord-5.1/Gemfile.base

@@ -0,0 +1,3 @@
+eval File.read File.expand_path('../../Gemfile.base', __FILE__)
+
+gem "activerecord", "~> 5.1.0"

data/gemfiles/activerecord-5.1/Gemfile.mysql2

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end

data/gemfiles/activerecord-5.1/Gemfile.postgresql

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "pg", "< 1"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/gemfiles/activerecord-5.1/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

data/gemfiles/activerecord-5.2/Gemfile.base

@@ -0,0 +1,3 @@
+eval File.read File.expand_path('../../Gemfile.base', __FILE__)
+
+gem "activerecord", ">= 5.2.0.beta0", "< 5.3"

data/gemfiles/activerecord-5.2/Gemfile.mysql2

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end

data/gemfiles/activerecord-5.2/Gemfile.postgresql

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/gemfiles/activerecord-5.2/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

data/lib/schema_associations/active_record/associations.rb

@@ -15,6 +15,11 @@ module SchemaAssociations
 
       module ClassMethods
 
+        def reflections(*args)
+          _load_schema_associations_associations
+          super
+        end
+
         def reflect_on_association(*args)
           _load_schema_associations_associations
           super
@@ -57,7 +62,6 @@ module SchemaAssociations
         #         schema_associations :concise_names => false, :except_type => :has_and_belongs_to_many
         #     end
         #
-        #
         def schema_associations(opts={})
           @schema_associations_config = SchemaAssociations.config.merge({:auto_create => true}.merge(opts))
         end
@@ -66,6 +70,17 @@ module SchemaAssociations
           @schema_associations_config ||= SchemaAssociations.config.dup
         end
 
+        %i[has_many has_one].each do |m|
+          define_method(m) do |name, *args|
+            if @schema_associations_associations_loaded
+              super name, *args
+            else
+              @schema_associations_deferred_associations ||= []
+              @schema_associations_deferred_associations.push({macro: m, name: name, args: args})
+            end
+          end
+        end
+
         private
 
         def _load_schema_associations_associations
@@ -73,6 +88,8 @@ module SchemaAssociations
           return if abstract_class?
           return unless schema_associations_config.auto_create?
 
+          @schema_associations_associations_loaded = :loading
+
           reverse_foreign_keys.each do | foreign_key |
             if foreign_key.from_table =~ /^#{table_name}_(.*)$/ || foreign_key.from_table =~ /^(.*)_#{table_name}$/
               other_table = $1
@@ -90,6 +107,14 @@ module SchemaAssociations
             _define_association(:belongs_to, foreign_key)
           end
 
+          (@schema_associations_deferred_associations || []).each do |a|
+            argstr = a[:args].inspect[1...-1] + ' # deferred association'
+            _create_association(a[:macro], a[:name], argstr, *a[:args])
+          end
+          if instance_variable_defined? :@schema_associations_deferred_associations
+            remove_instance_variable :@schema_associations_deferred_associations
+          end
+
           @schema_associations_associations_loaded = true
         end
 
@@ -159,7 +184,6 @@ module SchemaAssociations
           end
         end
 
-
         def _determine_association_names(reference_name, referencing_name, references_name)
 
           references_concise = _concise_name(references_name, referencing_name)

data/lib/schema_associations/version.rb

@@ -1,3 +1,3 @@
 module SchemaAssociations
-  VERSION = "1.2.6"
+  VERSION = "1.2.7"
 end

data/schema_dev.yml

@@ -3,6 +3,8 @@ ruby:
 activerecord:
   - 4.2
   - 5.0
+  - 5.1
+  - 5.2
 db:
   - mysql2
   - postgresql

data/spec/association_spec.rb

@@ -7,6 +7,8 @@ describe ActiveRecord::Base do
     remove_all_models
   end
 
+  let(:pk_type) { Gem::Requirement.new('< 5.1').satisfied_by?(::ActiveRecord.version) ? :integer : :bigint }
+
   context "in basic case" do
     before(:each) do
       create_tables(
@@ -568,6 +570,33 @@ describe ActiveRecord::Base do
     end
   end
 
+  context 'defining has_many through associations' do
+    before(:each) do
+      create_tables(
+          "users", {}, {},
+          "posts", {}, { :user_id => { foreign_key: true}},
+          "comments", {}, { :post_id => { foreign_key: true}},
+      )
+      class Post < ActiveRecord::Base; end
+      class Comment < ActiveRecord::Base; end
+      class User < ActiveRecord::Base
+        has_many :comments, :through => :posts
+      end
+    end
+
+    it 'should not error when accessing the through association' do
+      reflection = User.reflect_on_association(:posts)
+      expect(reflection).not_to be_nil
+
+      reflection = User.reflect_on_association(:comments)
+      expect(reflection).not_to be_nil
+      expect(reflection.macro).to eq(:has_many)
+      expect(reflection.options[:through]).to eq(:posts)
+
+      expect { User.new.comments }.to_not raise_error
+    end
+  end
+
   context "regarding existing methods" do
     before(:each) do
       create_tables(
@@ -702,7 +731,7 @@ describe ActiveRecord::Base do
       table_defs.each_slice(3) do |table_name, opts, columns_with_options|
         ActiveRecord::Migration.create_table table_name, opts do |t|
           columns_with_options.each_pair do |column, options|
-            coltype = options.delete(:coltype) || :integer
+            coltype = options.delete(:coltype) || pk_type
             t.send coltype, column, options
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_associations
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-11 00:00:00.000000000 Z
+date: 2018-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: schema_plus_foreign_keys
@@ -136,6 +136,14 @@ files:
 - gemfiles/activerecord-5.0/Gemfile.mysql2
 - gemfiles/activerecord-5.0/Gemfile.postgresql
 - gemfiles/activerecord-5.0/Gemfile.sqlite3
+- gemfiles/activerecord-5.1/Gemfile.base
+- gemfiles/activerecord-5.1/Gemfile.mysql2
+- gemfiles/activerecord-5.1/Gemfile.postgresql
+- gemfiles/activerecord-5.1/Gemfile.sqlite3
+- gemfiles/activerecord-5.2/Gemfile.base
+- gemfiles/activerecord-5.2/Gemfile.mysql2
+- gemfiles/activerecord-5.2/Gemfile.postgresql
+- gemfiles/activerecord-5.2/Gemfile.sqlite3
 - init.rb
 - lib/schema_associations.rb
 - lib/schema_associations/active_record/associations.rb
@@ -164,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: schema_associations
-rubygems_version: 2.5.1
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: ActiveRecord extension that automatically (DRY) creates associations based