obitum-rails_admin 0.0.1 → 0.0.2

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

@@ -14,7 +14,7 @@ module RailsAdmin
           def self.column_names
             @column_names
           end
-          
+
           def parse_input(params)
             params[name] = params[name].presence
           end
@@ -27,7 +27,7 @@ module RailsAdmin
           def value
             ""
           end
-          
+
           register_instance_option :visible do
             self.section.is_a?(RailsAdmin::Config::Sections::Edit)
           end

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

@@ -38,7 +38,7 @@ module RailsAdmin
           end
 
           def associated_collection(type)
-            return [] if type.nil?
+            return [] if type.blank?
             config = RailsAdmin.config(type)
             config.abstract_model.all.map do |object|
               [object.send(config.object_label_method), object.id]
@@ -46,7 +46,7 @@ module RailsAdmin
           end
 
           def associated_model_config
-            @associated_model_config ||= association[:parent_model].map{|type| RailsAdmin.config(type) }.select{|config| !config.excluded? }
+            @associated_model_config ||= association[:parent_model_proc].call.map{|type| RailsAdmin.config(type) }.select{|config| !config.excluded? }
           end
 
           def polymorphic_type_collection

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

@@ -18,7 +18,7 @@ module RailsAdmin
           # 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
-            "/javascripts/ckeditor/config.js"
+            "/assets/ckeditor/config.js"
           end
 
           register_instance_option(:html_attributes) do
@@ -27,7 +27,7 @@ module RailsAdmin
               :rows => "3"
             }
           end
-          
+
           register_instance_option(:partial) do
             :form_text
           end

data/lib/rails_admin/config/fields.rb

@@ -8,24 +8,14 @@ module RailsAdmin
       mattr_reader :default_factory
       @@default_factory = lambda do |parent, properties, fields|
         # If it's an association
-        if properties.has_key?(:parent_model)
+        if properties.has_key?(:parent_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)
-          fields << field
-
-        # If it's a column
-        elsif !properties.has_key?(:parent_model)
-          fields << (field = RailsAdmin::Config::Fields::Types.load(properties[:type]).new(parent, properties[:name], properties))
-          # hide _type columns (handled as associations)
-          if parent.abstract_model.belongs_to_associations.find {|a| a[:foreign_type] == properties[:name] }
-            field.hide
-          end
-          # hide _id column
-          if parent.abstract_model.belongs_to_associations.find {|a| a[:child_key] == properties[:name] }
-            field.hide
-            field.filterable(false) # filtering is handled on the association itself
-          end
+        else
+          field = RailsAdmin::Config::Fields::Types.load(properties[:type]).new(parent, properties[:name], properties)
         end
+        fields << field
+        field
       end
 
       # Registry of field factories.
@@ -55,7 +45,6 @@ module RailsAdmin
       # @see RailsAdmin::Config::Fields.registry
       def self.factory(parent)
         fields = []
-        return fields unless parent.abstract_model.model_store_exists?
         # Load fields for all properties (columns)
 
         parent.abstract_model.properties.each do |properties|
@@ -66,7 +55,7 @@ module RailsAdmin
           end
         end
         # Load fields for all associations (relations)
-        parent.abstract_model.associations.each do |association|
+        parent.abstract_model.associations.select{|a| a[:type] != :belongs_to }.each do |association| # :belongs_to are created by factory for belongs_to fields
           # Unless a previous factory has already loaded current field as well
           unless fields.find {|f| f.name == association[:name] }
             # Loop through factories until one returns true
@@ -95,3 +84,4 @@ require 'rails_admin/config/fields/factories/devise'
 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'

data/lib/rails_admin/config/has_fields.rb

@@ -80,7 +80,7 @@ module RailsAdmin
       # If a block is passed it will be evaluated in the context of each field
       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 if defined.empty?
@@ -101,28 +101,28 @@ module RailsAdmin
       def fields_of_type(type, &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 }
       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.map {|f| f.with(bindings) }.select(&:visible?).sort_by{|f| [f.order, i += 1] } # stable sort, damn
       end
-      
+
       protected
-      
-      # Raw fields. 
+
+      # Raw fields.
       # Recursively returns parent section's raw fields
       # Duping it if accessed for modification.
       def _fields(readonly = false)
         return @_fields if @_fields
         return @_ro_fields if readonly && @_ro_fields
-        
-        unless self.class == RailsAdmin::Config::Sections::Base 
+
+        unless self.class == RailsAdmin::Config::Sections::Base
           # 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

data/lib/rails_admin/config/has_groups.rb

@@ -2,7 +2,7 @@ require 'rails_admin/config/fields/group'
 
 module RailsAdmin
   module Config
-    module HasGroups      
+    module HasGroups
       # Accessor for a group
       #
       # If group with given name does not yet exist it will be created. If a
@@ -16,7 +16,7 @@ module RailsAdmin
 
       # Reader for groups that are marked as visible
       def visible_groups
-        parent.groups.map {|f| f.section = self; f.with(bindings) }.select(&:visible).select{|g| g.visible_fields.present?}
+        parent.groups.map {|f| f.section = self; f.with(bindings) }.select(&:visible?).select{|g| g.visible_fields.present?}
       end
     end
   end

data/lib/rails_admin/config/hideable.rb

@@ -9,12 +9,12 @@ module RailsAdmin
         end
       end
 
-      # Reader whether field is hidden.
+      # Reader whether object is hidden.
       def hidden?
         not visible
       end
 
-      # Writer to hide field.
+      # Writer to hide object.
       def hide(&block)
         visible block ? proc { false == (instance_eval &block) } : false
       end

data/lib/rails_admin/config/model.rb

@@ -1,5 +1,6 @@
 require 'rails_admin/config'
-require 'rails_admin/config/base'
+require 'rails_admin/config/proxyable'
+require 'rails_admin/config/configurable'
 require 'rails_admin/config/hideable'
 require 'rails_admin/config/has_groups'
 require 'rails_admin/config/fields/group'
@@ -12,14 +13,20 @@ require 'rails_admin/config/actions'
 module RailsAdmin
   module Config
     # Model specific configuration object.
-    class Model < RailsAdmin::Config::Base
+    class Model
+      include RailsAdmin::Config::Proxyable
+      include RailsAdmin::Config::Configurable
       include RailsAdmin::Config::Hideable
       include RailsAdmin::Config::Sections
-      
+
       attr_reader :abstract_model
       attr_accessor :groups
-      
+      attr_reader :parent, :root
+
       def initialize(entity)
+        @parent = nil
+        @root = self
+
         @abstract_model = begin
           if entity.kind_of?(RailsAdmin::AbstractModel)
             entity
@@ -29,15 +36,11 @@ module RailsAdmin
             RailsAdmin::AbstractModel.new(entity.class)
           end
         end
-        
         @groups = [ RailsAdmin::Config::Fields::Group.new(self, :default).tap {|g| g.label{I18n.translate("admin.form.basic_info")} } ]
-        @bindings = {}
-        @parent = nil
-        @root = self
       end
 
       def excluded?
-        @excluded ||= !RailsAdmin::AbstractModel.all.map(&:model).include?(abstract_model.model)
+        @excluded ||= !RailsAdmin::AbstractModel.all.map(&:model_name).include?(abstract_model.try(:model_name))
       end
 
       def object_label
@@ -48,28 +51,31 @@ module RailsAdmin
       # Unless configured in a model config block, it'll try to use :name followed by :title methods, then
       # any methods that may have been added to the label_methods array via Configuration.
       # Failing all of these, it'll return the class name followed by the model's id.
-      register_instance_option(:object_label_method) do
+      register_instance_option :object_label_method do
         @object_label_method ||= Config.label_methods.find { |method| (@dummy_object ||= abstract_model.model.new).respond_to? method } || :rails_admin_default_object_label_method
       end
 
-      register_instance_option(:label) do
+      register_instance_option :label do
         (@label ||= {})[::I18n.locale] ||= abstract_model.model.model_name.human(:default => abstract_model.model.model_name.demodulize.underscore.humanize)
       end
 
-      register_instance_option(:label_plural) do
+      register_instance_option :label_plural do
         (@label_plural ||= {})[::I18n.locale] ||= abstract_model.model.model_name.human(:count => 2, :default => label.pluralize)
       end
 
-      register_instance_option(:weight) do
+      register_instance_option :weight do
         0
       end
 
-      register_instance_option(:parent) do
-        :root
+      # parent node in navigation/breadcrumb
+      register_instance_option :parent do
+        @parent_model ||= begin
+          (klass = abstract_model.model.superclass).to_s.in?(['Object', 'BasicObject', 'ActiveRecord::Base']) ? nil : klass
+        end
       end
 
-      register_instance_option(:navigation_label) do
-        false
+      register_instance_option :navigation_label do
+         @navigation_label ||= (parent_module = abstract_model.model.parent) != Object ? parent_module.to_s : nil
       end
 
       # Act as a proxy for the base section configuration that actually

data/lib/rails_admin/config/proxyable/proxy.rb

@@ -0,0 +1,43 @@
+module RailsAdmin
+  module Config
+    module Proxyable
+
+      class Proxy
+
+        instance_methods.each {|m| undef_method m unless m =~ /^(__|instance_eval|object_id)/ }
+
+        attr_reader :bindings
+
+        def initialize(object, bindings = {})
+          @object = object
+          @bindings = bindings
+        end
+
+        # Bind variables to be used by the configuration options
+        def bind(key, value = nil)
+          if key.kind_of?(Hash)
+            @bindings = key
+          else
+            @bindings[key] = value
+          end
+          self
+        end
+
+        def method_missing(name, *args, &block)
+          if @object.respond_to?(name)
+            reset = @object.instance_variable_get("@bindings")
+            begin
+              @object.instance_variable_set("@bindings", @bindings)
+              response = @object.__send__(name, *args, &block)
+            ensure
+              @object.instance_variable_set("@bindings", @reset)
+            end
+            response
+          else
+            super(name, *args, &block)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rails_admin/config/proxyable.rb

@@ -0,0 +1,12 @@
+require 'rails_admin/config/proxyable/proxy'
+module RailsAdmin
+  module Config
+    module Proxyable
+      attr_accessor :bindings
+
+      def with(bindings = {})
+        RailsAdmin::Config::Proxyable::Proxy.new(self, bindings)
+      end
+    end
+  end
+end

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

@@ -1,4 +1,5 @@
-require 'rails_admin/config/base'
+require 'rails_admin/config/proxyable'
+require 'rails_admin/config/configurable'
 require 'rails_admin/config/has_fields'
 require 'rails_admin/config/has_groups'
 
@@ -6,12 +7,21 @@ module RailsAdmin
   module Config
     module Sections
       # Configuration of the show view for a new object
-      class Base < RailsAdmin::Config::Base
+      class Base
+        include RailsAdmin::Config::Proxyable
+        include RailsAdmin::Config::Configurable
+
         include RailsAdmin::Config::HasFields
         include RailsAdmin::Config::HasGroups
-        
+
+        attr_reader :abstract_model
+        attr_reader :parent, :root
+
         def initialize(parent)
-          super(parent)
+          @parent = parent
+          @root = parent.root
+
+          @abstract_model = root.abstract_model
         end
       end
     end

data/lib/rails_admin/config.rb

@@ -19,7 +19,7 @@ module RailsAdmin
     DEFAULT_ATTR_ACCESSIBLE_ROLE = Proc.new { :default }
 
     DEFAULT_AUTHORIZE = Proc.new {}
-    
+
     DEFAULT_AUDIT = Proc.new {}
 
     DEFAULT_CURRENT_USER = Proc.new do
@@ -99,7 +99,7 @@ module RailsAdmin
         @attr_accessible_role = blk if blk
         @attr_accessible_role || DEFAULT_ATTR_ACCESSIBLE_ROLE
       end
-      
+
       # Setup auditing/history/versioning provider that observe objects lifecycle
       def audit_with(*args, &block)
         extension = args.shift
@@ -112,7 +112,7 @@ module RailsAdmin
         end
         @audit || DEFAULT_AUDIT
       end
-      
+
       # Setup authorization to be run as a before filter
       # This is run inside the controller instance so you can setup any authorization you need to.
       #
@@ -191,6 +191,28 @@ module RailsAdmin
         end
       end
 
+      # pool of all found model names from the whole application
+      def models_pool
+        possible =
+          included_models.map(&:to_s).presence || (
+          @@system_models ||= # memoization for tests
+            ([Rails.application] + Rails::Application::Railties.engines).map do |app|
+              (app.paths['app/models'] + app.config.autoload_paths).map do |load_path|
+                Dir.glob(app.root.join(load_path)).map do |load_dir|
+                  Dir.glob(load_dir + "/**/*.rb").map do |filename|
+                    # app/models/module/class.rb => module/class.rb => module/class => Module::Class
+                    lchomp(filename, "#{app.root.join(load_dir)}/").chomp('.rb').camelize
+                  end
+                end
+              end
+            end.flatten
+          )
+
+        excluded = (excluded_models.map(&:to_s) + ['RailsAdmin::History'])
+
+        (possible - excluded).uniq.sort
+      end
+
       # Loads a model configuration instance from the registry or registers
       # a new one if one is yet to be added.
       #
@@ -206,7 +228,7 @@ module RailsAdmin
       def model(entity, &block)
         key = begin
           if entity.kind_of?(RailsAdmin::AbstractModel)
-            entity.model.name.to_sym
+            entity.model.try(:name).try :to_sym
           elsif entity.kind_of?(Class)
             entity.name.to_sym
           elsif entity.kind_of?(String) || entity.kind_of?(Symbol)
@@ -219,7 +241,7 @@ module RailsAdmin
         config.instance_eval(&block) if block
         config
       end
-            
+
       def default_hidden_fields=(fields)
         if fields.is_a?(Array)
           @default_hidden_fields = {}
@@ -229,12 +251,12 @@ module RailsAdmin
           @default_hidden_fields = fields
         end
       end
-      
+
       # Returns action configuration object
       def actions(&block)
         RailsAdmin::Config::Actions.instance_eval(&block) if block
       end
-      
+
       # Returns all model configurations
       #
       # If a block is given it is evaluated in the context of configuration
@@ -280,11 +302,18 @@ module RailsAdmin
       # Get all models that are configured as visible sorted by their weight and label.
       #
       # @see RailsAdmin::Config::Hideable
-      def visible_models
-        self.models.select {|m| m.visible? }.sort do |a, b|
+
+      def visible_models(bindings)
+        models.map{|m| m.with(bindings) }.select{|m| m.visible? && bindings[:controller].authorized?(:index, m.abstract_model)}.sort do |a, b|
           (weight_order = a.weight <=> b.weight) == 0 ? a.label.downcase <=> b.label.downcase : weight_order
         end
       end
+
+      private
+
+      def lchomp(base, arg)
+        base.to_s.reverse.chomp(arg.to_s.reverse).reverse
+      end
     end
 
     # Set default values for configuration options on load

data/lib/rails_admin/extension.rb

@@ -21,7 +21,7 @@ module RailsAdmin
     if(configuration = options[:configuration])
       CONFIGURATION_ADAPTERS[extension_key] = extension_definition::ConfigurationAdapter
     end
-    
+
     if(configuration = options[:auditing])
       AUDITING_ADAPTERS[extension_key] = extension_definition::AuditingAdapter
     end

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

@@ -7,23 +7,23 @@ module RailsAdmin
           @user_class = user_class
           require 'rails_admin/extensions/history/history'
         end
-        
+
         def latest
           ::RailsAdmin::History.latest
         end
-        
+
         def delete_object(message, object, model, user)
           ::RailsAdmin::History.create_history_item(message, object, model, user)
         end
-        
+
         def update_object(model, object, associations_before, associations_after, modified_associations, old_object, user)
           ::RailsAdmin::History.create_update_history(model, object, associations_before, associations_after, modified_associations, old_object, user)
         end
-        
+
         def create_object(message, object, abstract_model, user)
           ::RailsAdmin::History.create_history_item(message, object, abstract_model, user)
         end
-        
+
         def listing_for_model(model, query, sort, sort_reverse, all, page, per_page = (RailsAdmin::Config.default_items_per_page || 20))
           ::RailsAdmin::History.history_for_model(model, query, sort, sort_reverse, all, page, per_page)
         end
@@ -34,4 +34,4 @@ module RailsAdmin
       end
     end
   end
-end
+end

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

@@ -1,5 +1,6 @@
 class RailsAdmin::History < ActiveRecord::Base
-  set_table_name :rails_admin_histories
+
+  self.table_name = :rails_admin_histories
 
   IGNORED_ATTRS = Set[:id, :created_at, :created_on, :deleted_at, :updated_at, :updated_on, :deleted_on]
 

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

@@ -6,28 +6,28 @@ module RailsAdmin
           @version = version
           @user_class = user_class
         end
-        
+
         def message
           "#{@version.event} #{@version.item_type} id #{@version.item_id}"
         end
-        
+
         def created_at
           @version.created_at
         end
-        
+
         def table
           @version.item_type
         end
-        
+
         def username
           @user_class.find_by_id(@version.whodunnit).try(:email) || @version.whodunnit
         end
-        
+
         def item
           @version.item_id
         end
       end
-      
+
       class AuditingAdapter
         COLUMN_MAPPING = {
           :table => :item_type,
@@ -36,29 +36,29 @@ module RailsAdmin
           :created_at => :created_at,
           :message => :event
         }
-        
+
         def initialize(controller, user_class = User)
           raise "PaperTrail not found" unless defined?(PaperTrail)
           @controller = controller
           @user_class = user_class
         end
-        
+
         def latest
           Version.limit(100).map{|version| VersionProxy.new(version, @user_class)}
         end
-        
+
         def delete_object(message, object, model, user)
           # do nothing
         end
-        
+
         def update_object(model, object, associations_before, associations_after, modified_associations, old_object, user)
           # do nothing
         end
-        
+
         def create_object(message, object, abstract_model, user)
           # do nothing
         end
-        
+
         def listing_for_model(model, query, sort, sort_reverse, all, page, per_page = (RailsAdmin::Config.default_items_per_page || 20))
           if sort.present?
             sort = COLUMN_MAPPING[sort.to_sym]
@@ -89,4 +89,4 @@ module RailsAdmin
       end
     end
   end
-end
+end

data/lib/rails_admin/support/csv_converter.rb

@@ -13,17 +13,17 @@ module RailsAdmin
 
       @model = objects.first.class
       @abstract_model = RailsAdmin::AbstractModel.new(@model)
-      @model_config = RailsAdmin.config(@abstract_model)
+      @model_config = @abstract_model.config
       @methods = [(schema[:only] || []) + (schema[:methods] || [])].flatten.compact
       @fields = @model_config.export.fields.select{|f| @methods.include? f.name }
       @empty = ::I18n.t('admin.export.empty_value_for_associated_objects')
       @associations = {}
 
       (schema.delete(:include) || {}).each do |key, values|
-        association = @abstract_model.associations.find{ |association| association[:name] == key }
-        model = association[:type] == :belongs_to ? association[:parent_model] : association[:child_model]
-        abstract_model = RailsAdmin::AbstractModel.new(model)
-        model_config = RailsAdmin.config(abstract_model)
+        association = @model_config.export.fields.find{|f| f.name == key && f.association?}
+        model_config = association.associated_model_config
+        abstract_model = model_config.abstract_model
+        model = abstract_model.model
         methods = [(values[:only] || []) + (values[:methods] || [])].flatten.compact
         fields = model_config.export.fields.select{|f| methods.include? f.name }
 
@@ -65,7 +65,7 @@ module RailsAdmin
           end +
           @associations.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 => @model_config.export.fields.find{|f| f.name == association_name }.label))
+              output(::I18n.t('admin.export.csv.header_for_association_methods', :name => field.label, :association => option_hash[:association].label))
             end
           end.flatten
         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.1"
+  VERSION = "0.0.2"
 end

data/lib/rails_admin.rb

@@ -31,9 +31,4 @@ module RailsAdmin
       RailsAdmin::Config
     end
   end
-
-  # Reset RailsAdmin configuration to defaults
-  def self.reset
-    RailsAdmin::Config.reset
-  end
 end