system_settings 0.6.2 → 0.9.1

data/app/models/system_settings/decimal_list_setting.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+class SystemSettings::DecimalListSetting < SystemSettings::Setting
+  attribute :value, SystemSettings::Type::DecimalList.new(scale: 6)
+  validates :value, "system_settings/list_of_decimals": true
+end

data/app/models/system_settings/decimal_setting.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+class SystemSettings::DecimalSetting < SystemSettings::Setting
+  attribute :value, :decimal, scale: 6
+  validates :value, numericality: true
+end

data/app/models/system_settings/errors/error.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-module SystemSettings
-  module Errors
-    class Error < StandardError
-    end
+module SystemSettings::Errors
+  class Error < StandardError
   end
 end

data/app/models/system_settings/errors/not_found_error.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-module SystemSettings
-  module Errors
-    class NotFoundError < SystemSettings::Errors::Error
-    end
+module SystemSettings::Errors
+  class NotFoundError < SystemSettings::Errors::Error
   end
 end

data/app/models/system_settings/errors/not_loaded_error.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module SystemSettings::Errors
+  class NotLoadedError < SystemSettings::Errors::Error
+  end
+end

data/app/models/system_settings/errors/settings_read_error.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-module SystemSettings
-  module Errors
-    class SettingsReadError < SystemSettings::Errors::Error
-    end
+module SystemSettings::Errors
+  class SettingsReadError < SystemSettings::Errors::Error
   end
 end

data/app/models/system_settings/integer_list_setting.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-module SystemSettings
-  class IntegerListSetting < SystemSettings::Setting
-    attribute :value, SystemSettings::Type::IntegerList.new
-    validates :value, "system_settings/list_of_integers": true
-  end
+class SystemSettings::IntegerListSetting < SystemSettings::Setting
+  attribute :value, SystemSettings::Type::IntegerList.new(limit: 8)
+  validates :value, "system_settings/list_of_integers": true
 end

data/app/models/system_settings/integer_setting.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-module SystemSettings
-  class IntegerSetting < SystemSettings::Setting
-    attribute :value, :integer
-    validates :value, numericality: { only_integer: true }
-  end
+class SystemSettings::IntegerSetting < SystemSettings::Setting
+  attribute :value, :integer, limit: 8
+  validates :value, numericality: { only_integer: true }
 end

data/app/models/system_settings/list_of_decimals_validator.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class SystemSettings::ListOfDecimalsValidator < ActiveModel::EachValidator
+  LIST_REGEXP = /\A[+-]?\d+(?:\.\d+){0,1}(?:; *[+-]?\d+(?:\.\d+){0,1})*\z/.freeze
+  SINGLE_REGEXP = /\A[+-]?\d+(?:\.\d+){0,1}\z/.freeze
+
+  def validate_each(record, attr_name, value)
+    came_from_user = :"#{attr_name}_came_from_user?"
+
+    raw_value = record.read_attribute_before_type_cast(attr_name) if record.respond_to?(came_from_user) && record.public_send(came_from_user)
+    raw_value ||= value
+
+    raw_value = value if record_attribute_changed_in_place?(record, attr_name)
+
+    record.errors.add(attr_name, :not_a_list_of_decimals) unless matches_list_of_decimals_regexp?(raw_value)
+  end
+
+  private
+
+  def record_attribute_changed_in_place?(record, attr_name)
+    record.respond_to?(:attribute_changed_in_place?) &&
+      record.attribute_changed_in_place?(attr_name.to_s)
+  end
+
+  def matches_list_of_decimals_regexp?(raw_value)
+    case raw_value
+    when String
+      LIST_REGEXP.match?(raw_value)
+    when Array
+      raw_value.all? { |v| SINGLE_REGEXP.match?(v.to_s) }
+    else
+      false
+    end
+  end
+end

data/app/models/system_settings/list_of_integers_validator.rb

@@ -1,37 +1,35 @@
 # frozen_string_literal: true
 
-module SystemSettings
-  class ListOfIntegersValidator < ActiveModel::EachValidator
-    LIST_REGEXP = /\A[+-]?\d+(?:; *[+-]?\d+)*\z/.freeze
-    SINGLE_REGEXP = /\A[+-]?\d+\z/.freeze
+class SystemSettings::ListOfIntegersValidator < ActiveModel::EachValidator
+  LIST_REGEXP = /\A[+-]?\d+(?:; *[+-]?\d+)*\z/.freeze
+  SINGLE_REGEXP = /\A[+-]?\d+\z/.freeze
 
-    def validate_each(record, attr_name, value)
-      came_from_user = :"#{attr_name}_came_from_user?"
+  def validate_each(record, attr_name, value)
+    came_from_user = :"#{attr_name}_came_from_user?"
 
-      raw_value = record.read_attribute_before_type_cast(attr_name) if record.respond_to?(came_from_user) && record.public_send(came_from_user)
-      raw_value ||= value
+    raw_value = record.read_attribute_before_type_cast(attr_name) if record.respond_to?(came_from_user) && record.public_send(came_from_user)
+    raw_value ||= value
 
-      raw_value = value if record_attribute_changed_in_place?(record, attr_name)
+    raw_value = value if record_attribute_changed_in_place?(record, attr_name)
 
-      record.errors.add(attr_name, :not_a_list_of_integers) unless matches_list_of_integers_regexp?(raw_value)
-    end
+    record.errors.add(attr_name, :not_a_list_of_integers) unless matches_list_of_integers_regexp?(raw_value)
+  end
 
-    private
+  private
 
-    def record_attribute_changed_in_place?(record, attr_name)
-      record.respond_to?(:attribute_changed_in_place?) &&
-        record.attribute_changed_in_place?(attr_name.to_s)
-    end
+  def record_attribute_changed_in_place?(record, attr_name)
+    record.respond_to?(:attribute_changed_in_place?) &&
+      record.attribute_changed_in_place?(attr_name.to_s)
+  end
 
-    def matches_list_of_integers_regexp?(raw_value)
-      case raw_value
-      when String
-        LIST_REGEXP.match?(raw_value)
-      when Array
-        raw_value.all? { |v| SINGLE_REGEXP.match?(v.to_s) }
-      else
-        false
-      end
+  def matches_list_of_integers_regexp?(raw_value)
+    case raw_value
+    when String
+      LIST_REGEXP.match?(raw_value)
+    when Array
+      raw_value.all? { |v| SINGLE_REGEXP.match?(v.to_s) }
+    else
+      false
     end
   end
 end

data/app/models/system_settings/list_of_strings_validator.rb

@@ -1,38 +1,36 @@
 # frozen_string_literal: true
 
-module SystemSettings
-  class ListOfStringsValidator < ActiveModel::EachValidator
-    NON_WHITESPACE_REGEXP = /[^[:space:]]/.freeze
+class SystemSettings::ListOfStringsValidator < ActiveModel::EachValidator
+  NON_WHITESPACE_REGEXP = /[^[:space:]]/.freeze
 
-    def validate_each(record, attr_name, value)
-      came_from_user = :"#{attr_name}_came_from_user?"
+  def validate_each(record, attr_name, value)
+    came_from_user = :"#{attr_name}_came_from_user?"
 
-      raw_value = record.read_attribute_before_type_cast(attr_name) if record.respond_to?(came_from_user) && record.public_send(came_from_user)
-      raw_value ||= value
+    raw_value = record.read_attribute_before_type_cast(attr_name) if record.respond_to?(came_from_user) && record.public_send(came_from_user)
+    raw_value ||= value
 
-      raw_value = value if record_attribute_changed_in_place?(record, attr_name)
+    raw_value = value if record_attribute_changed_in_place?(record, attr_name)
 
-      record.errors.add(attr_name, :not_a_list_of_strings) unless matches_list_of_strings_regexp?(raw_value)
-    end
+    record.errors.add(attr_name, :not_a_list_of_strings) unless matches_list_of_strings_regexp?(raw_value)
+  end
 
-    private
+  private
 
-    def record_attribute_changed_in_place?(record, attr_name)
-      record.respond_to?(:attribute_changed_in_place?) &&
-        record.attribute_changed_in_place?(attr_name.to_s)
-    end
+  def record_attribute_changed_in_place?(record, attr_name)
+    record.respond_to?(:attribute_changed_in_place?) &&
+      record.attribute_changed_in_place?(attr_name.to_s)
+  end
 
-    def matches_list_of_strings_regexp?(raw_value)
-      case raw_value
-      when String
-        raw_value.split(SystemSettings::Type::StringList::DELIMITER_REGEXP).all? do |value|
-          NON_WHITESPACE_REGEXP.match?(value)
-        end
-      when Array
-        raw_value.all? { |v| NON_WHITESPACE_REGEXP.match?(v.to_s) }
-      else
-        false
+  def matches_list_of_strings_regexp?(raw_value)
+    case raw_value
+    when String
+      raw_value.split(SystemSettings::Type::StringList::DELIMITER_REGEXP).all? do |value|
+        NON_WHITESPACE_REGEXP.match?(value)
       end
+    when Array
+      raw_value.all? { |v| NON_WHITESPACE_REGEXP.match?(v.to_s) }
+    else
+      false
     end
   end
 end

data/app/models/system_settings/setting.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-module SystemSettings
-  class Setting < SystemSettings::ApplicationRecord
-    validates :type, presence: true
-    validates :name, presence: true, uniqueness: true
-  end
+class SystemSettings::Setting < SystemSettings::ApplicationRecord
+  validates :type, presence: true
+  validates :name, presence: true, uniqueness: true
 end

data/app/models/system_settings/string_list_setting.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-module SystemSettings
-  class StringListSetting < SystemSettings::Setting
-    attribute :value, SystemSettings::Type::StringList.new
-    validates :value, "system_settings/list_of_strings": true
-  end
+class SystemSettings::StringListSetting < SystemSettings::Setting
+  attribute :value, SystemSettings::Type::StringList.new
+  validates :value, "system_settings/list_of_strings": true
 end

data/app/models/system_settings/string_setting.rb

@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 
-module SystemSettings
-  class StringSetting < SystemSettings::Setting
-    attribute :value, :string
-    validates :value, presence: true
+class SystemSettings::StringSetting < SystemSettings::Setting
+  attribute :value, :string
+  validates :value, presence: true
+
+  def value=(original_value)
+    next_value = original_value.to_s.blank? ? nil : original_value.to_s.strip
+    super(next_value)
   end
 end

data/app/models/system_settings/type/decimal_list.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module SystemSettings::Type
+  class DecimalList < ActiveModel::Type::Value
+    SEPARATOR = ";"
+
+    def initialize(precision: nil, limit: nil, scale: nil)
+      super
+      @single_type = ActiveModel::Type::Decimal.new(precision: precision, limit: limit, scale: scale)
+    end
+
+    def type
+      :decimal_list
+    end
+
+    def deserialize(value)
+      result = value.presence && JSON.parse(value)
+      if result.is_a?(Array)
+        result.map { |v| @single_type.cast(v) }
+      else
+        result
+      end
+    end
+
+    def serialize(value)
+      JSON.dump(value) unless value.nil?
+    end
+
+    private
+
+    def cast_value(value)
+      case value
+      when Array
+        value.map { |v| @single_type.cast(v) }
+      when String
+        value.split(SEPARATOR).map { |v| @single_type.cast(v) }
+      end
+    end
+  end
+end

data/app/models/system_settings/type/integer_list.rb

@@ -1,43 +1,34 @@
 # frozen_string_literal: true
 
-module SystemSettings
-  module Type
-    class IntegerList < ActiveModel::Type::Value
-      SEPARATOR = ";"
+module SystemSettings::Type
+  class IntegerList < ActiveModel::Type::Value
+    SEPARATOR = ";"
 
-      def type
-        :integer_list
-      end
+    def initialize(precision: nil, limit: nil, scale: nil)
+      super
+      @single_type = ActiveModel::Type::Integer.new(precision: precision, limit: limit, scale: scale)
+    end
 
-      def deserialize(value)
-        value.presence && JSON.parse(value)
-      end
+    def type
+      :integer_list
+    end
 
-      def serialize(value)
-        JSON.dump(value) unless value.nil?
-      end
+    def deserialize(value)
+      value.presence && JSON.parse(value)
+    end
+
+    def serialize(value)
+      JSON.dump(value) unless value.nil?
+    end
 
-      private
+    private
 
-      def cast_value(value)
-        case value
-        when Array
-          value.map do |v|
-            begin
-              v.to_i
-            rescue StandardError
-              nil
-            end
-          end
-        when String
-          value.split(SEPARATOR).map do |v|
-            begin
-              v.to_i
-            rescue StandardError
-              nil
-            end
-          end
-        end
+    def cast_value(value)
+      case value
+      when Array
+        value.map { |v| @single_type.cast(v) }
+      when String
+        value.split(SEPARATOR).map { |v| @single_type.cast(v) }
       end
     end
   end

data/app/models/system_settings/type/string_list.rb

@@ -1,30 +1,28 @@
 # frozen_string_literal: true
 
-module SystemSettings
-  module Type
-    class StringList < ActiveModel::Type::Value
-      DELIMITER_REGEXP = /(?<=[^\\]);/.freeze
-      def type
-        :string_list
-      end
+module SystemSettings::Type
+  class StringList < ActiveModel::Type::Value
+    DELIMITER_REGEXP = /(?<=[^\\]);/.freeze
+    def type
+      :string_list
+    end
 
-      def deserialize(value)
-        value.presence && JSON.parse(value)
-      end
+    def deserialize(value)
+      value.presence && JSON.parse(value)
+    end
 
-      def serialize(value)
-        JSON.dump(value) unless value.nil?
-      end
+    def serialize(value)
+      JSON.dump(value) unless value.nil?
+    end
 
-      private
+    private
 
-      def cast_value(value)
-        case value
-        when Array
-          value.map { |v| String(v).strip }
-        when String
-          value.split(DELIMITER_REGEXP).map(&:strip).map { |str| str.gsub("\\;", ";") }
-        end
+    def cast_value(value)
+      case value
+      when Array
+        value.map { |v| String(v).strip }
+      when String
+        value.split(DELIMITER_REGEXP).map(&:strip).map { |str| str.gsub("\\;", ";") }
       end
     end
   end