cck_forms 3.3.2 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 193298cd7c3b91ac5f8427f293bf38ae60b09a09
-  data.tar.gz: 04392a3085d958fb7ab3f73a9c9340ce47fe900c
+  metadata.gz: 47a8cd38b248b42275dbcad881170f8d04da4dc9
+  data.tar.gz: 8a0e0fd4447f3330f6709b271094438922a4ec39
 SHA512:
-  metadata.gz: e9b35ff662f63eedceb15ea6ecf8179bdf04d7991c4379140cd6ed370a478189888030f0b29d1e4e6526ab893eccf4b2f2dff5546c73d460839949677290d0a0
-  data.tar.gz: a5468e5e66cdfc837f978536e53b7d4f9b03af520ee015fe729df4fea16ff70b8c37debe3db806f72dda07e0017c5ea29624b0d3822accb584a88597243f0bd1
+  metadata.gz: d3bd36c81ce696ee7090d0f7cfba39f9b8fa621a44acbbffa81210f4a87fac291ee8f5cd4e9bbda1fd4234c2d3fac70af702b6147a1a87db62277a37bf98d311
+  data.tar.gz: 3000a75fb172986b3400c538634191e543986d912743472bab1a8d03607cb5917cb66e93ae47d453e325be9bab4b98fee941240aa86d884e708aec35498d0800

data/config/locales/ru.yml

@@ -13,10 +13,10 @@ ru:
       image: Картинка
       integer: Целое число
       integer_range: Диапазон между двумя целыми числами
+      float_range: Диапазон между двумя дробными числами
       map: Точка на карте
       phones: Телефоны
       string: Строка
-      string_collection: Массив строк
       text: Текст
       time: Время
       watermarkless_album: Альбом без водяного знака
@@ -41,6 +41,12 @@ ru:
       less_than: до
       more_than: свыше
 
+    float_range:
+      till: до
+      from: от
+      less_than: до
+      more_than: свыше
+
     phones:
       add_more: Добавить еще телефонов
 

data/lib/cck_forms/parameter_type_class/float_range.rb

@@ -0,0 +1,11 @@
+class CckForms::ParameterTypeClass::FloatRange < CckForms::ParameterTypeClass::NumberRange
+  def normalize_number(number)
+    number.to_f.round(2)
+  end
+
+  def form_field(form_builder_field, field_name, options)
+    default_style = {class: 'form-control input-small'}
+
+    form_builder_field.number_field field_name, options.merge(value: value.try(:[], field_name.to_s), step: 'any').reverse_merge(default_style)
+  end
+end

data/lib/cck_forms/parameter_type_class/integer_range.rb

@@ -1,164 +1,5 @@
-# Represents a decimal range — two integer values.
-#
-# Has an extra_options (see base.rb): :ranges
-# If passed, on each object save the intersection of the target range and :ranges will be calculated and saved into DB
-# (denormalized) for easy finding later via where('some_field.ranged.300-600' => true).
-#
-class CckForms::ParameterTypeClass::IntegerRange # Rover :)
-  include CckForms::ParameterTypeClass::Base
-
-  # {from: 500, to: 1000, ranges: {"300-600" => true, "601-900" => true, "901-1500" => false}}
-  def mongoize
-    value_from_form = value
-    return nil if value_from_form.blank?
-
-    from = value_from_form.try(:[], 'from').to_i
-    till = value_from_form.try(:[], 'till').to_i
-
-    db_representation = {
-      from: from,
-      till: till,
-      ranges: {}
-    }
-
-    if @extra_options[:ranges].respond_to? :each
-      @extra_options[:ranges].each do |range_string|
-        low, high = range_string.split(range_string_delimiter)
-        if high.to_i.to_s != high.to_s
-          high = Integer::MAX_32BIT
-        end
-        low, high = low.to_i, high.to_i
-
-        #   -----
-        # [ RANGE ]
-        completely_in_range = (from >= low && till <= high)
-
-        #       -------
-        # [ RANGE ]
-        #
-        # ------
-        #    [ RANGE ]
-        intersects_range_partially = (from <= low && till >= low) || (from <= high && till >= high)
-
-        # -----------
-        #  [ RANGE ]
-        contains_range = from < low && till > high
-
-        db_representation[:ranges][range_string] = completely_in_range || intersects_range_partially || contains_range
-      end
-    end
-
-    db_representation
-  end
-
-  # "from 10"
-  # "till 20"
-  # "10-20"
-  #
-  # options:
-  #
-  #   delimeter - instead of "-"
-  def to_s(options = {})
-    options ||= {}
-    return '' if value.blank?
-
-    delimiter = options[:delimeter].presence || default_integer_range_delimiter
-
-    from = value.try(:[], 'from').to_i
-    till = value.try(:[], 'till').to_i
-
-    return '' if from.zero? && till.zero?
-
-    if from.zero?
-      [I18n.t('cck_forms.integer_range.till'), till].join(' ')
-    elsif till.zero?
-      [I18n.t('cck_forms.integer_range.from'), from].join(' ')
-    elsif from == till
-      from.to_s
-    else
-      [from, till].join(delimiter)
-    end
-  end
-
-  # If options[:for] == :search and options[:as] == :select, builds a SELECT with options from extra_options[:rages].
-  # Otherwise, two inputs are built.
-  #
-  # options[:only/:except] are available if the former case.
-  def build_form(form_builder, options)
-    set_value_in_hash options
-    if options.delete(:for) == :search
-      build_search_form(form_builder, options)
-    else
-      build_for_admin_interface_form(form_builder, options)
-    end
-  end
-
-  # Search with the help of extra_options[:ranges]
-  def search(criteria, field, query)
-    criteria.where("#{field}.ranges.#{query}" => true)
-  end
-
-
-
-  private
-
-  def build_for_admin_interface_form(form_builder, options)
-    delimiter = options[:delimeter].presence || ' — '
-
-    default_style = {class: 'form-control input-small'}
-    result = ['<div class="form-inline">']
-    form_builder.fields_for :value do |ff|
-      from_field = ff.number_field :from, options.merge(value: value.try(:[], 'from')).reverse_merge(default_style)
-      till_field = ff.number_field :till, options.merge(value: value.try(:[], 'till')).reverse_merge(default_style)
-      result << [from_field, till_field].join(delimiter).html_safe
-    end
-    result << '</div>'
-    result.join.html_safe
-  end
-
-  def build_search_form(form_builder, options)
-    delimiter = options[:delimeter].presence || default_integer_range_delimiter
-    form_fields = []
-    visual_representation = options.delete(:as)
-    show_only = options.delete(:only)
-
-    if visual_representation == :select
-      klazz = options.delete :class
-      form_fields << form_builder.select(:value, [['', '']] + humanized_integer_ranges_for_select, options.merge(selected: options[:value]), {class: klazz} )
-    else
-      show_all_fields = !show_only
-
-      if show_all_fields or show_only == :low
-        form_fields << form_builder.text_field(:from, options.merge(index: 'value', value: value.try(:[], 'from')))
-      end
-
-      if show_all_fields or show_only == :high
-        form_fields << form_builder.text_field(:till, options.merge(index: 'value', value: value.try(:[], 'till')))
-      end
-    end
-
-    form_fields.join(delimiter).html_safe
-  end
-
-  def default_integer_range_delimiter
-    '–'
-  end
-
-  def humanized_integer_ranges_for_select
-    @extra_options[:ranges].map do |range_string|
-      low, high = range_string.split(range_string_delimiter)
-      if low.to_i.to_s != low.to_s
-        option_text = [I18n.t('cck_forms.integer_range.less_than'), high].join(' ')
-      elsif high.to_i.to_s != high.to_s
-        option_text = [I18n.t('cck_forms.integer_range.more_than'), low].join(' ')
-      else
-        option_text = [low, high].join(default_integer_range_delimiter)
-      end
-      [option_text, range_string]
-    end
-  end
-
-  def range_string_delimiter
-    /[-:\\]/
+class CckForms::ParameterTypeClass::IntegerRange < CckForms::ParameterTypeClass::NumberRange
+  def normalize_number(number)
+    number.to_i
   end
 end

data/lib/cck_forms/parameter_type_class/number_range.rb

@@ -0,0 +1,169 @@
+# Represents a decimal range — two integer values.
+#
+# Has an extra_options (see base.rb): :ranges
+# If passed, on each object save the intersection of the target range and :ranges will be calculated and saved into DB
+# (denormalized) for easy finding later via where('some_field.ranged.300-600' => true).
+#
+class CckForms::ParameterTypeClass::NumberRange
+  include CckForms::ParameterTypeClass::Base
+
+  # {from: 500, to: 1000, ranges: {"300-600" => true, "601-900" => true, "901-1500" => false}}
+  def mongoize
+    value_from_form = value
+    return nil if value_from_form.blank?
+
+    from = normalize_number value_from_form.try(:[], 'from')
+    till = normalize_number value_from_form.try(:[], 'till')
+
+    db_representation = {
+      from: from,
+      till: till,
+      ranges: {}
+    }
+
+    if @extra_options[:ranges].respond_to? :each
+      @extra_options[:ranges].each do |range_string|
+        low, high = range_string.split(range_string_delimiter)
+        if normalize_number(high).to_s != high.to_s
+          high = Integer::MAX_32BIT
+        end
+        low, high = normalize_number(low), normalize_number(high)
+
+        #   -----
+        # [ RANGE ]
+        completely_in_range = (from >= low && till <= high)
+
+        #       -------
+        # [ RANGE ]
+        #
+        # ------
+        #    [ RANGE ]
+        intersects_range_partially = (from <= low && till >= low) || (from <= high && till >= high)
+
+        # -----------
+        #  [ RANGE ]
+        contains_range = from < low && till > high
+
+        db_representation[:ranges][range_string] = completely_in_range || intersects_range_partially || contains_range
+      end
+    end
+
+    db_representation
+  end
+
+  # "from 10"
+  # "till 20"
+  # "10-20"
+  #
+  # options:
+  #
+  #   delimeter - instead of "-"
+  def to_s(options = {})
+    options ||= {}
+    return '' if value.blank?
+
+    delimiter = options[:delimeter].presence || default_number_range_delimiter
+
+    from = normalize_number value.try(:[], 'from')
+    till = normalize_number value.try(:[], 'till')
+
+    return '' if from.zero? && till.zero?
+
+    if from.zero?
+      [I18n.t("cck_forms.#{self.class.code}.till"), till].join(' ')
+    elsif till.zero?
+      [I18n.t("cck_forms.#{self.class.code}.from"), from].join(' ')
+    elsif from == till
+      from.to_s
+    else
+      [from, till].join(delimiter)
+    end
+  end
+
+  # If options[:for] == :search and options[:as] == :select, builds a SELECT with options from extra_options[:rages].
+  # Otherwise, two inputs are built.
+  #
+  # options[:only/:except] are available if the former case.
+  def build_form(form_builder, options)
+    set_value_in_hash options
+    if options.delete(:for) == :search
+      build_search_form(form_builder, options)
+    else
+      build_for_admin_interface_form(form_builder, options)
+    end
+  end
+
+  # Search with the help of extra_options[:ranges]
+  def search(criteria, field, query)
+    criteria.where("#{field}.ranges.#{query}" => true)
+  end
+
+
+
+  private
+
+  def form_field(form_builder_field, field_name, options)
+    default_style = {class: 'form-control input-small'}
+
+    form_builder_field.number_field field_name, options.merge(value: value.try(:[], field_name.to_s)).reverse_merge(default_style)
+  end
+
+  def build_for_admin_interface_form(form_builder, options)
+    delimiter = options[:delimeter].presence || ' — '
+
+    result = ['<div class="form-inline">']
+    form_builder.fields_for :value do |ff|
+      from_field = form_field ff, :from, options
+      till_field = form_field ff, :till, options
+      result << [from_field, till_field].join(delimiter).html_safe
+    end
+    result << '</div>'
+    result.join.html_safe
+  end
+
+  def build_search_form(form_builder, options)
+    delimiter = options[:delimeter].presence || default_number_range_delimiter
+    form_fields = []
+    visual_representation = options.delete(:as)
+    show_only = options.delete(:only)
+
+    if visual_representation == :select
+      klazz = options.delete :class
+      form_fields << form_builder.select(:value, [['', '']] + humanized_number_ranges_for_select, options.merge(selected: options[:value]), {class: klazz} )
+    else
+      show_all_fields = !show_only
+
+      if show_all_fields or show_only == :low
+        form_fields << form_builder.text_field(:from, options.merge(index: 'value', value: value.try(:[], 'from')))
+      end
+
+      if show_all_fields or show_only == :high
+        form_fields << form_builder.text_field(:till, options.merge(index: 'value', value: value.try(:[], 'till')))
+      end
+    end
+
+    form_fields.join(delimiter).html_safe
+  end
+
+  def default_number_range_delimiter
+    '–'
+  end
+
+  def humanized_number_ranges_for_select
+    @extra_options[:ranges].map do |range_string|
+      low, high = range_string.split(range_string_delimiter)
+      if normalize_number(low).to_s != low.to_s
+        option_text = [I18n.t("cck_forms.#{self.class.code}.less_than"), high].join(' ')
+      elsif normalize_number(high).to_s != high.to_s
+        option_text = [I18n.t("cck_forms.#{self.class.code}.more_than"), low].join(' ')
+      else
+        option_text = [low, high].join(default_number_range_delimiter)
+      end
+      [option_text, range_string]
+    end
+  end
+
+  def range_string_delimiter
+    /[-:\\]/
+  end
+end

data/lib/cck_forms/version.rb

@@ -1,3 +1,3 @@
 module CckForms
-  VERSION = '3.3.2'
+  VERSION = '3.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cck_forms
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.4.0
 platform: ruby
 authors:
 - Ilya Konanykhin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-24 00:00:00.000000000 Z
+date: 2018-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -78,10 +78,12 @@ files:
 - lib/cck_forms/parameter_type_class/enum.rb
 - lib/cck_forms/parameter_type_class/file.rb
 - lib/cck_forms/parameter_type_class/float.rb
+- lib/cck_forms/parameter_type_class/float_range.rb
 - lib/cck_forms/parameter_type_class/image.rb
 - lib/cck_forms/parameter_type_class/integer.rb
 - lib/cck_forms/parameter_type_class/integer_range.rb
 - lib/cck_forms/parameter_type_class/map.rb
+- lib/cck_forms/parameter_type_class/number_range.rb
 - lib/cck_forms/parameter_type_class/phones.rb
 - lib/cck_forms/parameter_type_class/string.rb
 - lib/cck_forms/parameter_type_class/string_collection.rb