admin_assistant 1.0.0 → 1.0.1

data/lib/admin_assistant/default_search_column.rb

@@ -2,25 +2,21 @@ class AdminAssistant
   class DefaultSearchColumn < Column
     def initialize(model_class, opts)
       @model_class = model_class
-      @fields_to_include = opts[:fields_to_include] || []
+      @fields_to_match = opts[:fields_to_match] || []
     end
     
     def add_to_query_condition(ar_query_condition, search)
       unless search.params.blank?
         ar_query_condition.ar_query.boolean_join = :and
         ar_query_condition.boolean_join = :or
-        names_to_search = Model.new(@model_class).searchable_columns.map(
-          &:name
-        )
-        names_to_search.concat @fields_to_include
-        names_to_search.uniq.each do |field_name|
+        @fields_to_match.each do |field_name|
           ar_query_condition.sqls << "LOWER(#{field_name}) like LOWER(?)"
           ar_query_condition.bind_vars << "%#{search.params}%"
         end
       end
     end
     
-    def attributes_for_search_object(search_params)
+    def attributes_for_search_object(search_params, compare_to_range)
       {}
     end
       

data/lib/admin_assistant/form_view.rb

@@ -1,10 +1,5 @@
 class AdminAssistant
-  class FormView
-    def initialize(record, admin_assistant, action_view)
-      @record, @admin_assistant, @action_view =
-          record, admin_assistant, action_view
-    end
-    
+  module FormViewMethods
     def action
       if %w(new create).include?(controller.action_name)
         'create'
@@ -13,6 +8,21 @@ class AdminAssistant
       end
     end
     
+    def controller
+      @action_view.controller
+    end
+  end
+  
+  class FormView
+    include FormViewMethods
+    
+    attr_reader :record
+    
+    def initialize(record, admin_assistant, action_view)
+      @record, @admin_assistant, @action_view =
+          record, admin_assistant, action_view
+    end
+    
     def column_names
       if %w(new create).include?(@action_view.action_name)
         settings.columns_for_new
@@ -27,10 +37,6 @@ class AdminAssistant
       }
     end
     
-    def controller
-      @action_view.controller
-    end
-    
     def extra_submit_buttons
       settings.submit_buttons
     end
@@ -60,4 +66,102 @@ class AdminAssistant
       (@record.id ? "Edit" : "New") + " #{@admin_assistant.model_class_name}"
     end
   end
+  
+  class MultiFormView
+    include FormViewMethods
+    
+    def initialize(records, admin_assistant, action_view)
+      @records, @admin_assistant, @action_view =
+          records, admin_assistant, action_view
+      @sub_form_views = @records.map { |record|
+        AdminAssistant::FormView.new(record, @admin_assistant, @action_view)
+      }
+    end
+    
+    def columns
+      @sub_form_views.first.columns
+    end
+    
+    def extra_submit_buttons
+      @sub_form_views.first.extra_submit_buttons
+    end
+    
+    def form_for_args
+      [
+        @records.first.class.name.underscore.to_sym,
+        @records,
+        {
+          :url => {:action => action},
+          :builder => AdminAssistant::MultiFormView::Builder,
+          :sub_form_views => @sub_form_views
+        }
+      ]
+    end
+    
+    def submit_value
+      @sub_form_views.first.submit_value
+    end
+    
+    def title
+      @sub_form_views.first.title
+    end
+    
+    class Builder < ::ActionView::Helpers::FormBuilder
+      def initialize(object_name, object, template, options, proc)
+        super(object_name, object, template, options, proc)
+        @sub_form_views = options[:sub_form_views]
+      end
+
+      def each_sub_form
+        @object.each_with_index do |obj, i|
+          builder = SubFormBuilder.new(
+            @object_name, obj, @template, @options, @proc, i
+          )
+          yield builder, @sub_form_views[i]
+        end
+      end
+      
+      class SubFormBuilder
+        attr_reader :object, :prefix
+        
+        def initialize(object_name, object, template, options, proc, position)
+          @object_name, @object, @template, @options, @proc =
+              object_name, object, template, options, proc
+          @default_options = @options ? @options.slice(:index) : {}
+          @prefix = ('a'..'z').to_a[position]
+        end
+        
+        def method_missing(meth, *args, &block)
+          if my_field_helpers.include?(meth.to_s)
+            method = args.shift
+            options = args.shift || {}
+            @template.send(
+              meth,
+              "#{@object_name}[#{@prefix}]",
+              method,
+              objectify_options(options)
+            )
+          else
+            super
+          end
+        end
+        
+        def my_field_helpers
+          ::ActionView::Helpers::FormBuilder.field_helpers -
+              %w(label check_box radio_button fields_for) + ['datetime_select']
+        end
+        
+        def objectify_options(options)
+          @default_options.merge(options.merge(:object => @object))
+        end
+        
+        def select(method, choices, options = {}, html_options = {})
+          @template.select(
+            "#{@object_name}[#{@prefix}]", method, choices, 
+            objectify_options(options), @default_options.merge(html_options)
+          )
+        end
+      end
+    end
+  end
 end

data/lib/admin_assistant/has_many_column.rb

@@ -0,0 +1,56 @@
+class AdminAssistant
+  class HasManyColumn < Column
+    def initialize(has_many_assoc, opts)
+      @has_many_assoc = has_many_assoc
+      @match_text_fields_in_search = opts[:match_text_fields_in_search]
+    end
+    
+    def add_to_query_condition(ar_query_condition, search)
+      if @match_text_fields_in_search
+        if (value = search.send(name)) and !value.blank?
+          searchable_columns = Model.new(associated_class).searchable_columns
+          model_class = @has_many_assoc.active_record
+          sanitized_match_value = ActiveRecord::Base.sanitize("%#{value}%")
+          searchable_column_comparisons = searchable_columns.map { |column|
+            "LOWER(#{associated_class.table_name}.#{column.name}) like LOWER(#{sanitized_match_value})"
+          }
+          condition_sql = <<-CONDITION_SQL
+          #{model_class.table_name}.#{model_class.primary_key} in (select #{@has_many_assoc.primary_key_name} from #{associated_class.table_name} where #{searchable_column_comparisons.join(' or ')})
+          CONDITION_SQL
+          ar_query_condition.sqls << condition_sql
+        end
+      end
+    end
+
+    def associated_class
+      @has_many_assoc.klass
+    end
+    
+    def attributes_for_search_object(search_params, compare_to_range)
+      {name.to_sym => search_params[name]}
+    end
+    
+    def contains?(column_name)
+      column_name.to_s == name
+    end
+    
+    def model_class
+      @has_many_assoc.active_record
+    end
+    
+    def name
+      @has_many_assoc.name.to_s
+    end
+    
+    class FormView < AdminAssistant::VirtualColumn::FormView
+    end
+    
+    class SearchView < AdminAssistant::Column::View
+      include AdminAssistant::Column::SearchViewMethods
+      
+      def html(form)
+        "<p><label>#{label}</label> <br/>#{form.text_field(name)}</p>"
+      end
+    end
+  end
+end

data/lib/admin_assistant/index.rb

@@ -2,80 +2,48 @@ require 'ar_query'
 
 class AdminAssistant
   class Index
-    attr_reader :controller_methods
+    attr_reader :admin_assistant, :controller_methods, :url_params
     
     def initialize(admin_assistant, url_params = {}, controller_methods = {})
       @admin_assistant, @url_params, @controller_methods =
             admin_assistant, url_params, controller_methods
     end
     
-    def belongs_to_sort_column
-      @admin_assistant.accumulate_belongs_to_columns(column_names).detect { |c|
-        c.name.to_s == sort
-      }
+    def belongs_to_columns
+      @admin_assistant.accumulate_belongs_to_columns column_names
     end
     
     def column_names
-      settings.column_names || model_class.columns.map(&:name)
+      if settings.column_names
+        settings.column_names
+      else
+        model_class.columns.map(&:name).reject { |n|
+          %w(created_at updated_at).include?(n)
+        }
+      end
     end
     
     def columns
       @admin_assistant.accumulate_columns column_names
     end
-    
-    def conditions_from_settings
-      settings.conditions
-    end
-    
-    def find_include
-      fi = settings.include || []
-      if by_assoc = belongs_to_sort_column
-        fi << by_assoc.name
+
+    def hidden_fields_for_search_form
+      if @admin_assistant.search_settings.include_params_in_form
+        @url_params.reject do |name,value| 
+          name=="commit" or name=="search" or name=="action" or
+          name=="controller"
+        end
+      else
+        []
       end
-      fi
     end
     
     def model_class
       @admin_assistant.model_class
     end
     
-    def order_sql
-      if (sc = sort_column)
-        first_part = if (by_assoc = belongs_to_sort_column)
-          by_assoc.order_sql_field
-        else
-          sc.name
-        end
-        "#{first_part} #{sort_order}"
-      else
-        settings.sort_by
-      end
-    end
-    
     def records
-      unless @records
-        ar_query = ARQuery.new(
-          :order => order_sql, :include => find_include,
-          :per_page => 25, :page => @url_params[:page]
-        )
-        if @controller_methods[:conditions_for_index]
-          sql = @controller_methods[:conditions_for_index].call
-          ar_query.condition_sqls << sql if sql
-        elsif conditions_from_settings
-          if conditions_from_settings.respond_to?(:call)
-            conditions_sql = conditions_from_settings.call @url_params
-          else
-            conditions_sql = conditions_from_settings
-          end
-          ar_query.condition_sqls << conditions_sql if conditions_sql
-        end
-        search.add_to_query(ar_query)
-        if settings.total_entries
-          ar_query.total_entries = settings.total_entries.call
-        end
-        @records = model_class.paginate :all, ar_query.to_hash
-      end
-      @records
+      @records ||= RecordFinder.new(self).run
     end
     
     def search
@@ -97,16 +65,6 @@ class AdminAssistant
           (settings.sort_by.to_s if settings.sort_by.is_a?(Symbol))
     end
     
-    def sort_column
-      if sort
-        columns.detect { |c|
-          c.name.to_s == sort
-        } || belongs_to_sort_column
-      elsif settings.sort_by.is_a?(Symbol)
-        columns.detect { |c| c.name == settings.sort_by.to_s }
-      end
-    end
-    
     def sort_order
       @url_params[:sort_order] || 'asc'
     end
@@ -114,6 +72,116 @@ class AdminAssistant
     def view(action_view)
       @view ||= View.new(self, action_view, @admin_assistant)
     end
+      
+    class RecordFinder
+      def initialize(index)
+        @index = index
+      end
+      
+      def add_base_condition_sqls
+        if @index.controller_methods[:conditions_for_index]
+          sql = @index.controller_methods[:conditions_for_index].call
+          @ar_query.condition_sqls << sql if sql
+        elsif conditions_from_settings
+          if conditions_from_settings.respond_to?(:call)
+            conditions_sql = conditions_from_settings.call @index.url_params
+          else
+            conditions_sql = conditions_from_settings
+          end
+          @ar_query.condition_sqls << conditions_sql if conditions_sql
+        end
+      end
+      
+      def belongs_to_sort_column
+        @index.belongs_to_columns.detect { |c| c.name.to_s == @index.sort }
+      end
+      
+      def cache_total_entries(total_entries)
+        Rails.cache.write(
+          total_entries_cache_key, total_entries,
+          :expires_in => settings.cache_total_entries
+        )
+      end
+      
+      def caching_total_entries?
+        search.params.empty? && settings.cache_total_entries
+      end
+    
+      def conditions_from_settings
+        settings.conditions
+      end
+    
+      def find_include
+        fi = settings.include || []
+        if by_assoc = belongs_to_sort_column
+          fi << by_assoc.name
+        end
+        fi
+      end
+      
+      def optimized_total_entries
+        if settings.total_entries
+          settings.total_entries.call
+        elsif caching_total_entries?
+          Rails.cache.read total_entries_cache_key
+        end
+      end
+    
+      def order_sql
+        if (sc = sort_column)
+          first_part = if (by_assoc = belongs_to_sort_column)
+            by_assoc.order_sql_field
+          else
+            sc.name
+          end
+          "#{first_part} #{@index.sort_order}"
+        else
+          settings.sort_by
+        end
+      end
+      
+      def run
+        @ar_query = ARQuery.new(
+          :order => order_sql, :include => find_include,
+          :per_page => settings.per_page, :page => @index.url_params[:page]
+        )
+        add_base_condition_sqls
+        search.add_to_query @ar_query
+        @ar_query.total_entries = optimized_total_entries
+        records = @index.model_class.paginate(:all, @ar_query.to_hash)
+        if caching_total_entries? && @ar_query.to_hash[:total_entries].nil?
+          cache_total_entries records.total_entries
+        end
+        records
+      end
+      
+      def search
+        @index.search
+      end
+      
+      def settings
+        @index.settings
+      end
+    
+      def sort_column
+        if @index.sort
+          @index.columns.detect { |c|
+            c.name.to_s == @index.sort
+          } || belongs_to_sort_column
+        elsif settings.sort_by.is_a?(Symbol)
+          @index.columns.detect { |c| c.name == settings.sort_by.to_s }
+        end
+      end
+    
+      def total_entries_cache_key
+        key =
+            "AdminAssistant::#{@index.admin_assistant.controller_class.name}_count"
+        if conditions = @ar_query.to_hash[:conditions]
+          key << conditions.gsub(/\W/, '_')
+        end
+        key
+      end
+    end
     
     class View
       def initialize(index, action_view, admin_assistant)
@@ -121,6 +189,19 @@ class AdminAssistant
             index, action_view, admin_assistant
       end
       
+      def render_after_index_header
+        slug = "_after_index_header.html.erb"
+        abs_template_file = File.join( Rails.root, 'app/views', @admin_assistant.controller_class.controller_path, slug )
+        if File.exist?(abs_template_file)
+          template = if RAILS_GEM_VERSION == '2.1.0'
+            File.join(@admin_assistant.controller_class.controller_path, slug)
+          else
+            abs_template_file
+          end
+          @action_view.render :file => template
+        end
+      end
+      
       def ajax_toggle_allowed?
         @admin_assistant.update?
       end
@@ -134,6 +215,17 @@ class AdminAssistant
         @columns
       end
       
+      def delete_link(record)
+        @action_view.link_to_remote(
+          'Delete',
+          :url => {:action => 'destroy', :id => record.id},
+          :confirm => 'Are you sure?',
+          :success =>
+            "Effect.Fade('#{@admin_assistant.model_class.name.underscore}_#{record.id}', {duration: 0.25})",
+          :method => :delete
+        )
+      end
+      
       def destroy?
         @destroy ||= @admin_assistant.destroy?
       end
@@ -142,6 +234,14 @@ class AdminAssistant
         @edit ||= @admin_assistant.edit?
       end
       
+      def edit_link(record)
+        @action_view.link_to 'Edit', :action => 'edit', :id => record.id
+      end
+      
+      def new?
+        @new ||= @admin_assistant.new?
+      end
+      
       def header
         if block = @index.settings.header
           block.call @action_view.params
@@ -149,9 +249,22 @@ class AdminAssistant
           @admin_assistant.model_class_name.pluralize.capitalize
         end
       end
+      
+      def multi_form?
+        @admin_assistant.form_settings.multi?
+      end
+      
+      def new_link
+        new_link_name = if multi_form?
+          "New #{@admin_assistant.model_class_name.pluralize}"
+        else
+          "New #{@admin_assistant.model_class_name}"
+        end
+        @action_view.link_to new_link_name, @admin_assistant.url_params(:new)
+      end
 
       def right_column?
-        edit? or destroy? or show? or !right_column_lambdas.empty?
+        edit? or destroy? or show? or !right_column_lambdas.empty? or @action_view.respond_to?(:extra_right_column_links_for_index)
       end
       
       def right_column_lambdas
@@ -160,26 +273,13 @@ class AdminAssistant
       end
       
       def right_column_links(record)
-        links = ""
-        if edit?
-          links << @action_view.link_to(
-            'Edit', :action => 'edit', :id => record.id
-          ) << " "
-        end
-        if destroy?
-          links << @action_view.link_to_remote(
-            'Delete',
-            :url => {:action => 'destroy', :id => record.id},
-            :confirm => 'Are you sure?',
-            :success =>
-                "Effect.Fade('#{@admin_assistant.model_class.name.underscore}_#{record.id}')",
-            :method => :delete
-          ) << ' '
-        end
-        if show?
+        links = []
+        links << edit_link(record) if render_edit_link?(record)
+        links << delete_link(record) if render_delete_link?(record)
+        if render_show_link?(record)
           links << @action_view.link_to(
             'Show', :action => 'show', :id => record.id
-          ) << ' '
+          )
         end
         right_column_lambdas.each do |lambda|
           link_args = lambda.call record
@@ -188,14 +288,51 @@ class AdminAssistant
         if @action_view.respond_to?(:extra_right_column_links_for_index)
           links << @action_view.extra_right_column_links_for_index(
             record
-          ) || ''
+          )
         end
-        links
+        links.join(" &bull; ")
+      end
+      
+      def tr_css_classes(record)
+        css_classes = [@action_view.cycle('odd', 'even')]
+        if @action_view.respond_to?(:css_class_for_index_tr)
+          css_classes << @action_view.css_class_for_index_tr(record)
+        end
+        css_classes.join(' ')
+      end
+      
+      def render_new_link?
+        return false if @action_view.respond_to?(:link_to_new_in_index?) && !@action_view.link_to_new_in_index?
+        new?
+      end
+      
+      def render_search_link?
+        return false if @action_view.respond_to?(:link_to_search_in_index?) && !@action_view.link_to_search_in_index?
+        true
+      end
+      
+      def render_edit_link?(record)
+        return false if @action_view.respond_to?(:link_to_edit_in_index?) && !@action_view.link_to_edit_in_index?(record)
+        edit?
+      end
+      
+      def render_delete_link?(record)
+        return false if @action_view.respond_to?(:link_to_delete_in_index?) && !@action_view.link_to_delete_in_index?(record)
+        destroy?
+      end
+      
+      def render_show_link?(record)
+        return false if @action_view.respond_to?(:link_to_show_in_index?) && !@action_view.link_to_show_in_index?(record)
+        show?
       end
       
       def show?
         @show ||= @admin_assistant.show?
       end
+      
+      def show_link(record)
+        @action_view.link_to 'Show', :action => 'show', :id => record.id
+      end
     end
   end
 end

data/lib/admin_assistant/polymorphic_belongs_to_column.rb

@@ -24,7 +24,7 @@ class AdminAssistant
       @belongs_to_assoc.association_foreign_key
     end
     
-    def attributes_for_search_object(search_params)
+    def attributes_for_search_object(search_params, compare_to_range)
       atts = {}
       atts[association_foreign_key.to_sym] = 
           search_params[association_foreign_key]