rails_admin 0.1.2 → 0.2.0

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

@@ -11,7 +11,7 @@ module RailsAdmin
         include RailsAdmin::Config::Configurable
         include RailsAdmin::Config::Hideable
         include RailsAdmin::Config::Groupable
-        
+
         attr_reader :name, :properties, :abstract_model
         attr_accessor :defined, :order, :section
         attr_reader :parent, :root
@@ -164,7 +164,7 @@ module RailsAdmin
         #
         # @see RailsAdmin::AbstractModel.properties
         register_instance_option :required? do
-          context = (bindings && bindings[:object] ? (bindings[:object].persisted? ? :update : :create) : :nil)          
+          context = (bindings && bindings[:object] ? (bindings[:object].persisted? ? :update : :create) : :nil)
           (@required ||= {})[context] ||= !!([name] + children_fields).uniq.find do |column_name|
             !!abstract_model.model.validators_on(column_name).find do |v|
               !v.options[:allow_nil] and
@@ -237,14 +237,14 @@ module RailsAdmin
 
         # Reader whether field is optional.
         #
-        # @see RailsAdmin::Config::Fields::Base.register_instance_option(:required?)
+        # @see RailsAdmin::Config::Fields::Base.register_instance_option :required?
         def optional?
           not required?
         end
 
         # Inverse accessor whether this field is required.
         #
-        # @see RailsAdmin::Config::Fields::Base.register_instance_option(:required?)
+        # @see RailsAdmin::Config::Fields::Base.register_instance_option :required?
         def optional(state = nil, &block)
           if !state.nil? || block
             required state.nil? ? proc { false == (instance_eval &block) } : false == state
@@ -275,6 +275,11 @@ module RailsAdmin
           false
         end
 
+        # Allowed methods for the field in forms
+        register_instance_option :allowed_methods do
+          [method_name]
+        end
+
         def inverse_of
           nil
         end
@@ -287,6 +292,7 @@ module RailsAdmin
           bindings[:object].new_record? && self.value.nil? && !self.default_value.nil? ? self.default_value : nil
         end
 
+
         def inspect
           "#<#{self.class.name}[#{name}] #{
             instance_variables.map do |v|

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

@@ -28,9 +28,9 @@ module RailsAdmin
           end
 
           def method_name
-            nested_form ? "#{self.name}_attributes" : association[:foreign_key]
+            nested_form ? "#{self.name}_attributes".to_sym : association[:foreign_key]
           end
-          
+
           def multiple?
             false
           end

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

@@ -7,21 +7,21 @@ module RailsAdmin
         class Boolean < RailsAdmin::Config::Fields::Base
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types::register(self)
-          
+
           register_instance_option :view_helper do
             :check_box
           end
 
-          register_instance_option(:formatted_value) do
+          register_instance_option :formatted_value do
             bindings[:view].image_tag("rails_admin/#{value ? 'bullet_black' : 'bullet_white'}.png", :alt => value.to_s)
           end
 
-          register_instance_option(:export_value) do
+          register_instance_option :export_value do
             value.to_s
           end
 
           # Accessor for field's help text displayed below input field.
-          register_instance_option(:help) do
+          register_instance_option :help do
             ""
           end
         end

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

@@ -8,21 +8,21 @@ module RailsAdmin
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types::register(self)
 
-          register_instance_option(:label) do
+          register_instance_option :label do
             label = ((@label ||= {})[::I18n.locale] ||= abstract_model.model.human_attribute_name name)
             label = "Id" if label == ''
             label
           end
 
-          register_instance_option(:help) do
+          register_instance_option :help do
             "BSON::ObjectId"
           end
 
-          register_instance_option(:read_only) do
+          register_instance_option :read_only do
             true
           end
 
-          register_instance_option(:sort_reverse?) do
+          register_instance_option :sort_reverse? do
             serial?
           end
 

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

@@ -8,15 +8,15 @@ module RailsAdmin
         class Carrierwave < RailsAdmin::Config::Fields::Types::FileUpload
           RailsAdmin::Config::Fields::Types.register(self)
 
-          register_instance_option(:thumb_method) do
+          register_instance_option :thumb_method do
             @thumb_method ||= ((versions = bindings[:object].send(name).versions.keys).find{|k| k.in?([:thumb, :thumbnail, 'thumb', 'thumbnail'])} || versions.first.to_s)
           end
 
-          register_instance_option(:delete_method) do
+          register_instance_option :delete_method do
             "remove_#{name}"
           end
 
-          register_instance_option(:cache_method) do
+          register_instance_option :cache_method do
             "#{name}_cache"
           end
 

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

@@ -133,15 +133,15 @@ module RailsAdmin
             params[name] = self.class.normalize(params[name], "#{localized_date_format} #{localized_time_format}") if params[name].present?
           end
 
-          register_instance_option(:sort_reverse?) do
+          register_instance_option :sort_reverse? do
             true
           end
 
-          register_instance_option(:date_format) do
+          register_instance_option :date_format do
             self.class.format
           end
 
-          register_instance_option(:formatted_value) do
+          register_instance_option :formatted_value do
             unless (time = value).nil?
               I18n.l(time, :format => strftime_format)
             else
@@ -149,11 +149,11 @@ module RailsAdmin
             end
           end
 
-          register_instance_option(:partial) do
+          register_instance_option :partial do
             :form_datetime
           end
 
-          register_instance_option(:strftime_format) do
+          register_instance_option :strftime_format do
             localized_format self.class.i18n_scope
           end
         end

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

@@ -7,19 +7,19 @@ module RailsAdmin
         class Enum < RailsAdmin::Config::Fields::Base
           RailsAdmin::Config::Fields::Types::register(self)
 
-          register_instance_option(:partial) do
+          register_instance_option :partial do
             :form_enumeration
           end
 
-          register_instance_option(:enum_method) do
+          register_instance_option :enum_method do
             @enum_method ||= (bindings[:object].class.respond_to?("#{name}_enum") || bindings[:object].respond_to?("#{name}_enum")) ? "#{name}_enum" : name
           end
 
-          register_instance_option(:enum) do
+          register_instance_option :enum do
             bindings[:object].class.respond_to?(enum_method) ? bindings[:object].class.send(enum_method) : bindings[:object].send(enum_method)
           end
 
-          register_instance_option(:pretty_value) do
+          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 || ' - '
             elsif enum.is_a?(::Array) && enum.first.is_a?(::Array)
@@ -29,7 +29,7 @@ module RailsAdmin
             end
           end
 
-          register_instance_option(:multiple?) do
+          register_instance_option :multiple? do
             properties && [:serialized].include?(properties[:type])
           end
         end

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

@@ -7,27 +7,27 @@ module RailsAdmin
         class FileUpload < RailsAdmin::Config::Fields::Base
           RailsAdmin::Config::Fields::Types::register(self)
 
-          register_instance_option(:partial) do
+          register_instance_option :partial do
             :form_file_upload
           end
 
-          register_instance_option(:thumb_method) do
+          register_instance_option :thumb_method do
             nil
           end
 
-          register_instance_option(:delete_method) do
+          register_instance_option :delete_method do
             nil
           end
 
-          register_instance_option(:cache_method) do
+          register_instance_option :cache_method do
             nil
           end
 
-          register_instance_option(:export_value) do
+          register_instance_option :export_value do
             resource_url.to_s
           end
 
-          register_instance_option(:pretty_value) do
+          register_instance_option :pretty_value do
             if value.presence
               v = bindings[:view]
               url = resource_url
@@ -46,6 +46,10 @@ module RailsAdmin
             (url = resource_url.to_s) && url.split('.').last =~ /jpg|jpeg|png|gif/i
           end
 
+          register_instance_option :allowed_methods do
+            [method_name, delete_method, cache_method].compact
+          end
+
           # virtual class
           def resource_url
             raise 'not implemented'

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

@@ -18,7 +18,7 @@ module RailsAdmin
           end
 
           def method_name
-            nested_form ? "#{super}_attributes" : "#{super.to_s.singularize}_ids" # name_ids
+            nested_form ? "#{super}_attributes".to_sym : "#{super.to_s.singularize}_ids".to_sym  # name_ids
           end
 
           # Reader for validation errors of the bound object

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

@@ -13,7 +13,7 @@ module RailsAdmin
           end
 
           # Accessor for field's formatted value
-          register_instance_option(:formatted_value) do
+          register_instance_option :formatted_value do
             (o = value) && o.send(associated_model_config.object_label_method)
           end
 
@@ -26,9 +26,9 @@ module RailsAdmin
           end
 
           def method_name
-            nested_form ? "#{self.name}_attributes" : "#{self.name}_id"
+            nested_form ? "#{self.name}_attributes".to_sym  : "#{self.name}_id".to_sym
           end
-          
+
           def multiple?
             false
           end

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

@@ -12,7 +12,7 @@ module RailsAdmin
             :number_field
           end
 
-          register_instance_option(:sort_reverse?) do
+          register_instance_option :sort_reverse? do
             serial?
           end
         end

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

@@ -9,11 +9,11 @@ module RailsAdmin
         class Paperclip < RailsAdmin::Config::Fields::Types::FileUpload
           RailsAdmin::Config::Fields::Types.register(self)
 
-          register_instance_option(:delete_method) do
+          register_instance_option :delete_method do
             "delete_#{name}" if bindings[:object].respond_to?("delete_#{name}")
           end
 
-          register_instance_option(:thumb_method) do
+          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
           end

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

@@ -8,22 +8,22 @@ module RailsAdmin
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types::register(self)
 
-          register_instance_option(:partial) do
+          register_instance_option :partial do
             :form_polymorphic_association
           end
 
           # Accessor whether association is visible or not. By default
           # association checks that any of the child models are included in
           # configuration.
-          register_instance_option(:visible?) do
+          register_instance_option :visible? do
             associated_model_config.length > 0
           end
 
-          register_instance_option(:sortable) do
+          register_instance_option :sortable do
             false
           end
 
-          register_instance_option(:searchable) do
+          register_instance_option :searchable do
             false
           end
 
@@ -37,6 +37,10 @@ module RailsAdmin
             nil
           end
 
+          register_instance_option :allowed_methods do
+            [children_fields]
+          end
+
           def associated_collection(type)
             return [] if type.blank?
             config = RailsAdmin.config(type)

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

@@ -7,11 +7,11 @@ module RailsAdmin
         class Serialized < RailsAdmin::Config::Fields::Types::Text
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types::register(self)
-          
+
           register_instance_option :formatted_value do
             YAML.dump value
           end
-          
+
           def parse_input(params)
             params[name] = (params[name].blank? ? nil : YAML.load(params[name])) if params[name].is_a?(::String)
           end

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

@@ -8,14 +8,14 @@ module RailsAdmin
 
           RailsAdmin::Config::Fields::Types::register(self)
 
-          register_instance_option(:html_attributes) do
+          register_instance_option :html_attributes do
             {
               :maxlength => length,
               :size => [50, length.to_i].min
             }
            end
 
-          register_instance_option(:help) do
+          register_instance_option :help do
             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]}."
@@ -33,7 +33,7 @@ module RailsAdmin
             text
           end
 
-          register_instance_option(:partial) do
+          register_instance_option :partial do
             :form_field
           end
         end

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

@@ -9,33 +9,33 @@ module RailsAdmin
           RailsAdmin::Config::Fields::Types::register(self)
 
           # CKEditor is disabled by default
-          register_instance_option(:ckeditor) do
+          register_instance_option :ckeditor do
             false
           end
 
           # If you want to have a different toolbar configuration for CKEditor
           # create your own custom config.js and override this configuration
-          register_instance_option(:ckeditor_config_js) do
+          register_instance_option :ckeditor_config_js do
             nil
           end
 
           #Use this if you want to point to a cloud instances of CKeditor
-          register_instance_option(:ckeditor_location) do
+          register_instance_option :ckeditor_location do
             nil
           end
 
           #Use this if you want to point to a cloud instances of the base CKeditor
-          register_instance_option(:ckeditor_base_location) do
+          register_instance_option :ckeditor_base_location do
             '/assets/ckeditor/'
           end
 
           # Codemirror is disabled by default and CKEditor takes precedence
-          register_instance_option(:codemirror) do
+          register_instance_option :codemirror do
             false
           end
 
           #Pass the theme and mode for Codemirror
-          register_instance_option(:codemirror_config) do
+          register_instance_option :codemirror_config do
             {
               :mode => 'css',
               :theme => 'night'
@@ -43,7 +43,7 @@ module RailsAdmin
           end
 
           #Pass the location of the theme and mode for Codemirror
-          register_instance_option(:codemirror_assets) do
+          register_instance_option :codemirror_assets do
             {
               :mode => '/assets/codemirror/modes/css.js',
               :theme => '/assets/codemirror/themes/night.css'
@@ -51,36 +51,43 @@ module RailsAdmin
           end
 
           #Use this if you want to point to a cloud instances of CodeMirror
-          register_instance_option(:codemirror_js_location) do
+          register_instance_option :codemirror_js_location do
             '/assets/codemirror.js'
           end
 
           #Use this if you want to point to a cloud instances of CodeMirror
-          register_instance_option(:codemirror_css_location) do
+          register_instance_option :codemirror_css_location do
             '/assets/codemirror.css'
           end
 
           # bootstrap_wysihtml5
-          register_instance_option(:bootstrap_wysihtml5) do
+          register_instance_option :bootstrap_wysihtml5 do
             false
           end
 
-          register_instance_option(:bootstrap_wysihtml5_css_location) do
+          # If you want to have a different toolbar configuration for wysihtml5
+          # you can use a Ruby hash to configure these options:
+          # https://github.com/jhollingworth/bootstrap-wysihtml5/#advanced
+          register_instance_option :bootstrap_wysihtml5_config_options do
+            nil
+          end
+
+          register_instance_option :bootstrap_wysihtml5_css_location do
             '/assets/bootstrap-wysihtml5.css'
           end
 
-          register_instance_option(:bootstrap_wysihtml5_js_location) do
-            '/assets/bootstrap-wysihtml5-all.js'
+          register_instance_option :bootstrap_wysihtml5_js_location do
+            '/assets/bootstrap-wysihtml5.js'
           end
 
-          register_instance_option(:html_attributes) do
+          register_instance_option :html_attributes do
             {
               :cols => '48',
               :rows => '3'
             }
           end
 
-          register_instance_option(:partial) do
+          register_instance_option :partial do
             :form_text
           end