imyou 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ea37cab3c8ce4f35113a47972b4936655a977040adee8ea2bd6b59f01ad5168
-  data.tar.gz: 7de5c7103f8e133355f0c08ad0fa6e7056e33c9101930c7326a965aa09083022
+  metadata.gz: 05a7537c8208e72b170c4f7e4288ab682c166e155065754986d8bae046620af4
+  data.tar.gz: 6bbd47526c77292554d5245ff49b06ae10ee3a4cf6b652e6256d3ce31ae4c39b
 SHA512:
-  metadata.gz: 1ddaf339b9c10bfb339280fd05eb4dc827b46ca6f163f3031a7e95e292ff8eea6624f5660f605f6ba3827f22a95bb60f8fc1348ec118843f3a2560059ca12861
-  data.tar.gz: 3f7a465be25dd666cab0aa6a3e427f9ed49b836f3329c3ab5ae96771a156b1e3334b5fd1d1ab9c445abdabcafa368bfe03ad435e07cea2fa6d94b182f5436dff
+  metadata.gz: 873bbe9b3c56b04c3d77474029de273352347de2e5156ac674cb9b81427b43ad83312bdd30312a3490487579005882c5929da35ee863742b9a5eb447b7412c7b
+  data.tar.gz: b78f199e55baa6924ef404ef7198e9e9d0d727d61150f631a2240d9776f3bd58c077c191f6cb03f4cf89bfd18f643d6a4afda11be95885462c76fa026e10be79

data/README.md

@@ -60,7 +60,7 @@ end
 @book.nicknames = %w(red green blue)
 @book.nicknames # => ['red', 'green', 'blue']
 
-# eager_load(LEFT OUTER JOIN)
+# preload
 User.with_nicknames
 
 # Search users by nickname.

data/lib/imyou/models.rb

@@ -8,6 +8,11 @@ module Imyou
       class_eval do
 
         has_many :imyou_nicknames, -> { order(id: :asc) }, class_name: 'Imyou::Nickname', as: :model, dependent: :destroy
+
+        accepts_nested_attributes_for :imyou_nicknames,
+                                      allow_destroy: true,
+                                      reject_if: ->(attributes) { attributes['name'].blank? }
+
         scope :with_nicknames, -> { preload(:imyou_nicknames) }
 
         scope :match_by_nickname, ->(nickname, with_name_column: true) do
@@ -81,7 +86,11 @@ module Imyou
         end
 
         def nicknames
-          self.imyou_nicknames.pluck(:name)
+          if new_record?
+            self.imyou_nicknames.map(&:name)
+          else
+            self.imyou_nicknames.pluck(:name)
+          end
         end
 
         def remove_all_nicknames
@@ -89,16 +98,32 @@ module Imyou
         end
 
         def add_nickname(nickname)
-          self.imyou_nicknames.create!(name: nickname)
+          if new_record?
+            self.imyou_nicknames.build(name: nickname)
+          else
+            self.imyou_nicknames.find_or_create_by(name: nickname)
+          end
         end
 
         def remove_nickname(nickname)
-          self.imyou_nicknames.find_by(name: nickname)&.destroy!
+          if new_record?
+            array = self.imyou_nicknames.to_a.delete_if do |imyou_nickname|
+              imyou_nickname.name == nickname
+            end
+            self.imyou_nicknames.replace(array)
+            true
+          else
+            self.imyou_nicknames.find_by(name: nickname)&.destroy!
+          end
         end
 
         def nicknames=(new_nicknames)
-          if new_nicknames.blank?
-            self.imyou_nicknames.delete_all
+          if new_record?
+            new_nicknames&.each do |new_nickname|
+              self.imyou_nicknames.build(name: new_nickname)
+            end
+          elsif new_nicknames.blank?
+              self.remove_all_nicknames
           else
             self.imyou_nicknames.where.not(name: new_nicknames).delete_all
             new_nicknames.each do |new_nickname|

data/lib/imyou/nickname.rb

@@ -4,11 +4,9 @@ module Imyou
     belongs_to :model, polymorphic: true
 
     scope :by_type, -> (klass) { where(model_type: klass.name) }
-    scope :default_order, -> { order(created_at: :asc) }
+    scope :default_order, -> { order(id: :asc) }
     default_scope { default_order }
 
-    validates :model_id, presence: true
-    validates :model_type, presence: true
     validates :name, presence: true
     validates_uniqueness_of :name, scope: [ :model_id, :model_type ]
   end

data/lib/imyou/version.rb

@@ -1,3 +1,3 @@
 module Imyou
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imyou
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - patorash