rails_admin 0.6.0 → 0.6.1

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

@@ -6,7 +6,7 @@ module RailsAdmin
       module Types
         class Decimal < RailsAdmin::Config::Fields::Base
           # Register field type for the type loader
-          RailsAdmin::Config::Fields::Types::register(self)
+          RailsAdmin::Config::Fields::Types.register(self)
         end
       end
     end

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

@@ -27,10 +27,10 @@ module RailsAdmin
           end
 
           register_instance_option :thumb_method do
-            "100x100>"
+            '100x100>'
           end
 
-          def resource_url thumb = false
+          def resource_url(thumb = false)
             return nil unless (v = value)
             thumb ? v.thumb(thumb).try(:url) : v.url
           end

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

@@ -5,7 +5,7 @@ module RailsAdmin
     module Fields
       module Types
         class Enum < RailsAdmin::Config::Fields::Base
-          RailsAdmin::Config::Fields::Types::register(self)
+          RailsAdmin::Config::Fields::Types.register(self)
 
           register_instance_option :partial do
             :form_enumeration
@@ -21,9 +21,9 @@ module RailsAdmin
 
           register_instance_option :pretty_value do
             if enum.is_a?(::Hash)
-              enum.reject{|k,v| v.to_s != value.to_s}.keys.first.to_s.presence || value.presence || ' - '
+              enum.reject { |k, v| v.to_s != value.to_s }.keys.first.to_s.presence || value.presence || ' - '
             elsif enum.is_a?(::Array) && enum.first.is_a?(::Array)
-              enum.find{|e|e[1].to_s == value.to_s}.try(:first).to_s.presence || value.presence || ' - '
+              enum.detect { |e|e[1].to_s == value.to_s }.try(:first).to_s.presence || value.presence || ' - '
             else
               value.presence || ' - '
             end

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

@@ -5,7 +5,7 @@ module RailsAdmin
     module Fields
       module Types
         class FileUpload < RailsAdmin::Config::Fields::Base
-          RailsAdmin::Config::Fields::Types::register(self)
+          RailsAdmin::Config::Fields::Types.register(self)
 
           register_instance_option :partial do
             :form_file_upload
@@ -31,11 +31,11 @@ module RailsAdmin
             if value.presence
               v = bindings[:view]
               url = resource_url
-              if self.image
+              if image
                 thumb_url = resource_url(thumb_method)
-                (url != thumb_url) ? v.link_to(v.image_tag(thumb_url, :class => 'img-polaroid'), url, :target => 'blank') : v.image_tag(thumb_url)
+                (url != thumb_url) ? v.link_to(v.image_tag(thumb_url, class: 'img-polaroid'), url, target: 'blank') : v.image_tag(thumb_url)
               else
-                v.link_to(nil, url, :target => 'blank')
+                v.link_to(nil, url, target: 'blank')
               end
             end
           end
@@ -50,7 +50,7 @@ module RailsAdmin
 
           # virtual class
           def resource_url
-            raise 'not implemented'
+            fail('not implemented')
           end
 
           def virtual?

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

@@ -6,7 +6,7 @@ module RailsAdmin
       module Types
         class Float < RailsAdmin::Config::Fields::Base
           # Register field type for the type loader
-          RailsAdmin::Config::Fields::Types::register(self)
+          RailsAdmin::Config::Fields::Types.register(self)
         end
       end
     end

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

@@ -6,7 +6,7 @@ module RailsAdmin
       module Types
         class HasAndBelongsToManyAssociation < RailsAdmin::Config::Fields::Types::HasManyAssociation
           # Register field type for the type loader
-          RailsAdmin::Config::Fields::Types::register(self)
+          RailsAdmin::Config::Fields::Types.register(self)
         end
       end
     end

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

@@ -6,7 +6,7 @@ module RailsAdmin
       module Types
         class HasManyAssociation < RailsAdmin::Config::Fields::Association
           # Register field type for the type loader
-          RailsAdmin::Config::Fields::Types::register(self)
+          RailsAdmin::Config::Fields::Types.register(self)
 
           register_instance_option :partial do
             nested_form ? :form_nested_many : :form_filtering_multiselect

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

@@ -6,7 +6,7 @@ module RailsAdmin
       module Types
         class HasOneAssociation < RailsAdmin::Config::Fields::Association
           # Register field type for the type loader
-          RailsAdmin::Config::Fields::Types::register(self)
+          RailsAdmin::Config::Fields::Types.register(self)
 
           register_instance_option :partial do
             nested_form ? :form_nested_one : :form_filtering_select
@@ -25,9 +25,8 @@ module RailsAdmin
             true
           end
 
-
           def editable?
-            (nested_form || abstract_model.model.new.respond_to?("#{self.name}_id=")) && super
+            (nested_form || abstract_model.model.new.respond_to?("#{name}_id=")) && super
           end
 
           def selected_id
@@ -35,7 +34,7 @@ module RailsAdmin
           end
 
           def method_name
-            nested_form ? "#{self.name}_attributes".to_sym  : "#{self.name}_id".to_sym
+            nested_form ? "#{name}_attributes".to_sym  : "#{name}_id".to_sym
           end
 
           def multiple?

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

@@ -5,7 +5,7 @@ module RailsAdmin
     module Fields
       module Types
         class Hidden < RailsAdmin::Config::Fields::Base
-          RailsAdmin::Config::Fields::Types::register(self)
+          RailsAdmin::Config::Fields::Types.register(self)
 
           register_instance_option :view_helper do
             :hidden_field

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

@@ -6,7 +6,7 @@ module RailsAdmin
       module Types
         class Integer < 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
             :number_field

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

@@ -14,8 +14,8 @@ module RailsAdmin
           end
 
           register_instance_option :thumb_method do
-            @styles ||= bindings[:object].send(name).styles.map(&:first)
-            @thumb_method ||= @styles.find{|s| [:thumb, 'thumb', :thumbnail, 'thumbnail'].include?(s)} || @styles.first || :original
+            @styles ||= bindings[:object].send(name).styles.collect(&:first)
+            @thumb_method ||= @styles.detect { |s| [:thumb, 'thumb', :thumbnail, 'thumbnail'].include?(s) } || @styles.first || :original
           end
 
           def resource_url(thumb = false)

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

@@ -6,7 +6,7 @@ module RailsAdmin
       module Types
         class Password < 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 :view_helper do
             :password_field
@@ -17,16 +17,16 @@ module RailsAdmin
           end
 
           register_instance_option :formatted_value do
-            "".html_safe
+            ''.html_safe
           end
 
           # Password field's value does not need to be read
           def value
-            ""
+            ''
           end
 
           register_instance_option :visible do
-            self.section.is_a?(RailsAdmin::Config::Sections::Edit)
+            section.is_a?(RailsAdmin::Config::Sections::Edit)
           end
 
           register_instance_option :pretty_value do

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

@@ -6,7 +6,7 @@ module RailsAdmin
       module Types
         class PolymorphicAssociation < RailsAdmin::Config::Fields::Types::BelongsToAssociation
           # Register field type for the type loader
-          RailsAdmin::Config::Fields::Types::register(self)
+          RailsAdmin::Config::Fields::Types.register(self)
 
           register_instance_option :partial do
             :form_polymorphic_association
@@ -27,12 +27,12 @@ module RailsAdmin
             false
           end
 
-          # TODO not supported yet
+          # TODO: not supported yet
           register_instance_option :associated_collection_cache_all do
             false
           end
 
-          # TODO not supported yet
+          # TODO: not supported yet
           register_instance_option :associated_collection_scope do
             nil
           end
@@ -44,29 +44,26 @@ module RailsAdmin
           def associated_collection(type)
             return [] if type.blank?
             config = RailsAdmin.config(type)
-            config.abstract_model.all.map do |object|
+            config.abstract_model.all.collect do |object|
               [object.send(config.object_label_method), object.id]
             end
           end
 
           def associated_model_config
-            @associated_model_config ||= association[:model_proc].call.map{|type| RailsAdmin.config(type) }.select{|config| !config.excluded? }
+            @associated_model_config ||= association[:model_proc].call.collect { |type| RailsAdmin.config(type) }.select { |config| !config.excluded? }
           end
 
           def polymorphic_type_collection
-            associated_model_config.map do |config|
+            associated_model_config.collect do |config|
               [config.label, config.abstract_model.model.name]
             end
           end
 
           def polymorphic_type_urls
-            types = associated_model_config.map do |config|
+            types = associated_model_config.collect do |config|
               [config.abstract_model.model.name, config.abstract_model.to_param]
             end
-
-            ::Hash[*types.collect { |v|
-                  [v[0], bindings[:view].index_path(v[1])]
-                }.flatten]
+            ::Hash[*types.collect { |v| [v[0], bindings[:view].index_path(v[1])] }.flatten]
           end
 
           # Reader for field's value

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

@@ -6,7 +6,7 @@ module RailsAdmin
       module Types
         class Serialized < RailsAdmin::Config::Fields::Types::Text
           # Register field type for the type loader
-          RailsAdmin::Config::Fields::Types::register(self)
+          RailsAdmin::Config::Fields::Types.register(self)
 
           register_instance_option :formatted_value do
             YAML.dump(value) unless value.nil?

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

@@ -5,18 +5,17 @@ module RailsAdmin
     module Fields
       module Types
         class String < RailsAdmin::Config::Fields::Base
-
-          RailsAdmin::Config::Fields::Types::register(self)
+          RailsAdmin::Config::Fields::Types.register(self)
 
           register_instance_option :html_attributes do
             {
-              :maxlength => length,
-              :size => [50, length.to_i].min
+              maxlength: length,
+              size: [50, length.to_i].min
             }
-           end
+          end
 
           def generic_help
-            text = (required? ? I18n.translate("admin.form.required") : I18n.translate("admin.form.optional")) + '. '
+            text = (required? ? I18n.translate('admin.form.required') : I18n.translate('admin.form.optional')) + '. '
             if valid_length.present? && valid_length[:is].present?
               text += "#{I18n.translate("admin.form.char_length_of").capitalize} #{valid_length[:is]}."
             else

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

@@ -6,30 +6,30 @@ module RailsAdmin
       module Types
         class Text < RailsAdmin::Config::Fields::Base
           # Register field type for the type loader
-          RailsAdmin::Config::Fields::Types::register(self)
+          RailsAdmin::Config::Fields::Types.register(self)
 
           [:ckeditor, :ckeditor_base_location, :ckeditor_config_js, :ckeditor_location].each do |key|
             register_deprecated_instance_option key do
-              raise "The 'field(:foo){ ckeditor true }' style DSL is deprecated. Please use 'field :foo, :ck_editor' instead."
+              fail("The 'field(:foo){ ckeditor true }' style DSL is deprecated. Please use 'field :foo, :ck_editor' instead.")
             end
           end
 
           [:codemirror, :codemirror_assets, :codemirror_config, :codemirror_css_location, :codemirror_js_location].each do |key|
             register_deprecated_instance_option key do
-              raise "The 'field(:foo){ codemirror true }' style DSL is deprecated. Please use 'field :foo, :code_mirror' instead."
+              fail("The 'field(:foo){ codemirror true }' style DSL is deprecated. Please use 'field :foo, :code_mirror' instead.")
             end
           end
 
           [:bootstrap_wysihtml5, :bootstrap_wysihtml5_config_options, :bootstrap_wysihtml5_css_location, :bootstrap_wysihtml5_js_location].each do |key|
             register_deprecated_instance_option key do
-              raise "The 'field(:foo){ bootstrap_wysihtml5 true }' style DSL is deprecated. Please use 'field :foo, :wysihtml5' instead."
+              fail("The 'field(:foo){ bootstrap_wysihtml5 true }' style DSL is deprecated. Please use 'field :foo, :wysihtml5' instead.")
             end
           end
 
           register_instance_option :html_attributes do
             {
-              :cols => '48',
-              :rows => '3'
+              cols: '48',
+              rows: '3'
             }
           end
 

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

@@ -6,16 +6,16 @@ module RailsAdmin
       module Types
         class Time < 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 = :short
           @i18n_scope = [:time, :formats]
           @js_plugin_options = {
-            "showDate" => false,
+            'showDate' => false,
           }
 
           # Register field type for the type loader
-          RailsAdmin::Config::Fields::Types::register(self)
+          RailsAdmin::Config::Fields::Types.register(self)
 
           def parse_input(params)
             params[name] = self.class.normalize(params[name], localized_time_format) if params[name].present?
@@ -27,7 +27,7 @@ module RailsAdmin
           end
 
           register_instance_option :strftime_format do
-            (localized_format.include? "%p") ? "%I:%M %p" : "%H:%M"
+            (localized_format.include? '%p') ? '%I:%M %p' : '%H:%M'
           end
         end
       end

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

@@ -6,7 +6,7 @@ module RailsAdmin
       module Types
         class Timestamp < 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 = [:time, :formats]

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

@@ -6,7 +6,7 @@ module RailsAdmin
       module Types
         class Wysihtml5 < 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 wysihtml5
           # you can use a Ruby hash to configure these options:
@@ -23,7 +23,6 @@ module RailsAdmin
             ActionController::Base.helpers.asset_path('bootstrap-wysihtml5.js')
           end
 
-
           register_instance_option :partial do
             :form_wysihtml5
           end

data/lib/rails_admin/config/has_fields.rb

@@ -4,7 +4,7 @@ module RailsAdmin
     module HasFields
       # Defines a configuration for a field.
       def field(name, type = nil, add_to_section = true, &block)
-        field = _fields.find {|f| name == f.name }
+        field = _fields.detect { |f| name == f.name }
 
         # some fields are hidden by default (belongs_to keys, has_many associations in list views.)
         # unhide them if config specifically defines them
@@ -20,7 +20,7 @@ module RailsAdmin
         # one found in default stack
         elsif !type.nil? && type != (field.nil? ? nil : field.type)
           _fields.delete(field) unless field.nil?
-          properties = abstract_model.properties.find {|p| name == p[:name] }
+          properties = abstract_model.properties.detect { |p| name == p[:name] }
           field = (_fields <<  RailsAdmin::Config::Fields::Types.load(type).new(self, name, properties)).last
         end
 
@@ -31,9 +31,7 @@ module RailsAdmin
         end
 
         # If a block has been given evaluate it and sort fields after that
-        if block
-          field.instance_eval &block
-        end
+        field.instance_eval(&block) if block
         field
       end
 
@@ -46,7 +44,7 @@ module RailsAdmin
       # or include fields by conditions if no field names
       def include_fields(*field_names, &block)
         if field_names.empty?
-          _fields.select {|f| f.instance_eval &block }.each do |f|
+          _fields.select { |f| f.instance_eval(&block) }.each do |f|
             unless f.defined
               f.defined = true
               f.order = _fields.select(&:defined).length
@@ -60,35 +58,34 @@ module RailsAdmin
       # exclude fields by name or by condition (block)
       def exclude_fields(*field_names, &block)
         block ||= lambda { |f| field_names.include?(f.name) }
-        _fields.each {|f| f.defined = true } if _fields.select(&:defined).empty?
-        _fields.select {|f| f.instance_eval &block }.each {|f| f.defined = false }
+        _fields.each { |f| f.defined = true } if _fields.select(&:defined).empty?
+        _fields.select { |f| f.instance_eval(&block) }.each { |f| f.defined = false }
       end
 
       # API candy
-      alias :exclude_fields_if :exclude_fields
-      alias :include_fields_if :include_fields
+      alias_method :exclude_fields_if, :exclude_fields
+      alias_method :include_fields_if, :include_fields
 
       def include_all_fields
-        include_fields_if() { true }
+        include_fields_if { true }
       end
 
-
       # Returns all field configurations for the model configuration instance. If no fields
       # have been defined returns all fields. Defined fields are sorted to match their
       # order property. If order was not specified it will match the order in which fields
       # were defined.
       #
       # If a block is passed it will be evaluated in the context of each field
-      def fields(*field_names,&block)
+      def fields(*field_names, &block)
         return all_fields if field_names.empty? && !block
 
         if field_names.empty?
-          defined = _fields.select {|f| f.defined }
+          defined = _fields.select { |f| f.defined }
           defined = _fields if defined.empty?
         else
-          defined = field_names.map{|field_name| _fields.find {|f| f.name == field_name } }
+          defined = field_names.collect { |field_name| _fields.detect { |f| f.name == field_name } }
         end
-        defined.map do |f|
+        defined.collect do |f|
           unless f.defined
             f.defined = true
             f.order = _fields.select(&:defined).length
@@ -100,21 +97,24 @@ module RailsAdmin
 
       # Defines configuration for fields by their type.
       def fields_of_type(type, &block)
-        _fields.select {|f| type == f.type }.map! {|f| f.instance_eval &block } if block
+        _fields.select { |f| type == f.type }.map! { |f| f.instance_eval(&block) } if block
       end
 
       # Accessor for all fields
       def all_fields
-        ((ro_fields = _fields(true)).select(&:defined).presence || ro_fields).map{|f| f.section = self; f }
+        ((ro_fields = _fields(true)).select(&:defined).presence || ro_fields).collect do |f|
+          f.section = self
+          f
+        end
       end
 
       # Get all fields defined as visible, in the correct order.
       def visible_fields
         i = 0
-        all_fields.map {|f| f.with(bindings) }.select(&:visible?).sort_by{|f| [f.order, i += 1] } # stable sort, damn
+        all_fields.collect { |f| f.with(bindings) }.select(&:visible?).sort_by { |f| [f.order, i += 1] } # stable sort, damn
       end
 
-      protected
+    protected
 
       # Raw fields.
       # Recursively returns parent section's raw fields
@@ -123,13 +123,13 @@ module RailsAdmin
         return @_fields if @_fields
         return @_ro_fields if readonly && @_ro_fields
 
-        unless self.class == RailsAdmin::Config::Sections::Base
+        if self.class == RailsAdmin::Config::Sections::Base
+          @_ro_fields = @_fields = RailsAdmin::Config::Fields.factory(self)
+        else
           # parent is RailsAdmin::Config::Model, recursion is on Section's classes
           @_ro_fields ||= parent.send(self.class.superclass.to_s.underscore.split('/').last)._fields(true).freeze
-        else # recursion tail
-          @_ro_fields = @_fields = RailsAdmin::Config::Fields.factory(self)
         end
-        readonly ? @_ro_fields : (@_fields ||= @_ro_fields.map(&:clone))
+        readonly ? @_ro_fields : (@_fields ||= @_ro_fields.collect(&:clone))
       end
     end
   end