linker 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7215c599b0c4568eaee73a1f5dd17ef4494d8c67
-  data.tar.gz: 1f7122fc680bcbfa1471871e617966da3ec6c986
+  metadata.gz: b48ed834d2a2939cd146a4df6f0cea04cab670bf
+  data.tar.gz: acdc8c5c7188540ac99e79e22667262d2b8af3de
 SHA512:
-  metadata.gz: b6307b9c840caffcaaa6afbae8205bcfd203c74e34459ae8e74fa3a6211c5178efac4703103aadfe569ec7922965029b6bcf399eb133094f78c949ad6093f944
-  data.tar.gz: 3893664531b92f965ada075022e2413ccea81558d236c00355a3e0c368e7e6b80acb41e4878d21fe94a4ef4c6a6db384558077d498959a6005f8f384d2b5eb8b
+  metadata.gz: 517dd1f9aac26980d68f308ad4381e1d3ad5e3e84aec4b5c503b49c09290574d84694deea22f8970473aec0cfe561c5fbc043a821c9007a1352470098f6168d5
+  data.tar.gz: 43050b4f7f21a3072348ecc0132d7e84c590fcb4847f4e472a04d27a01d5843406686849f5481b65b174341fad08ed8613e7940eaafd859ecdb8cbe9b6afc0fc

data/lib/linker/forms/attributes.rb

@@ -19,6 +19,7 @@ module Linker
       set_fields_for_methods(map_belongs_to_associations, true)
       set_fields_for_methods(map_has_one_associations, true)
       set_non_fields_for_methods(map_has_one_associations)
+      set_remove_accessor(map_has_many_associations)
     end
 
     def set_reader_for_main_model
@@ -97,6 +98,13 @@ module Linker
         end
       end
 
+      def set_remove_accessor assoc_set
+        assoc_set.each do |c|
+          #ap "Criando attr_accessor :_remove para #{c[:klass]}"
+          c[:klass].constantize.class_eval{ attr_accessor :_remove }
+        end
+      end
+
       def map_associations assoc
         assoc.inject([]) do |t, c| 
           t << {

data/lib/linker/forms/params.rb

@@ -6,11 +6,6 @@ module Linker
 
     included do
       def params= params
-        # Delete all associated objects if there is nothing in params
-        @mapped_hm_assoc.each do |c|
-          _get_main_model.send(c[:name]).destroy_all if !params.key?("#{c[:name]}_attributes")
-        end
-
         params.each do |param, value|
           if value.is_a?(Hash)
             table = param.gsub(%r{_attributes$}, '')
@@ -32,14 +27,19 @@ module Linker
 
             # has_many attrs
             else
-              ids = value.map.with_index{|c,i| c.last['id'].present? ? c.last['id'] : nil }.compact
-              _get_main_model.send(table).where(["#{_get_main_model.send(table).table.name}.id NOT IN (?)", ids]).destroy_all if ids.present?
+              ids_to_remove = value.map{|c| c.last['id'] if c.last['id'].present? && c.last.key?('_remove') && c.last['_remove'] == '1' }.compact
+
+              if ids_to_remove.present?
+                r = search_has_many(table)
+                r[:klass].constantize.send(:where, ["#{r[:klass].constantize.table_name}.id IN (?)", ids_to_remove]).destroy_all
+                value.delete_if{|i, c| ids_to_remove.include?(c['id']) }
+              end
 
               value.each do |c|
                 if c.last['id'].present?
-                  _get_main_model.send(table).find(c.last['id']).update_attributes(c.last)
+                  _get_main_model.send(table).find(c.last['id']).update_attributes(c.last.except('_remove'))
                 else
-                  _get_main_model.send(table).send(:build, c.last)
+                  _get_main_model.send(table).send(:build, c.last.except('_remove'))
                 end
               end
             end
@@ -73,7 +73,12 @@ module Linker
       end
 
       def search_has_one name
-        s = map_has_one_associations.detect{|c| c[:name] == name}
+        s = @mapped_ho_assoc.detect{|c| c[:name] == name}
+        s.present? && s
+      end
+
+      def search_has_many name
+        s = @mapped_hm_assoc.detect{|c| c[:name] == name}
         s.present? && s
       end
   end

data/lib/linker/version.rb

@@ -1,3 +1,3 @@
 module Linker
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/users_form_spec.rb

@@ -26,11 +26,13 @@ describe UsersForm do
 
   subject(:dependent_users_sample) { users_form.dependent_users.sample }
   it { expect(dependent_users_sample).to be_an(DependentUser) }
+  it { expect(dependent_users_sample).to respond_to(:_remove) }
 
   it { expect(users_form).to respond_to(:my_tasks, :my_tasks_attributes=) }
   it { expect(users_form.my_tasks).to be_an(Array) }
   subject(:tasks_sample) { users_form.my_tasks.sample }
-  it { expect(tasks_sample).to be_an(Task) }
+  it { expect(tasks_sample).to be_a(Task) }
+  it { expect(tasks_sample).to respond_to(:_remove) }
 
   it { expect(users_form).to respond_to(:address, :address_attributes=) }
   subject(:address) { users_form.address }
@@ -142,7 +144,7 @@ describe UsersForm do
         'profile_list'               => '',
         'my_phone_list'              => '',
         'little_pet_attributes'      => {'id' => '1', 'name' => 'Stuart 2'},
-        #'tasks_attributes'           => {'0' => {'id' => '', 'name' => 'T1'}, '1' => {'id' => '', 'name' => 'T2'}},
+        'my_tasks_attributes'        => {'0' => {'id' => '1', 'name' => 'Task 1', '_remove' => '1'}, '1' => {'id' => '', 'name' => 'Task 3'}},
         'dependent_users_attributes' => {'0' => {'id' => '1', 'name' => 'John 2', 'date_birth' => Date.new(1990, 2, 2)}, '1' => {'id' => '', 'name' => '', 'date_birth' => ''}}
       }
       users_form_existing_user.save
@@ -156,15 +158,16 @@ describe UsersForm do
     subject(:users_form_existing_user_pet) { users_form_existing_user.little_pet }
     subject(:users_form_existing_user_family) { users_form_existing_user.my_family }
     subject(:users_form_existing_user_user_tasks) { users_form_existing_user.user.my_tasks }
-    subject(:users_form_existing_user_tasks_sample) { users_form_existing_user.my_tasks.sample }
+    subject(:users_form_existing_user_tasks) { users_form_existing_user.my_tasks }
 
     subject(:users_form_existing_user_to_model) { users_form_existing_user.to_model }
     it { expect(users_form_existing_user_to_model.class).to eq(User) }
     it { expect(users_form_existing_user_to_model.persisted?).to eq(true) }
 
-    it { expect(users_form_existing_user_user_tasks.empty?).to be(true) }
-    it { expect(users_form_existing_user_tasks_sample.persisted?).to be(false) }
-    it { expect(users_form_existing_user_tasks_sample).to be_a(Task) }
+    it { expect(users_form_existing_user_tasks.first).to be_a(Task) }
+    it { expect(users_form_existing_user_tasks.first.persisted?).to eq(true) }
+    it { expect(users_form_existing_user_tasks.first.name).to eq('Task 3') }
+    it { expect(Task.find_by_id(1)).to eq(nil) }
 
     it { expect(users_form_existing_user_dependent_users.sample.persisted?).to eq(true) }
     it { expect(users_form_existing_user_dependent_users.first.id).to eq(1) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linker
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Glauco Custódio