obitum-rails_admin 0.0.2 → 0.0.3

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

@@ -56,24 +56,29 @@ module RailsAdmin
 
         # Reader for the association's child model's configuration
         def associated_model_config
-          @associated_model_config ||= RailsAdmin.config(association[:child_model_proc].call)
+          @associated_model_config ||= RailsAdmin.config(association[:model_proc].call)
         end
 
         # Reader for the association's child model object's label method
-        def associated_label_method
-          @associated_label_method ||= associated_model_config.object_label_method
+        def associated_object_label_method
+          @associated_object_label_method ||= associated_model_config.object_label_method
         end
-
-        # Reader for the association's child key
-        def child_key
-          association[:child_key]
+        
+        # Reader for associated primary key
+        def associated_primary_key
+          @associated_primary_key ||= association[:primary_key_proc].call
+        end
+        
+        # Reader for the association's key
+        def foreign_key
+          association[:foreign_key]
         end
 
         # Reader for the inverse relationship
         def inverse_of
           association[:inverse_of]
         end
-
+        
         # Reader whether this is a polymorphic association
         def polymorphic?
           association[:polymorphic]
@@ -88,7 +93,12 @@ module RailsAdmin
         def value
           bindings[:object].send(association[:name])
         end
-
+        
+        # has many?
+        def multiple?
+          true
+        end
+        
         def virtual?
           true
         end

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

@@ -1,12 +1,7 @@
-require 'active_support/core_ext/string/inflections'
-require 'active_model/mass_assignment_security'
-
 require 'rails_admin/config/proxyable'
 require 'rails_admin/config/configurable'
 require 'rails_admin/config/hideable'
-require 'rails_admin/config/fields'
-require 'rails_admin/config/fields/association'
-require 'rails_admin/config/fields/groupable'
+require 'rails_admin/config/groupable'
 
 module RailsAdmin
   module Config
@@ -15,15 +10,12 @@ module RailsAdmin
         include RailsAdmin::Config::Proxyable
         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
 
-        def self.inherited(klass)
-          klass.instance_variable_set("@view_helper", :text_field)
-        end
-
         def initialize(parent, name, properties)
           @parent = parent
           @root = parent.root
@@ -34,11 +26,9 @@ module RailsAdmin
           @order = 0
           @properties = properties
           @section = parent
-
-          extend RailsAdmin::Config::Fields::Groupable
         end
 
-        register_instance_option(:css_class) do
+        register_instance_option :css_class do
           "#{self.name}_field"
         end
 
@@ -50,37 +40,37 @@ module RailsAdmin
           properties.blank?
         end
 
-        register_instance_option(:column_width) do
+        register_instance_option :column_width do
           nil
         end
 
-        register_instance_option(:sortable) do
+        register_instance_option :sortable do
           !virtual? || children_fields.first || false
         end
 
-        register_instance_option(:searchable) do
+        register_instance_option :searchable do
           !virtual? || children_fields.first || false
         end
 
-        register_instance_option(:queryable?) do
+        register_instance_option :queryable? do
           !virtual?
         end
 
-        register_instance_option(:filterable?) do
+        register_instance_option :filterable? do
           !!searchable
         end
 
-        register_instance_option(:search_operator) do
+        register_instance_option :search_operator do
           @search_operator ||= RailsAdmin::Config.default_search_operator
         end
 
         # serials and dates are reversed in list, which is more natural (last modified items first).
-        register_instance_option(:sort_reverse?) do
+        register_instance_option :sort_reverse? do
           false
         end
 
         # list of columns I should search for that field [{ :column => 'table_name.column', :type => field.type }, {..}]
-        register_instance_option(:searchable_columns) do
+        register_instance_option :searchable_columns do
           @searchable_columns ||= case self.searchable
           when true
             [{ :column => "#{self.abstract_model.model.table_name}.#{self.name}", :type => self.type }]
@@ -113,27 +103,27 @@ module RailsAdmin
           end
         end
 
-        register_instance_option(:formatted_value) do
+        register_instance_option :formatted_value do
           value.to_s
         end
 
         # output for pretty printing (show, list)
-        register_instance_option(:pretty_value) do
+        register_instance_option :pretty_value do
           formatted_value.presence || ' - '
         end
 
         # output for printing in export view (developers beware: no bindings[:view] and no data!)
-        register_instance_option(:export_value) do
+        register_instance_option :export_value do
           pretty_value
         end
 
 
         # Accessor for field's help text displayed below input field.
-        register_instance_option(:help) do
+        register_instance_option :help do
           (@help ||= {})[::I18n.locale] ||= (required? ? I18n.translate("admin.form.required") : I18n.translate("admin.form.optional")) + '. '
         end
 
-        register_instance_option(:html_attributes) do
+        register_instance_option :html_attributes do
           {}
         end
 
@@ -144,20 +134,20 @@ module RailsAdmin
         # Accessor for field's label.
         #
         # @see RailsAdmin::AbstractModel.properties
-        register_instance_option(:label) do
+        register_instance_option :label do
           (@label ||= {})[::I18n.locale] ||= abstract_model.model.human_attribute_name name
         end
 
         # Accessor for field's maximum length per database.
         #
         # @see RailsAdmin::AbstractModel.properties
-        register_instance_option(:length) do
+        register_instance_option :length do
           @length ||= properties && properties[:length]
         end
 
         # Accessor for field's length restrictions per validations
         #
-        register_instance_option(:valid_length) do
+        register_instance_option :valid_length do
           @valid_length ||= abstract_model.model.validators_on(name).find{|v|
             v.is_a?(ActiveModel::Validations::LengthValidator)}.try{|v| v.options} || {}
         end
@@ -169,7 +159,7 @@ module RailsAdmin
         # Accessor for whether this is field is mandatory.
         #
         # @see RailsAdmin::AbstractModel.properties
-        register_instance_option(:required?) do
+        register_instance_option :required? do
           @required ||= !!([name] + children_fields).uniq.find do |column_name|
             !!abstract_model.model.validators_on(column_name).find do |v|
               v.is_a?(ActiveModel::Validations::PresenceValidator) && !v.options[:allow_nil] ||
@@ -181,16 +171,16 @@ module RailsAdmin
         # Accessor for whether this is a serial field (aka. primary key, identifier).
         #
         # @see RailsAdmin::AbstractModel.properties
-        register_instance_option(:serial?) do
+        register_instance_option :serial? do
           properties && properties[:serial?]
         end
 
-        register_instance_option(:view_helper) do
-          @view_helper ||= self.class.instance_variable_get("@view_helper")
+        register_instance_option :view_helper do
+          :text_field
         end
 
-        register_instance_option :read_only do
-          not editable
+        register_instance_option :read_only? do
+          not editable?
         end
 
         # init status in the view
@@ -217,12 +207,11 @@ module RailsAdmin
           bindings[:view].render :partial => partial.to_s, :locals => {:field => self, :form => bindings[:form] }
         end
 
-        def editable
+        def editable?
           return false if @properties && @properties[:read_only]
           !bindings[:object].class.active_authorizer[bindings[:view].controller.send(:_attr_accessible_role)].deny?(self.method_name)
         end
 
-
         # Is this an association
         def association?
           kind_of?(RailsAdmin::Config::Fields::Association)
@@ -239,7 +228,7 @@ module RailsAdmin
         #
         # @see RailsAdmin::Config::Fields::Base.register_instance_option(:required?)
         def optional?
-          not required
+          not required?
         end
 
         # Inverse accessor whether this field is required.

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

@@ -3,12 +3,12 @@ require 'rails_admin/config/fields/types'
 require 'rails_admin/config/fields/types/belongs_to_association'
 
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
-  if association = parent.abstract_model.associations.find {|a| a[:child_key] == properties[:name] }
+  if association = parent.abstract_model.associations.find {|a| a[:foreign_key] == properties[:name] }
     field = RailsAdmin::Config::Fields::Types.load("#{association[:polymorphic] ? :polymorphic : :belongs_to}_association").new(parent, association[:name], association)
     fields << field
 
     child_columns = []
-    id_column = parent.abstract_model.properties.find {|p| p[:name].to_s == association[:child_key].to_s }
+    id_column = parent.abstract_model.properties.find {|p| p[:name].to_s == association[:foreign_key].to_s }
     child_columns << RailsAdmin::Config::Fields.default_factory.call(parent, id_column, fields)
 
     if association[:polymorphic]

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

@@ -3,7 +3,7 @@ require 'rails_admin/config/fields/types'
 require 'rails_admin/config/fields/types/file_upload'
 
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
-  extensions = [nil, :file_name, ]
+  extensions = [nil, :file_name]
   model = parent.abstract_model.model
 
   if defined?(::CarrierWave) && (model = parent.abstract_model.model).kind_of?(CarrierWave::Mount) && model.uploaders.include?(attachment_name = properties[:name].to_s.chomp('_file_name').to_sym)

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

@@ -2,7 +2,7 @@ require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/types/enum'
 
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
-  if parent.abstract_model.model.instance_methods.include?(:"#{properties[:name]}_enum") || parent.abstract_model.model.instance_methods.include?("#{properties[:name]}_enum")
+  if parent.abstract_model.model.instance_methods.map(&:to_s).include?("#{properties[:name]}_enum")
     fields << RailsAdmin::Config::Fields::Types::Enum.new(parent, properties[:name], properties)
     true
   else

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

@@ -8,7 +8,7 @@ require 'rails_admin/config/fields/types/password'
 # @see RailsAdmin::Config::Fields::Types::Password.column_names
 # @see RailsAdmin::Config::Fields.register_factory
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
-  if RailsAdmin::Config::Fields::Types::Password.column_names.include?(properties[:name])
+  if [:password].include?(properties[:name])
     fields << RailsAdmin::Config::Fields::Types::Password.new(parent, properties[:name], properties)
     true
   else

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

@@ -0,0 +1,17 @@
+require 'rails_admin/config/fields'
+require 'rails_admin/config/fields/types/serialized'
+
+# Register a custom field factory for properties named as password. More property
+# names can be registered in RailsAdmin::Config::Fields::Password.column_names
+# array.
+#
+# @see RailsAdmin::Config::Fields::Types::Password.column_names
+# @see RailsAdmin::Config::Fields.register_factory
+RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
+  if parent.abstract_model.model.serialized_attributes.keys.include?(properties[:name].to_s)
+    fields << RailsAdmin::Config::Fields::Types::Serialized.new(parent, properties[:name], properties)
+    true
+  else
+    false
+  end
+end

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

@@ -18,6 +18,7 @@ require 'rails_admin/config/fields/types/polymorphic_association'
 require 'rails_admin/config/fields/types/string'
 require 'rails_admin/config/fields/types/hidden'
 require 'rails_admin/config/fields/types/text'
+require 'rails_admin/config/fields/types/serialized'
 require 'rails_admin/config/fields/types/time'
 require 'rails_admin/config/fields/types/timestamp'
 require 'rails_admin/config/fields/types/color'

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

@@ -5,10 +5,8 @@ module RailsAdmin
     module Fields
       module Types
         class BelongsToAssociation < RailsAdmin::Config::Fields::Association
-          # Register field type for the type loader
           RailsAdmin::Config::Fields::Types::register(self)
 
-          # Accessor for field's formatted value
           register_instance_option :formatted_value do
             (o = value) && o.send(associated_model_config.object_label_method)
           end
@@ -25,16 +23,16 @@ module RailsAdmin
             nested_form ? :form_nested_one : :form_filtering_select
           end
 
-          def associated_model_config
-            @config ||= RailsAdmin.config(association[:parent_model_proc].call)
-          end
-
           def selected_id
-            bindings[:object].send(child_key)
+            bindings[:object].send(foreign_key)
           end
 
           def method_name
-            nested_form ? "#{association[:child_key]}_attributes" : association[:child_key]
+            nested_form ? "#{self.name}_attributes" : association[:foreign_key]
+          end
+          
+          def multiple?
+            false
           end
         end
       end

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

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

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

@@ -17,7 +17,7 @@ module RailsAdmin
             (o = value) && o.send(associated_model_config.object_label_method)
           end
 
-          def editable
+          def editable?
             (nested_form || abstract_model.model.new.respond_to?("#{self.name}_id=")) && super
           end
 
@@ -28,6 +28,10 @@ module RailsAdmin
           def method_name
             nested_form ? "#{self.name}_attributes" : "#{self.name}_id"
           end
+          
+          def multiple?
+            false
+          end
         end
       end
     end

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

@@ -7,8 +7,10 @@ module RailsAdmin
         class Hidden < RailsAdmin::Config::Fields::Base
           RailsAdmin::Config::Fields::Types::register(self)
 
-          @view_helper = :hidden_field
-
+          register_instance_option :view_helper do
+            :hidden_field
+          end
+          
           register_instance_option(:partial) do
             :form_field
           end

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

@@ -8,7 +8,9 @@ module RailsAdmin
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types::register(self)
 
-          @view_helper = :number_field
+          register_instance_option :view_helper do
+            :number_field
+          end
 
           register_instance_option(:sort_reverse?) do
             serial?

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

@@ -8,11 +8,8 @@ module RailsAdmin
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types::register(self)
 
-          @column_names = [:password]
-          @view_helper = :password_field
-
-          def self.column_names
-            @column_names
+          register_instance_option :view_helper do
+            :password_field
           end
 
           def parse_input(params)

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

@@ -46,7 +46,7 @@ module RailsAdmin
           end
 
           def associated_model_config
-            @associated_model_config ||= association[:parent_model_proc].call.map{|type| RailsAdmin.config(type) }.select{|config| !config.excluded? }
+            @associated_model_config ||= association[:model_proc].call.map{|type| RailsAdmin.config(type) }.select{|config| !config.excluded? }
           end
 
           def polymorphic_type_collection

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

@@ -0,0 +1,22 @@
+require 'rails_admin/config/fields/types/text'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        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]))
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,8 +8,6 @@ module RailsAdmin
 
           RailsAdmin::Config::Fields::Types::register(self)
 
-          @view_helper = :text_field
-
           register_instance_option(:html_attributes) do
             {
               :maxlength => length,

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

@@ -7,9 +7,7 @@ module RailsAdmin
         class Text < RailsAdmin::Config::Fields::Base
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types::register(self)
-
-          @view_helper = :text_area
-
+          
           # CKEditor is disabled by default
           register_instance_option(:ckeditor) do
             false

data/lib/rails_admin/config/fields.rb

@@ -8,7 +8,7 @@ module RailsAdmin
       mattr_reader :default_factory
       @@default_factory = lambda do |parent, properties, fields|
         # If it's an association
-        if properties.has_key?(:parent_model_proc)
+        if properties.has_key?(:model_proc)
           association = parent.abstract_model.associations.find {|a| a[:name].to_s == properties[:name].to_s}
           field = RailsAdmin::Config::Fields::Types.load("#{association[:polymorphic] ? :polymorphic : properties[:type]}_association").new(parent, properties[:name], association)
         else
@@ -85,3 +85,4 @@ require 'rails_admin/config/fields/factories/paperclip'
 require 'rails_admin/config/fields/factories/dragonfly'
 require 'rails_admin/config/fields/factories/carrierwave'
 require 'rails_admin/config/fields/factories/belongs_to_association'
+require 'rails_admin/config/fields/factories/serialized'

data/lib/rails_admin/config/groupable.rb

@@ -0,0 +1,18 @@
+require 'rails_admin/config/fields/group'
+
+module RailsAdmin
+  module Config
+    module Groupable
+      # Register a group instance variable and accessor methods for objects
+      # extending the has groups mixin. The extended objects must implement
+      # reader for a parent object which includes this module.
+      #
+      # @see RailsAdmin::Config::HasGroups.group
+      # @see RailsAdmin::Config::Fields::Group
+      def group(name = nil)
+        @group = parent.group(name) unless name.nil? # setter
+        @group ||= parent.group(:default) # getter
+      end
+    end
+  end
+end

data/lib/rails_admin/config/has_fields.rb

@@ -126,7 +126,7 @@ module RailsAdmin
           # 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).map{|f| f.group :default; f }
+          @_ro_fields = @_fields = RailsAdmin::Config::Fields.factory(self)
         end
         readonly ? @_ro_fields : (@_fields ||= @_ro_fields.map(&:clone))
       end

data/lib/rails_admin/extensions/history/history.rb

@@ -19,7 +19,7 @@ class RailsAdmin::History < ActiveRecord::Base
     end
 
     model.associations.each do |t|
-      assoc = changed_property_list.index(t[:child_key].to_param)
+      assoc = changed_property_list.index(t[:foreign_key].to_param)
       changed_property_list[assoc] = "associated #{t[:pretty_name]}" if assoc
     end
 

data/lib/rails_admin/version.rb

@@ -2,5 +2,5 @@ module RailsAdmin
   # FIXME: this needs to be manually kept in sync with the gemspec's
   # s.version until http://jira.codehaus.org/browse/JRUBY-5319 is
   # fixed
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/controllers/main_controller_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe RailsAdmin::MainController do
@@ -107,8 +109,72 @@ describe RailsAdmin::MainController do
       controller.list_entries.length.should == @players.size
 
     end
+  end
 
+  describe "index" do
+    it "uses source association's primary key with :compact, not target model's default primary key" do
+      class TeamWithNumberedPlayers < ActiveRecord::Base
+        self.table_name = 'teams'
+        has_many :numbered_players, :class_name => 'Player', :primary_key => :number, :foreign_key => 'team_id'
+      end
+      FactoryGirl.create :team
+      TeamWithNumberedPlayers.first.numbered_players = [FactoryGirl.create(:player, :number => 123)]
+      returned = get :index, {:model_name => 'player', :source_object_id => Team.first.id, :source_abstract_model => 'team_with_numbered_players', :associated_collection => 'numbered_players', :current_action => :create, :compact => true, :format => :json}
+      returned.body.should =~ /\"id\"\:123/
+    end
+  end
+  
+  describe "sanitize_params_for!" do
+    it 'sanitize params recursively in nested forms' do
+      RailsAdmin.config Comment do
+        configure :created_at do
+          show
+        end
+      end
+      
+      RailsAdmin.config NestedFieldTest do
+        configure :created_at do
+          show
+        end
+      end
 
-
+      I18n.locale = :fr
+      controller.params = {
+        "field_test"=>{
+          :"datetime_field"=>"1 août 2010", 
+          "nested_field_tests_attributes"=>{
+            "new_1330520162002"=>{
+              "comment_attributes"=>{
+                :"created_at"=>"2 août 2010"
+              },
+              :"created_at"=>"3 août 2010"
+            }
+          }, 
+          "comment_attributes"=>{
+            :"created_at"=>"4 août 2010"
+          }
+        }
+      }
+      
+      controller.send(:sanitize_params_for!, :create, RailsAdmin.config(FieldTest), controller.params['field_test'])
+      
+      controller.params.should == {
+        "field_test"=>{
+          :datetime_field=>'Sun, 01 Aug 2010 00:00:00 UTC +00:00', 
+          "nested_field_tests_attributes"=>{
+            "new_1330520162002"=>{
+              "comment_attributes"=>{
+                :created_at=>'Mon, 02 Aug 2010 00:00:00 UTC +00:00'
+              }, 
+              :created_at=>'Tue, 03 Aug 2010 00:00:00 UTC +00:00'
+            }
+          }, 
+          "comment_attributes"=>{
+            :created_at=>'Wed, 04 Aug 2010 00:00:00 UTC +00:00'
+          }
+        }
+      }
+      I18n.locale = :en
+    end
   end
 end

data/spec/integration/basic/list/rails_admin_basic_list_spec.rb

@@ -246,7 +246,8 @@ describe "RailsAdmin Basic List" do
       end
 
       visit index_path(:model_name => "player")
-      should have_content("$.filters.append('Name', 'name', 'string', '', '', '', false, '1');$.filters.append('Team', 'team', 'belongs_to_association', '', '', '', false, '2');")
+      should have_content(%{$.filters.append("Name", "name", "string", null, null, "", 1);})
+      should have_content(%{$.filters.append("Team", "team", "belongs_to_association", null, null, "", 2);})
     end
   end