rails_admin 2.1.0 → 3.0.0.beta

data/lib/rails_admin/extensions/paper_trail/auditing_adapter.rb

@@ -11,7 +11,7 @@ module RailsAdmin
 
         def message
           @message = @version.event
-          @version.respond_to?(:changeset) && @version.changeset.present? ? @message + ' [' + @version.changeset.to_a.collect { |c| c[0] + ' = ' + c[1][1].to_s }.join(', ') + ']' : @message
+          @version.respond_to?(:changeset) && @version.changeset.present? ? @message + ' [' + @version.changeset.to_a.collect { |c| "#{c[0]} = #{c[1][1]}" }.join(', ') + ']' : @message
         end
 
         def created_at
@@ -23,7 +23,11 @@ module RailsAdmin
         end
 
         def username
-          (@user_class.find(@version.whodunnit).try(:email) rescue nil) || @version.whodunnit
+          begin
+            @user_class.find(@version.whodunnit).try(:email)
+          rescue StandardError
+            nil
+          end || @version.whodunnit
         end
 
         def item
@@ -57,13 +61,14 @@ module RailsAdmin
         EOS
 
         def self.setup
-          raise('PaperTrail not found') unless defined?(::PaperTrail)
-          RailsAdmin::Extensions::ControllerExtension.send(:include, ControllerExtension)
+          raise 'PaperTrail not found' unless defined?(::PaperTrail)
+
+          RailsAdmin::Extensions::ControllerExtension.include ControllerExtension
         end
 
         def initialize(controller, user_class = 'User', version_class = '::Version')
           @controller = controller
-          @controller.send(:set_paper_trail_whodunnit) if @controller
+          @controller&.send(:set_paper_trail_whodunnit)
           begin
             @user_class = user_class.to_s.constantize
           rescue NameError
@@ -116,7 +121,7 @@ module RailsAdmin
 
           current_page = page.presence || '1'
 
-          versions = object.nil? ? versions_for_model(model) : object.versions
+          versions = object.nil? ? versions_for_model(model) : object.public_send(model.model.versions_association_name)
           versions = versions.where('event LIKE ?', "%#{query}%") if query.present?
           versions = versions.order(sort_reverse == 'true' ? "#{sort} DESC" : sort)
           versions = all ? versions : versions.send(Kaminari.config.page_method_name, current_page).per(per_page)
@@ -149,10 +154,10 @@ module RailsAdmin
         # classes](https://github.com/paper-trail-gem/paper_trail#6a-custom-version-classes)
         #
         # ```ruby
-        # has_paper_trail class_name: 'MyVersion'
+        # has_paper_trail versions: { class_name: 'MyVersion' }
         # ```
         def version_class_for(model)
-          model.paper_trail_options[:class_name].try(:constantize) || @version_class
+          model.paper_trail_options.dig(:versions, :class_name).try(:constantize) || @version_class
         end
       end
     end

data/lib/rails_admin/extensions/pundit/authorization_adapter.rb

@@ -7,7 +7,7 @@ module RailsAdmin
       class AuthorizationAdapter
         # This method is called first time only and used for setup
         def self.setup
-          RailsAdmin::Extensions::ControllerExtension.send(:include, ::Pundit)
+          RailsAdmin::Extensions::ControllerExtension.include ::Pundit
         end
 
         # See the +authorize_with+ config method for where the initialization happens.
@@ -21,10 +21,9 @@ module RailsAdmin
         # AbstractModel instance that applies. The third argument is the actual model
         # instance if it is available.
         def authorize(action, abstract_model = nil, model_object = nil)
-          record = model_object || abstract_model && abstract_model.model
-          if action && !policy(record).send(action_for_pundit(action))
-            raise ::Pundit::NotAuthorizedError.new("not allowed to #{action} this #{record}")
-          end
+          record = model_object || abstract_model&.model
+          raise ::Pundit::NotAuthorizedError.new("not allowed to #{action} this #{record}") if action && !policy(record).send(action_for_pundit(action))
+
           @controller.instance_variable_set(:@_pundit_policy_authorized, true)
         end
 
@@ -33,7 +32,7 @@ module RailsAdmin
         # This takes the same arguments as +authorize+. The difference is that this will
         # return a boolean whereas +authorize+ will raise an exception when not authorized.
         def authorized?(action, abstract_model = nil, model_object = nil)
-          record = model_object || abstract_model && abstract_model.model
+          record = model_object || abstract_model&.model
           policy(record).send(action_for_pundit(action)) if action
         end
 
@@ -50,7 +49,7 @@ module RailsAdmin
         # records. It should return a hash of attributes which match what the user
         # is authorized to create.
         def attributes_for(action, abstract_model)
-          record = abstract_model && abstract_model.model
+          record = abstract_model&.model
           policy(record).try(:attributes_for, action) || {}
         end
 

data/lib/rails_admin/support/csv_converter.rb

@@ -1,11 +1,13 @@
 # encoding: UTF-8
+
 require 'csv'
 
 module RailsAdmin
   class CSVConverter
-    def initialize(objects = [], schema = {})
+    def initialize(objects = [], schema = nil)
       @fields = []
       @associations = []
+      schema ||= {}
 
       return self if (@objects = objects).blank?
 
@@ -13,12 +15,14 @@ module RailsAdmin
       @abstract_model = RailsAdmin::AbstractModel.new(@model)
       @model_config = @abstract_model.config
       @methods = [(schema[:only] || []) + (schema[:methods] || [])].flatten.compact
-      @fields = @methods.collect { |m| export_fields_for(m).first }
+      @fields = @methods.collect { |m| export_field_for(m) }.compact
       @empty = ::I18n.t('admin.export.empty_value_for_associated_objects')
       schema_include = schema.delete(:include) || {}
 
       @associations = schema_include.each_with_object({}) do |(key, values), hash|
-        association = association_for(key)
+        association = export_field_for(key)
+        next unless association&.association?
+
         model_config = association.associated_model_config
         abstract_model = model_config.abstract_model
         methods = [(values[:only] || []) + (values[:methods] || [])].flatten.compact
@@ -28,7 +32,7 @@ module RailsAdmin
           model: abstract_model.model,
           abstract_model: abstract_model,
           model_config: model_config,
-          fields: methods.collect { |m| export_fields_for(m, model_config).first },
+          fields: methods.collect { |m| export_field_for(m, model_config) }.compact,
         }
         hash
       end
@@ -41,13 +45,12 @@ module RailsAdmin
           https://github.com/ruby/csv/issues/62
         MSG
       end
+
       options = HashWithIndifferentAccess.new(options)
       encoding_to = Encoding.find(options[:encoding_to]) if options[:encoding_to].present?
 
       csv_string = generate_csv_string(options)
-      if encoding_to
-        csv_string = csv_string.encode(encoding_to, invalid: :replace, undef: :replace, replace: '?')
-      end
+      csv_string = csv_string.encode(encoding_to, invalid: :replace, undef: :replace, replace: '?') if encoding_to
 
       # Add a BOM for utf8 encodings, helps with utf8 auto-detect for some versions of Excel.
       # Don't add if utf8 but user don't want to touch input encoding:
@@ -61,12 +64,8 @@ module RailsAdmin
 
   private
 
-    def association_for(key)
-      export_fields_for(key).detect(&:association?)
-    end
-
-    def export_fields_for(method, model_config = @model_config)
-      model_config.export.fields.select { |f| f.name == method }
+    def export_field_for(method, model_config = @model_config)
+      model_config.export.fields.detect { |f| f.name == method }
     end
 
     def generate_csv_string(options)

data/lib/rails_admin/support/datetime.rb

@@ -1,98 +1,64 @@
-require 'rails_admin/support/i18n'
-
 module RailsAdmin
   module Support
     class Datetime
       # Ruby format options as a key and momentjs format options as a value
       MOMENTJS_TRANSLATIONS = {
-        '%a' => 'ddd',        # The abbreviated weekday name ("Sun")
         '%A' => 'dddd',       # The  full  weekday  name ("Sunday")
-        '%b' => 'MMM',        # The abbreviated month name ("Jan")
+        '%a' => 'ddd',        # The abbreviated weekday name ("Sun")
         '%B' => 'MMMM',       # The  full  month  name ("January")
+        '%b' => 'MMM',        # The abbreviated month name ("Jan")
+        '%D' => 'MM/DD/YY',   # American date format mm/dd/yy
         '%d' => 'DD',         # Day of the month (01..31)
         '%-d' => 'D',         # Day of the month (1..31)
-        '%D' => 'MM/DD/YY',   # American date format mm/dd/yy
-        '%e' => 'D',          # Day of the month (1..31)
-        '%F' => 'YY-MM-DD',   # ISO 8601 date format
+        '%F' => 'YYYY-MM-DD', # ISO 8601 date format
+        '%G' => 'GGGG',       # ISO Week Year (2020)
+        '%g' => 'GG',         # ISO Week Year (20)
         '%H' => 'HH',         # Hour of the day, 24-hour clock (00..23)
+        '%-H' => 'H',         # Hour of the day, 24-hour clock (0..23)
+        '%h' => 'MMM',        # Same as %b
         '%I' => 'hh',         # Hour of the day, 12-hour clock (01..12)
+        '%-I' => 'h',         # Hour of the day, 12-hour clock (1..12)
+        '%j' => 'DDDD',       # Day of Year (001..366)
+        '%L' => 'SSS',        # Millisecond of the second (000..999)
+        '%M' => 'mm',         # Minute of the hour (00..59)
+        '%-M' => 'm',         # Minute of the hour (0..59)
         '%m' => 'MM',         # Month of the year (01..12)
         '%-m' => 'M',         # Month of the year (1..12)
-        '%M' => 'mm',         # Minute of the hour (00..59)
+        '%N' => 'SSSSSSSSS',  # Fractional seconds 9 digits
+        '%9N' => 'SSSSSSSSS', # Fractional seconds 9 digits
+        '%6N' => 'SSSSSS',    # Fractional seconds 6 digits
+        '%3N' => 'SSS',       # Fractional seconds 3 digits
+        '%P' => 'a',          # Meridian indicator ('am' or 'pm')
         '%p' => 'A',          # Meridian indicator ('AM' or 'PM')
+        '%Q' => 'x',          # Number of milliseconds since 1970-01-01 00:00:00 UTC.
+        '%R' => 'HH:mm',      # 24-hour time (%H:%M)
+        '%r' => 'hh:mm:ss A', # 12-hour time (%I:%M:%S %p)
         '%S' => 'ss',         # Second of the minute (00..60)
+        '%-S' => 's',         # Second of the minute (0..60)
+        '%s' => 'X',          # Number of seconds since 1970-01-01 00:00:00 UTC.
+        '%T' => 'HH:mm:ss',   # 24-hour time (%H:%M:%S)
+        '%U' => 'ww',         # Week number of the year.  The week starts with Sunday.  (00..53)
+        '%u' => 'E',          # Day of the week (Monday is 1, 1..7)
+        '%W' => 'WW',         # Week number of the year.  The week starts with Monday.  (00..53)
+        '%w' => 'e',          # Day of the week (Sunday is 0, 0..6)
+        '%X' => 'HH:mm:ss',   # Same as %T
+        '%x' => 'MM/DD/YY',   # Same as %D
         '%Y' => 'YYYY',       # Year with century
         '%y' => 'YY',         # Year without a century (00..99)
+        '%Z' => 'Z',          # Equivalent to %:z (e.g. +09:00)
+        '%z' => 'ZZ',         # Time zone as hour and minute offset from UTC (e.g. +0900)
+        '%:z' => 'Z',         # Time zone as hour and minute offset from UTC with a colon (e.g. +09:00),
+        '%%' => '%',
       }.freeze
 
       class << self
-        include RailsAdmin::Support::I18n
-
-        def delocalize(date_string, format)
-          return date_string if ::I18n.locale.to_s == 'en'
-          format.to_s.scan(/%[AaBbp]/) do |match|
-            case match
-            when '%A'
-              english = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
-              day_names.each_with_index { |d, i| date_string = date_string.gsub(/#{d}/, english[i]) }
-            when '%a'
-              english = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
-              abbr_day_names.each_with_index { |d, i| date_string = date_string.gsub(/#{d}/, english[i]) }
-            when '%B'
-              english = [nil, "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"][1..-1]
-              month_names.each_with_index { |m, i| date_string = date_string.gsub(/#{m}/, english[i]) }
-            when '%b'
-              english = [nil, "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"][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
+        def to_momentjs(strftime_format)
+          strftime_format.gsub(/(?<!%)(?<![-0-9:])\w+/, '[\0]').gsub(/%([-0-9:]?\w)/) do |match|
+            MOMENTJS_TRANSLATIONS[match] or raise <<-MSG.gsub(/^\s{14}/, '')
+              Unsupported strftime directive '#{match}' was found. Please consider explicitly setting momentjs_format instance option for the field.
+                field(:name_of_field) { momentjs_format '...' }
+            MSG
           end
-          date_string
-        end
-
-        def normalize(date_string, format)
-          return unless date_string
-          delocalize(date_string, format)
-          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
-      end
-
-      attr_reader :strftime_format
-
-      def initialize(strftime_format)
-        @strftime_format = strftime_format
-      end
-
-      # Ruby to javascript formatting options translator
-      def to_momentjs
-        strftime_format.gsub(/\w[^.(!?%)\W]{1,}/, '[\0]').gsub(/%(\w|\-\w)/) do |match|
-          MOMENTJS_TRANSLATIONS[match]
-        end
-      end
-
-      # Delocalize a l10n datetime strings
-      def delocalize(value)
-        self.class.delocalize(value, strftime_format)
-      end
-
-      def parse_string(value)
-        return if value.blank?
-        return value if %w(DateTime Date Time).include?(value.class.name)
-        return if (delocalized_value = delocalize(value)).blank?
-
-        begin
-          # Adjust with the correct timezone and daylight savint time
-          datetime_with_wrong_tz = ::DateTime.strptime(delocalized_value, strftime_format.gsub('%-d', '%d'))
-          Time.zone.parse(datetime_with_wrong_tz.strftime('%Y-%m-%d %H:%M:%S'))
-        rescue ArgumentError
-          nil
         end
       end
     end

data/lib/rails_admin/support/esmodule_preprocessor.rb

@@ -0,0 +1,32 @@
+module RailsAdmin
+  class ESModulePreprocessor
+    def self.instance
+      @instance ||= new
+    end
+
+    def self.call(input)
+      instance.call(input)
+    end
+
+    def initialize; end
+
+    def call(input)
+      data = input[:data]
+
+      # only process files under rails_admin/src
+      if input[:filename].start_with? RailsAdmin::Engine.root.join('src').to_s
+        data.gsub!(/^(import .+)$/) { "// #{Regexp.last_match(1)}" }
+        data.gsub!(/^(export +default +{)$/) do
+          case File.basename(input[:filename])
+          when 'i18n.js'
+            "/* #{Regexp.last_match(1)} */ window.I18n = {"
+          else
+            raise "Unable to preprocess file: #{input[:filename]}"
+          end
+        end
+      end
+
+      {data: data}
+    end
+  end
+end

data/lib/rails_admin/support/hash_helper.rb

@@ -13,11 +13,12 @@ module RailsAdmin
       when Hash
         obj.each_with_object({}) do |(key, val), res|
           nkey = key.is_a?(String) ? key.to_sym : key
-          nval = case val
-                 when Hash, Array then symbolize(val)
-                 when String      then val.to_sym
-                 else val
-                 end
+          nval =
+            case val
+            when Hash, Array then symbolize(val)
+            when String      then val.to_sym
+            else val
+            end
           res[nkey] = nval
         end
       else

data/lib/rails_admin/version.rb

@@ -1,15 +1,19 @@
 module RailsAdmin
   class Version
-    MAJOR = 2
-    MINOR = 1
+    MAJOR = 3
+    MINOR = 0
     PATCH = 0
-    PRE = nil
+    PRE = 'beta'.freeze
 
     class << self
       # @return [String]
       def to_s
         [MAJOR, MINOR, PATCH, PRE].compact.join('.')
       end
+
+      def js
+        JSON.parse(File.read("#{__dir__}/../../package.json"))['version']
+      end
     end
   end
 end

data/lib/rails_admin.rb

@@ -5,7 +5,6 @@ require 'rails_admin/extension'
 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/hash_helper'
 require 'yaml'
@@ -28,7 +27,7 @@ module RailsAdmin
     if entity
       RailsAdmin::Config.model(entity, &block)
     elsif block_given?
-      block.call(RailsAdmin::Config)
+      RailsAdmin::Config.apply(&block)
     else
       RailsAdmin::Config
     end
@@ -56,5 +55,3 @@ module RailsAdmin
     YAML.dump(object)
   end
 end
-
-require 'rails_admin/bootstrap-sass' unless defined? Bootstrap

data/lib/tasks/rails_admin.rake

@@ -9,10 +9,10 @@ namespace :rails_admin do
     system 'rails g rails_admin:uninstall'
   end
 
-  desc 'CI env for Travis'
+  desc 'CI env for GitHub Actions'
   task :prepare_ci_env do
     adapter = ENV['CI_DB_ADAPTER'] || 'sqlite3'
-    database = ('sqlite3' == adapter ? 'db/development.sqlite3' : 'ci_rails_admin')
+    database = (adapter == 'sqlite3' ? 'db/development.sqlite3' : 'ci_rails_admin')
     username =
       case adapter
       when 'postgresql'
@@ -28,7 +28,7 @@ namespace :rails_admin do
         'adapter' => adapter,
         'database' => database,
         'username' => username,
-        'password' => ('postgresql' == adapter ? 'postgres' : ''),
+        'password' => (adapter == 'postgresql' ? 'postgres' : ''),
         'host' => '127.0.0.1',
         'encoding' => 'utf8',
         'pool' => 5,

data/package.json

@@ -0,0 +1,28 @@
+{
+  "name": "rails_admin",
+  "version": "3.0.0-beta",
+  "description": "RailsAdmin is a Rails engine that provides an easy-to-use interface for managing your data.",
+  "homepage": "https://github.com/railsadminteam/rails_admin",
+  "license": "MIT",
+  "author": "Mitsuhiro Shibuya <mit.shibuya@gmail.com>",
+  "files": [
+    "src"
+  ],
+  "main": "src/rails_admin/base.js",
+  "scripts": {
+    "link": "yarn link && cd spec/dummy_app && yarn link rails_admin",
+    "format": "prettier -w ."
+  },
+  "dependencies": {
+    "@fortawesome/fontawesome-free": "^5.15.4",
+    "@rails/ujs": "^6.1.4-1",
+    "bootstrap-sass": "3.4.1",
+    "eonasdan-bootstrap-datetimepicker": "^4.17.49",
+    "jquery": "^3.6.0",
+    "jquery-ui": "^1.12.1",
+    "moment": "^2.29.1"
+  },
+  "devDependencies": {
+    "prettier": "^2.4.1"
+  }
+}

data/src/rails_admin/base.js

@@ -0,0 +1,21 @@
+import Rails from "@rails/ujs";
+import jQuery from "jquery";
+import moment from "moment";
+import "./vendor/jquery.pjax";
+import "./vendor/jquery_nested_form";
+import "bootstrap-sass";
+import "moment/min/locales.js";
+import "eonasdan-bootstrap-datetimepicker";
+
+import "./filter-box";
+import "./filtering-multiselect";
+import "./filtering-select";
+import "./nested-form-hooks";
+import "./remote-form";
+import "./sidescroll";
+import "./ui";
+import "./widgets";
+
+Rails.start();
+window.$ = window.jQuery = jQuery;
+window.moment = moment;