obitum-rails_admin 0.0.1 → 0.0.2

data/lib/rails_admin/config/actions/delete.rb

@@ -3,15 +3,15 @@ module RailsAdmin
     module Actions
       class Delete < RailsAdmin::Config::Actions::Base
         RailsAdmin::Config::Actions.register(self)
-        
+
         register_instance_option :member do
           true
         end
-        
+
         register_instance_option :route_fragment do
           'delete'
         end
-        
+
         register_instance_option :http_methods do
           [:get, :delete]
         end
@@ -19,18 +19,18 @@ module RailsAdmin
         register_instance_option :authorization_key do
           :destroy
         end
-        
+
         register_instance_option :controller do
           Proc.new do
             if request.get? # DELETE
-            
+
               respond_to do |format|
                 format.html { render @action.template_name }
                 format.js   { render @action.template_name, :layout => false }
               end
-            
+
             elsif request.delete? # DESTROY
-              
+
               @auditing_adapter && @auditing_adapter.delete_object("Destroyed #{@model_config.with(:object => @object).object_label}", @object, @abstract_model, _current_user)
               if @abstract_model.destroy(@object)
                 flash[:success] = t("admin.flash.successful", :name => @model_config.label, :action => t("admin.actions.delete.done"))
@@ -39,11 +39,14 @@ module RailsAdmin
               end
 
               redirect_to back_or_index
-              
+
             end
-            
           end
         end
+
+        register_instance_option :link_icon do
+          'icon-remove'
+        end
       end
     end
   end

data/lib/rails_admin/config/actions/edit.rb

@@ -2,32 +2,32 @@ module RailsAdmin
   module Config
     module Actions
       class Edit < RailsAdmin::Config::Actions::Base
-        RailsAdmin::Config::Actions.register(self)        
-        
+        RailsAdmin::Config::Actions.register(self)
+
         register_instance_option :member do
           true
         end
-        
+
         register_instance_option :http_methods do
           [:get, :put]
         end
-        
+
         register_instance_option :controller do
           Proc.new do
-            
+
             if request.get? # EDIT
 
               respond_to do |format|
                 format.html { render @action.template_name }
                 format.js   { render @action.template_name, :layout => false }
               end
-            
+
             elsif request.put? # UPDATE
-            
+
               @cached_assocations_hash = associations_hash
               @attributes = get_attributes
               @modified_assoc = []
-      
+
               @old_object = @object.dup
               @model_config.update.fields.map { |f| f.parse_input(@attributes) if f.respond_to?(:parse_input) }
               @object.set_attributes(@attributes, _attr_accessible_role)
@@ -41,11 +41,15 @@ module RailsAdmin
               else
                 handle_save_error :edit
               end
-              
+
             end
 
           end
         end
+
+        register_instance_option :link_icon do
+          'icon-pencil'
+        end
       end
     end
   end

data/lib/rails_admin/config/actions/export.rb

@@ -3,15 +3,15 @@ module RailsAdmin
     module Actions
       class Export < RailsAdmin::Config::Actions::Base
         RailsAdmin::Config::Actions.register(self)
-        
+
         register_instance_option :collection do
           true
         end
-        
+
         register_instance_option :http_methods do
           [:get, :post]
         end
-        
+
         register_instance_option :controller do
           Proc.new do
 
@@ -23,14 +23,17 @@ module RailsAdmin
             else
               render @action.template_name
             end
-            
+
           end
         end
-        
+
         register_instance_option :bulkable? do
           true
         end
-        
+
+        register_instance_option :link_icon do
+          'icon-share'
+        end
       end
     end
   end

data/lib/rails_admin/config/actions/history_index.rb

@@ -3,19 +3,19 @@ module RailsAdmin
     module Actions
       class HistoryIndex < RailsAdmin::Config::Actions::Base
         RailsAdmin::Config::Actions.register(self)
-        
+
         register_instance_option :authorization_key do
           :history
         end
-        
+
         register_instance_option :collection do
           true
         end
-        
+
         register_instance_option :route_fragment do
           'history'
         end
-        
+
         register_instance_option :controller do
           Proc.new do
             @general = true
@@ -24,10 +24,14 @@ module RailsAdmin
             render @action.template_name, :layout => request.xhr? ? false : 'rails_admin/application'
           end
         end
-        
+
         register_instance_option :template_name do
           :history
         end
+
+        register_instance_option :link_icon do
+          'icon-book'
+        end
       end
     end
   end

data/lib/rails_admin/config/actions/history_show.rb

@@ -3,19 +3,19 @@ module RailsAdmin
     module Actions
       class HistoryShow < RailsAdmin::Config::Actions::Base
         RailsAdmin::Config::Actions.register(self)
-        
+
         register_instance_option :authorization_key do
           :history
         end
-        
+
         register_instance_option :member do
           true
         end
-        
+
         register_instance_option :route_fragment do
           'history'
         end
-        
+
         register_instance_option :controller do
           Proc.new do
             @general = false
@@ -24,10 +24,14 @@ module RailsAdmin
             render @action.template_name, :layout => request.xhr? ? false : 'rails_admin/application'
           end
         end
-        
+
         register_instance_option :template_name do
           :history
         end
+
+        register_instance_option :link_icon do
+          'icon-book'
+        end
       end
     end
   end

data/lib/rails_admin/config/actions/index.rb

@@ -3,33 +3,38 @@ module RailsAdmin
     module Actions
       class Index < RailsAdmin::Config::Actions::Base
         RailsAdmin::Config::Actions.register(self)
-        
+
         register_instance_option :collection do
           true
         end
-        
+
         register_instance_option :http_methods do
           [:get, :post]
         end
-        
+
         register_instance_option :route_fragment do
           ''
         end
-        
+
         register_instance_option :breadcrumb_parent do
-          :dashboard
+          parent_model = bindings[:abstract_model].try(:config).try(:parent)
+          if am = parent_model && RailsAdmin.config(parent_model).try(:abstract_model)
+            [:index, am]
+          else
+            [:dashboard]
+          end
         end
-        
+
         register_instance_option :controller do
           Proc.new do
             @objects ||= list_entries
 
             respond_to do |format|
-              
-              format.html do  
+
+              format.html do
                 render @action.template_name, :layout => !request.xhr?, :status => (flash[:error].present? ? :not_found : 200)
               end
-              
+
               format.json do
                 output = if params[:compact]
                   @objects.map{ |o| { :id => o.id, :label => o.send(@model_config.object_label_method) } }
@@ -42,7 +47,7 @@ module RailsAdmin
                   render :json => output
                 end
               end
-              
+
               format.xml do
                 output = @objects.to_xml(@schema)
                 if params[:send_data]
@@ -51,7 +56,7 @@ module RailsAdmin
                   render :xml => output
                 end
               end
-              
+
               format.csv do
                 header, encoding, output = CSVConverter.new(@objects, @schema).to_csv(params[:csv_options])
                 if params[:send_data]
@@ -62,11 +67,16 @@ module RailsAdmin
                   render :text => output
                 end
               end
-              
+
             end
-            
+
           end
         end
+
+
+        register_instance_option :link_icon do
+          'icon-th-list'
+        end
       end
     end
   end

data/lib/rails_admin/config/actions/new.rb

@@ -3,21 +3,21 @@ module RailsAdmin
     module Actions
       class New < RailsAdmin::Config::Actions::Base
         RailsAdmin::Config::Actions.register(self)
-        
+
         register_instance_option :collection do
           true
         end
-        
+
         register_instance_option :http_methods do
           [:get, :post] # NEW / CREATE
         end
-        
+
         register_instance_option :controller do
-          
+
           Proc.new do
-            
+
             if request.get? # NEW
-              
+
               @object = @abstract_model.new
               @authorization_adapter && @authorization_adapter.attributes_for(:new, @abstract_model).each do |name, value|
                 @object.send("#{name}=", value)
@@ -29,12 +29,12 @@ module RailsAdmin
                 format.html { render @action.template_name }
                 format.js   { render @action.template_name, :layout => false }
               end
-              
+
             elsif request.post? # CREATE
-              
+
               @modified_assoc = []
               @object = @abstract_model.new
-              @attributes = get_attributes              
+              @attributes = get_attributes
               @model_config.create.fields.each {|f| f.parse_input(@attributes) if f.respond_to?(:parse_input) }
               @authorization_adapter && @authorization_adapter.attributes_for(:create, @abstract_model).each do |name, value|
                 @object.send("#{name}=", value)
@@ -50,10 +50,14 @@ module RailsAdmin
               else
                 handle_save_error
               end
-              
+
             end
           end
         end
+
+        register_instance_option :link_icon do
+          'icon-plus'
+        end
       end
     end
   end

data/lib/rails_admin/config/actions/show.rb

@@ -3,24 +3,29 @@ module RailsAdmin
     module Actions
       class Show < RailsAdmin::Config::Actions::Base
         RailsAdmin::Config::Actions.register(self)
-        
+
         register_instance_option :member do
           true
         end
-        
+
         register_instance_option :route_fragment do
           ''
         end
-        
+
         register_instance_option :breadcrumb_parent do
-          :index
+          [:index, bindings[:abstract_model]]
         end
-        
+
         register_instance_option :controller do
           Proc.new do
             render @action.template_name
           end
         end
+
+
+        register_instance_option :link_icon do
+          'icon-info-sign'
+        end
       end
     end
   end

data/lib/rails_admin/config/actions/show_in_app.rb

@@ -3,20 +3,25 @@ module RailsAdmin
     module Actions
       class ShowInApp < RailsAdmin::Config::Actions::Base
         RailsAdmin::Config::Actions.register(self)
-        
+
         register_instance_option :member do
           true
         end
-        
+
         register_instance_option :visible? do
-          bindings[:controller].main_app.url_for(bindings[:object]) rescue false
+          authorized? && (bindings[:controller].main_app.url_for(bindings[:object]) rescue false)
         end
-        
+
         register_instance_option :controller do
           Proc.new do
             redirect_to main_app.url_for(@object)
           end
         end
+
+
+        register_instance_option :link_icon do
+          'icon-eye-open'
+        end
       end
     end
   end

data/lib/rails_admin/config/actions.rb

@@ -1,7 +1,7 @@
 module RailsAdmin
   module Config
     module Actions
-      
+
       class << self
         def all(scope = nil, bindings = {})
           if scope.is_a?(Hash)
@@ -22,28 +22,28 @@ module RailsAdmin
           when :member
             @@actions.select(&:member?)
           end
-          
-          bindings[:controller] ? actions.map{ |action| action.with(bindings) }.select(&:visible?) : actions
+          actions = actions.map{ |action| action.with(bindings) }
+          bindings[:controller] ? actions.select(&:visible?) : actions
         end
-        
+
         def find custom_key, bindings = {}
           init_actions!
-          action = @@actions.find{ |a| a.custom_key == custom_key }
-          bindings[:controller] ? (action && action.with(bindings).try(:visible?) && action || nil) : action
+          action = @@actions.find{ |a| a.custom_key == custom_key }.with(bindings)
+          bindings[:controller] ? (action.try(:visible?) && action || nil) : action
         end
-        
+
         def collection key, parent_class = :base, &block
           add_action key, parent_class, :collection, &block
         end
-        
+
         def member key, parent_class = :base, &block
           add_action key, parent_class, :member, &block
         end
-        
+
         def root key, parent_class = :base, &block
           add_action key, parent_class, :root, &block
         end
-        
+
         def add_action key, parent_class, parent, &block
           a = "RailsAdmin::Config::Actions::#{parent_class.to_s.camelize}".constantize.new
           a.instance_eval(%{
@@ -59,17 +59,17 @@ module RailsAdmin
             raise "Action #{a.custom_key} already exist. Please change its custom key"
           end
         end
-          
+
         def reset
           @@actions = nil
         end
-        
+
         def register(name, klass = nil)
           if klass == nil && name.kind_of?(Class)
             klass = name
             name = klass.to_s.demodulize.underscore.to_sym
           end
-        
+
           instance_eval %{
             def #{name}(&block)
               action = #{klass}.new
@@ -82,9 +82,9 @@ module RailsAdmin
             end
           }
         end
-        
-        private 
-        
+
+        private
+
         def init_actions!
           @@actions ||= [
             Dashboard.new,

data/lib/rails_admin/config/configurable.rb

@@ -0,0 +1,92 @@
+module RailsAdmin
+  module Config
+    # A module for all configurables.
+
+    module Configurable
+      def self.included(base)
+        base.send :extend, ClassMethods
+      end
+
+      def has_option?(name)
+        options = self.class.instance_variable_get("@config_options")
+        options && options.has_key?(name)
+      end
+
+      # Register an instance option for this object only
+      def register_instance_option(option_name, &default)
+        scope = class << self; self; end;
+        self.class.register_instance_option(option_name, scope, &default)
+      end
+
+      def register_deprecated_instance_option(option_name, replacement_option_name)
+        scope = class << self; self; end;
+        self.class.register_deprecated_instance_option(option_name, replacement_option_name, scope)
+      end
+
+      module ClassMethods
+        # Register an instance option. Instance option is a configuration
+        # option that stores its value within an instance variable and is
+        # accessed by an instance method. Both go by the name of the option.
+        def register_instance_option(option_name, scope = self, &default)
+          unless options = scope.instance_variable_get("@config_options")
+            options = scope.instance_variable_set("@config_options", {})
+          end
+
+          option_name = option_name.to_s
+
+          options[option_name] = nil
+
+          # If it's a boolean create an alias for it and remove question mark
+          if "?" == option_name[-1, 1]
+            scope.send(:define_method, "#{option_name.chop!}?") do
+              send(option_name)
+            end
+          end
+
+          # Define getter/setter by the option name
+          scope.send(:define_method, option_name) do |*args, &block|
+            if !args[0].nil? || block
+              # Invocation with args --> This is the declaration of the option, i.e. setter
+              instance_variable_set("@#{option_name}_registered", args[0].nil? ? block : args[0])
+            else
+              # Invocation without args nor block --> It's the use of the option, i.e. getter
+              value = instance_variable_get("@#{option_name}_registered")
+              case value
+                when Proc
+                  # Track recursive invocation with an instance variable. This prevents run-away recursion
+                  # and allows configurations such as
+                  # label { "#{label}".upcase }
+                  # This will use the default definition when called recursively.
+                  if instance_variable_get("@#{option_name}_recurring")
+                    value = instance_eval &default
+                  else
+                    instance_variable_set("@#{option_name}_recurring", true)
+                    value = instance_eval &value
+                    instance_variable_set("@#{option_name}_recurring", false)
+                  end
+                when nil
+                  value = instance_eval &default
+              end
+              value
+            end
+          end
+        end
+
+        def register_deprecated_instance_option(option_name, replacement_option_name, scope = self)
+          scope.send(:define_method, option_name) do |*args, &block|
+            ActiveSupport::Deprecation.warn("The #{option_name} configuration option is deprecated, please use #{replacement_option_name}.")
+            send(replacement_option_name, *args, &block)
+          end
+        end
+
+        # Register a class option. Class option is a configuration
+        # option that stores it's value within a class object's instance variable
+        # and is accessed by a class method. Both go by the name of the option.
+        def register_class_option(option_name, &default)
+          scope = class << self; self; end;
+          self.register_instance_option(option_name, scope, &default)
+        end
+      end
+    end
+  end
+end

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

@@ -27,14 +27,6 @@ module RailsAdmin
           end.to_sentence.html_safe
         end
 
-        register_instance_option(:sortable) do
-          false
-        end
-
-        register_instance_option(:searchable) do
-          false
-        end
-
         # Accessor whether association is visible or not. By default
         # association checks whether the child model is excluded in
         # configuration or not.
@@ -64,7 +56,7 @@ module RailsAdmin
 
         # Reader for the association's child model's configuration
         def associated_model_config
-          @associated_model_config ||= RailsAdmin.config(association[:child_model])
+          @associated_model_config ||= RailsAdmin.config(association[:child_model_proc].call)
         end
 
         # Reader for the association's child model object's label method
@@ -82,24 +74,11 @@ module RailsAdmin
           association[:inverse_of]
         end
 
-        # we need to check for validation on method and on association
-        register_instance_option :required? do
-          @required ||= !!(abstract_model.model.validators_on(name) + abstract_model.model.validators_on(method_name)).find do |v|
-            v.is_a?(ActiveModel::Validations::PresenceValidator) && !v.options[:allow_nil] ||
-            v.is_a?(ActiveModel::Validations::NumericalityValidator) && !v.options[:allow_nil]
-          end
-        end
-
-        # Reader for validation errors of the bound object
-        def errors
-          bindings[:object].errors[association[:name]] + bindings[:object].errors[child_key]
-        end
-
         # Reader whether this is a polymorphic association
         def polymorphic?
           association[:polymorphic]
         end
-        
+
         # Reader for nested attributes
         register_instance_option :nested_form do
           association[:nested_form]
@@ -109,6 +88,10 @@ module RailsAdmin
         def value
           bindings[:object].send(association[:name])
         end
+
+        def virtual?
+          true
+        end
       end
     end
   end