rails_admin 0.6.0 → 0.6.1

data/lib/rails_admin/support/core_extensions.rb

@@ -1,5 +1,4 @@
 class Hash
-
   def symbolize
     Hash.symbolize_hash(self)
   end
@@ -7,7 +6,7 @@ class Hash
   def self.symbolize_hash(obj)
     case obj
     when Array
-      obj.inject([]){|res, val|
+      obj.inject([])do|res, val|
         res << case val
         when Hash, Array
           symbolize_hash(val)
@@ -17,9 +16,9 @@ class Hash
           val
         end
         res
-      }
+      end
     when Hash
-      obj.inject({}){|res, (key, val)|
+      obj.inject({})do|res, (key, val)|
         nkey = case key
         when String
           key.to_sym
@@ -36,7 +35,7 @@ class Hash
         end
         res[nkey] = nval
         res
-      }
+      end
     else
       obj
     end

data/lib/rails_admin/support/csv_converter.rb

@@ -2,13 +2,11 @@
 require RUBY_VERSION < '1.9' ? 'fastercsv' : 'csv'
 
 module RailsAdmin
-
-  CSVClass = RUBY_VERSION < '1.9' ? ::FasterCSV : ::CSV
+  CSV_CLASS = RUBY_VERSION < '1.9' ? ::FasterCSV : ::CSV
   NON_ASCII_ENCODINGS = /(UTF\-16)|(UTF\-32)|(ISO\-2022\-JP)|(Big5\-HKSCS)|(UTF\-7)/
   UTF8_ENCODINGS = [nil, '', 'utf8', 'utf-8', 'unicode', 'UTF8', 'UTF-8', 'UNICODE']
 
   class CSVConverter
-
     def initialize(objects = [], schema = {})
       return self if (@objects = objects).blank?
 
@@ -16,22 +14,22 @@ module RailsAdmin
       @abstract_model = RailsAdmin::AbstractModel.new(@model)
       @model_config = @abstract_model.config
       @methods = [(schema[:only] || []) + (schema[:methods] || [])].flatten.compact
-      @fields = @methods.map {|m| export_fields_for(m).first }
+      @fields = @methods.collect { |m| export_fields_for(m).first }
       @empty = ::I18n.t('admin.export.empty_value_for_associated_objects')
       schema_include = schema.delete(:include) || {}
 
-      @associations = schema_include.reduce({}) do |hash, (key, values)|
+      @associations = schema_include.inject({}) do |hash, (key, values)|
         association = association_for(key)
         model_config = association.associated_model_config
         abstract_model = model_config.abstract_model
         methods = [(values[:only] || []) + (values[:methods] || [])].flatten.compact
 
         hash[key] = {
-          :association => association,
-          :model => abstract_model.model,
-          :abstract_model => abstract_model,
-          :model_config => model_config,
-          :fields => methods.map {|m| export_fields_for(m, model_config).first }
+          association: association,
+          model: abstract_model.model,
+          abstract_model: abstract_model,
+          model_config: model_config,
+          fields: methods.collect { |m| export_fields_for(m, model_config).first }
         }
         hash
       end
@@ -62,16 +60,16 @@ module RailsAdmin
             csv_string = @iconv.iconv(csv_string) rescue csv_string
           end
         rescue
-          Rails.logger.error("Iconv cannot convert to #{@encoding_to}: #{$!}\nNo conversion will take place")
+          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]
     end
 
-    private
+  private
 
     def association_for(key)
-      export_fields_for(key).find(&:association?)
+      export_fields_for(key).detect(&:association?)
     end
 
     def export_fields_for(method, model_config = @model_config)
@@ -79,8 +77,8 @@ module RailsAdmin
     end
 
     def generate_csv_string(options)
-      generator_options = (options[:generator] || {}).symbolize_keys.delete_if {|_, value| value.blank? }
-      CSVClass.generate(generator_options) do |csv|
+      generator_options = (options[:generator] || {}).symbolize_keys.delete_if { |_, value| value.blank? }
+      CSV_CLASS.generate(generator_options) do |csv|
         csv << generate_csv_header unless options[:skip_header]
 
         method = @objects.respond_to?(:find_each) ? :find_each : :each
@@ -91,24 +89,24 @@ module RailsAdmin
     end
 
     def generate_csv_header
-      @fields.map do |field|
-        output(::I18n.t('admin.export.csv.header_for_root_methods', :name => field.label, :model => @abstract_model.pretty_name))
+      @fields.collect do |field|
+        output(::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].map do |field|
-          output(::I18n.t('admin.export.csv.header_for_association_methods', :name => field.label, :association => option_hash[:association].label))
+        option_hash[:fields].collect do |field|
+          output(::I18n.t('admin.export.csv.header_for_association_methods', name: field.label, association: option_hash[:association].label))
         end
       end
     end
 
     def generate_csv_row(object)
-      @fields.map do |field|
-        output(field.with(:object => object).export_value)
+      @fields.collect do |field|
+        output(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].map do |field|
-          output(associated_objects.map{ |ao| field.with(:object => ao).export_value.presence || @empty }.join(','))
+        option_hash[:fields].collect do |field|
+          output(associated_objects.collect { |ao| field.with(object: ao).export_value.presence || @empty }.join(','))
         end
       end
     end

data/lib/rails_admin/version.rb

@@ -1,18 +1,15 @@
 module RailsAdmin
   class Version
-    MAJOR = 0 unless defined? MAJOR
-    MINOR = 6 unless defined? MINOR
-    PATCH = 0 unless defined? PATCH
-    PRE = nil unless defined? PRE
+    MAJOR = 0
+    MINOR = 6
+    PATCH = 1
+    PRE = nil
 
     class << self
-
       # @return [String]
       def to_s
         [MAJOR, MINOR, PATCH, PRE].compact.join('.')
       end
-
     end
-
   end
 end

data/lib/rails_admin/version.rbc

@@ -0,0 +1,582 @@
+!RBIX
+9595534255132031488
+x
+M
+1
+n
+n
+x
+10
+__script__
+i
+28
+99
+7
+0
+65
+49
+1
+2
+13
+99
+12
+7
+2
+12
+7
+3
+12
+65
+12
+49
+4
+4
+15
+49
+2
+0
+15
+2
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+5
+x
+10
+RailsAdmin
+x
+11
+open_module
+x
+15
+__module_init__
+M
+1
+n
+n
+x
+10
+RailsAdmin
+i
+29
+5
+66
+99
+7
+0
+1
+65
+49
+1
+3
+13
+99
+12
+7
+2
+12
+7
+3
+12
+65
+12
+49
+4
+4
+15
+49
+2
+0
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+5
+x
+7
+Version
+x
+10
+open_class
+x
+14
+__class_init__
+M
+1
+n
+n
+x
+7
+Version
+i
+190
+5
+66
+26
+93
+0
+15
+29
+17
+0
+7
+0
+98
+1
+1
+30
+8
+23
+25
+92
+0
+27
+8
+28
+15
+7
+2
+8
+29
+1
+9
+34
+1
+8
+41
+65
+7
+0
+78
+49
+3
+2
+15
+26
+93
+1
+15
+29
+57
+0
+7
+4
+98
+1
+1
+30
+8
+63
+25
+92
+1
+27
+8
+68
+15
+7
+2
+8
+69
+1
+9
+74
+1
+8
+81
+65
+7
+4
+79
+49
+3
+2
+15
+26
+93
+2
+15
+29
+97
+0
+7
+5
+98
+1
+1
+30
+8
+103
+25
+92
+2
+27
+8
+108
+15
+7
+2
+8
+109
+1
+9
+114
+1
+8
+121
+65
+7
+5
+80
+49
+3
+2
+15
+26
+93
+3
+15
+29
+137
+0
+7
+6
+98
+1
+1
+30
+8
+143
+25
+92
+3
+27
+8
+148
+15
+7
+2
+8
+149
+1
+9
+154
+1
+8
+161
+65
+7
+6
+1
+49
+3
+2
+15
+5
+99
+43
+7
+12
+49
+8
+1
+13
+99
+12
+7
+9
+12
+7
+10
+12
+65
+12
+49
+11
+4
+15
+54
+50
+9
+0
+11
+I
+a
+I
+0
+I
+0
+I
+0
+n
+p
+12
+x
+5
+MAJOR
+x
+16
+vm_const_defined
+s
+8
+constant
+x
+9
+const_set
+x
+5
+MINOR
+x
+5
+PATCH
+x
+3
+PRE
+x
+4
+Type
+x
+22
+object_singleton_class
+x
+18
+__metaclass_init__
+M
+1
+n
+n
+x
+18
+__metaclass_init__
+i
+16
+5
+66
+99
+7
+0
+7
+1
+65
+67
+49
+2
+0
+49
+3
+4
+11
+I
+5
+I
+0
+I
+0
+I
+0
+n
+p
+4
+x
+4
+to_s
+M
+1
+n
+n
+x
+4
+to_s
+i
+24
+45
+0
+1
+45
+2
+3
+45
+4
+5
+45
+6
+7
+35
+4
+49
+8
+0
+7
+9
+64
+49
+10
+1
+11
+I
+4
+I
+0
+I
+0
+I
+0
+n
+p
+11
+x
+5
+MAJOR
+n
+x
+5
+MINOR
+n
+x
+5
+PATCH
+n
+x
+3
+PRE
+n
+x
+7
+compact
+s
+1
+.
+x
+4
+join
+p
+5
+I
+-1
+I
+b
+I
+0
+I
+c
+I
+18
+x
+71
+/Users/sferik/Projects/Ruby/gems/rails_admin/lib/rails_admin/version.rb
+p
+0
+x
+17
+method_visibility
+x
+15
+add_defn_method
+p
+3
+I
+2
+I
+b
+I
+10
+x
+71
+/Users/sferik/Projects/Ruby/gems/rails_admin/lib/rails_admin/version.rb
+p
+0
+x
+13
+attach_method
+p
+19
+I
+2
+I
+3
+I
+29
+I
+0
+I
+2a
+I
+4
+I
+51
+I
+0
+I
+52
+I
+5
+I
+79
+I
+0
+I
+7a
+I
+6
+I
+a1
+I
+0
+I
+a2
+I
+8
+I
+be
+x
+71
+/Users/sferik/Projects/Ruby/gems/rails_admin/lib/rails_admin/version.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+2
+I
+2
+I
+1d
+x
+71
+/Users/sferik/Projects/Ruby/gems/rails_admin/lib/rails_admin/version.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+0
+I
+1
+I
+1c
+x
+71
+/Users/sferik/Projects/Ruby/gems/rails_admin/lib/rails_admin/version.rb
+p
+0