rails_admin 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f7dc936446d63b1ecdd6f711d291c25d8c69222a8b4694edc248c9930e67983
-  data.tar.gz: 4e89905db9dac3f8e7336e025fea98a7e03a5bd3d085406fa043f452999efc3c
+  metadata.gz: af37bc66a94584a21b754a3832c8556484f2e8fef1b5b926e373b11ae9ca7ff9
+  data.tar.gz: a50edd522f580bfcad1d574f5142c678c238acf9c56f269194cbd89b1255cec4
 SHA512:
-  metadata.gz: 71faff5dae3bc4102bc8fb00a4deb42c601e49c5295fb17f88444f57409ab346d466dfd02b66a8998d9394cc270a6760c3586bc8fd7df83d4a6e078b830f93ce
-  data.tar.gz: fc96ebe4813b3621dea3eadde119932e7fd4ebcca303100cbdfc3172c7d8fa2f15f93c489554b581bcd2fe10ab4f636a5927536d94081eb75ae4f867a34b3d17
+  metadata.gz: fa60983825f2d6ebca5c5b940a9e849cc491bb51981b1ee07a7b90cf6038167e4ac31823b49b7b0256d0f293aedaacf6cb0248e1ce038e7a03b72f5c3d70d8f9
+  data.tar.gz: 95f6c62c0d8dafe6ff4359992df55b1dde343fdf8a6ff4222d07f263d94cf1ddf1710a576ff83c6fb2cb25cac3edb566134dea9374f4b55a5e61ad673d93f47b

data/app/assets/javascripts/rails_admin/ra.filter-box.js

@@ -119,6 +119,13 @@
             .prop('name', operator_name)
             .append('<option value="_discard">...</option>')
             .append($('<option data-additional-fieldset="additional-fieldset" value="like"></option>').prop('selected', field_operator == "like").text(RailsAdmin.I18n.t("contains")))
+            .append(
+            $(
+            '<option data-additional-fieldset="additional-fieldset" value="not_like"></option>'
+            )
+            .prop("selected", field_operator == "not_like")
+            .text(RailsAdmin.I18n.t("does_not_contain"))
+            )
             .append($('<option data-additional-fieldset="additional-fieldset" value="is"></option>').prop('selected', field_operator == "is").text(RailsAdmin.I18n.t("is_exactly")))
             .append($('<option data-additional-fieldset="additional-fieldset" value="starts_with"></option>').prop('selected', field_operator == "starts_with").text(RailsAdmin.I18n.t("starts_with")))
             .append($('<option data-additional-fieldset="additional-fieldset" value="ends_with"></option>').prop('selected', field_operator == "ends_with").text(RailsAdmin.I18n.t("ends_with")))

data/app/views/rails_admin/main/index.html.haml

@@ -103,7 +103,7 @@
               %td.other.left= link_to "...", @other_left_link, class: 'pjax'
             - properties.map{ |property| property.bind(:object, object) }.each do |property|
               - value = property.pretty_value
-              %td{class: "#{property.css_class} #{property.type_css_class}", title: strip_tags(value.to_s)}= value
+              %td{class: "#{property.css_class} #{property.type_css_class}", title: value}= value
             - if @other_right_link ||= other_right && index_path(params.merge(set: (params[:set].to_i + 1)))
               %td.other.right= link_to "...", @other_right_link, class: 'pjax'
             - unless frozen_columns

data/config/locales/rails_admin.en.yml

@@ -13,6 +13,7 @@ en:
       last_week: Last week
       number: Number ...
       contains: Contains
+      does_not_contain: Does not contain
       is_exactly: Is exactly
       starts_with: Starts with
       ends_with: Ends with

data/lib/rails_admin/adapters/active_record.rb

@@ -250,7 +250,7 @@ module RailsAdmin
 
           @value = begin
             case @operator
-            when 'default', 'like'
+            when 'default', 'like', 'not_like'
               "%#{@value}%"
             when 'starts_with'
               "#{@value}%"
@@ -262,7 +262,13 @@ module RailsAdmin
           end
 
           if ['postgresql', 'postgis'].include? ar_adapter
-            ["(#{@column} ILIKE ?)", @value]
+            if @operator == 'not_like'
+              ["(#{@column} NOT ILIKE ?)", @value]
+            else
+              ["(#{@column} ILIKE ?)", @value]
+            end
+          elsif @operator == 'not_like'
+            ["(LOWER(#{@column}) NOT LIKE ?)", @value]
           else
             ["(LOWER(#{@column}) LIKE ?)", @value]
           end

data/lib/rails_admin/adapters/active_record.rb.bak

@@ -0,0 +1,348 @@
+# frozen_string_literal: true
+
+require 'active_record'
+require 'rails_admin/adapters/active_record/association'
+require 'rails_admin/adapters/active_record/model_extension'
+require 'rails_admin/adapters/active_record/property'
+
+module RailsAdmin
+  module Adapters
+    module ActiveRecord
+      DISABLED_COLUMN_TYPES = %i[tsvector blob binary spatial hstore geometry].freeze
+
+      def model_with_extension
+        @model_with_extension ||=
+          begin
+            klass = Class.new(model) do
+              include ModelExtension
+            end
+            klass.instance_eval <<-RUBY, __FILE__, __LINE__+1
+              def name
+                "#{@model_name.to_s}"
+              end
+            RUBY
+            klass
+          end
+      end
+
+      def new(params = {})
+        model_with_extension.new(params)
+      end
+
+      def get(id, scope = nil)
+        scope = model_with_extension.merge(scope || scoped)
+        scope.where(primary_key => id).first
+      end
+
+      def scoped
+        model_with_extension.all
+      end
+
+      def first(options = {}, scope = nil)
+        all(options, scope).first
+      end
+
+      def all(options = {}, scope = nil)
+        scope = model_with_extension.merge(scope || scoped)
+        scope = scope.includes(options[:include]) if options[:include]
+        scope = scope.limit(options[:limit]) if options[:limit]
+        scope = bulk_scope(scope, options) if options[:bulk_ids]
+        scope = query_scope(scope, options[:query]) if options[:query]
+        scope = filter_scope(scope, options[:filters]) if options[:filters]
+        scope = scope.send(Kaminari.config.page_method_name, options[:page]).per(options[:per]) if options[:page] && options[:per]
+        scope = sort_scope(scope, options) if options[:sort]
+        scope
+      end
+
+      def count(options = {}, scope = nil)
+        all(options.merge(limit: false, page: false), scope).count(:all)
+      end
+
+      def destroy(objects)
+        Array.wrap(objects).each(&:destroy)
+      end
+
+      def associations
+        model.reflect_on_all_associations.collect do |association|
+          Association.new(association, model)
+        end
+      end
+
+      def properties
+        columns = model.columns.reject do |c|
+          c.type.blank? ||
+            DISABLED_COLUMN_TYPES.include?(c.type.to_sym) ||
+            c.try(:array)
+        end
+        columns.collect do |property|
+          Property.new(property, model)
+        end
+      end
+
+      def base_class
+        model.base_class
+      end
+
+      delegate :primary_key, :table_name, to: :model, prefix: false
+
+      def quoted_table_name
+        model.quoted_table_name
+      end
+
+      def quote_column_name(name)
+        model.connection.quote_column_name(name)
+      end
+
+      def encoding
+        adapter =
+          if ::ActiveRecord::Base.respond_to?(:connection_db_config)
+            ::ActiveRecord::Base.connection_db_config.configuration_hash[:adapter]
+          else
+            ::ActiveRecord::Base.connection_config[:adapter]
+          end
+        case adapter
+        when 'postgresql'
+          ::ActiveRecord::Base.connection.select_one("SELECT ''::text AS str;").values.first.encoding
+        when 'mysql2'
+          if RUBY_ENGINE == 'jruby'
+            ::ActiveRecord::Base.connection.select_one("SELECT '' AS str;").values.first.encoding
+          else
+            ::ActiveRecord::Base.connection.raw_connection.encoding
+          end
+        when 'oracle_enhanced'
+          ::ActiveRecord::Base.connection.select_one('SELECT dummy FROM DUAL').values.first.encoding
+        else
+          ::ActiveRecord::Base.connection.select_one("SELECT '' AS str;").values.first.encoding
+        end
+      end
+
+      def embedded?
+        false
+      end
+
+      def cyclic?
+        false
+      end
+
+      def adapter_supports_joins?
+        true
+      end
+
+    private
+
+      def bulk_scope(scope, options)
+        scope.where(primary_key => options[:bulk_ids])
+      end
+
+      def sort_scope(scope, options)
+        direction = options[:sort_reverse] ? :asc : :desc
+        case options[:sort]
+        when String, Symbol
+          scope.reorder("#{options[:sort]} #{direction}")
+        when Array
+          scope.reorder(options[:sort].zip(Array.new(options[:sort].size) { direction }).to_h)
+        when Hash
+          scope.reorder(options[:sort].map { |table_name, column| "#{table_name}.#{column}" }.
+            zip(Array.new(options[:sort].size) { direction }).to_h)
+        else
+          raise ArgumentError.new("Unsupported sort value: #{options[:sort]}")
+        end
+      end
+
+      class WhereBuilder
+        def initialize(scope)
+          @statements = []
+          @values = []
+          @tables = []
+          @scope = scope
+        end
+
+        def add(field, value, operator)
+          field.searchable_columns.flatten.each do |column_infos|
+            statement, value1, value2 = StatementBuilder.new(column_infos[:column], column_infos[:type], value, operator, @scope.connection.adapter_name).to_statement
+            @statements << statement if statement.present?
+            @values << value1 unless value1.nil?
+            @values << value2 unless value2.nil?
+            table, column = column_infos[:column].split('.')
+            @tables.push(table) if column
+          end
+        end
+
+        def build
+          scope = @scope.where(@statements.join(' OR '), *@values)
+          scope = scope.references(*@tables.uniq) if @tables.any?
+          scope
+        end
+      end
+
+      def query_scope(scope, query, fields = config.list.fields.select(&:queryable?))
+        if config.list.search_by
+          scope.send(config.list.search_by, query)
+        else
+          wb = WhereBuilder.new(scope)
+          fields.each do |field|
+            value = parse_field_value(field, query)
+            wb.add(field, value, field.search_operator)
+          end
+          # OR all query statements
+          wb.build
+        end
+      end
+
+      # filters example => {"string_field"=>{"0055"=>{"o"=>"like", "v"=>"test_value"}}, ...}
+      # "0055" is the filter index, no use here. o is the operator, v the value
+      def filter_scope(scope, filters, fields = config.list.fields.select(&:filterable?))
+        filters.each_pair do |field_name, filters_dump|
+          filters_dump.each_value do |filter_dump|
+            wb = WhereBuilder.new(scope)
+            field = fields.detect { |f| f.name.to_s == field_name }
+            value = parse_field_value(field, filter_dump[:v])
+
+            wb.add(field, value, (filter_dump[:o] || RailsAdmin::Config.default_search_operator))
+            # AND current filter statements to other filter statements
+            scope = wb.build
+          end
+        end
+        scope
+      end
+
+      def build_statement(column, type, value, operator)
+        StatementBuilder.new(column, type, value, operator, model.connection.adapter_name).to_statement
+      end
+
+      class StatementBuilder < RailsAdmin::AbstractModel::StatementBuilder
+        def initialize(column, type, value, operator, adapter_name)
+          super column, type, value, operator
+          @adapter_name = adapter_name
+        end
+
+      protected
+
+        def unary_operators
+          case @type
+          when :boolean
+            boolean_unary_operators
+          when :uuid
+            uuid_unary_operators
+          when :integer, :decimal, :float
+            numeric_unary_operators
+          else
+            generic_unary_operators
+          end
+        end
+
+      private
+
+        def generic_unary_operators
+          {
+            '_blank' => ["(#{@column} IS NULL OR #{@column} = '')"],
+            '_present' => ["(#{@column} IS NOT NULL AND #{@column} != '')"],
+            '_null' => ["(#{@column} IS NULL)"],
+            '_not_null' => ["(#{@column} IS NOT NULL)"],
+            '_empty' => ["(#{@column} = '')"],
+            '_not_empty' => ["(#{@column} != '')"],
+          }
+        end
+
+        def boolean_unary_operators
+          generic_unary_operators.merge(
+            '_blank' => ["(#{@column} IS NULL)"],
+            '_empty' => ["(#{@column} IS NULL)"],
+            '_present' => ["(#{@column} IS NOT NULL)"],
+            '_not_empty' => ["(#{@column} IS NOT NULL)"],
+          )
+        end
+        alias_method :numeric_unary_operators, :boolean_unary_operators
+        alias_method :uuid_unary_operators, :boolean_unary_operators
+
+        def range_filter(min, max)
+          if min && max && min == max
+            ["(#{@column} = ?)", min]
+          elsif min && max
+            ["(#{@column} BETWEEN ? AND ?)", min, max]
+          elsif min
+            ["(#{@column} >= ?)", min]
+          elsif max
+            ["(#{@column} <= ?)", max]
+          end
+        end
+
+        def build_statement_for_type
+          case @type
+          when :boolean                   then build_statement_for_boolean
+          when :integer, :decimal, :float then build_statement_for_integer_decimal_or_float
+          when :string, :text, :citext    then build_statement_for_string_or_text
+          when :enum                      then build_statement_for_enum
+          when :belongs_to_association    then build_statement_for_belongs_to_association
+          when :uuid                      then build_statement_for_uuid
+          end
+        end
+
+        def build_statement_for_boolean
+          case @value
+          when 'false', 'f', '0'
+            ["(#{@column} IS NULL OR #{@column} = ?)", false]
+          when 'true', 't', '1'
+            ["(#{@column} = ?)", true]
+          end
+        end
+
+        def column_for_value(value)
+          ["(#{@column} = ?)", value]
+        end
+
+        def build_statement_for_belongs_to_association
+          return if @value.blank?
+
+          ["(#{@column} = ?)", @value.to_i] if @value.to_i.to_s == @value
+        end
+
+        def build_statement_for_string_or_text
+          return if @value.blank?
+
+          return ["(#{@column} = ?)", @value] if ['is', '='].include?(@operator)
+
+          @value = @value.mb_chars.downcase unless %w[postgresql postgis].include? ar_adapter
+
+          @value =
+            case @operator
+            when 'default', 'like', 'not_like'
+              "%#{@value}%"
+            when 'starts_with'
+              "#{@value}%"
+            when 'ends_with'
+              "%#{@value}"
+            else
+              return
+            end
+
+          if %w[postgresql postgis].include? ar_adapter
+            if @operator == 'not_like'
+              ["(#{@column} NOT ILIKE ?)", @value]
+            else
+              ["(#{@column} ILIKE ?)", @value]
+            end
+          elsif @operator == 'not_like'
+            ["(LOWER(#{@column}) NOT LIKE ?)", @value]
+          else
+            ["(LOWER(#{@column}) LIKE ?)", @value]
+          end
+        end
+
+        def build_statement_for_enum
+          return if @value.blank?
+
+          ["(#{@column} IN (?))", Array.wrap(@value)]
+        end
+
+        def build_statement_for_uuid
+          column_for_value(@value) if /\A[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}\z/.match?(@value.to_s)
+        end
+
+        def ar_adapter
+          @adapter_name.downcase
+        end
+      end
+    end
+  end
+end

data/lib/rails_admin/adapters/mongoid.rb

@@ -258,6 +258,8 @@ module RailsAdmin
           return if @value.blank?
           @value = begin
             case @operator
+            when 'not_like'
+              Regexp.compile("^((?!#{Regexp.escape(@value)}).)*$", Regexp::IGNORECASE)
             when 'default', 'like'
               Regexp.compile(Regexp.escape(@value), Regexp::IGNORECASE)
             when 'starts_with'

data/lib/rails_admin/config.rb

@@ -198,7 +198,7 @@ module RailsAdmin
       end
 
       def default_search_operator=(operator)
-        if %w(default like starts_with ends_with is =).include? operator
+        if %w(default like not_like starts_with ends_with is =).include? operator
           @default_search_operator = operator
         else
           raise(ArgumentError.new("Search operator '#{operator}' not supported"))

data/lib/rails_admin/version.rb

@@ -1,8 +1,8 @@
 module RailsAdmin
   class Version
     MAJOR = 2
-    MINOR = 2
-    PATCH = 1
+    MINOR = 3
+    PATCH = 0
     PRE = nil
 
     class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-08 00:00:00.000000000 Z
+date: 2024-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -348,6 +348,7 @@ files:
 - lib/rails_admin.rb
 - lib/rails_admin/abstract_model.rb
 - lib/rails_admin/adapters/active_record.rb
+- lib/rails_admin/adapters/active_record.rb.bak
 - lib/rails_admin/adapters/active_record/abstract_object.rb
 - lib/rails_admin/adapters/active_record/association.rb
 - lib/rails_admin/adapters/active_record/property.rb
@@ -614,7 +615,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Admin for Rails