active_scaffold 4.1.6 → 4.2.0

data/lib/active_scaffold/bridges/date_picker/ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ActiveScaffold::Bridges::DatePicker
   module DatePickerBridge
     def initialize(model_id)
@@ -72,18 +74,22 @@ ActionView::Base.class_eval do
   alias_method :active_scaffold_human_condition_date_picker, :active_scaffold_human_condition_datetime
   alias_method :active_scaffold_human_condition_datetime_picker, :active_scaffold_human_condition_datetime
   include ActiveScaffold::Bridges::DatePicker::Helper::SearchColumnHelpers
+
   alias_method :active_scaffold_search_datetime_picker_field, :active_scaffold_search_date_picker_field
   include ActiveScaffold::Bridges::DatePicker::Helper::FormColumnHelpers
+
   alias_method :active_scaffold_input_datetime_picker, :active_scaffold_input_date_picker
   include ActiveScaffold::Bridges::DatePicker::Helper::DatepickerColumnHelpers
 end
 ActiveScaffold::Finder::ClassMethods.module_eval do
   prepend ActiveScaffold::Bridges::DatePicker::Finder
+
   alias_method :condition_for_date_picker_type, :condition_for_datetime
   alias_method :condition_for_datetime_picker_type, :condition_for_datetime
 end
 ActiveScaffold::AttributeParams.module_eval do
   prepend ActiveScaffold::Bridges::DatePicker::AttributeParams
+
   alias_method :column_value_for_date_picker_type, :column_value_for_datetime_type
   alias_method :column_value_for_datetime_picker_type, :column_value_for_datetime_type
 end

data/lib/active_scaffold/bridges/date_picker/helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold::Bridges
   class DatePicker
     module Helper
@@ -69,7 +71,9 @@ module ActiveScaffold::Bridges
           ampm: false,
           hourText: I18n.translate!('datetime.prompts.hour', locale: locale),
           minuteText: I18n.translate!('datetime.prompts.minute', locale: locale),
-          secondText: I18n.translate!('datetime.prompts.second', locale: locale)
+          secondText: I18n.translate!('datetime.prompts.second', locale: locale),
+          millisecText: I18n.translate!('datetime.prompts.millisec', locale: locale),
+          microsecText: I18n.translate!('datetime.prompts.microsec', locale: locale)
         }
 
         as_datetime_picker_options = I18n.translate! :datetime_picker_options, scope: :active_scaffold, locale: locale, default: ''
@@ -94,7 +98,7 @@ module ActiveScaffold::Bridges
           )
         end
         js_format = rails_format.dup
-        js_format.gsub!(/([ ]|^)([^% ]\S*)/, " '\\2'")
+        js_format.gsub!(/( |^)([^% ]\S*)/, " '\\2'")
         DATE_FORMAT_CONVERSION.each do |key, value|
           js_format.gsub!(key, value)
         end
@@ -128,7 +132,7 @@ module ActiveScaffold::Bridges
       end
 
       module DatepickerColumnHelpers
-        def to_datepicker_format(rails_format)
+        def to_datepicker_format(rails_format) # rubocop:disable Rails/Delegate
           ActiveScaffold::Bridges::DatePicker::Helper.to_datepicker_format(rails_format)
         end
 

data/lib/active_scaffold/bridges/date_picker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold::Bridges
   class DatePicker < ActiveScaffold::DataStructures::Bridge
     autoload :Helper, 'active_scaffold/bridges/date_picker/helper'

data/lib/active_scaffold/bridges/dragonfly/dragonfly_bridge.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module Bridges
     class Dragonfly

data/lib/active_scaffold/bridges/dragonfly/dragonfly_bridge_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module Bridges
     class Dragonfly

data/lib/active_scaffold/bridges/dragonfly/form_ui.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module Helpers
     module FormColumnHelpers
@@ -5,7 +7,7 @@ module ActiveScaffold
         record = options[:object]
         dragonfly = record.send(column.name.to_s)
         content = active_scaffold_column_dragonfly(record, column, ui_options: ui_options) if dragonfly.present?
-        active_scaffold_file_with_remove_link(column, options, content, 'remove_', 'dragonfly_controls', ui_options: ui_options)
+        active_scaffold_file_with_content(column, options, content, 'remove_', 'dragonfly_controls', ui_options: ui_options)
       end
     end
   end

data/lib/active_scaffold/bridges/dragonfly/list_ui.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module Helpers
     module ListColumnHelpers

data/lib/active_scaffold/bridges/dragonfly.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ActiveScaffold::Bridges::Dragonfly < ActiveScaffold::DataStructures::Bridge
   def self.install
     require File.join(File.dirname(__FILE__), 'dragonfly/form_ui')

data/lib/active_scaffold/bridges/file_column/as_file_column_bridge.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveScaffold::DataStructures::Column.class_eval do
   attr_accessor :file_column_display
 end

data/lib/active_scaffold/bridges/file_column/file_column_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module Bridges
     class FileColumn
@@ -9,17 +11,16 @@ module ActiveScaffold
 
           def generate_delete_helpers(klass)
             file_column_fields(klass).each do |field|
-              klass.send :class_eval, <<-CODE, __FILE__, __LINE__ + 1 unless klass.method_defined?(:"#{field}_with_delete=")
-                attr_reader :delete_#{field}
+              next if klass.method_defined?(:"#{field}_with_delete=")
 
-                def delete_#{field}=(value)
-                  value = (value=="true") if String===value
-                  return unless value
+              klass.attr_reader :"delete_#{field}"
+              klass.define_method "delete_#{field}=" do |value|
+                value = (value == 'true') if value.is_a?(String)
+                return unless value
 
-                  # passing nil to the file column causes the file to be deleted.  Don't delete if we just uploaded a file!
-                  self.#{field} = nil unless self.#{field}_just_uploaded?
-                end
-              CODE
+                # passing nil to the file column causes the file to be deleted.  Don't delete if we just uploaded a file!
+                send("#{field}=", nil) unless send("#{field}_just_uploaded?")
+              end
             end
           end
 

data/lib/active_scaffold/bridges/file_column/form_ui.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module Helpers
     # Helpers that assist with the rendering of a Form Column

data/lib/active_scaffold/bridges/file_column/list_ui.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module Helpers
     # Helpers that assist with the rendering of a List Column

data/lib/active_scaffold/bridges/file_column/test/functional/file_column_keep_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require File.expand_path('../mock_model.rb', __dir__)
 require File.expand_path('../../file_column_helpers.rb', __dir__)

data/lib/active_scaffold/bridges/file_column/test/mock_model.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class MockModel
   attr_accessor :name, :bio, :band_image, :band_image_just_uploaded
 

data/lib/active_scaffold/bridges/file_column.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ActiveScaffold::Bridges::FileColumn < ActiveScaffold::DataStructures::Bridge
   def self.install
     if ActiveScaffold::Config::Core.method_defined?(:initialize_with_file_column)

data/lib/active_scaffold/bridges/logical_query_parser/tokens_grammar.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+Treetop.load File.expand_path('tokens_grammar.treetop', __dir__)
+
+class ActiveScaffold::Bridges::LogicalQueryParser
+  module TokensGrammar
+    class Parser
+      def initialize(operator = 'AND')
+        @operator = operator
+      end
+
+      def parse(*, **)
+        super.tap do |node|
+          node.instance_variable_set(:@literal_operator, @operator)
+        end
+      end
+    end
+
+    module ExpNode
+      def to_sql(params = {})
+        params[:_sql] ||= +''
+        params[:literal_operator] ||= @literal_operator || 'AND'
+        exp.to_sql(params)
+      end
+    end
+
+    module LiteralExpNode
+      def to_sql(params)
+        word.to_sql(params)
+        params[:_sql] << " #{params[:literal_operator]} "
+        exp.to_sql(params)
+      end
+    end
+
+    module WordNode
+      def to_sql(params)
+        text = LogicalQueryParser.unquote(word.text_value)
+
+        sql = build_arel(params, :matches, text).reduce(:or).to_sql
+        sql = "(#{sql})" if sql[0] != '(' && sql[-1] != ')'
+        params[:_sql] << sql
+      end
+
+      private
+
+      def build_arel(params, operator, text)
+        if params[:columns].is_a?(Hash)
+          build_arel_from_hash(params[:model], params[:columns], operator, text)
+        else
+          build_arel_from_columns(params[:model], params[:columns], operator, text)
+        end
+      end
+
+      def build_arel_from_columns(klass, columns, operator, text)
+        columns.map { |column| klass.arel_table[column].send(operator, Arel.sql(klass.connection.quote("%#{text}%"))) }
+      end
+
+      def build_arel_from_hash(klass, hash, operator, text)
+        hash.flat_map do |assoc_klass, columns|
+          build_arel_from_columns(assoc_klass, columns, operator, text)
+        end
+      end
+    end
+  end
+end

data/lib/active_scaffold/bridges/logical_query_parser/tokens_grammar.treetop

@@ -0,0 +1,31 @@
+class ActiveScaffold::Bridges::LogicalQueryParser
+  grammar TokensGrammar
+    rule exp
+      sp* exp:(literal_exp / word) sp* <ExpNode>
+    end
+
+    rule literal_exp
+      word sp+ exp <LiteralExpNode>
+    end
+
+    rule word
+      word:(quoted_word / unquoted_word) <WordNode>
+    end
+
+    rule quoted_word
+      '"' ('\"' / !'"' .)* '"'
+    end
+
+    rule unquoted_word
+      atom+
+    end
+
+    rule sp
+      ' ' / '　'
+    end
+
+    rule atom
+      !sp .
+    end
+  end
+end

data/lib/active_scaffold/bridges/logical_query_parser.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class ActiveScaffold::Bridges::LogicalQueryParser < ActiveScaffold::DataStructures::Bridge
+  def self.install
+    require File.join(File.dirname(__FILE__), 'logical_query_parser/tokens_grammar')
+    ActiveScaffold::Finder.send(:remove_const, :LOGICAL_COMPARATORS)
+    ActiveScaffold::Finder.const_set :LOGICAL_COMPARATORS, %w[all_tokens any_token logical].freeze
+  end
+end

data/lib/active_scaffold/bridges/paper_trail/actions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold::Actions
   module DeletedRecords
     def self.included(base)

data/lib/active_scaffold/bridges/paper_trail/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold::Config
   class DeletedRecords < Base
     self.crud_type = :read

data/lib/active_scaffold/bridges/paper_trail/helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold::Bridges
   class PaperTrail
     module Helper

data/lib/active_scaffold/bridges/paper_trail/paper_trail_bridge.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module Bridges
     class PaperTrail

data/lib/active_scaffold/bridges/paper_trail.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ActiveScaffold::Bridges::PaperTrail < ActiveScaffold::DataStructures::Bridge
   def self.install
     require File.join(File.dirname(__FILE__), 'paper_trail/paper_trail_bridge')

data/lib/active_scaffold/bridges/paperclip/form_ui.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module Helpers
     module FormColumnHelpers
@@ -5,7 +7,7 @@ module ActiveScaffold
         record = options[:object]
         paperclip = record.send(column.name.to_s)
         content = active_scaffold_column_paperclip(record, column, ui_options: ui_options) if paperclip.file?
-        active_scaffold_file_with_remove_link(column, options, content, 'delete_', 'paperclip_controls', ui_options: ui_options)
+        active_scaffold_file_with_content(column, options, content, 'delete_', 'paperclip_controls', ui_options: ui_options)
       end
     end
   end

data/lib/active_scaffold/bridges/paperclip/list_ui.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module Helpers
     module ListColumnHelpers

data/lib/active_scaffold/bridges/paperclip/paperclip_bridge.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module Bridges
     class Paperclip

data/lib/active_scaffold/bridges/paperclip/paperclip_bridge_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module Bridges
     class Paperclip
@@ -6,18 +8,16 @@ module ActiveScaffold
         self.thumbnail_style = :thumbnail
 
         def self.generate_delete_helper(klass, field)
-          klass.class_eval <<-CODE, __FILE__, __LINE__ + 1 unless klass.method_defined?(:"delete_#{field}=")
-            attr_reader :delete_#{field}                                   # attr_reader :delete_file
-                                                                           #
-            def delete_#{field}=(value)                                    # def delete_file=(value)
-              value = (value == "true") if String === value                #   value = (value == "true") if String === value
-              return unless value                                          #   return unless value
-                                                                           #
-              # passing nil to the file column causes the file             #   # passing nil to the file column causes the file
-              # to be deleted. Don't delete if we just uploaded a file!    #   # to be deleted. Don't delete if we just uploaded a file!
-              self.#{field} = nil unless self.#{field}.dirty?              #   self.file = nil unless self.file.dirty?
-            end                                                            # end
-          CODE
+          return if klass.method_defined?(:"delete_#{field}=")
+
+          klass.attr_reader :"delete_#{field}"
+          klass.define_method "delete_#{field}=" do |value|
+            value = (value == 'true') if value.is_a?(String)
+            return unless value
+
+            # passing nil to the file column causes the file to be deleted.  Don't delete if we just uploaded a file!
+            send("#{field}=", nil) unless send(field).dirty?
+          end
         end
       end
     end

data/lib/active_scaffold/bridges/paperclip.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ActiveScaffold::Bridges::Paperclip < ActiveScaffold::DataStructures::Bridge
   def self.install
     if ActiveScaffold::Config::Core.method_defined?(:initialize_with_paperclip)

data/lib/active_scaffold/bridges/record_select/helpers.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 require 'active_support/concern'
 
 class ActiveScaffold::Bridges::RecordSelect
   module Helpers
     extend ActiveSupport::Concern
+
     included do
       include FormColumnHelpers
       include SearchColumnHelpers
@@ -12,16 +15,20 @@ class ActiveScaffold::Bridges::RecordSelect
       # requires RecordSelect plugin to be installed and configured.
       def active_scaffold_input_record_select(column, options, ui_options: column.options)
         record = options.delete(:object)
-        if column.association&.singular?
-          multiple = ui_options.dig(:html_options, :multiple)
-          html = active_scaffold_record_select(record, column, options, record.send(column.name), multiple, ui_options: ui_options)
-          html << active_scaffold_add_new(column, record, options, ui_options: ui_options) if ui_options[:add_new]
-          html
-        elsif column.association&.collection?
-          active_scaffold_record_select(record, column, options, record.send(column.name), true, ui_options: ui_options)
-        else
-          active_scaffold_record_select_autocomplete(record, column, options, ui_options: ui_options)
+        html =
+          if column.association&.singular?
+            multiple = ui_options.dig(:html_options, :multiple)
+            active_scaffold_record_select(record, column, options, record.send(column.name), multiple, ui_options: ui_options.except(:add_new))
+          elsif column.association&.collection?
+            active_scaffold_record_select(record, column, options, record.send(column.name), true, ui_options: ui_options.except(:add_new))
+          else
+            active_scaffold_record_select_autocomplete(record, column, options, ui_options: ui_options)
+          end
+        if column.association && ui_options[:add_new]
+          html = content_tag(:div, html, class: 'select-field') <<
+                 active_scaffold_add_new(column, record, options, ui_options: ui_options)
         end
+        html
       end
 
       def active_scaffold_record_select(record, column, options, value, multiple, ui_options: column.options)
@@ -78,8 +85,9 @@ class ActiveScaffold::Bridges::RecordSelect
           column.association.klass.find(value.to_i)
         end
       rescue StandardError => e
-        Rails.logger.error "#{e.class.name}: #{e.message} -- Sorry, we are not that smart yet. Attempted to restore search values to search fields :#{column.name} in #{controller.class}"
-        raise e
+        message = "Sorry, we are not that smart yet. Attempted to restore search values to search fields :#{column.name} in #{controller.class}"
+        Rails.logger.error "#{e.class.name}: #{e.message} -- #{message}"
+        raise e.class, "#{e.message} -- #{message}", e.backtrace
       end
     end
   end

data/lib/active_scaffold/bridges/record_select.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ActiveScaffold::Bridges::RecordSelect < ActiveScaffold::DataStructures::Bridge
   def self.install
     require File.join(File.dirname(__FILE__), 'record_select/helpers.rb')

data/lib/active_scaffold/bridges/semantic_attributes/column.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ActiveScaffold::Bridges::SemanticAttributes
   module Column
     def initialize(name, active_record_class)

data/lib/active_scaffold/bridges/semantic_attributes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ActiveScaffold::Bridges::SemanticAttributes < ActiveScaffold::DataStructures::Bridge
   def self.install
     require File.join(File.dirname(__FILE__), 'semantic_attributes/column.rb')

data/lib/active_scaffold/bridges/tiny_mce/helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ActiveScaffold::Bridges::TinyMce
   module Helpers
     def self.included(base)
@@ -18,7 +20,7 @@ class ActiveScaffold::Bridges::TinyMce
         options[:class] = "#{options[:class]} mceEditor #{ui_options[:class]}".strip
 
         settings = tinymce_configuration(ui_options[:tinymce_config] || :default)
-                     .options.except('selector').merge(ui_options[:tinymce] || {})
+                     .options.except('selector').merge(ui_options[:tinymce]&.stringify_keys || {})
         options['data-tinymce'] = settings.to_json
 
         html = []

data/lib/active_scaffold/bridges/tiny_mce.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ActiveScaffold::Bridges::TinyMce < ActiveScaffold::DataStructures::Bridge
   autoload :Helpers, 'active_scaffold/bridges/tiny_mce/helpers.rb'
   def self.install
@@ -11,4 +13,8 @@ class ActiveScaffold::Bridges::TinyMce < ActiveScaffold::DataStructures::Bridge
   def self.javascripts
     ['tinymce', 'jquery/tiny_mce_bridge']
   end
+
+  def self.stylesheets
+    ['tiny_mce_bridge']
+  end
 end

data/lib/active_scaffold/bridges/usa_state_select/usa_state_select_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold::Bridges
   class UsaStateSelect
     module UsaStateSelectHelpers

data/lib/active_scaffold/bridges/usa_state_select.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ActiveScaffold::Bridges::UsaStateSelect < ActiveScaffold::DataStructures::Bridge
   def self.install
     require File.join(File.dirname(__FILE__), 'usa_state_select/usa_state_select_helper.rb')

data/lib/active_scaffold/bridges.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module Bridges
     ActiveScaffold.autoload_subdir('bridges', self)

data/lib/active_scaffold/config/base.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 module ActiveScaffold::Config
   class Base
     include ActiveScaffold::Configurable
     extend ActiveScaffold::Configurable
+
     NO_FORMATS = [].freeze
 
     def initialize(core_config)
@@ -20,12 +23,10 @@ module ActiveScaffold::Config
     attr_reader :core, :user_settings_key
 
     # delegate
-    def crud_type
-      self.class.crud_type
-    end
+    delegate :crud_type, to: :class
 
-    def label(model = nil)
-      model ||= @core.label(count: 1)
+    def label(model = nil, core: @core)
+      model ||= core.label(count: 1)
       @label.nil? ? model : as_(@label, model: model)
     end
 
@@ -99,6 +100,10 @@ module ActiveScaffold::Config
         @conf.core.user
       end
 
+      def label(model = nil)
+        @conf.label(model, core: core)
+      end
+
       def [](key)
         @storage[@action][key.to_s] if @action && @storage[@action]
       end
@@ -117,8 +122,8 @@ module ActiveScaffold::Config
         @storage[@action].key? key.to_s if @action && @storage[@action]
       end
 
-      def method_missing(name, *args)
-        proxy_to_conf?(name, true) ? @conf.send(name, *args) : super
+      def method_missing(name, *)
+        proxy_to_conf?(name, true) ? @conf.send(name, *) : super
       end
 
       def respond_to_missing?(name, include_all = false)