Add activerecord-51 gemfile

.travis.yml

@@ -8,6 +8,7 @@ gemfile:
   - gemfiles/activerecord-412.gemfile
   - gemfiles/activerecord-42.gemfile
   - gemfiles/activerecord-50.gemfile
+  - gemfiles/activerecord-51.gemfile
   - gemfiles/activerecord-master.gemfile
 matrix:
   allow_failures:

README.md

@@ -28,6 +28,7 @@ Or install it yourself as:
 - activerecord-4.1.x
 - activerecord-4.2.x
 - activerecord-5.0.x
+- activerecord-5.1.x
 
 ## Usage
 
@@ -128,6 +129,7 @@ Support associations is only `belongs_to` and simple `has_many`
 
 1. Fork it ( https://github.com/joker1007/activemodel-associations/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+3. Run tests with `rake spec:all`
+4. Commit your changes (`git commit -am 'Add some feature'`)
+5. Push to the branch (`git push origin my-new-feature`)
+6. Create a new Pull Request

Rakefile

@@ -6,7 +6,7 @@ RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
 
 namespace :spec do
-  %w(activerecord-41 activerecord-412 activerecord-42 activerecord-50 activerecord-master).each do |gemfile|
+  %w(activerecord-41 activerecord-412 activerecord-42 activerecord-50 activerecord-51 activerecord-master).each do |gemfile|
     desc "Run Tests by #{gemfile}.gemfile"
     task gemfile do
       Bundler.with_clean_env do
@@ -18,7 +18,7 @@ namespace :spec do
 
   desc "Run All Tests"
   task :all do
-    %w(activerecord-41 activerecord-412 activerecord-42 activerecord-50 activerecord-master).each do |gemfile|
+    %w(activerecord-41 activerecord-412 activerecord-42 activerecord-50 activerecord-51 activerecord-master).each do |gemfile|
       Rake::Task["spec:#{gemfile}"].invoke
     end
   end

gemfiles/activerecord-51.gemfile

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

lib/active_model/associations/association_scope_extension.rb

@@ -1,6 +1,15 @@
 module ActiveModel::Associations
   module AssociationScopeExtension
-    if ActiveRecord.version >= Gem::Version.new("5.0.0.beta")
+    if ActiveRecord.version >= Gem::Version.new("5.1.0")
+      def add_constraints(scope, owner, refl, chain_head, chain_tail)
+        if refl.options[:active_model]
+          target_ids = refl.options[:target_ids]
+          return scope.where(id: owner[target_ids])
+        end
+
+        super
+      end
+    elsif 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]

lib/active_record/associations/has_many_for_active_model_association.rb

@@ -21,12 +21,13 @@ def empty?
 
     # full replace simplely
     def replace(other_array)
-      original_target = load_target.dup
       other_array.each { |val| raise_on_type_mismatch!(val) }
       target_ids = reflection.options[:target_ids]
       owner[target_ids] = other_array.map(&:id)
 
-      old_records = original_target - other_array
+      load_target
+
+      old_records = target - other_array
       old_records.each do |record|
         @target.delete(record)
       end

spec/db/migrate/10_create_users.rb

@@ -1,9 +1,21 @@
-class CreateUsers < ActiveRecord::Migration
-  def change
-    create_table :users do |t|
-      t.string :name
+if ActiveRecord.version >= Gem::Version.new("5.1.0")
+  class CreateUsers < ActiveRecord::Migration[4.2]
+    def change
+      create_table :users do |t|
+        t.string :name
 
-      t.timestamps
+        t.timestamps
+      end
+    end
+  end
+else
+  class CreateUsers < ActiveRecord::Migration
+    def change
+      create_table :users do |t|
+        t.string :name
+
+        t.timestamps
+      end
     end
   end
 end

spec/lib/active_model/association_spec.rb

@@ -132,9 +132,9 @@ class Group
         include ActiveModel::Associations
 
         attr_accessor :name
-        attr_reader :user_ids
+        attr_reader :id, :user_ids
 
-        has_many :users
+        has_many :users, primary_key: "id"
 
         def [](attr)
           self.send(attr)
@@ -234,8 +234,8 @@ def []=(attr, value)
 
         it "can define different class_name association" do
           class DiffClassNameHasManyGroup < Group
-            attr_reader :member_ids
-            has_many :members, class_name: "User"
+            attr_reader :id, :member_ids
+            has_many :members, class_name: "User", primary_key: "id"
           end
 
           user = User.create(name: "joker1007")