activeadmin 0.2.2 → 0.3.0

data/lib/active_admin/comments/configuration.rb

@@ -2,13 +2,15 @@ module ActiveAdmin
   module Comments
 
     module Configuration
+      extend ActiveSupport::Concern
 
-      # Set the namespaces that can create and view comments
-      #
-      #   config.allow_comments_in = [:admin, :root]
-      #
-      @@allow_comments_in = [ActiveAdmin.default_namespace]
-      mattr_accessor :allow_comments_in
+      included do
+        # Set the namespaces that can create and view comments
+        #
+        #   config.allow_comments_in = [:admin, :root]
+        #
+        setting :allow_comments_in, [:admin]
+      end
 
     end
 

data/lib/active_admin/comments/namespace_helper.rb

@@ -5,7 +5,7 @@ module ActiveAdmin
 
       # Returns true of the namespace allows comments
       def comments?
-        ActiveAdmin.allow_comments_in && ActiveAdmin.allow_comments_in.include?(name)
+        application.allow_comments_in && application.allow_comments_in.include?(name)
       end
 
     end

data/lib/active_admin/comments/views/active_admin_comments.rb

@@ -21,7 +21,7 @@ module ActiveAdmin
         end
 
         def record_comments
-          @record_comments ||= @record.active_admin_comments.where(:namespace => active_admin_namespace.name)
+          @record_comments ||= @record.active_admin_comments.where(:namespace => active_admin_namespace.name.to_s)
         end
 
         def build_comments

data/lib/active_admin/csv_builder.rb

@@ -0,0 +1,45 @@
+module ActiveAdmin
+  # CSVBuilder stores CSV configuration
+  #
+  # Usage example:
+  #
+  #   csv_builder = CSVBuilder.new
+  #   csv_builder.column :id
+  #   csv_builder.column("Name") { |resource| resource.full_name }
+  #
+  class CSVBuilder
+
+    # Return a default CSVBuilder for a resource
+    # The CSVBuilder's columns would be Id followed by this
+    # resource's content columns
+    def self.default_for_resource(resource)
+      new.tap do |csv_builder|
+        csv_builder.column(:id)
+        resource.content_columns.each do |content_column|
+          csv_builder.column(content_column.name.to_sym)
+        end
+      end
+    end
+
+    attr_reader :columns
+
+    def initialize(&block)
+      @columns = []
+      instance_eval &block if block_given?
+    end
+
+    # Add a column
+    def column(name, &block)
+      @columns << Column.new(name, block)
+    end
+
+    class Column
+      attr_reader :name, :data
+      
+      def initialize(name, block = nil)
+        @name = name.is_a?(Symbol) ? name.to_s.titleize : name
+        @data = block || name.to_sym
+      end
+    end
+  end
+end

data/lib/active_admin/dashboards.rb

@@ -27,7 +27,7 @@ module ActiveAdmin
       # Add a new dashboard section to a namespace. If no namespace is given
       # it will be added to the default namespace.
       def add_section(name, options = {}, &block)
-        namespace = options.delete(:namespace) || ActiveAdmin.default_namespace
+        namespace = options.delete(:namespace) || ActiveAdmin.application.default_namespace || :root
         self.sections[namespace] ||= [] 
         self.sections[namespace] << Section.new(namespace, name, options, &block)
         self.sections[namespace].sort!

data/lib/active_admin/dashboards/dashboard_controller.rb

@@ -2,24 +2,17 @@ module ActiveAdmin
   module Dashboards
     class DashboardController < ResourceController
 
-      before_filter :skip_sidebar!
-
       actions :index
 
-      # Render from here if not overriden
-      self.default_views = 'active_admin_dashboard'
-
-      clear_action_items!
-
       def index
         @dashboard_sections = find_sections
-        render_or_default 'index'
+        render 'active_admin/dashboard/index.html.arb'
       end
 
       protected
 
       def set_current_tab
-        @current_tab = "Dashboard"
+        @current_tab = I18n.t("active_admin.dashboard")
       end
 
       def find_sections
@@ -37,7 +30,7 @@ module ActiveAdmin
 
       # Return the current menu for the view. This is a helper method
       def current_menu
-        ActiveAdmin.namespaces[namespace].menu
+        ActiveAdmin.application.namespaces[namespace].menu
       end
 
     end

data/lib/active_admin/dependency_checker.rb

@@ -0,0 +1,28 @@
+require 'rails/version'
+
+module ActiveAdmin
+  module DependencyChecker
+    class << self
+      def check!
+        if rails_3_1?
+          unless meta_search_1_1? && sass_rails_3_1?
+            warn "ActiveAdmin requires meta_search >= 1.1.0.pre and sass-rails ~> 3.1.0.rc to work with rails >= 3.1.0"
+          end
+        end
+      end
+
+      def rails_3_1?
+        Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 1
+      end
+
+      def meta_search_1_1?
+        Gem.loaded_specs['meta_search'].version.to_s >= "1.1"
+      end
+
+      def sass_rails_3_1?
+        require 'sass/rails/version'
+        Sass::Rails::VERSION >= "3.1"
+      end
+    end
+  end
+end

data/lib/active_admin/deprecation.rb

@@ -0,0 +1,36 @@
+module ActiveAdmin
+  module Deprecation
+    extend self
+
+    def warn(message, callstack = caller)
+      ActiveSupport::Deprecation.warn "Active Admin: #{message}", callstack
+    end
+
+    # Deprecate a method.
+    #
+    # @param [Module] klass the Class or Module to deprecate the method on
+    # @param [Symbol] method the method to deprecate
+    # @param [String] message the message to display to the end user
+    #
+    # Example:
+    #
+    #     class MyClass
+    #       def my_method
+    #         # ...
+    #       end
+    #       ActiveAdmin::Deprecation.deprecate self, :my_method,
+    #         "MyClass#my_method is being removed in the next release"
+    #     end
+    #
+    def deprecate(klass, method, message)
+      klass.class_eval <<-EOC, __FILE__, __LINE__
+        alias_method :"deprecated_#{method}", :#{method}
+        def #{method}(*args)
+          ActiveAdmin::Deprecation.warn('#{message}', caller)
+          send(:deprecated_#{method}, *args)
+        end
+      EOC
+    end
+
+  end
+end

data/lib/active_admin/devise.rb

@@ -4,11 +4,18 @@ module ActiveAdmin
   module Devise
 
     def self.config
-      {
-        :path => ActiveAdmin.default_namespace,
+      config = {
+        :path => ActiveAdmin.application.default_namespace,
         :controllers => ActiveAdmin::Devise.controllers,
         :path_names => { :sign_in => 'login', :sign_out => "logout" }
       }
+
+      if ::Devise.respond_to?(:sign_out_via)
+        logout_methods = [::Devise.sign_out_via, ActiveAdmin.application.logout_link_method].flatten.uniq
+        config.merge!( :sign_out_via => logout_methods)
+      end
+
+      config
     end
 
     def self.controllers
@@ -27,7 +34,11 @@ module ActiveAdmin
 
       # Redirect to the default namespace on logout
       def root_path
-        "/#{ActiveAdmin.default_namespace}"
+        if ActiveAdmin.application.default_namespace
+          "/#{ActiveAdmin.application.default_namespace}"
+        else
+          "/"
+        end
       end
     end
 

data/lib/active_admin/dsl.rb

@@ -94,8 +94,15 @@ module ActiveAdmin
       config.scope(*args, &block)
     end
 
+    # Add a new action item to the resource
+    #
+    # @param [Hash] options valid keys include:
+    #                 :only:  A single or array of controller actions to display
+    #                         this action item on.
+    #                 :except: A single or array of controller actions not to
+    #                          display this action item on.
     def action_item(options = {}, &block)
-      controller.action_item(options, &block)
+      config.add_action_item(options, &block)
     end
 
     # Configure the index page for the resource
@@ -115,6 +122,23 @@ module ActiveAdmin
       controller.form_config = options
     end
 
+    def sidebar(name, options = {}, &block)
+      config.sidebar_sections << ActiveAdmin::SidebarSection.new(name, options, &block)
+    end
+
+    # Configure the CSV format
+    #
+    # For example:
+    #
+    #   csv do
+    #     column :name
+    #     column("Author") { |post| post.author.full_name }
+    #   end
+    #
+    def csv(&block)
+      config.csv_builder = CSVBuilder.new(&block)
+    end
+
     # Member Actions give you the functionality of defining both the
     # action and the route directly from your ActiveAdmin registration
     # block.
@@ -181,11 +205,9 @@ module ActiveAdmin
     # Filters
     delegate :filter, :to => :controller
 
-    # Sidebar
-    delegate :sidebar, :to => :controller
 
     # Standard rails filters
-    delegate :before_filter, :after_filter, :around_filter, :to => :controller
+    delegate :before_filter, :skip_before_filter, :after_filter, :around_filter, :to => :controller
 
     # Specify which actions to create in the controller
     #

data/lib/active_admin/engine.rb

@@ -0,0 +1,4 @@
+module ActiveAdmin
+  class Engine < Rails::Engine
+  end
+end

data/lib/active_admin/form_builder.rb

@@ -4,7 +4,7 @@ module ActiveAdmin
   class FormBuilder < ::Formtastic::SemanticFormBuilder
 
     attr_reader :form_buffers
-    
+
     def initialize(*args)
       @form_buffers = ["".html_safe]
       super
@@ -20,7 +20,9 @@ module ActiveAdmin
     # The input method returns a properly formatted string for
     # its contents, so we want to skip the internal buffering
     # while building up its contents
-    def input(*args)
+    def input(method, *args)
+      return if polymorphic_belongs_to_association?(method)
+      
       content = with_new_form_buffer { super }
       return content.html_safe unless @inputs_with_block
       form_buffers.last << content.html_safe
@@ -38,18 +40,18 @@ module ActiveAdmin
       content = with_new_form_buffer{ super }
       form_buffers.last << content.html_safe
     end
-    
+
     def cancel_link(url = nil, html_options = {}, li_attributes = {})
       li_attributes[:class] ||= "cancel"
       url ||= {:action => "index"}
-      template.content_tag(:li, (template.link_to "Cancel", url, html_options), li_attributes)
+      template.content_tag(:li, (template.link_to I18n.t('active_admin.cancel'), url, html_options), li_attributes)
     end
-    
+
     def commit_button_with_cancel_link
       content = commit_button
       content << cancel_link
     end
-    
+
     def datepicker_input(method, options)
       options = options.dup
       options[:input_html] ||= {}
@@ -67,7 +69,7 @@ module ActiveAdmin
       form_block = proc do |has_many_form|
         block.call(has_many_form) + if has_many_form.object.new_record?
                                       template.content_tag :li do
-                                        template.link_to "Delete", "#", :onclick => "$(this).closest('.has_many_fields').remove(); return false;", :class => "button"
+                                        template.link_to I18n.t('active_admin.has_many_delete'), "#", :onclick => "$(this).closest('.has_many_fields').remove(); return false;", :class => "button"
                                       end
                                     else
                                     end
@@ -88,7 +90,7 @@ module ActiveAdmin
           end
 
           js = template.escape_javascript(js)
-          js = template.link_to "Add New #{association.to_s.singularize.titlecase}", "#", :onclick => "$(this).before('#{js}'.replace(/NEW_RECORD/g, new Date().getTime())); return false;", :class => "button"
+          js = template.link_to I18n.t('active_admin.has_many_new', :model => association.to_s.singularize.titlecase), "#", :onclick => "$(this).before('#{js}'.replace(/NEW_RECORD/g, new Date().getTime())); return false;", :class => "button"
 
           form_buffers.last << js.html_safe
         end
@@ -98,12 +100,19 @@ module ActiveAdmin
 
     private
 
+    # Pass in a method to check if it's a polymorphic association
+    def polymorphic_belongs_to_association?(method)
+      reflection = reflection_for(method)
+      
+      reflection && reflection.macro == :belongs_to && reflection.options[:polymorphic]
+    end
+
     def with_new_form_buffer
       form_buffers << "".html_safe
       return_value = yield
       form_buffers.pop
       return_value
     end
-    
+
   end
 end

data/lib/active_admin/helpers/scope_chain.rb

@@ -0,0 +1,23 @@
+module ActiveAdmin
+  module ScopeChain
+    # Scope an ActiveRecord::Relation chain
+    #
+    # Example:
+    #   scope_chain(Scope.new(:published), Article)
+    #   # => Article.published
+    #
+    # @param scope The <ActiveAdmin::Scope> we want to scope on
+    # @param chain The ActiveRecord::Relation chain or ActiveRecord::Base class to scope
+    # @return <ActiveRecord::Relation or ActiveRecord::Base> The scoped relation chain
+    #
+    def scope_chain(scope, chain)
+      if scope.scope_method
+        chain.send(scope.scope_method)
+      elsif scope.scope_block
+        instance_exec chain, &scope.scope_block
+      else
+        chain
+      end
+    end
+  end
+end

data/lib/active_admin/helpers/settings.rb

@@ -0,0 +1,70 @@
+require 'active_support/concern'
+
+module ActiveAdmin
+
+  # Adds a class method to a class to create settings with default values.
+  #
+  # Example:
+  #
+  #   class Configuration
+  #     include ActiveAdmin::Settings
+  #
+  #     setting :site_title, "Default Site Title"
+  #   end
+  #
+  #   conf = Configuration.new
+  #   conf.site_title #=> "Default Site Title"
+  #   conf.site_title = "Override Default"
+  #   conf.site_title #=> "Override Default"
+  #
+  module Settings
+    extend ActiveSupport::Concern
+
+    module InstanceMethods
+
+      def read_default_setting(name)
+        default_settings[name]
+      end
+
+      private
+
+      def default_settings
+        self.class.default_settings
+      end
+
+    end
+
+    module ClassMethods
+
+      def setting(name, default)
+        default_settings[name] = default
+        attr_accessor(name)
+
+        # Create an accessor that grabs from the defaults
+        # if @name has not been set yet
+        class_eval <<-EOC, __FILE__, __LINE__ + 1
+          def #{name}
+            if instance_variable_defined? :@#{name}
+              @#{name}
+            else
+              read_default_setting(:#{name})
+            end
+          end
+        EOC
+      end
+
+      def deprecated_setting(name, default, message = nil)
+        message = message || "The #{name} setting is deprecated and will be removed."
+        setting(name, default)
+
+        ActiveAdmin::Deprecation.deprecate self, name, message
+        ActiveAdmin::Deprecation.deprecate self, :"#{name}=", message
+      end
+
+      def default_settings
+        @default_settings ||= {}
+      end
+
+    end
+  end
+end