activemodel-associations 0.1.2 → 0.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6685a28ca5b130f8762895039083ba25e8e7e230
-  data.tar.gz: c245032bc18aa7fae1f9a25dbdcb21ac07d1bce7
+  metadata.gz: 96d915a47cf355c89bfb5267bfdabbbc74904373
+  data.tar.gz: c53bdffbaa73f1a10de38161362a5bf560c74a3b
 SHA512:
-  metadata.gz: 786a262f5f9c012f46bc2d3fa9748634ce89745ebe8b7c636b718a42fae3a86310ae494d4c8f61bb94e751bfa42816cd6b2231550b44d874a807ea19cf5c7201
-  data.tar.gz: e329a2da7598e1ea434ad0a2b16458405e9cd89a669843906418ad813aa1432c7b5eaeec40721c532acf8543f39844dfa6530e931f9731a4328d530ae118ad0e
+  metadata.gz: 2e87d7fc4bc20f1253bd7fd35ae63d474a457491f08ea5c5e1ca64f6ae82982c2aa0cc92149c693f85f7ab8ce04a8a3d4ddbfd7b0b0d267f06396592cd4402fb
+  data.tar.gz: 37db84892aeddc84b52443c5a9a4722f3efdcbb9d4f000390a948caccc6c5cfeaa7d00d0c494f2b297c021489e75c2022dd7d0f15fe5c099ce525fb7d90df4c8

data/.travis.yml

@@ -1,20 +1,14 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.2
-  - 2.1
-  - 2.0
+  - 2.3.0
+  - 2.2.4
 gemfile:
-  - gemfiles/activerecord-40.gemfile
   - gemfiles/activerecord-41.gemfile
   - gemfiles/activerecord-412.gemfile
   - gemfiles/activerecord-42.gemfile
+  - gemfiles/activerecord-50.gemfile
   - gemfiles/activerecord-master.gemfile
 matrix:
-  exclude:
-    - rvm: 2.0
-      gemfile: gemfiles/activerecord-master.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/activerecord-master.gemfile
   allow_failures:
     - gemfile: gemfiles/activerecord-master.gemfile

data/Rakefile

@@ -6,17 +6,19 @@ RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
 
 namespace :spec do
-  %w(activerecord-40 activerecord-41 activerecord-412 activerecord-42 activerecord-master).each do |gemfile|
+  %w(activerecord-41 activerecord-412 activerecord-42 activerecord-50 activerecord-master).each do |gemfile|
     desc "Run Tests by #{gemfile}.gemfile"
     task gemfile do
-      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle install --path .bundle"
-      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake -t spec"
+      Bundler.with_clean_env do
+        sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle install --path .bundle"
+        sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake -t spec"
+      end
     end
   end
 
   desc "Run All Tests"
   task :all do
-    %w(activerecord-40 activerecord-41 activerecord-412 activerecord-42 activerecord-master).each do |gemfile|
+    %w(activerecord-41 activerecord-412 activerecord-42 activerecord-50 activerecord-master).each do |gemfile|
       Rake::Task["spec:#{gemfile}"].invoke
     end
   end

data/gemfiles/activerecord-50.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.0.0.beta"
+gem "activemodel", "~> 5.0.0.beta"
+gem "activesupport", "~> 5.0.0.beta"
+
+gemspec :path => "../"

data/lib/active_model/associations.rb

@@ -4,6 +4,7 @@ require 'active_model/associations/autosave_association'
 require 'active_model/associations/override_methods'
 require 'active_record/associations/builder/has_many_for_active_model'
 require 'active_record/associations/has_many_for_active_model_association'
+require 'active_support/core_ext/module'
 
 module ActiveModel
   module Associations
@@ -14,13 +15,15 @@ module ActiveModel
     include ActiveRecordReflection
     include OverrideMethods
 
+    included do
+      mattr_accessor :belongs_to_required_by_default, instance_accessor: false
+    end
+
     module ClassMethods
       # define association like ActiveRecord
       def belongs_to(name, scope = nil, options = {})
         reflection = ActiveRecord::Associations::Builder::BelongsTo.build(self, name, scope, options)
-        if ActiveRecord.version >= Gem::Version.new("4.1")
-          ActiveRecord::Reflection.add_reflection self, name, reflection
-        end
+        ActiveRecord::Reflection.add_reflection self, name, reflection
       end
 
       # define association like ActiveRecord
@@ -32,9 +35,7 @@ module ActiveModel
         end
 
         reflection = ActiveRecord::Associations::Builder::HasManyForActiveModel.build(self, name, scope, options, &extension)
-        if ActiveRecord.version >= Gem::Version.new("4.1")
-          ActiveRecord::Reflection.add_reflection self, name, reflection
-        end
+        ActiveRecord::Reflection.add_reflection self, name, reflection
 
         mixin = generated_association_methods
         mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1

data/lib/active_model/associations/association_scope_extension.rb

@@ -1,9 +1,9 @@
 module ActiveModel::Associations
   module AssociationScopeExtension
-    if ActiveRecord.version < Gem::Version.new("4.1")
-      def add_constraints(scope)
-        if reflection.options[:active_model]
-          target_ids = reflection.options[:target_ids]
+    if ActiveRecord.version >= Gem::Version.new("5.0.0.beta")
+      def add_constraints(scope, owner, association_klass, refl, chain_head, chain_tail)
+        if refl.options[:active_model]
+          target_ids = refl.options[:target_ids]
           return scope.where(id: owner[target_ids])
         end
 

data/lib/active_model/associations/version.rb

@@ -1,5 +1,5 @@
 module ActiveModel
   module Associations
-    VERSION = "0.1.2"
+    VERSION = "0.2.0.beta1"
   end
 end

data/lib/active_record/associations/builder/has_many_for_active_model.rb

@@ -1,7 +1,23 @@
 module ActiveRecord::Associations::Builder
   class HasManyForActiveModel < HasMany
-    def valid_options
-      super + [:active_model, :target_ids] - [:through, :dependent, :source, :source_type, :counter_cache, :as]
+    p ActiveRecord.version
+    p ActiveRecord.version >= Gem::Version.new("5.0.0.beta")
+    if ActiveRecord.version >= Gem::Version.new("5.0.0.beta")
+      AR_CALLBACK_METHODS = %i(define_callback before_validation after_validation before_save after_save before_update after_update)
+
+      def self.valid_options(_options)
+        super + [:active_model, :target_ids] - [:through, :dependent, :source, :source_type, :counter_cache, :as]
+      end
+
+      def self.define_callbacks(model, reflection)
+        if AR_CALLBACK_METHODS.all? { |meth| self.respond_to?(meth) }
+          super
+        end
+      end
+    else
+      def valid_options
+        super + [:active_model, :target_ids] - [:through, :dependent, :source, :source_type, :counter_cache, :as]
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel-associations
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0.beta1
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2016-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -207,10 +207,10 @@ files:
 - README.md
 - Rakefile
 - activemodel-associations.gemspec
-- gemfiles/activerecord-40.gemfile
 - gemfiles/activerecord-41.gemfile
 - gemfiles/activerecord-412.gemfile
 - gemfiles/activerecord-42.gemfile
+- gemfiles/activerecord-50.gemfile
 - gemfiles/activerecord-master.gemfile
 - lib/active_model/associations.rb
 - lib/active_model/associations/active_record_reflection.rb
@@ -242,12 +242,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: ActiveRecord Association Helper for PORO (Plain Old Ruby Object)

data/gemfiles/activerecord-40.gemfile

@@ -1,7 +0,0 @@
-source "https://rubygems.org"
-
-gem "activerecord", "~> 4.0.0"
-gem "activemodel", "~> 4.0.0"
-gem "activesupport", "~> 4.0.0"
-
-gemspec :path => "../"