create_custom_attributes 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a025789bdf522713dc791d1a425f9846940c0d3fc2d828cd7c511890bb6d1c2
-  data.tar.gz: 26482dac5817a7e72824897b7c2d68c6a407190069e519acc667d986e404717b
+  metadata.gz: cfc0f2cee77429347fd5b147254475dde430f436d0bddcd34cdf79ac57a137b8
+  data.tar.gz: f0d2d676dec9c047efaa99bb3ff17a31718f7c64dc41f1bef24e447c89536290
 SHA512:
-  metadata.gz: b0c468f3313e8c073ad61fa97f414fddc0b82ade5294908dda346783b4b8a77bd2d57f271eec381be070bbe386110d1151447e32f6cdc08149f451ec569c513b
-  data.tar.gz: 98a62c90dedbbadee34436256bad7b6bd593d999e138099735b3d5471aa337262a38cbd8ad0a7347a241c427bf94933c4eae97252f4949000a5f185f2fc735f6
+  metadata.gz: 44b5c345a4f4ad50784696fb892b67f62524ce97b0741ee8b0e1afdf9396172aee09769f39d3f447baafbfcbbf3f88f1b98020bdd748bcbd21a46fd54b06ab27
+  data.tar.gz: a3335e2608599d3e276118d873b539d6305ef5b80a514d628811219e7acb940def2a665595b09d18cd14a12cbffdf503b20bdf8679b9125562536184dc8138ec

data/lib/custom_attributes/acts_as/acts_as_custom_field.rb

@@ -88,7 +88,7 @@ module CustomAttributes
           end
         end
 
-        if position.present? && self.class.where(position: position, model_type: model_type).where.not(id: id).count > 0
+        if position.present? && self.class.where(position: position, model_type: model_type).where.not(id: id).where(custom_scope).count > 0
           errors.add :position, ::I18n.t('activerecord.errors.messages.invalid_position')
         end
       end
@@ -180,7 +180,7 @@ module CustomAttributes
       def set_position
         return unless position.nil?
 
-        last_position = self.class.where(model_type: model_type).order(position: :desc).first.try(:position)
+        last_position = self.class.where(model_type: model_type).where(custom_scope).order(position: :desc).first.try(:position)
         self.position = 1
         self.position = last_position + 1 unless last_position.nil?
       end
@@ -188,7 +188,7 @@ module CustomAttributes
       def change_position_by(diff)
         new_pos = position + diff unless position.nil?
 
-        swap_field = self.class.find_by(model_type: model_type, position: new_pos)
+        swap_field = self.class.find_by(model_type: model_type, position: new_pos).where(custom_scope)
 
         if swap_field.present?
           swap_field.position = position
@@ -213,7 +213,7 @@ module CustomAttributes
 
       def ensure_position_integrity
         expected_position = 1
-        self.class.where(model_type: model_type).order(position: :asc).each do |field|
+        self.class.where(model_type: model_type).order(position: :asc).where(custom_scope).each do |field|
           if expected_position != field.position
             field.position = expected_position
             field.save

data/lib/custom_attributes/version.rb

@@ -1,3 +1,3 @@
 module CustomAttributes
-  VERSION = '0.6.2'.freeze
+  VERSION = '0.6.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: create_custom_attributes
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Daniel Grützmacher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-07 00:00:00.000000000 Z
+date: 2019-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails