active_scaffold 3.7.7 → 3.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5777dd56be3d144f2c62d8b2fa3cf8a0e765155d3afd445b5d150ce25c203155
-  data.tar.gz: 2c2ef1fbe12d539b84d81d48d1a2d373f3634a864664d61ab27099c783f404c4
+  metadata.gz: 91fd5ea7093e75c0b38bab3de974135ab0502fedb6627341403ff6ea0800eca4
+  data.tar.gz: 4949444e01d9e06d8e277e15698a97593868bcd3a297378d2cf421ece2e00ad2
 SHA512:
-  metadata.gz: e13283f6ae89cf8618e070ee0e6afa87a47389eaee7043a669ab771f82c6aec2dbbdf2317c57ca6872785622e601d0d1278140e53cf24ca5245a88f9353dfe97
-  data.tar.gz: ea569709001c16bae097715c62fe9a9717597c288b2504d2c930e55aa01b28e77b53c29583d3e0462c86f329aebae8c8a82d73c832b14332a8999ee777d42e3c
+  metadata.gz: fbafb7483143581f8430dcf3cbce154f160022e05c2e0760627d7e571fdff1718d68a883e6fc152fb943f1d480e259d2001ae0579fc5788df0cca7469cef77f9
+  data.tar.gz: b64826066e5e12fa27636680ea15647ab8072323c078a032398fe49f187693f9ada4555004fcda0244b9493de544c57cfac08f0d80c4eadf98fab5880170bb0e

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+= 3.7.8
+- Rollback previous behaviour when submitting empty values, broken when default_value was added. Default value set in column is not used when trying to save empty value, DB default is used in that case, and save NULL when string is empty, as before.
+- Support operators =, null and not null for :select search_ui, so it's possible to search for NULL with :select search UI.
+
 = 3.7.7
 - Fix usage with mongoid, broken on 3.7.5
 - Support proc or lambda in label of action links

data/README.md

@@ -1,10 +1,9 @@
 
 Overview
 ========
-[![Build status](https://api.travis-ci.com/activescaffold/active_scaffold.svg?branch=master)](https://app.travis-ci.com/activescaffold/active_scaffold)
+[![Build status](https://github.com/activescaffold/active_scaffold/actions/workflows/ci.yml/badge.svg)](https://github.com/activescaffold/active_scaffold/actions/workflows/ci.yml)
 [![Code Climate](https://codeclimate.com/github/activescaffold/active_scaffold/badges/gpa.svg)](https://codeclimate.com/github/activescaffold/active_scaffold)
 [![Test Coverage](https://codeclimate.com/github/activescaffold/active_scaffold/badges/coverage.svg)](https://codeclimate.com/github/activescaffold/active_scaffold)
-[![Dependency Status](https://gemnasium.com/activescaffold/active_scaffold.svg)](https://gemnasium.com/activescaffold/active_scaffold)
 [![Gem Version](https://badge.fury.io/rb/active_scaffold.svg)](https://badge.fury.io/rb/active_scaffold)
 [![Inline docs](https://inch-ci.org/github/activescaffold/active_scaffold.svg?branch=master)](https://inch-ci.org/github/activescaffold/active_scaffold)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)

data/lib/active_scaffold/data_structures/column.rb

@@ -469,8 +469,10 @@ module ActiveScaffold::DataStructures
       return nil unless column
       if column.is_a?(ActiveModel::Attribute)
         column.value
+      elsif active_record? && null?
+        nil
       else
-        default_value
+        @db_default_value
       end
     end
 

data/lib/active_scaffold/finder.rb

@@ -169,8 +169,12 @@ module ActiveScaffold
         when :date, :time, :datetime, :timestamp
           condition_for_datetime(column, value)
         when :select, :select_multiple, :draggable, :multi_select, :country, :usa_state, :chosen, :multi_chosen
-          values = Array(value).select(&:present?)
-          ['%<search_sql>s in (?)', values] if values.present?
+          if value.is_a?(Hash)
+            condition_for_range(column, value, like_pattern)
+          else
+            values = Array(value).select(&:present?)
+            ['%<search_sql>s in (?)', values] if values.present?
+          end
         else
           if column.text?
             value = column.active_record? ? column.active_record_class.sanitize_sql_like(value) : value

data/lib/active_scaffold/helpers/human_condition_helpers.rb

@@ -104,6 +104,10 @@ module ActiveScaffold
 
       def active_scaffold_human_condition_select(column, associated)
         attribute = column.active_record_class.human_attribute_name(column.name)
+        if associated.is_a?(Hash)
+          return active_scaffold_human_condition_range(column, associated) unless associated['opt'] == '='
+          associated = associated['from']
+        end
         associated = [associated].compact unless associated.is_a? Array
         if column.association
           method = column.options[:label_method] || :to_label

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -54,7 +54,7 @@ module ActiveScaffold
 
       # the standard active scaffold options used for class, name and scope
       def active_scaffold_search_options(column)
-        {:name => "search[#{column.name}]", :class => "#{column.name}-input", :id => "search_#{column.name}", :value => field_search_params[column.name.to_s]}
+        {name: "search[#{column.name}]", class: "#{column.name}-input", id: "search_#{column.name}", value: field_search_params[column.name.to_s]}
       end
 
       def search_attribute(column, record)
@@ -98,6 +98,13 @@ module ActiveScaffold
       def active_scaffold_search_select(column, html_options, options = {}, ui_options: column.options)
         record = html_options.delete(:object)
         associated = html_options.delete :value
+        if include_null_comparators?(column)
+          range_opts = html_options.slice(:name, :id)
+          range_opts[:opt_value], associated, = field_search_params_range_values(column)
+          operators = active_scaffold_search_select_comparator_options(column, ui_options: ui_options)
+          html_options[:name] += '[from]'
+        end
+
         if column.association
           associated = associated.is_a?(Array) ? associated.map(&:to_i) : associated.to_i unless associated.nil?
           method = column.association.belongs_to? ? column.association.foreign_key : column.name
@@ -119,13 +126,16 @@ module ActiveScaffold
           active_scaffold_translate_select_options(options)
         end
 
-        if (optgroup = options.delete(:optgroup))
-          select(:record, method, active_scaffold_grouped_options(column, select_options, optgroup), options, html_options)
-        elsif column.association
-          collection_select(:record, method, select_options, :id, ui_options[:label_method] || :to_label, options, html_options)
-        else
-          select(:record, method, select_options, options, html_options)
-        end
+        select =
+          if (optgroup = options.delete(:optgroup))
+            select(:record, method, active_scaffold_grouped_options(column, select_options, optgroup), options, html_options)
+          elsif column.association
+            collection_select(:record, method, select_options, :id, ui_options[:label_method] || :to_label, options, html_options)
+          else
+            select(:record, method, select_options, options, html_options)
+          end
+
+        operators ? build_active_scaffold_search_range_ui(operators, select, **range_opts) : select
       end
 
       def active_scaffold_search_select_multiple(column, options, ui_options: column.options)
@@ -207,6 +217,12 @@ module ActiveScaffold
         select_options
       end
 
+      def active_scaffold_search_select_comparator_options(column, ui_options: column.options)
+        select_options = [[as_('='.to_sym), '=']]
+        select_options.concat(ActiveScaffold::Finder::NULL_COMPARATORS.collect { |comp| [as_(comp), comp] })
+        select_options
+      end
+
       def include_null_comparators?(column, ui_options: column.options)
         return ui_options[:null_comparators] if ui_options.key? :null_comparators
         if column.association
@@ -219,30 +235,37 @@ module ActiveScaffold
       def active_scaffold_search_range(column, options, input_method = :text_field_tag, input_options = {}, ui_options: column.options)
         opt_value, from_value, to_value = field_search_params_range_values(column)
 
-        select_options = active_scaffold_search_range_comparator_options(column, ui_options: ui_options)
+        operators = active_scaffold_search_range_comparator_options(column, ui_options: ui_options)
         text_field_size = active_scaffold_search_range_string?(column) ? 15 : 10
-        opt_value ||= select_options[0][1]
 
         from_value = controller.class.condition_value_for_numeric(column, from_value)
         to_value = controller.class.condition_value_for_numeric(column, to_value)
         from_value = format_number_value(from_value, ui_options) if from_value.is_a?(Numeric)
         to_value = format_number_value(to_value, ui_options) if to_value.is_a?(Numeric)
-        html = select_tag("#{options[:name]}[opt]", options_for_select(select_options, opt_value),
-                          :id => "#{options[:id]}_opt", :class => 'as_search_range_option')
         from_options = active_scaffold_input_text_options(input_options.merge(:id => options[:id], :size => text_field_size))
         to_options = from_options.merge(:id => "#{options[:id]}_to")
-        html << content_tag('span', :id => "#{options[:id]}_numeric", :style => ActiveScaffold::Finder::NULL_COMPARATORS.include?(opt_value) ? 'display: none' : nil) do
-          send(input_method, "#{options[:name]}[from]", from_value, input_options) <<
-            content_tag(
-              :span,
-              safe_join([' - ', send(input_method, "#{options[:name]}[to]", to_value, to_options)]),
-              :id => "#{options[:id]}_between", :class => 'as_search_range_between', :style => ('display: none' unless opt_value == 'BETWEEN')
-            )
-        end
-        content_tag :span, html, :class => 'search_range'
+
+        from_field = send(input_method, "#{options[:name]}[from]", from_value, input_options)
+        to_field = send(input_method, "#{options[:name]}[to]", to_value, to_options)
+        build_active_scaffold_search_range_ui(operators, from_field, to_field, opt_value: opt_value, **options.slice(:name, :id))
       end
       alias active_scaffold_search_string active_scaffold_search_range
 
+      def build_active_scaffold_search_range_ui(operators, from, to = nil, name:, id:, opt_value: nil)
+        opt_value ||= operators[0][1]
+        html = select_tag("#{name}[opt]", options_for_select(operators, opt_value),
+                          id: "#{id}_opt", class: 'as_search_range_option')
+        if to
+          from << content_tag(
+            :span,
+            safe_join([' - ', to]),
+            id: "#{id}_between", class: 'as_search_range_between', style: ('display: none' unless opt_value == 'BETWEEN')
+          )
+        end
+        html << content_tag('span', from, id: "#{id}_numeric", style: ActiveScaffold::Finder::NULL_COMPARATORS.include?(opt_value) ? 'display: none' : nil)
+        content_tag :span, html, class: 'search_range'
+      end
+
       def active_scaffold_search_integer(column, options, ui_options: column.options)
         number_opts = ui_options.slice(:step, :min, :max).reverse_merge(step: '1')
         active_scaffold_search_range(column, options, :number_field_tag, number_opts, ui_options: ui_options)

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 7
-    PATCH = 7
+    PATCH = 8
     FIX = nil
 
     STRING = [MAJOR, MINOR, PATCH, FIX].compact.join('.')

data/test/test_helper.rb

@@ -1,4 +1,11 @@
-require 'simplecov' if ENV['COVERAGE']
+if ENV['COVERAGE'] == 'true'
+  require 'simplecov'
+  require 'simplecov_json_formatter'
+  SimpleCov.formatters = [
+    SimpleCov::Formatter::HTMLFormatter,
+    SimpleCov::Formatter::JSONFormatter
+  ]
+end
 
 ENV['RAILS_ENV'] = 'test'
 require 'mock_app/config/environment'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.7.7
+  version: 3.7.8
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-18 00:00:00.000000000 Z
+date: 2024-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails