activemodel-associations 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78d28b409b8b4a0658df2eb0729e3737a7cf5fe6
-  data.tar.gz: 3b84b0cbff584770cd0e8c247b036111d9a7a300
+  metadata.gz: 3d9c6e4e10b3abbddc32adb581c7986a5cb62efc
+  data.tar.gz: 5dc2e3d9acb6351c8d041f252e43454d221bd3e9
 SHA512:
-  metadata.gz: 56f110e11d873c9916cb51325753d95f250957b225739df87b6812e33c62a01df41e8f1768f0f6fe08a6e74a5ed8ae429a10658f23a759740fda8c299e3bb898
-  data.tar.gz: 1e83f7e627843b46949b8d6d1c7f48938c09513ccf47d291580df107d3fc84c8a20248c670ebc5c15484818bf9786eba0b7235456e3a838fd7e014ca1e509b48
+  metadata.gz: bdb223dd6a00f9571869a04cde42dbaabe997fefd9a02fc9bb9dac6ceb964b48f36ef84f5b8c41f259083ff7ddc315875013e01278cb6038961ce63919669e09
+  data.tar.gz: 1b75beaef925ef9149e7ebcefaf167eb094263a2b552224e56972d5ea6fafa331ab293d0960679378bbf71ffcf3813b910b19fe93bacd07f31749c615a48db8d

data/README.md

@@ -1,4 +1,4 @@
-# Activemodel::Association
+# Activemodel::Associations
 [![Build Status](https://travis-ci.org/joker1007/activemodel-associations.svg?branch=master)](https://travis-ci.org/joker1007/activemodel-associations)
 [![Coverage Status](https://coveralls.io/repos/joker1007/activemodel-associations/badge.png)](https://coveralls.io/r/joker1007/activemodel-associations)
 

data/activemodel-associations.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |spec|
   spec.version       = ActiveModel::Associations::VERSION
   spec.authors       = ["joker1007"]
   spec.email         = ["kakyoin.hierophant@gmail.com"]
-  spec.summary       = %q{ActiveRecord Association Helper for PORO}
-  spec.description   = %q{ActiveRecord Association Helper for PORO}
-  spec.homepage      = ""
+  spec.summary       = %q{ActiveRecord Association Helper for PORO (Plain Old Ruby Object)}
+  spec.description   = %q{ActiveRecord Association Helper for PORO (Plain Old Ruby Object)}
+  spec.homepage      = "https://github.com/joker1007/activemodel-associations"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/lib/active_model/associations/version.rb

@@ -1,5 +1,5 @@
 module ActiveModel
   module Associations
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/active_record/associations/has_many_for_active_model_association.rb

@@ -12,20 +12,43 @@ module ActiveRecord::Associations
 
     # 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
+      old_records.each do |record|
+        @target.delete(record)
+      end
+
+      other_array.each do |record|
+        if index = @target.index(record)
+          @target[index] = record
+        else
+          @target << record
+        end
+      end
     end
 
-    # no need load_target, and transaction
+    # no need transaction
     def concat(*records)
+      load_target
       flatten_records = records.flatten
       flatten_records.each { |val| raise_on_type_mismatch!(val) }
       target_ids = reflection.options[:target_ids]
       owner[target_ids] ||= []
       owner[target_ids].concat(flatten_records.map(&:id))
-      reset
-      reset_scope
+
+      flatten_records.each do |record|
+        if index = @target.index(record)
+          @target[index] = record
+        else
+          @target << record
+        end
+      end
+
+      target
     end
   end
 end

data/spec/lib/active_model/association_spec.rb

@@ -132,8 +132,8 @@ describe ActiveModel::Associations do
         end
 
         describe "defined accessor" do
-          let(:user1) { User.create(name: "joker1007") }
-          let(:user2) { User.create(name: "kakyoin") }
+          let!(:user1) { User.create(name: "joker1007") }
+          let!(:user2) { User.create(name: "kakyoin") }
           let(:group) { Group.new(user_ids: [user1.id, user2.id]) }
 
           it "returns ActiveRecord CollectionProxy of target class" do
@@ -148,6 +148,21 @@ describe ActiveModel::Associations do
             expect(group.users).to eq [user1, user2]
           end
 
+          it "replace target, and set target_ids attributes" do
+            expect(group.users).to eq [user1, user2]
+            group.users = [user1]
+            expect(group.users).to eq [user1]
+            group.users = []
+            expect(group.users).to be_empty
+          end
+
+          it "receives target ActiveRecord CollectionProxy, and set target_ids attributes" do
+            group = Group.new
+            expect(group.users).to be_empty
+            group.users = User.all
+            expect(group.users).to eq [user1, user2]
+          end
+
           it "can replace having association" do
             user3 = User.create(name: "jotaro")
             group = Group.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel-associations
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -150,7 +150,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ActiveRecord Association Helper for PORO
+description: ActiveRecord Association Helper for PORO (Plain Old Ruby Object)
 email:
 - kakyoin.hierophant@gmail.com
 executables: []
@@ -182,7 +182,7 @@ files:
 - spec/db/migrate/10_create_users.rb
 - spec/lib/active_model/association_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/joker1007/activemodel-associations
 licenses:
 - MIT
 metadata: {}
@@ -205,7 +205,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: ActiveRecord Association Helper for PORO
+summary: ActiveRecord Association Helper for PORO (Plain Old Ruby Object)
 test_files:
 - spec/db/migrate/10_create_users.rb
 - spec/lib/active_model/association_spec.rb