rails_admin 0.7.0 → 0.8.1

data/config/locales/rails_admin.en.yml

@@ -27,7 +27,6 @@ en:
       next: "Next »"
       truncate: "…"
     misc:
-      filter_date_format: "mm/dd/yy" # a combination of 'dd', 'mm' and 'yy' with any delimiter. No other interpolation will be done!
       search: "Search"
       filter: "Filter"
       refresh: "Refresh"

data/lib/generators/rails_admin/templates/initializer.erb

@@ -11,6 +11,9 @@ RailsAdmin.config do |config|
   ## == Cancan ==
   # config.authorize_with :cancan
 
+  ## == Pundit ==
+  # config.authorize_with :pundit
+
   ## == PaperTrail ==
   # config.audit_with :paper_trail, 'User', 'PaperTrail::Version' # PaperTrail >= 3.0.0
 

data/lib/rails_admin.rb

@@ -4,10 +4,11 @@ require 'rails_admin/config'
 require 'rails_admin/extension'
 require 'rails_admin/extensions/cancan'
 require 'rails_admin/extensions/cancancan'
+require 'rails_admin/extensions/pundit'
 require 'rails_admin/extensions/paper_trail'
 require 'rails_admin/extensions/history'
 require 'rails_admin/support/csv_converter'
-require 'rails_admin/support/core_extensions'
+require 'rails_admin/support/hash_helper'
 
 module RailsAdmin
   # Setup RailsAdmin

data/lib/rails_admin/abstract_model.rb

@@ -1,3 +1,5 @@
+require 'rails_admin/support/datetime'
+
 module RailsAdmin
   class AbstractModel
     cattr_accessor :all
@@ -109,6 +111,10 @@ module RailsAdmin
       extend Adapters::Mongoid
     end
 
+    def parse_field_value(field, value)
+      value.is_a?(Array) ? value.map { |v| field.parse_value(v) } : field.parse_value(value)
+    end
+
     class StatementBuilder
       def initialize(column, type, value, operator)
         @column = column
@@ -119,7 +125,6 @@ module RailsAdmin
 
       def to_statement
         return if [@operator, @value].any? { |v| v == '_discard' }
-
         unary_operators[@operator] || unary_operators[@value] ||
           build_statement_for_type_generic
       end
@@ -166,13 +171,16 @@ module RailsAdmin
       end
 
       def build_statement_for_date
-        range_filter(*get_filtering_duration)
+        start_date, end_date = get_filtering_duration
+        start_date = (start_date.to_date rescue nil) if start_date
+        end_date = (end_date.to_date rescue nil) if end_date
+        range_filter(start_date, end_date)
       end
 
       def build_statement_for_datetime_or_timestamp
         start_date, end_date = get_filtering_duration
-        start_date = start_date.to_time.beginning_of_day if start_date
-        end_date = end_date.to_time.end_of_day if end_date
+        start_date = start_date.to_time.try(:beginning_of_day) if start_date
+        end_date = end_date.to_time.try(:end_of_day) if end_date
         range_filter(start_date, end_date)
       end
 
@@ -219,7 +227,7 @@ module RailsAdmin
         end
 
         def between
-          [convert_to_date(@value[1]), convert_to_date(@value[2])]
+          [@value[1], @value[2]]
         end
 
         def default
@@ -228,18 +236,8 @@ module RailsAdmin
 
       private
 
-        def date_format
-          I18n.t('admin.misc.filter_date_format',
-                 default: I18n.t('admin.misc.filter_date_format', locale: :en)).gsub('dd', '%d').gsub('mm', '%m').gsub('yy', '%Y')
-        end
-
-        def convert_to_date(value)
-          value.present? && Date.strptime(value, date_format)
-        end
-
         def default_date
-          default_date_value = Array.wrap(@value).first
-          convert_to_date(default_date_value) rescue false
+          Array.wrap(@value).first
         end
       end
     end

data/lib/rails_admin/adapters/active_record.rb

@@ -40,7 +40,7 @@ module RailsAdmin
       end
 
       def count(options = {}, scope = nil)
-        all(options.merge(limit: false, page: false), scope).count
+        all(options.merge(limit: false, page: false), scope).count(:all)
       end
 
       def destroy(objects)
@@ -94,6 +94,11 @@ module RailsAdmin
 
         def add(field, value, operator)
           field.searchable_columns.flatten.each do |column_infos|
+            if value.is_a?(Array)
+              value = value.map { |v| field.parse_value(v) }
+            else
+              value = field.parse_value(value)
+            end
             statement, value1, value2 = StatementBuilder.new(column_infos[:column], column_infos[:type], value, operator).to_statement
             @statements << statement if statement.present?
             @values << value1 unless value1.nil?
@@ -113,7 +118,7 @@ module RailsAdmin
       def query_scope(scope, query, fields = config.list.fields.select(&:queryable?))
         wb = WhereBuilder.new(scope)
         fields.each do |field|
-          wb.add(field, query, field.search_operator)
+          wb.add(field, field.parse_value(query), field.search_operator)
         end
         # OR all query statements
         wb.build
@@ -125,7 +130,10 @@ module RailsAdmin
         filters.each_pair do |field_name, filters_dump|
           filters_dump.each do |_, filter_dump|
             wb = WhereBuilder.new(scope)
-            wb.add(fields.detect { |f| f.name.to_s == field_name }, filter_dump[:v], (filter_dump[:o] || 'default'))
+            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] || 'default'))
             # AND current filter statements to other filter statements
             scope = wb.build
           end
@@ -203,7 +211,12 @@ module RailsAdmin
               return
             end
           end
-          ["(LOWER(#{@column}) #{like_operator} ?)", @value]
+
+          if ar_adapter == 'postgresql'
+            ["(#{@column} ILIKE ?)", @value]
+          else
+            ["(LOWER(#{@column}) LIKE ?)", @value]
+          end
         end
 
         def build_statement_for_enum
@@ -214,10 +227,6 @@ module RailsAdmin
         def ar_adapter
           ::ActiveRecord::Base.connection.adapter_name.downcase
         end
-
-        def like_operator
-          ar_adapter == 'postgresql' ? 'ILIKE' : 'LIKE'
-        end
       end
     end
   end

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

@@ -37,6 +37,11 @@ module RailsAdmin
           association.foreign_key.to_sym
         end
 
+        def foreign_key_nullable?
+          return true if foreign_key.nil? || type != :has_many
+          (column = klass.columns_hash[foreign_key.to_s]).nil? || column.null
+        end
+
         def foreign_type
           options[:foreign_type].try(:to_sym) || :"#{name}_type" if options[:polymorphic]
         end

data/lib/rails_admin/adapters/mongoid.rb

@@ -8,7 +8,6 @@ module RailsAdmin
   module Adapters
     module Mongoid
       DISABLED_COLUMN_TYPES = ['Range', 'Moped::BSON::Binary', 'BSON::Binary', 'Mongoid::Geospatial::Point']
-      ObjectId = defined?(Moped::BSON) ? Moped::BSON::ObjectId : BSON::ObjectId # rubocop:disable ConstantName
 
       def new(params = {})
         AbstractObject.new(model.new(params))
@@ -67,9 +66,7 @@ module RailsAdmin
 
       def properties
         fields = model.fields.reject { |_name, field| DISABLED_COLUMN_TYPES.include?(field.type.to_s) }
-        fields.collect do |_name, field|
-          Property.new(field, model)
-        end
+        fields.collect { |_name, field| Property.new(field, model) }
       end
 
       def table_name
@@ -102,6 +99,7 @@ module RailsAdmin
         conditions_per_collection = {}
         field.searchable_columns.each do |column_infos|
           collection_name, column_name = parse_collection_name(column_infos[:column])
+          value = parse_field_value(field, value)
           statement = build_statement(column_name, column_infos[:type], value, operator)
           next unless statement
           conditions_per_collection[collection_name] ||= []
@@ -114,7 +112,8 @@ module RailsAdmin
         statements = []
 
         fields.each do |field|
-          conditions_per_collection = make_field_conditions(field, query, field.search_operator)
+          value = parse_field_value(field, query)
+          conditions_per_collection = make_field_conditions(field, value, field.search_operator)
           statements.concat make_condition_for_current_collection(field, conditions_per_collection)
         end
 
@@ -134,7 +133,8 @@ module RailsAdmin
           filters_dump.each do |_, filter_dump|
             field = fields.detect { |f| f.name.to_s == field_name }
             next unless field
-            conditions_per_collection = make_field_conditions(field, filter_dump[:v], (filter_dump[:o] || 'default'))
+            value = parse_field_value(field, filter_dump[:v])
+            conditions_per_collection = make_field_conditions(field, value, (filter_dump[:o] || 'default'))
             field_statements = make_condition_for_current_collection(field, conditions_per_collection)
             if field_statements.many?
               statements << {'$or' => field_statements}
@@ -265,8 +265,7 @@ module RailsAdmin
         end
 
         def build_statement_for_belongs_to_association_or_bson_object_id
-          object_id = (object_id_from_string(@value) rescue nil)
-          {@column => object_id} if object_id
+          {@column => @value} if @value
         end
 
         def range_filter(min, max)
@@ -278,10 +277,6 @@ module RailsAdmin
             {@column => {'$lte' => max}}
           end
         end
-
-        def object_id_from_string(str)
-          ObjectId.from_string(str)
-        end
       end
     end
   end

data/lib/rails_admin/adapters/mongoid/association.rb

@@ -48,6 +48,11 @@ module RailsAdmin
           association.foreign_key.to_sym rescue nil
         end
 
+        def foreign_key_nullable?
+          return if foreign_key.nil?
+          true
+        end
+
         def foreign_type
           return unless polymorphic? && [:referenced_in, :belongs_to].include?(macro)
           association.inverse_type.try(:to_sym) || :"#{name}_type"

data/lib/rails_admin/config/actions/export.rb

@@ -16,7 +16,7 @@ module RailsAdmin
           proc do
             if format = params[:json] && :json || params[:csv] && :csv || params[:xml] && :xml
               request.format = format
-              @schema = params[:schema].symbolize if params[:schema] # to_json and to_xml expect symbols for keys AND values.
+              @schema = HashHelper.symbolize(params[:schema]) if params[:schema] # to_json and to_xml expect symbols for keys AND values.
               @objects = list_entries(@model_config, :export)
               index
             else

data/lib/rails_admin/config/fields.rb

@@ -82,4 +82,5 @@ require 'rails_admin/config/fields/factories/devise'
 require 'rails_admin/config/fields/factories/paperclip'
 require 'rails_admin/config/fields/factories/dragonfly'
 require 'rails_admin/config/fields/factories/carrierwave'
+require 'rails_admin/config/fields/factories/refile'
 require 'rails_admin/config/fields/factories/association'

data/lib/rails_admin/config/fields/association.rb

@@ -57,6 +57,11 @@ module RailsAdmin
           @associated_collection_cache_all ||= (associated_model_config.abstract_model.count < 100)
         end
 
+        # determines whether association's elements can be removed
+        register_instance_option :removable? do
+          association.foreign_key_nullable?
+        end
+
         # Reader for the association's child model's configuration
         def associated_model_config
           @associated_model_config ||= RailsAdmin.config(association.klass)

data/lib/rails_admin/config/fields/base.rb

@@ -301,6 +301,10 @@ module RailsAdmin
           (translated.is_a?(Hash) ? translated.to_a.first[1] : translated).html_safe
         end
 
+        def parse_value(value)
+          value
+        end
+
         def parse_input(_params)
           # overriden
         end

data/lib/rails_admin/config/fields/factories/paperclip.rb

@@ -5,7 +5,7 @@ require 'rails_admin/config/fields/types/file_upload'
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
   extensions = [:file_name, :content_type, :file_size, :updated_at, :fingerprint]
   model = parent.abstract_model.model
-  if (properties.name.to_s =~ /^(.+)_file_name$/) && defined?(::Paperclip) && model.attachment_definitions && model.attachment_definitions.key?(attachment_name = Regexp.last_match[1].to_sym)
+  if (properties.name.to_s =~ /^(.+)_file_name$/) && defined?(::Paperclip) && model.try(:attachment_definitions) && model.attachment_definitions.key?(attachment_name = Regexp.last_match[1].to_sym)
     field = RailsAdmin::Config::Fields::Types.load(:paperclip).new(parent, attachment_name, properties)
     children_fields = []
     extensions.each do |ext|

data/lib/rails_admin/config/fields/factories/refile.rb

@@ -0,0 +1,25 @@
+require 'rails_admin/config/fields'
+require 'rails_admin/config/fields/types'
+require 'rails_admin/config/fields/types/file_upload'
+
+RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
+  extensions = [:id, :filename, :size, :content_type]
+  model = parent.abstract_model.model
+  if (properties.name.to_s =~ /^(.+)_id$/) && defined?(::Refile) && model.ancestors.map(&:to_s).include?("Refile::Attachment(#{attachment_name = Regexp.last_match[1].to_sym})")
+    field = RailsAdmin::Config::Fields::Types.load(:refile).new(parent, attachment_name, properties)
+    children_fields = []
+    extensions.each do |ext|
+      children_column_name = "#{attachment_name}_#{ext}".to_sym
+      next unless child_properties = parent.abstract_model.properties.detect { |p| p.name.to_s == children_column_name.to_s }
+      children_field = fields.detect { |f| f.name == children_column_name } || RailsAdmin::Config::Fields.default_factory.call(parent, child_properties, fields)
+      children_field.hide
+      children_field.filterable(false)
+      children_fields << children_field.name
+    end
+    field.children_fields(children_fields)
+    fields << field
+    true
+  else
+    false
+  end
+end

data/lib/rails_admin/config/fields/types/active_record_enum.rb

@@ -27,12 +27,12 @@ module RailsAdmin
             false
           end
 
+          def parse_value(value)
+            value.present? ? enum.invert[value.to_i] : nil
+          end
+
           def parse_input(params)
-            if params[name].present?
-              params[name] = enum.invert[params[name].to_i]
-            elsif params[name]
-              params[name] = nil
-            end
+            params[name] = parse_value(params[name]) if params[name]
           end
         end
       end

data/lib/rails_admin/config/fields/types/all.rb

@@ -10,6 +10,7 @@ require 'rails_admin/config/fields/types/enum'
 require 'rails_admin/config/fields/types/file_upload'
 require 'rails_admin/config/fields/types/paperclip'
 require 'rails_admin/config/fields/types/carrierwave'
+require 'rails_admin/config/fields/types/refile'
 require 'rails_admin/config/fields/types/float'
 require 'rails_admin/config/fields/types/has_and_belongs_to_many_association'
 require 'rails_admin/config/fields/types/has_many_association'

data/lib/rails_admin/config/fields/types/bson_object_id.rb

@@ -8,6 +8,14 @@ module RailsAdmin
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 
+          OBJECT_ID ||= begin
+            if defined?(Moped::BSON)
+              Moped::BSON::ObjectId
+            elsif defined?(BSON::ObjectId)
+              BSON::ObjectId
+            end
+          end
+
           register_instance_option :label do
             label = ((@label ||= {})[::I18n.locale] ||= abstract_model.model.human_attribute_name name)
             label = 'Id' if label == ''
@@ -26,13 +34,19 @@ module RailsAdmin
             serial?
           end
 
-          def parse_input(params)
-            params[name] = (params[name].blank? ? nil : abstract_model.object_id_from_string(params[name])) if params[name].is_a?(::String)
+          def parse_value(value)
+            value.present? ? OBJECT_ID.from_string(value) : nil
+          rescue BSON::ObjectId::Invalid
+            nil
           rescue => e
             unless ['BSON::InvalidObjectId', 'Moped::Errors::InvalidObjectId'].include? e.class.to_s
               raise e
             end
           end
+
+          def parse_input(params)
+            params[name] = parse_value(params[name]) if params[name].is_a?(::String)
+          end
         end
       end
     end

data/lib/rails_admin/config/fields/types/date.rb

@@ -5,17 +5,28 @@ module RailsAdmin
     module Fields
       module Types
         class Date < RailsAdmin::Config::Fields::Types::Datetime
-          # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 
-          @format = :long
-          @i18n_scope = [:date, :formats]
-          @js_plugin_options = {
-            'showTime' => false,
-          }
+          register_instance_option :date_format do
+            :long
+          end
+
+          register_instance_option :i18n_scope do
+            [:date, :formats]
+          end
+
+          register_instance_option :datepicker_options do
+            {
+              showTodayButton: true,
+              format: parser.to_momentjs,
+            }
+          end
 
-          def parse_input(params)
-            params[name] = self.class.normalize(params[name], localized_date_format).to_date if params[name].present?
+          register_instance_option :html_attributes do
+            {
+              required: required?,
+              size: 18,
+            }
           end
         end
       end

data/lib/rails_admin/config/fields/types/datetime.rb

@@ -1,148 +1,68 @@
 require 'rails_admin/config/fields/base'
-require 'rails_admin/i18n_support'
+require 'rails_admin/support/datetime'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
         class Datetime < RailsAdmin::Config::Fields::Base
-          # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 
-          @format = :long
-          @i18n_scope = [:time, :formats]
-          @js_plugin_options = {}
-
-          class << self
-            include RailsAdmin::I18nSupport
-
-            attr_reader :format, :i18n_scope, :js_plugin_options
-
-            def normalize(date_string, format)
-              unless I18n.locale == 'en'
-                format.to_s.scan(/%[AaBbp]/) do |match|
-                  case match
-                  when '%A'
-                    english = I18n.t('date.day_names', locale: :en)
-                    day_names.each_with_index { |d, i| date_string = date_string.gsub(/#{d}/, english[i]) }
-                  when '%a'
-                    english = I18n.t('date.abbr_day_names', locale: :en)
-                    abbr_day_names.each_with_index { |d, i| date_string = date_string.gsub(/#{d}/, english[i]) }
-                  when '%B'
-                    english = I18n.t('date.month_names', locale: :en)[1..-1]
-                    month_names.each_with_index { |m, i| date_string = date_string.gsub(/#{m}/, english[i]) }
-                  when '%b'
-                    english = I18n.t('date.abbr_month_names', locale: :en)[1..-1]
-                    abbr_month_names.each_with_index { |m, i| date_string = date_string.gsub(/#{m}/, english[i]) }
-                  when '%p'
-                    date_string = date_string.gsub(/#{I18n.t('date.time.am', default: "am")}/, 'am')
-                    date_string = date_string.gsub(/#{I18n.t('date.time.pm', default: "pm")}/, 'pm')
-                  end
-                end
-              end
-              parse_date_string(date_string)
-            end
-
-            # Parse normalized date strings using time zone
-            def parse_date_string(date_string)
-              ::Time.zone.parse(date_string)
-            end
+          def parser
+            @parser ||= RailsAdmin::Support::Datetime.new(strftime_format)
           end
 
-          def formatted_date_value
-            value = bindings[:object].new_record? && self.value.nil? ? default_value : self.value
-            value.nil? ? '' : I18n.l(value, format: localized_date_format).strip
+          def parse_value(value)
+            parser.parse_string(value)
           end
 
-          def formatted_time_value
-            value.nil? ? '' : I18n.l(value, format: localized_time_format)
-          end
-
-          # Ruby to javascript formatting options translator
-          def js_date_format
-            # Ruby format options as a key and javascript format options
-            # as a value
-            translations = {
-              '%a' => 'D',          # The abbreviated weekday name ("Sun")
-              '%A' => 'DD',         # The  full  weekday  name ("Sunday")
-              '%b' => 'M',          # The abbreviated month name ("Jan")
-              '%B' => 'MM',         # The  full  month  name ("January")
-              '%d' => 'dd',         # Day of the month (01..31)
-              '%D' => 'mm/dd/y',    # American date format mm/dd/yy
-              '%e' => 'd',          # Day of the month (1..31)
-              '%F' => 'yy-mm-dd',   # ISO 8601 date format
-              # "%H" => "??",         # Hour of the day, 24-hour clock (00..23)
-              # "%I" => "??",         # Hour of the day, 12-hour clock (01..12)
-              '%m' => 'mm',         # Month of the year (01..12)
-              '%-m' => 'm',         # Month of the year (1..12)
-              # "%M" => "??",         # Minute of the hour (00..59)
-              # "%p" => "??",         # Meridian indicator ("AM" or "PM")
-              # "%S" => "??",         # Second of the minute (00..60)
-              '%Y' => 'yy',         # Year with century
-              '%y' => 'y',          # Year without a century (00..99)
-            }
-            localized_date_format.gsub(/%\w/) { |match| translations[match] }
+          def parse_input(params)
+            params[name] = parse_value(params[name]) if params[name]
           end
 
-          def js_plugin_options
-            options = {
-              'datepicker' => {
-                'dateFormat' => js_date_format,
-                'dayNames' => self.class.day_names,
-                'dayNamesShort' => self.class.abbr_day_names,
-                'dayNamesMin' => self.class.abbr_day_names,
-                'firstDay' => 1,
-                'monthNames' => self.class.month_names,
-                'monthNamesShort' => self.class.abbr_month_names,
-                'value' => formatted_date_value,
-              },
-              'timepicker' => {
-                'amPmText' => meridian_indicator? ? %w(Am Pm) : ['', ''],
-                'hourText' => I18n.t('datetime.prompts.hour', default: I18n.t('datetime.prompts.hour', locale: :en)),
-                'minuteText' => I18n.t('datetime.prompts.minute', default: I18n.t('datetime.prompts.minute', locale: :en)),
-                'showPeriod' => meridian_indicator?,
-                'value' => formatted_time_value,
-              },
-            }
-
-            options.merge(self.class.js_plugin_options)
+          def value
+            parent_value = super
+            if %w(DateTime Date Time).include?(parent_value.class.name)
+              parent_value.in_time_zone
+            else
+              parent_value
+            end
           end
 
-          def localized_format(scope = [:time, :formats])
-            format = date_format.to_sym
-            I18n.t(format, scope: scope, default: [
-              I18n.t(format, scope: scope, locale: :en),
-              I18n.t(self.class.format, scope: scope, locale: :en),
-            ]).to_s
+          register_instance_option :date_format do
+            :long
           end
 
-          def localized_date_format
-            localized_format([:date, :formats])
+          register_instance_option :i18n_scope do
+            [:time, :formats]
           end
 
-          def localized_time_format
-            meridian_indicator? ? '%I:%M %p' : '%H:%M'
+          register_instance_option :strftime_format do
+            fallback = ::I18n.t(date_format, scope: i18n_scope, locale: :en)
+            ::I18n.t(date_format, scope: i18n_scope, default: fallback).to_s
           end
 
-          def meridian_indicator?
-            strftime_format.include? '%p'
+          register_instance_option :datepicker_options do
+            {
+              showTodayButton: true,
+              format: parser.to_momentjs,
+            }
           end
 
-          def parse_input(params)
-            params[name] = self.class.normalize(params[name], "#{localized_date_format} #{localized_time_format}") if params[name].present?
+          register_instance_option :html_attributes do
+            {
+              required: required?,
+              size: 22,
+            }
           end
 
           register_instance_option :sort_reverse? do
             true
           end
 
-          register_instance_option :date_format do
-            self.class.format
-          end
-
           register_instance_option :formatted_value do
-            if time = value
-              I18n.l(time, format: strftime_format)
+            if time = (value || default_value)
+              ::I18n.l(time, format: strftime_format)
             else
               ''.html_safe
             end
@@ -151,10 +71,6 @@ module RailsAdmin
           register_instance_option :partial do
             :form_datetime
           end
-
-          register_instance_option :strftime_format do
-            localized_format self.class.i18n_scope
-          end
         end
       end
     end