rails_admin 0.6.0 → 0.6.1

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

@@ -3,20 +3,19 @@ require 'rails_admin/config/fields/types'
 require 'rails_admin/config/fields/types/belongs_to_association'
 
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
-  if association = parent.abstract_model.associations.find {|a| a[:foreign_key] == properties[:name] && [:belongs_to, :has_and_belongs_to_many].include?(a[:type]) }
+  if association = parent.abstract_model.associations.detect { |a| a[:foreign_key] == properties[:name] && [:belongs_to, :has_and_belongs_to_many].include?(a[:type]) }
     field = RailsAdmin::Config::Fields::Types.load("#{association[:polymorphic] ? :polymorphic : association[:type]}_association").new(parent, association[:name], association)
     fields << field
 
     child_columns = []
-    possible_field_names =
-      if association[:polymorphic]
-        [:foreign_key, :foreign_type, :foreign_inverse_of]
-      else
-        [:foreign_key]
-      end.map{|k| association[k] }.compact
+    possible_field_names = if association[:polymorphic]
+      [:foreign_key, :foreign_type, :foreign_inverse_of]
+    else
+      [:foreign_key]
+    end.collect { |k| association[k] }.compact
 
-    parent.abstract_model.properties.select{|p| possible_field_names.include? p[:name] }.each do |column|
-      unless child_field = fields.find{|f| f.name.to_s == column[:name].to_s }
+    parent.abstract_model.properties.select { |p| possible_field_names.include? p[:name] }.each do |column|
+      unless child_field = fields.detect { |f| f.name.to_s == column[:name].to_s }
         child_field = RailsAdmin::Config::Fields.default_factory.call(parent, column, fields)
       end
       child_columns << child_field
@@ -27,6 +26,6 @@ RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
       child_column.filterable(false)
     end
 
-    field.children_fields child_columns.map(&:name)
+    field.children_fields child_columns.collect(&:name)
   end
 end

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

@@ -3,27 +3,21 @@ require 'rails_admin/config/fields/types'
 require 'rails_admin/config/fields/types/file_upload'
 
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
-  extensions = [nil, :file_name]
   model = parent.abstract_model.model
-
-  if defined?(::CarrierWave) && (model = parent.abstract_model.model).kind_of?(CarrierWave::Mount) && model.uploaders.include?(attachment_name = properties[:name].to_s.chomp('_file_name').to_sym)
-
-
+  if defined?(::CarrierWave) && (model).kind_of?(CarrierWave::Mount) && model.uploaders.include?(attachment_name = properties[:name].to_s.chomp('_file_name').to_sym)
     columns = [model.uploader_options[attachment_name][:mount_on] || attachment_name, "#{attachment_name}_content_type".to_sym, "#{attachment_name}_file_size".to_sym]
-
     field = RailsAdmin::Config::Fields::Types.load(:carrierwave).new(parent, attachment_name, properties)
     fields << field
     children_fields = []
     columns.each do |children_column_name|
-      if child_properties = parent.abstract_model.properties.find {|p| p[:name].to_s == children_column_name.to_s }
-        children_field = fields.find{ |f| f.name == children_column_name } || RailsAdmin::Config::Fields.default_factory.call(parent, child_properties, fields)
+      if 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 unless field == children_field
         children_field.filterable(false) unless field == children_field
         children_fields << children_field.name
       end
     end
     field.children_fields(children_fields)
-
     true
   else
     false

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

@@ -6,14 +6,12 @@ require 'rails_admin/config/fields/types/password'
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
   if properties[:name] == :encrypted_password
     extensions = [:password_salt, :reset_password_token, :remember_token]
-    model = parent.abstract_model.model
-
     fields << RailsAdmin::Config::Fields::Types.load(:password).new(parent, :password, properties)
     fields << RailsAdmin::Config::Fields::Types.load(:password).new(parent, :password_confirmation, properties)
     extensions.each do |ext|
-      properties = parent.abstract_model.properties.find {|p| ext == p[:name]}
+      properties = parent.abstract_model.properties.detect { |p| ext == p[:name] }
       if properties
-        unless field = fields.find{ |f| f.name == ext }
+        unless field = fields.detect { |f| f.name == ext }
           RailsAdmin::Config::Fields.default_factory.call(parent, properties, fields)
           field = fields.last
         end

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

@@ -4,15 +4,13 @@ require 'rails_admin/config/fields/types/file_upload'
 
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
   extensions = [:name, :uid]
-  model = parent.abstract_model.model
-
-  if (properties[:name].to_s =~ /^(.+)_uid$/) && defined?(::Dragonfly) && parent.abstract_model.model.dragonfly_attachment_classes.map(&:attribute).include?(attachment_name = $1.to_sym)
+  if (properties[:name].to_s =~ /^(.+)_uid$/) && defined?(::Dragonfly) && parent.abstract_model.model.dragonfly_attachment_classes.collect(&:attribute).include?(attachment_name = Regexp.last_match[1].to_sym)
     field = RailsAdmin::Config::Fields::Types.load(:dragonfly).new(parent, attachment_name, properties)
     children_fields = []
     extensions.each do |ext|
       children_column_name = "#{attachment_name}_#{ext}".to_sym
-      if child_properties = parent.abstract_model.properties.find {|p| p[:name].to_s == children_column_name.to_s }
-        children_field = fields.find{ |f| f.name == children_column_name } || RailsAdmin::Config::Fields.default_factory.call(parent, child_properties, fields)
+      if 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

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

@@ -6,7 +6,7 @@ RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
   _model = parent.abstract_model.model
   _method_name = "#{properties[:name]}_enum"
 
-  #NOTICE: _method_name could be `to_enum` and this method defined in Object.
+  # NOTICE: _method_name could be `to_enum` and this method defined in Object.
   if !Object.respond_to?(_method_name) && \
       (_model.respond_to?(_method_name) || \
           _model.method_defined?(_method_name))

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

@@ -5,13 +5,13 @@ 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$/) and defined?(::Paperclip) and model.attachment_definitions and model.attachment_definitions.has_key?(attachment_name = $1.to_sym)
+  if (properties[:name].to_s =~ /^(.+)_file_name$/) && defined?(::Paperclip) && model.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|
       children_column_name = "#{attachment_name}_#{ext}".to_sym
-      if child_properties = parent.abstract_model.properties.find {|p| p[:name].to_s == children_column_name.to_s }
-        children_field = fields.find{ |f| f.name == children_column_name } || RailsAdmin::Config::Fields.default_factory.call(parent, child_properties, fields)
+      if 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

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

@@ -33,29 +33,27 @@ module RailsAdmin
           field = section.field(name, type, &block)
           # Directly manipulate the variable instead of using the accessor
           # as group probably is not yet registered to the parent object.
-          field.instance_variable_set("@group", self)
+          field.instance_variable_set('@group', self)
           field
         end
 
         # Reader for fields attached to this group
         def fields
-          section.fields.select {|f| self == f.group }
+          section.fields.select { |f| self == f.group }
         end
 
         # Defines configuration for fields by their type
         #
         # @see RailsAdmin::Config::Fields.fields_of_type
         def fields_of_type(type, &block)
-          selected = section.fields.select {|f| type == f.type }
-          if block
-            selected.each {|f| f.instance_eval &block }
-          end
+          selected = section.fields.select { |f| type == f.type }
+          selected.each { |f| f.instance_eval(&block) } if block
           selected
         end
 
         # Reader for fields that are marked as visible
         def visible_fields
-          section.with(bindings).visible_fields.select {|f| self == f.group }
+          section.with(bindings).visible_fields.select { |f| self == f.group }
         end
 
         # Should it open by default
@@ -65,7 +63,7 @@ module RailsAdmin
 
         # Configurable group label which by default is group's name humanized.
         register_instance_option :label do
-          (@label ||= {})[::I18n.locale] ||= (parent.fields.find{|f|f.name == self.name}.try(:label) || name.to_s.humanize)
+          (@label ||= {})[::I18n.locale] ||= (parent.fields.detect { |f|f.name == name }.try(:label) || name.to_s.humanize)
         end
 
         # Configurable help text

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

@@ -9,11 +9,11 @@ module RailsAdmin
         @@registry = {}
 
         def self.load(type)
-          @@registry[type.to_sym] or raise "Unsupported field datatype: #{type}"
+          @@registry[type.to_sym] || fail("Unsupported field datatype: #{type}")
         end
 
         def self.register(type, klass = nil)
-          if klass == nil && type.kind_of?(Class)
+          if klass.nil? && type.kind_of?(Class)
             klass = type
             type = klass.name.to_s.demodulize.underscore
           end

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

@@ -5,18 +5,18 @@ module RailsAdmin
     module Fields
       module Types
         class BelongsToAssociation < RailsAdmin::Config::Fields::Association
-          RailsAdmin::Config::Fields::Types::register(self)
+          RailsAdmin::Config::Fields::Types.register(self)
 
           register_instance_option :formatted_value do
             (o = value) && o.send(associated_model_config.object_label_method)
           end
 
           register_instance_option :sortable do
-            @sortable ||= abstract_model.adapter_supports_joins? && associated_model_config.abstract_model.properties.map{ |p| p[:name] }.include?(associated_model_config.object_label_method) ? associated_model_config.object_label_method : {self.abstract_model.table_name => self.method_name}
+            @sortable ||= abstract_model.adapter_supports_joins? && associated_model_config.abstract_model.properties.collect { |p| p[:name] }.include?(associated_model_config.object_label_method) ? associated_model_config.object_label_method : {abstract_model.table_name => method_name}
           end
 
           register_instance_option :searchable do
-            @searchable ||= associated_model_config.abstract_model.properties.map{ |p| p[:name] }.include?(associated_model_config.object_label_method) ? [associated_model_config.object_label_method, {self.abstract_model.model => self.method_name}] : {self.abstract_model.model => self.method_name}
+            @searchable ||= associated_model_config.abstract_model.properties.collect { |p| p[:name] }.include?(associated_model_config.object_label_method) ? [associated_model_config.object_label_method, {abstract_model.model => method_name}] : {abstract_model.model => method_name}
           end
 
           register_instance_option :partial do
@@ -36,7 +36,7 @@ module RailsAdmin
           end
 
           def method_name
-            nested_form ? "#{self.name}_attributes".to_sym : association[:foreign_key]
+            nested_form ? "#{name}_attributes".to_sym : association[:foreign_key]
           end
 
           def multiple?

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

@@ -4,7 +4,7 @@ module RailsAdmin
       module Types
         class Boolean < RailsAdmin::Config::Fields::Base
           # Register field type for the type loader
-          RailsAdmin::Config::Fields::Types::register(self)
+          RailsAdmin::Config::Fields::Types.register(self)
 
           register_instance_option :view_helper do
             :check_box
@@ -27,7 +27,7 @@ module RailsAdmin
 
           # Accessor for field's help text displayed below input field.
           def generic_help
-            ""
+            ''
           end
         end
       end

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

@@ -6,16 +6,16 @@ module RailsAdmin
       module Types
         class BsonObjectId < RailsAdmin::Config::Fields::Types::String
           # Register field type for the type loader
-          RailsAdmin::Config::Fields::Types::register(self)
+          RailsAdmin::Config::Fields::Types.register(self)
 
           register_instance_option :label do
             label = ((@label ||= {})[::I18n.locale] ||= abstract_model.model.human_attribute_name name)
-            label = "Id" if label == ''
+            label = 'Id' if label == ''
             label
           end
 
           def generic_help
-            "BSON::ObjectId"
+            'BSON::ObjectId'
           end
 
           register_instance_option :read_only do
@@ -27,12 +27,10 @@ module RailsAdmin
           end
 
           def parse_input(params)
-            begin
-              params[name] = (params[name].blank? ? nil : abstract_model.object_id_from_string(params[name])) if params[name].is_a?(::String)
-            rescue => e
-              unless ['BSON::InvalidObjectId', 'Moped::Errors::InvalidObjectId'].include? e.class.to_s
-                raise e
-              end
+            params[name] = (params[name].blank? ? nil : abstract_model.object_id_from_string(params[name])) if params[name].is_a?(::String)
+          rescue => e
+            unless ['BSON::InvalidObjectId', 'Moped::Errors::InvalidObjectId'].include? e.class.to_s
+              raise e
             end
           end
         end
@@ -40,6 +38,3 @@ module RailsAdmin
     end
   end
 end
-
-
-

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

@@ -9,7 +9,7 @@ module RailsAdmin
           RailsAdmin::Config::Fields::Types.register(self)
 
           register_instance_option :thumb_method do
-            @thumb_method ||= ((versions = bindings[:object].send(name).versions.keys).find{|k| k.in?([:thumb, :thumbnail, 'thumb', 'thumbnail'])} || versions.first.to_s)
+            @thumb_method ||= ((versions = bindings[:object].send(name).versions.keys).detect { |k| k.in?([:thumb, :thumbnail, 'thumb', 'thumbnail']) } || versions.first.to_s)
           end
 
           register_instance_option :delete_method do

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

@@ -6,7 +6,7 @@ module RailsAdmin
       module Types
         class CKEditor < RailsAdmin::Config::Fields::Types::Text
           # Register field type for the type loader
-          RailsAdmin::Config::Fields::Types::register(self)
+          RailsAdmin::Config::Fields::Types.register(self)
 
           # If you want to have a different toolbar configuration for CKEditor
           # create your own custom config.js and override this configuration
@@ -14,12 +14,12 @@ module RailsAdmin
             nil
           end
 
-          #Use this if you want to point to a cloud instances of CKeditor
+          # Use this if you want to point to a cloud instances of CKeditor
           register_instance_option :location do
             nil
           end
 
-          #Use this if you want to point to a cloud instances of the base CKeditor
+          # Use this if you want to point to a cloud instances of the base CKeditor
           register_instance_option :base_location do
             "#{Rails.application.config.assets.prefix}/ckeditor/"
           end

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

@@ -6,30 +6,30 @@ module RailsAdmin
       module Types
         class CodeMirror < RailsAdmin::Config::Fields::Types::Text
           # Register field type for the type loader
-          RailsAdmin::Config::Fields::Types::register(self)
+          RailsAdmin::Config::Fields::Types.register(self)
 
-          #Pass the theme and mode for Codemirror
+          # Pass the theme and mode for Codemirror
           register_instance_option :config do
             {
-              :mode => 'css',
-              :theme => 'night'
+              mode: 'css',
+              theme: 'night'
             }
           end
 
-          #Pass the location of the theme and mode for Codemirror
+          # Pass the location of the theme and mode for Codemirror
           register_instance_option :assets do
             {
-              :mode => '/assets/codemirror/modes/css.js',
-              :theme => '/assets/codemirror/themes/night.css'
+              mode: '/assets/codemirror/modes/css.js',
+              theme: '/assets/codemirror/themes/night.css'
             }
           end
 
-          #Use this if you want to point to a cloud instances of CodeMirror
+          # Use this if you want to point to a cloud instances of CodeMirror
           register_instance_option :js_location do
             '/assets/codemirror.js'
           end
 
-          #Use this if you want to point to a cloud instances of CodeMirror
+          # Use this if you want to point to a cloud instances of CodeMirror
           register_instance_option :css_location do
             '/assets/codemirror.css'
           end

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

@@ -5,10 +5,10 @@ module RailsAdmin
     module Fields
       module Types
         class Color < RailsAdmin::Config::Fields::Base
-          RailsAdmin::Config::Fields::Types::register(self)
+          RailsAdmin::Config::Fields::Types.register(self)
 
           register_instance_option :pretty_value do
-            bindings[:view].content_tag :strong, (value.presence || ' - '), :style => "color: #{color}"
+            bindings[:view].content_tag :strong, (value.presence || ' - '), style: "color: #{color}"
           end
 
           register_instance_option :partial do

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

@@ -6,12 +6,12 @@ module RailsAdmin
       module Types
         class Date < RailsAdmin::Config::Fields::Types::Datetime
           # Register field type for the type loader
-          RailsAdmin::Config::Fields::Types::register(self)
+          RailsAdmin::Config::Fields::Types.register(self)
 
           @format = :long
           @i18n_scope = [:date, :formats]
           @js_plugin_options = {
-            "showTime" => false,
+            'showTime' => false,
           }
 
           def parse_input(params)

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

@@ -7,37 +7,36 @@ module RailsAdmin
       module Types
         class Datetime < RailsAdmin::Config::Fields::Base
           # Register field type for the type loader
-          RailsAdmin::Config::Fields::Types::register(self)
+          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"
+              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]) }
+                    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]) }
+                    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]) }
+                    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]) }
+                    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")
+                    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
@@ -48,16 +47,15 @@ module RailsAdmin
             def parse_date_string(date_string)
               ::Time.zone.parse(date_string)
             end
-
           end
 
           def formatted_date_value
-            value = bindings[:object].new_record? && self.value.nil? && !self.default_value.nil? ? self.default_value : self.value
-            value.nil? ? "" : I18n.l(value, :format => localized_date_format).strip
+            value = bindings[:object].new_record? && self.value.nil? && !default_value.nil? ? default_value : self.value
+            value.nil? ? '' : I18n.l(value, format: localized_date_format).strip
           end
 
           def formatted_time_value
-            value.nil? ? "" : I18n.l(value, :format => localized_time_format)
+            value.nil? ? '' : I18n.l(value, format: localized_time_format)
           end
 
           # Ruby to javascript formatting options translator
@@ -65,56 +63,56 @@ module RailsAdmin
             # 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
+              '%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' => '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)
+              '%Y' => 'yy',         # Year with century
+              '%y' => 'y',          # Year without a century (00..99)
             }
-            localized_date_format.gsub(/%\w/) {|match| translations[match]}
+            localized_date_format.gsub(/%\w/) { |match| translations[match] }
           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,
+              '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? ? ["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,
+              '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 = options.merge self.class.js_plugin_options
+            options.merge(self.class.js_plugin_options)
           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),
+            I18n.t(format, scope: scope, default: [
+              I18n.t(format, scope: scope, locale: :en),
+              I18n.t(self.class.format, scope: scope, locale: :en),
             ]).to_s
           end
 
@@ -123,11 +121,11 @@ module RailsAdmin
           end
 
           def localized_time_format
-            meridian_indicator? ? "%I:%M %p" : "%H:%M"
+            meridian_indicator? ? '%I:%M %p' : '%H:%M'
           end
 
           def meridian_indicator?
-            strftime_format.include? "%p"
+            strftime_format.include? '%p'
           end
 
           def parse_input(params)
@@ -143,10 +141,10 @@ module RailsAdmin
           end
 
           register_instance_option :formatted_value do
-            unless (time = value).nil?
-              I18n.l(time, :format => strftime_format)
+            if time = value
+              I18n.l(time, format: strftime_format)
             else
-              "".html_safe
+              ''.html_safe
             end
           end