rails_admin 0.6.5 → 0.6.6

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

@@ -1,6 +1,6 @@
 - @model_config.show.with(object: @object, view: self, controller: self.controller).visible_groups.each do |fieldset|
   - unless (fields = fieldset.with(object: @object, view: self, controller: self.controller).visible_fields).empty?
-    - if !(values = fields.map{ |f| f.value.presence }).compact.empty? || !RailsAdmin::config.compact_show_view
+    - if !(values = fields.map{ |f| f.formatted_value.presence }).compact.empty? || !RailsAdmin::config.compact_show_view
       .fieldset
         %h4
           = fieldset.label

data/lib/rails_admin/adapters/active_record.rb

@@ -56,8 +56,8 @@ module RailsAdmin
       def properties
         columns = model.columns.reject do |c|
           c.type.blank? ||
-            DISABLED_COLUMN_TYPES.include?(c.type.to_sym) ||
-            c.try(:array)
+          DISABLED_COLUMN_TYPES.include?(c.type.to_sym) ||
+          c.try(:array)
         end
         columns.collect do |property|
           Property.new(property, model)

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

@@ -71,7 +71,7 @@ module RailsAdmin
 
         def object_field_type
           if [:belongs_to, :referenced_in, :embedded_in].
-            include?(model.relations.values.detect { |r| r.foreign_key.try(:to_sym) == name }.try(:macro).try(:to_sym))
+             include?(model.relations.values.detect { |r| r.foreign_key.try(:to_sym) == name }.try(:macro).try(:to_sym))
             :bson_object_id
           else
             :string

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

@@ -14,7 +14,6 @@ module RailsAdmin
 
         register_instance_option :controller do
           proc do
-
             if request.post? # BULK DELETE
 
               @objects = list_entries(@model_config, :destroy)

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

@@ -14,7 +14,6 @@ module RailsAdmin
 
         register_instance_option :controller do
           proc do
-
             if request.get? # EDIT
 
               respond_to do |format|
@@ -41,7 +40,6 @@ module RailsAdmin
               end
 
             end
-
           end
         end
 

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

@@ -14,7 +14,6 @@ module RailsAdmin
 
         register_instance_option :controller do
           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.
@@ -23,7 +22,6 @@ module RailsAdmin
             else
               render @action.template_name
             end
-
           end
         end
 

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

@@ -40,7 +40,6 @@ module RailsAdmin
             end
 
             respond_to do |format|
-
               format.html do
                 render @action.template_name, status: (flash[:error].present? ? :not_found : 200)
               end
@@ -81,9 +80,7 @@ module RailsAdmin
                   render text: output
                 end
               end
-
             end
-
           end
         end
 

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

@@ -13,9 +13,7 @@ module RailsAdmin
         end
 
         register_instance_option :controller do
-
           proc do
-
             if request.get? # NEW
 
               @object = @abstract_model.new

data/lib/rails_admin/config/configurable.rb

@@ -29,7 +29,7 @@ module RailsAdmin
         # accessed by an instance method. Both go by the name of the option.
         def register_instance_option(option_name, scope = self, &default)
           options = scope.instance_variable_get('@config_options') ||
-                      scope.instance_variable_set('@config_options', {})
+                    scope.instance_variable_set('@config_options', {})
 
           option_name = option_name.to_s
           options[option_name] = nil

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

@@ -266,6 +266,15 @@ module RailsAdmin
         # Reader for field's value
         def value
           bindings[:object].safe_send(name)
+        rescue NoMethodError => e
+          raise e.exception <<-EOM.gsub(/^\s{10}/, '')
+          #{e.message}
+          If you want to use a RailsAdmin virtual field(= a field without corresponding instance method),
+          you should declare 'formatted_value' in the field definition.
+            field :#{name} do
+              formatted_value{ bindings[:object].call_some_method }
+            end
+          EOM
         end
 
         # Reader for nested attributes

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

@@ -2,14 +2,13 @@ require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/types/enum'
 
 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.
   if !Object.respond_to?(method_name) && \
-      (model.respond_to?(method_name) || \
-          model.method_defined?(method_name))
+     (model.respond_to?(method_name) || \
+         model.method_defined?(method_name))
     fields << RailsAdmin::Config::Fields::Types::Enum.new(parent, properties.name, properties)
     true
   else

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

@@ -19,6 +19,10 @@ module RailsAdmin
             associated_model_config.length > 0
           end
 
+          register_instance_option :formatted_value do
+            (o = value) && o.send(RailsAdmin.config(o).object_label_method)
+          end
+
           register_instance_option :sortable do
             false
           end

data/lib/rails_admin/config/model.rb

@@ -44,7 +44,8 @@ module RailsAdmin
       end
 
       def object_label
-        bindings[:object].send object_label_method
+        bindings[:object].send(object_label_method).presence ||
+          bindings[:object].send(:rails_admin_default_object_label_method)
       end
 
       # The display for a model instance (i.e. a single database record).

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

@@ -107,8 +107,8 @@ module RailsAdmin
 
         def version_class_for(model_name)
           klass = model_name.constantize.
-            try(:version_class_name).
-            try(:constantize)
+                  try(:version_class_name).
+                  try(:constantize)
 
           klass || @version_class
         end

data/lib/rails_admin/support/csv_converter.rb

@@ -1,12 +1,10 @@
 # encoding: UTF-8
-require RUBY_VERSION < '1.9' ? 'fastercsv' : 'csv'
+require 'csv'
 
 module RailsAdmin
-  CSV_CLASS = RUBY_VERSION < '1.9' ? ::FasterCSV : ::CSV
-  NON_ASCII_ENCODINGS = /(UTF\-16)|(UTF\-32)|(EUC\-JP)|(ISO\-2022\-JP)|(Shift_JIS)|(Big5\-HKSCS)|(UTF\-7)/
-  UTF8_ENCODINGS = [nil, '', 'utf8', 'utf-8', 'unicode', 'UTF8', 'UTF-8', 'UNICODE']
-
   class CSVConverter
+    UTF8_ENCODINGS = [nil, '', 'utf8', 'utf-8', 'unicode', 'UTF8', 'UTF-8', 'UNICODE']
+    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?
 
@@ -37,33 +35,23 @@ module RailsAdmin
 
     def to_csv(options = {})
       # encoding shenanigans first
-      @encoding_from = UTF8_ENCODINGS.include?(@abstract_model.encoding) ? 'UTF-8' : @abstract_model.encoding
-
-      @encoding_to = options[:encoding_to].presence || @encoding_from
+      @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)
 
       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: '?')
+      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] == 'UTF-8'
-        csv_string = csv_string.force_encoding('UTF-8') if csv_string.respond_to?(:force_encoding)
+      if options[:encoding_to].present? && @encoding_to == Encoding::UTF_8
         csv_string = "\xEF\xBB\xBF#{csv_string}"
       end
-      # global conversion for non ASCII encodings
-      if @encoding_to =~ NON_ASCII_ENCODINGS && @encoding_to != @encoding_from
-        require 'iconv'
-        begin
-          if @iconv = Iconv.new("#{@encoding_to}//TRANSLIT//IGNORE", @encoding_from)
-            csv_string = @iconv.iconv(csv_string) rescue csv_string
-          end
-        rescue
-          Rails.logger.error("Iconv cannot convert to #{@encoding_to}: #{$ERROR_INFO}\nNo conversion will take place")
-        end
-      end
-      [!options[:skip_header], @encoding_to, csv_string]
+      [!options[:skip_header], @encoding_to.to_s, csv_string]
     end
 
   private
@@ -78,7 +66,7 @@ module RailsAdmin
 
     def generate_csv_string(options)
       generator_options = (options[:generator] || {}).symbolize_keys.delete_if { |_, value| value.blank? }
-      CSV_CLASS.generate(generator_options) do |csv|
+      CSV.generate(generator_options) do |csv|
         csv << generate_csv_header unless options[:skip_header]
 
         method = @objects.respond_to?(:find_each) ? :find_each : :each
@@ -90,33 +78,25 @@ module RailsAdmin
 
     def generate_csv_header
       @fields.collect do |field|
-        output(::I18n.t('admin.export.csv.header_for_root_methods', name: field.label, model: @abstract_model.pretty_name))
+        ::I18n.t('admin.export.csv.header_for_root_methods', name: field.label, model: @abstract_model.pretty_name)
       end +
-      @associations.flat_map do |_association_name, option_hash|
-        option_hash[:fields].collect do |field|
-          output(::I18n.t('admin.export.csv.header_for_association_methods', name: field.label, association: option_hash[:association].label))
+        @associations.flat_map do |_association_name, option_hash|
+          option_hash[:fields].collect do |field|
+            ::I18n.t('admin.export.csv.header_for_association_methods', name: field.label, association: option_hash[:association].label)
+          end
         end
-      end
     end
 
     def generate_csv_row(object)
       @fields.collect do |field|
-        output(field.with(object: object).export_value)
+        field.with(object: object).export_value
       end +
-      @associations.flat_map do |association_name, option_hash|
-        associated_objects = [object.send(association_name)].flatten.compact
-        option_hash[:fields].collect do |field|
-          output(associated_objects.collect { |ao| field.with(object: ao).export_value.presence || @empty }.join(','))
+        @associations.flat_map do |association_name, option_hash|
+          associated_objects = [object.send(association_name)].flatten.compact
+          option_hash[:fields].collect do |field|
+            associated_objects.collect { |ao| field.with(object: ao).export_value.presence || @empty }.join(',')
+          end
         end
-      end
-    end
-
-    def output(str)
-      # Can't use the CSV generator with encodings that are not supersets of ASCII-7
-      return str.to_s if @encoding_to =~ NON_ASCII_ENCODINGS || !@iconv
-
-      # Convert piece by piece
-      @iconv.iconv(str.to_s) rescue str.to_s
     end
   end
 end

data/lib/rails_admin/version.rb

@@ -2,7 +2,7 @@ module RailsAdmin
   class Version
     MAJOR = 0
     MINOR = 6
-    PATCH = 5
+    PATCH = 6
     PRE = nil
 
     class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -79,16 +79,22 @@ dependencies:
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
@@ -191,16 +197,22 @@ dependencies:
   name: sass-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::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -314,8 +326,8 @@ files:
 - app/assets/stylesheets/rails_admin/base/mixins.scss
 - app/assets/stylesheets/rails_admin/base/theming.scss
 - app/assets/stylesheets/rails_admin/base/variables.scss
-- app/assets/stylesheets/rails_admin/bootstrap/_accordion.scss
 - app/assets/stylesheets/rails_admin/bootstrap/_alerts.scss
+- app/assets/stylesheets/rails_admin/bootstrap/_badges.scss
 - app/assets/stylesheets/rails_admin/bootstrap/_breadcrumbs.scss
 - app/assets/stylesheets/rails_admin/bootstrap/_button-groups.scss
 - app/assets/stylesheets/rails_admin/bootstrap/_buttons.scss
@@ -325,28 +337,29 @@ files:
 - app/assets/stylesheets/rails_admin/bootstrap/_component-animations.scss
 - app/assets/stylesheets/rails_admin/bootstrap/_dropdowns.scss
 - app/assets/stylesheets/rails_admin/bootstrap/_forms.scss
+- app/assets/stylesheets/rails_admin/bootstrap/_glyphicons.scss
 - app/assets/stylesheets/rails_admin/bootstrap/_grid.scss
-- app/assets/stylesheets/rails_admin/bootstrap/_hero-unit.scss
-- app/assets/stylesheets/rails_admin/bootstrap/_labels-badges.scss
-- app/assets/stylesheets/rails_admin/bootstrap/_layouts.scss
+- app/assets/stylesheets/rails_admin/bootstrap/_input-groups.scss
+- app/assets/stylesheets/rails_admin/bootstrap/_jumbotron.scss
+- app/assets/stylesheets/rails_admin/bootstrap/_labels.scss
+- app/assets/stylesheets/rails_admin/bootstrap/_list-group.scss
 - app/assets/stylesheets/rails_admin/bootstrap/_media.scss
 - app/assets/stylesheets/rails_admin/bootstrap/_mixins.scss
 - app/assets/stylesheets/rails_admin/bootstrap/_modals.scss
 - app/assets/stylesheets/rails_admin/bootstrap/_navbar.scss
 - app/assets/stylesheets/rails_admin/bootstrap/_navs.scss
+- app/assets/stylesheets/rails_admin/bootstrap/_normalize.scss
 - app/assets/stylesheets/rails_admin/bootstrap/_pager.scss
 - app/assets/stylesheets/rails_admin/bootstrap/_pagination.scss
+- app/assets/stylesheets/rails_admin/bootstrap/_panels.scss
 - app/assets/stylesheets/rails_admin/bootstrap/_popovers.scss
+- app/assets/stylesheets/rails_admin/bootstrap/_print.scss
 - app/assets/stylesheets/rails_admin/bootstrap/_progress-bars.scss
-- app/assets/stylesheets/rails_admin/bootstrap/_reset.scss
-- app/assets/stylesheets/rails_admin/bootstrap/_responsive-1200px-min.scss
-- app/assets/stylesheets/rails_admin/bootstrap/_responsive-767px-max.scss
-- app/assets/stylesheets/rails_admin/bootstrap/_responsive-768px-979px.scss
-- app/assets/stylesheets/rails_admin/bootstrap/_responsive-navbar.scss
+- app/assets/stylesheets/rails_admin/bootstrap/_responsive-embed.scss
 - app/assets/stylesheets/rails_admin/bootstrap/_responsive-utilities.scss
 - app/assets/stylesheets/rails_admin/bootstrap/_scaffolding.scss
-- app/assets/stylesheets/rails_admin/bootstrap/_sprites.scss
 - app/assets/stylesheets/rails_admin/bootstrap/_tables.scss
+- app/assets/stylesheets/rails_admin/bootstrap/_theme.scss
 - app/assets/stylesheets/rails_admin/bootstrap/_thumbnails.scss
 - app/assets/stylesheets/rails_admin/bootstrap/_tooltip.scss
 - app/assets/stylesheets/rails_admin/bootstrap/_type.scss
@@ -354,7 +367,35 @@ files:
 - app/assets/stylesheets/rails_admin/bootstrap/_variables.scss
 - app/assets/stylesheets/rails_admin/bootstrap/_wells.scss
 - app/assets/stylesheets/rails_admin/bootstrap/bootstrap.scss
-- app/assets/stylesheets/rails_admin/bootstrap/responsive.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_alerts.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_background-variant.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_border-radius.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_buttons.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_center-block.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_clearfix.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_forms.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_gradients.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_grid-framework.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_grid.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_hide-text.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_image.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_labels.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_list-group.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_nav-divider.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_nav-vertical-align.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_opacity.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_pagination.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_panels.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_progress-bar.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_reset-filter.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_resize.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_responsive-visibility.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_size.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_tab-focus.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_table-row.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_text-emphasis.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_text-overflow.scss
+- app/assets/stylesheets/rails_admin/bootstrap/mixins/_vendor-prefixes.scss
 - app/assets/stylesheets/rails_admin/custom/mixins.scss
 - app/assets/stylesheets/rails_admin/custom/theming.scss
 - app/assets/stylesheets/rails_admin/custom/variables.scss
@@ -546,7 +587,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Admin for Rails