rails_admin 0.8.1 → 1.0.0.rc

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 = HashHelper.symbolize(params[:schema]) if params[:schema] # to_json and to_xml expect symbols for keys AND values.
+              @schema = HashHelper.symbolize(params[:schema].slice(:except, :include, :methods, :only).permit!.to_h) 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/actions/index.rb

@@ -71,13 +71,17 @@ module RailsAdmin
               end
 
               format.csv do
-                header, encoding, output = CSVConverter.new(@objects, @schema).to_csv(params[:csv_options])
+                header, encoding, output = CSVConverter.new(@objects, @schema).to_csv(params[:csv_options].permit!.to_h)
                 if params[:send_data]
                   send_data output,
                             type: "text/csv; charset=#{encoding}; #{'header=present' if header}",
                             disposition: "attachment; filename=#{params[:model_name]}_#{DateTime.now.strftime('%Y-%m-%d_%Hh%Mm%S')}.csv"
                 else
-                  render text: output
+                  if Rails.version.to_s >= '5'
+                    render plain: output
+                  else
+                    render text: output
+                  end
                 end
               end
             end

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

@@ -21,7 +21,8 @@ module RailsAdmin
                 @object.send("#{name}=", value)
               end
               if object_params = params[@abstract_model.to_param]
-                @object.set_attributes(@object.attributes.merge(object_params))
+                sanitize_params_for!(request.xhr? ? :modal : :create)
+                @object.set_attributes(@object.attributes.merge(object_params.to_h))
               end
               respond_to do |format|
                 format.html { render @action.template_name }

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

@@ -54,7 +54,7 @@ module RailsAdmin
         # preload entire associated collection (per associated_collection_scope) on load
         # Be sure to set limit in associated_collection_scope if set is large
         register_instance_option :associated_collection_cache_all do
-          @associated_collection_cache_all ||= (associated_model_config.abstract_model.count < 100)
+          @associated_collection_cache_all ||= (associated_model_config.abstract_model.count < associated_model_limit)
         end
 
         # determines whether association's elements can be removed
@@ -105,6 +105,10 @@ module RailsAdmin
         def virtual?
           true
         end
+
+        def associated_model_limit
+          RailsAdmin.config.default_associated_collection_limit
+        end
       end
     end
   end

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

@@ -34,6 +34,10 @@ module RailsAdmin
           def parse_input(params)
             params[name] = parse_value(params[name]) if params[name]
           end
+
+          def form_value
+            ::Rails.version >= '5' ? enum[super] : super
+          end
         end
       end
     end

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

@@ -8,14 +8,6 @@ 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 == ''
@@ -35,13 +27,7 @@ module RailsAdmin
           end
 
           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
+            value.present? ? abstract_model.parse_object_id(value) : nil
           end
 
           def parse_input(params)

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

@@ -38,8 +38,11 @@ module RailsAdmin
           end
 
           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
+            begin
+              ::I18n.t(date_format, scope: i18n_scope, raise: true)
+            rescue ::I18n::ArgumentError
+              "%B %d, %Y %H:%M"
+            end
           end
 
           register_instance_option :datepicker_options do

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

@@ -42,7 +42,7 @@ module RailsAdmin
           end
 
           register_instance_option :image? do
-            (url = resource_url.to_s) && url.split('.').last =~ /jpg|jpeg|png|gif/i
+            (url = resource_url.to_s) && url.split('.').last =~ /jpg|jpeg|png|gif|svg/i
           end
 
           register_instance_option :allowed_methods do

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

@@ -9,11 +9,11 @@ module RailsAdmin
           RailsAdmin::Config::Fields::Types.register(self)
 
           register_instance_option :formatted_value do
-            YAML.dump(value) unless value.nil?
+            RailsAdmin.yaml_dump(value) unless value.nil?
           end
 
           def parse_value(value)
-            value.present? ? (SafeYAML.load(value) || nil) : nil
+            value.present? ? (RailsAdmin.yaml_load(value) || nil) : nil
           end
 
           def parse_input(params)

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

@@ -16,11 +16,11 @@ module RailsAdmin
           end
 
           register_instance_option :css_location do
-            ActionController::Base.helpers.asset_path('bootstrap-wysihtml5.css')
+            ActionController::Base.helpers.asset_path('bootstrap-wysihtml5/index.css')
           end
 
           register_instance_option :js_location do
-            ActionController::Base.helpers.asset_path('bootstrap-wysihtml5.js')
+            ActionController::Base.helpers.asset_path('bootstrap-wysihtml5/index.js')
           end
 
           register_instance_option :partial do

data/lib/rails_admin/config/lazy_model.rb

@@ -5,13 +5,53 @@ module RailsAdmin
     class LazyModel < BasicObject
       def initialize(entity, &block)
         @entity = entity
-        @deferred_block = block
+        @deferred_blocks = [*block]
+        @existing_blocks = []
+      end
+
+      def add_deferred_block(&block)
+        @deferred_blocks << block
       end
 
       def target
-        unless @model
-          @model = ::RailsAdmin::Config::Model.new(@entity)
-          @model.instance_eval(&@deferred_block) if @deferred_block
+        @model ||= ::RailsAdmin::Config::Model.new(@entity)
+        # When evaluating multiple configuration blocks, the order of
+        # execution is important. As one would expect (in my opinion),
+        # options defined within a resource should take precedence over
+        # more general options defined in an initializer. This way,
+        # general settings for a number of resources could be specified
+        # in the initializer, while models could override these settings
+        # later, if required.
+        #
+        # CAVEAT: It cannot be guaranteed that blocks defined in an initializer
+        # will be loaded (and adde to @deferred_blocks) first. For instance, if
+        # the initializer references a model class before defining
+        # a RailsAdmin configuration block, the configuration from the
+        # resource will get added to @deferred_blocks first:
+        #
+        #     # app/models/some_model.rb
+        #     class SomeModel
+        #       rails_admin do
+        #         :
+        #       end
+        #     end
+        #
+        #     # config/initializers/rails_admin.rb
+        #     model = 'SomeModel'.constantize # blocks from SomeModel get loaded
+        #     model.config model do           # blocks from initializer gets loaded
+        #       :
+        #     end
+        #
+        # Thus, sort all blocks to excute for a resource by Proc.source_path,
+        # to guarantee that blocks from 'config/initializers' evaluate before
+        # blocks defined within a model class.
+        unless @deferred_blocks.empty?
+          @existing_blocks += @deferred_blocks
+          @existing_blocks.
+            partition { |block| block.source_location.first =~ %r{config\/initializers} }.
+            flatten.
+            each { |block| @model.instance_eval(&block) }
+          @deferred_blocks = []
         end
         @model
       end

data/lib/rails_admin/config/model.rb

@@ -61,7 +61,7 @@ module RailsAdmin
       end
 
       register_instance_option :label_plural do
-        (@label_plural ||= {})[::I18n.locale] ||= abstract_model.model.model_name.human(count: Float::INFINITY, default: label.pluralize)
+        (@label_plural ||= {})[::I18n.locale] ||= abstract_model.model.model_name.human(count: Float::INFINITY, default: label.pluralize(::I18n.locale))
       end
 
       def pluralize(count)

data/lib/rails_admin/engine.rb

@@ -7,7 +7,6 @@ require 'rack-pjax'
 require 'rails'
 require 'rails_admin'
 require 'remotipart'
-require 'safe_yaml/load'
 
 module RailsAdmin
   class Engine < Rails::Engine

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

@@ -41,6 +41,7 @@ module RailsAdmin
         def initialize(controller, user_class = 'User', version_class = '::Version')
           fail('PaperTrail not found') unless defined?(PaperTrail)
           @controller = controller
+          @controller.send(:set_paper_trail_whodunnit) if @controller
           begin
             @user_class = user_class.to_s.constantize
           rescue NameError
@@ -97,7 +98,7 @@ module RailsAdmin
           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)
-          paginated_proxies = Kaminari.paginate_array([], total_count: versions.total_count)
+          paginated_proxies = Kaminari.paginate_array([], total_count: versions.try(:total_count) || versions.count)
           paginated_proxies = paginated_proxies.page(current_page).per(per_page)
           versions.each do |version|
             paginated_proxies << VersionProxy.new(version, @user_class)

data/lib/rails_admin/support/csv_converter.rb

@@ -3,8 +3,6 @@ require 'csv'
 
 module RailsAdmin
   class CSVConverter
-    UTF8_ENCODINGS = [nil, '', 'utf8', 'utf-8', 'unicode', 'UTF8', 'UTF-8', 'UNICODE', 'utf8mb4']
-    TARGET_ENCODINGS = %w(UTF-8 UTF-16LE UTF-16BE UTF-32LE UTF-32BE UTF-7 ISO-8859-1 ISO-8859-15 IBM850 MacRoman Windows-1252 ISO-8859-3 IBM852 ISO-8859-2 Windows-1250 IBM855 ISO-8859-5 KOI8-R MacCyrillic Windows-1251 IBM866 GB2312 GBK GB18030 Big5 Big5-HKSCS EUC-TW EUC-JP ISO-2022-JP Shift_JIS EUC-KR)
     def initialize(objects = [], schema = {})
       return self if (@objects = objects).blank?
 
@@ -34,24 +32,21 @@ module RailsAdmin
     end
 
     def to_csv(options = {})
-      # encoding shenanigans first
-      @encoding_from = Encoding.find(UTF8_ENCODINGS.include?(@abstract_model.encoding) ? 'UTF-8' : @abstract_model.encoding)
-      @encoding_to = Encoding.find(options[:encoding_to].presence || @encoding_from)
+      encoding_to = Encoding.find(options[:encoding_to]) if options[:encoding_to].present?
 
       csv_string = generate_csv_string(options)
-
-      if @encoding_to != @encoding_from
-        csv_string = csv_string.encode(@encoding_to, @encoding_from, invalid: :replace, undef: :replace, replace: '?')
+      if encoding_to
+        csv_string = csv_string.encode(encoding_to, invalid: :replace, undef: :replace, replace: '?')
       end
+
       # 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:
       # If user chooses utf8, they will open it in utf8 and BOM will disappear at reading.
       # But that way "English" users who don't bother and chooses to let utf8 by default won't get BOM added
       # and will not see it if Excel opens the file with a different encoding.
-      if options[:encoding_to].present? && @encoding_to == Encoding::UTF_8
-        csv_string = "\xEF\xBB\xBF#{csv_string}"
-      end
-      [!options[:skip_header], @encoding_to.to_s, csv_string]
+      csv_string = "\xEF\xBB\xBF#{csv_string}" if encoding_to == Encoding::UTF_8
+
+      [!options[:skip_header], (encoding_to || csv_string.encoding).to_s, csv_string]
     end
 
   private
@@ -66,10 +61,11 @@ module RailsAdmin
 
     def generate_csv_string(options)
       generator_options = (options[:generator] || {}).symbolize_keys.delete_if { |_, value| value.blank? }
+      method = @objects.respond_to?(:find_each) ? :find_each : :each
+
       CSV.generate(generator_options) do |csv|
         csv << generate_csv_header unless options[:skip_header]
 
-        method = @objects.respond_to?(:find_each) ? :find_each : :each
         @objects.send(method) do |object|
           csv << generate_csv_row(object)
         end

data/lib/rails_admin/support/datetime.rb

@@ -10,6 +10,7 @@ module RailsAdmin
         '%b' => 'MMM',        # The abbreviated month name ("Jan")
         '%B' => 'MMMM',       # The  full  month  name ("January")
         '%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
@@ -32,16 +33,16 @@ module RailsAdmin
           format.to_s.scan(/%[AaBbp]/) do |match|
             case match
             when '%A'
-              english = ::I18n.t('date.day_names', locale: :en)
+              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 = ::I18n.t('date.abbr_day_names', locale: :en)
+              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 = ::I18n.t('date.month_names', locale: :en)[1..-1]
+              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 = ::I18n.t('date.abbr_month_names', locale: :en)[1..-1]
+              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')
@@ -88,7 +89,7 @@ module RailsAdmin
 
         begin
           # Adjust with the correct timezone and daylight savint time
-          datetime_with_wrong_tz = ::DateTime.strptime(delocalized_value, strftime_format)
+          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

data/lib/rails_admin/support/i18n.rb

@@ -6,33 +6,35 @@ module RailsAdmin
       def abbr_day_names
         ::I18n.t('date.abbr_day_names', raise: true)
       rescue ::I18n::ArgumentError
-        ::I18n.t('date.abbr_day_names', locale: :en)
+        ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
       end
 
       def abbr_month_names
         begin
           names = ::I18n.t('date.abbr_month_names', raise: true)
         rescue ::I18n::ArgumentError
-          names = ::I18n.t('date.abbr_month_names', locale: :en)
+          names = [nil, "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
         end
         names[1..-1]
       end
 
       def date_format
-        ::I18n.t('date.formats.default', default: ::I18n.t('date.formats.default', locale: :en))
+        ::I18n.t('date.formats.default', raise: true)
+      rescue
+        "%Y-%m-%d"
       end
 
       def day_names
         ::I18n.t('date.day_names', raise: true)
       rescue ::I18n::ArgumentError
-        ::I18n.t('date.day_names', locale: :en)
+        ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
       end
 
       def month_names
         begin
           names = ::I18n.t('date.month_names', raise: true)
         rescue ::I18n::ArgumentError
-          names = ::I18n.t('date.month_names', locale: :en)
+          names = [nil, "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]
         end
         names[1..-1]
       end

data/lib/rails_admin/version.rb

@@ -1,9 +1,9 @@
 module RailsAdmin
   class Version
-    MAJOR = 0
-    MINOR = 8
-    PATCH = 1
-    PRE = nil
+    MAJOR = 1
+    MINOR = 0
+    PATCH = 0
+    PRE = 'rc'
 
     class << self
       # @return [String]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 1.0.0.rc
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -142,46 +142,38 @@ dependencies:
   name: rack-pjax
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: remotipart
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '6'
 - !ruby/object:Gem::Dependency
-  name: safe_yaml
+  name: remotipart
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -303,7 +295,6 @@ files:
 - app/assets/javascripts/rails_admin/custom/ui.coffee
 - app/assets/javascripts/rails_admin/jquery.colorpicker.js
 - app/assets/javascripts/rails_admin/jquery.pjax.js
-- app/assets/javascripts/rails_admin/jquery.remotipart.fixed.js
 - app/assets/javascripts/rails_admin/ra.filter-box.js
 - app/assets/javascripts/rails_admin/ra.filtering-multiselect.js
 - app/assets/javascripts/rails_admin/ra.filtering-select.js
@@ -413,11 +404,11 @@ files:
 - app/helpers/rails_admin/application_helper.rb
 - app/helpers/rails_admin/form_builder.rb
 - app/helpers/rails_admin/main_helper.rb
-- app/views/kaminari/twitter-bootstrap/_gap.html.haml
-- app/views/kaminari/twitter-bootstrap/_next_page.html.haml
-- app/views/kaminari/twitter-bootstrap/_page.html.haml
-- app/views/kaminari/twitter-bootstrap/_paginator.html.haml
-- app/views/kaminari/twitter-bootstrap/_prev_page.html.haml
+- app/views/kaminari/ra-twitter-bootstrap/_gap.html.haml
+- app/views/kaminari/ra-twitter-bootstrap/_next_page.html.haml
+- app/views/kaminari/ra-twitter-bootstrap/_page.html.haml
+- app/views/kaminari/ra-twitter-bootstrap/_paginator.html.haml
+- app/views/kaminari/ra-twitter-bootstrap/_prev_page.html.haml
 - app/views/layouts/rails_admin/_navigation.html.haml
 - app/views/layouts/rails_admin/_secondary_navigation.html.haml
 - app/views/layouts/rails_admin/_sidebar_navigation.html.haml
@@ -469,6 +460,7 @@ files:
 - lib/rails_admin/adapters/mongoid.rb
 - lib/rails_admin/adapters/mongoid/abstract_object.rb
 - lib/rails_admin/adapters/mongoid/association.rb
+- lib/rails_admin/adapters/mongoid/bson.rb
 - lib/rails_admin/adapters/mongoid/extension.rb
 - lib/rails_admin/adapters/mongoid/property.rb
 - lib/rails_admin/bootstrap-sass.rb
@@ -591,15 +583,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: 1.8.11
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Admin for Rails