create_custom_attributes 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc552dc1d4611f73fe12579a4ce65aea76a4a3bc
-  data.tar.gz: 8bbbdc05b0261609125ce0cc6b25f1efcf2b90e7
+  metadata.gz: 06c297e0cd6b991be546243a4dac67daac49da1a
+  data.tar.gz: fe6165192b2580a744e289f960584428048861d1
 SHA512:
-  metadata.gz: 694b6a66cae8731de68d98833ed5d40d176d2d0a94824e53cf95b0c1453e2d776eaa254d6f5ac8827aa9500100e0f145848b8b6f593a923779c9b0b6a597bb72
-  data.tar.gz: 4d37e57058d2ae9e5f2f8f3587203b3acc32019f879274d0d485252e9aa7321ef18950ccda7485681f2c5bcdb0c99b0e36dc8c59e4b293489215cdce5047eff1
+  metadata.gz: 75bceb2b33c6c8b10e492b4907cd2ab6ede17419303aa4c9f87182bd7865a81220326a7c75c96034f4d7793a5601bdc421106d6425962f83b360ee8338176ab5
+  data.tar.gz: d6a61d3dc48f7a0bc0f456a79115a78be44ae67e7e28f9379475274f2bdba1dc89f6779d0ac0dfeef7d9f1ae2fe28607da0c6c2e0b8c08a034b353e1205e14fa

data/lib/custom_attributes/acts_as/acts_as_custom_field.rb

@@ -15,8 +15,8 @@ module CustomAttributes
 
         attr_accessor :edit_tag_style
 
-        validates_numericality_of :min_length, :only_integer => true, :greater_than_or_equal_to => 0
-        validates_numericality_of :max_length, :only_integer => true, :greater_than_or_equal_to => 0
+        validates_numericality_of :min_length, only_integer: true, greater_than_or_equal_to: 0
+        validates_numericality_of :max_length, only_integer: true, greater_than_or_equal_to: 0
         validates_presence_of :name, :field_type
         validates_uniqueness_of :name, scope: :model_type
         validates_length_of :name, maximum: 30
@@ -25,6 +25,9 @@ module CustomAttributes
 
         before_create do |field|
           field.set_slug
+
+          field.ensure_position_integrity
+          field.set_position
         end
 
         before_save do |field|
@@ -83,6 +86,10 @@ module CustomAttributes
             errors.add :default, message
           end
         end
+
+        if position.present? && self.class.where(position: position, model_type: model_type).where.not(id: id).count > 0
+          errors.add :position, ::I18n.t('activerecord.errors.messages.invalid_position')
+        end
       end
 
       # Helper function used in validate_custom_field
@@ -149,12 +156,42 @@ module CustomAttributes
         end
       end
 
+      def decrement_position
+        change_position_by(-1)
+      end
+
+      def increment_position
+        change_position_by(1)
+      end
+
       protected
 
       def set_slug
         self.slug = create_slug
       end
 
+      def set_position
+        return unless position.nil?
+
+        last_position = self.class.where(model_type: model_type).order(position: :desc).first.try(:position)
+        self.position = 1
+        self.position = last_position + 1 unless last_position.nil?
+      end
+
+      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)
+
+        if swap_field.present?
+          swap_field.position = position
+          swap_field.save(validate: false)
+
+          self.position = new_pos
+          save
+        end
+      end
+
       def create_slug(iterator = 0)
         new_slug = name.strip.gsub(/([^A-Za-z0-9])+/) { '_' }.downcase
 
@@ -162,6 +199,24 @@ module CustomAttributes
         new_slug = create_slug(iterator += 1) unless CustomField.where(slug: new_slug).count == 0
         new_slug
       end
+
+      def customizable_class
+        model_type.gsub('CustomField', '').constantize
+      rescue NameError
+        false
+      end
+
+      def ensure_position_integrity
+        expected_position = 1
+        self.class.where(model_type: model_type).order(position: :asc).each do |field|
+          if expected_position != field.position
+            field.position = expected_position
+            field.save
+          end
+
+          expected_position += 1
+        end
+      end
     end
   end
 end

data/lib/custom_attributes/api/custom_attributes_controller_helper.rb

@@ -13,11 +13,11 @@ module CustomAttributes
       end
 
       def self.all_values(customizable)
-        return customizable.custom_field_values
+        customizable.custom_field_values
       end
 
       def self.value_by_field_id(customizable, field_id)
-        return customizable.populated_custom_field_value(field_id)
+        customizable.populated_custom_field_value(field_id)
       end
 
       def self.update_field_value(customizable, field_id, value)
@@ -28,5 +28,15 @@ module CustomAttributes
         customizable.custom_value_for(field_id)
       end
     end
+
+    module CustomField
+      def self.increment_position(field)
+        field.increment_position
+      end
+
+      def self.decrement_position(field)
+        field.decrement_position
+      end
+    end
   end
 end

data/lib/custom_attributes/version.rb

@@ -1,3 +1,3 @@
 module CustomAttributes
-  VERSION = '0.5.2'.freeze
+  VERSION = '0.5.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: create_custom_attributes
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Daniel Grützmacher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-20 00:00:00.000000000 Z
+date: 2017-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails