simple_admin 0.5.2 → 0.6.0

data/Gemfile

@@ -3,10 +3,10 @@ source "http://rubygems.org"
 # Gem's dependencies in simple_admin.gemspec
 gemspec
 
-gem "rails", ">= 3.1.0rc4"
+gem "rails", ">= 3.2.0"
 gem "kaminari", ">= 0"
 gem "formtastic", ">= 0"
-gem "meta_search", ">= 1.1.0.pre"
+gem "ransack"
 gem "fastercsv" if RUBY_VERSION =~ /^1.8/
 gem "fuubar"
 

data/README.rdoc

@@ -72,7 +72,7 @@ You can also specify to which actions the before block should be
 applied:
 
     SimpleAdmin.register :post do
-      before :only => [:create, :delete] do
+      before :only => [:create, :destroy] do
         require_admin
       end
     end
@@ -219,7 +219,7 @@ generated at initialization. Available actions are:
 * new
 * show
 * edit
-* delete
+* destroy
 * create
 * update
 

data/Rakefile

@@ -44,8 +44,8 @@ task :sample do
   # If we are not on 1.9.x we need fastercsv
   system "echo 'gem \"fastercsv\"' >> Gemfile" if RUBY_VERSION =~ /^1.8/
 
-  # To work with Rails 3.1.x we need the latest meta_search
-  system "echo 'gem \"meta_search\", \">= 1.1.0.pre\"' >> Gemfile"
+  # To work with Rails 3.1.x we need ransack
+  system "echo 'gem \"ransack\"' >> Gemfile"
 
   # With more gems, comes more bundling
   system "bundle"

data/app/assets/stylesheets/simple_admin/active_admin.css

@@ -793,7 +793,7 @@ body {
       margin-right: 300px; }
   #active_admin_content.without_sidebar #main_content_wrapper #main_content {
     margin-right: 0; }
-  #active_admin_content #sidebar {
+  #active_admin_content #sidebar, #active_admin_content #filters {
     float: left;
     width: 270px;
     margin-left: -270px; }
@@ -989,7 +989,7 @@ table {
   .panel_contents table tr.even td {
     background: #f4f5f5; }
 
-.sidebar_section {
+.sidebar_section, .filters_section {
   background: #f4f4f4;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
@@ -998,7 +998,7 @@ table {
   -moz-box-shadow: inset 0 1px 4px #dddddd;
   -webkit-box-shadow: inset 0 1px 4px #dddddd;
   margin-bottom: 20px; }
-  .sidebar_section h3 {
+  .sidebar_section h3, .filters_section h3 {
     background: #efefef;
     background: -webkit-gradient(linear, left top, left bottom, from(#efefef), to(#dfe1e2));
     background: -moz-linear-gradient(-90deg, #efefef, #dfe1e2);
@@ -1015,16 +1015,21 @@ table {
     line-height: 140%;
     margin-bottom: 0.5em;
     color: #5e6469; }
+    .filters_section h3 span.icon svg path, .filters_section h3 span.icon svg polygon, .filters_section h3 span.icon svg rect, .filters_section h3 span.icon svg circle,
     .sidebar_section h3 span.icon svg path, .sidebar_section h3 span.icon svg polygon, .sidebar_section h3 span.icon svg rect, .sidebar_section h3 span.icon svg circle {
       fill: #5e6469 !important; }
+    .filters_section h3 span.icon,
     .sidebar_section h3 span.icon {
       width: 1em;
       height: 1em; }
+    .filters_section h3 span.icon svg,
     .sidebar_section h3 span.icon svg {
       width: 1em;
       height: 1em; }
+    .filters_section h3 span.icon,
     .sidebar_section h3 span.icon {
       margin-right: 5px; }
+  .filters_section > div,
   .sidebar_section > div {
     padding: 3px 15px 15px 15px; }
 
@@ -1385,6 +1390,7 @@ table.dashboard {
   text-transform: uppercase;
   letter-spacing: 0.2em; }
 
+.filters_section .attributes_table th,
 .sidebar_section .attributes_table th {
   width: 50px; }
 

data/app/controllers/simple_admin/admin_controller.rb

@@ -1,5 +1,5 @@
 require 'kaminari'
-require 'meta_search'
+require 'ransack'
 
 module SimpleAdmin
   class AdminController < ::ApplicationController
@@ -7,6 +7,7 @@ module SimpleAdmin
     before_filter :lookup_interface, :except => [:dashboard]
     before_filter :lookup_before, :except => [:dashboard]
     before_filter :lookup_resource, :only => [:show, :edit, :update, :destroy]
+    before_filter :check_action, :except => [:dashboard]
 
     unloadable
 
@@ -17,10 +18,12 @@ module SimpleAdmin
     layout 'simple_admin'
 
     def index
-      @collection = @interface.constant
-      @collection = @collection.order("#{@interface.constant.table_name}.#{$1} #{$2}") if params[:order] && params[:order] =~ /^([\w\_\.]+)_(desc|asc)$/
-      @collection = @collection.metasearch(clean_search_params(params))
-      @collection = @collection.page(params[:page]).per(params[:per_page] || SimpleAdmin.default_per_page) if params[:format].blank? || params[:format] == 'html'
+      @collection = @interface.constant rescue nil
+      if @collection
+        @collection = @collection.search(clean_search_params(params)).result
+        @collection = @collection.order("#{@interface.constant.table_name}.#{$1} #{$2}") if params[:order] && params[:order] =~ /^([\w\_\.]+)_(desc|asc)$/
+        @collection = @collection.page(params[:page]).per(params[:per_page] || SimpleAdmin.default_per_page) if params[:format].blank? || params[:format] == 'html'
+      end
       respond_to do |format|
         format.csv
         format.html
@@ -116,9 +119,13 @@ module SimpleAdmin
       search_params = search_params.dup
       search_params.delete_if do |key, value|
         value == "" ||
-        ["utf8", "scope", "commit", "action", "order", "interface", "controller", "format", "page", "per_page"].include?(key)
+        ["utf8", "scope", "commit", "action", "order", "interface", "controller", "format", "page", "per_page", "editing", "mode"].include?(key)
       end
       search_params
     end
+
+    def check_action
+      raise SimpleAdmin::ActionNotAllowed.new(params[:action]) unless @interface.actions.include?(params[:action].to_sym)
+    end
   end
 end

data/app/helpers/simple_admin/filter_helper.rb

@@ -1,10 +1,31 @@
 module SimpleAdmin
   module FilterHelper
+    def filter_fields(attributes)
+      attributes.map do |col|
+        options = col.options.dup
+        expand_block_options!(options)
+        case col.kind
+        when :attribute, :filter
+          filter_for(col.attribute, @interface.constant, options)
+        when :content
+          instance_exec(self, &col.data)
+        when :fieldset
+          content_tag :fieldset, options do
+            content_tag :legend do
+              options[:legend]
+            end unless options[:legend].blank
+            filter_fields(col.attributes)
+          end
+        else
+          content_tag :div, options do
+            filter_fields(col.attributes)
+          end
+        end
+      end.join.html_safe
+    end
+
     def filter_for(method, klass, options={})
-      options ||= {}
-      options = options.dup
       options[:as] ||= default_filter_type(klass, method)
-      expand_block_options!(options)
       return "" unless options[:as]
       field_type = options.delete(:as)
       wrapper_options = options[:wrapper_html] || {}
@@ -15,22 +36,26 @@ module SimpleAdmin
     end
 
     def filter_string_input(klass, method, options = {})
-      field_name = "#{method}_contains"
+      field_name = "#{method}_cont"
+      label_content =  options[:title] || options[:label] || "Search #{method.to_s.titlecase}" unless options[:label] == false
 
-      [ label(field_name, options[:title] || "Search #{method.to_s.titlecase}"),
-        text_field_tag(field_name, params[field_name] || '')
-      ].join("\n").html_safe
+      content = []
+      content << label(field_name, label_content) unless label_content.blank?
+      content << text_field_tag(field_name, params[field_name] || '', options[:input_html] || {})
+      content.join("\n").html_safe
     end
 
     def filter_date_range_input(klass, method, options = {})
-      gt_field_name = "#{method}_gte"
-      lt_field_name = "#{method}_lte"
-
-      [ label(gt_field_name, options[:title] || method.to_s.titlecase),
-        filter_date_text_field(klass, gt_field_name),
-        " - ",
-        filter_date_text_field(klass, lt_field_name)
-      ].join("\n").html_safe
+      gt_field_name = "#{method}_gteq"
+      lt_field_name = "#{method}_lteq"
+      label_content =  options[:title] || options[:label] || "#{method.to_s.titlecase}" unless options[:label] == false
+
+      content = []
+      content << label(gt_field_name, label_content) unless label_content.blank?
+      content << filter_date_text_field(klass, gt_field_name)
+      content << " - "
+      content << filter_date_text_field(klass, lt_field_name)
+      content.join("\n").html_safe
     end
 
     def filter_date_text_field(klass, method)
@@ -39,12 +64,18 @@ module SimpleAdmin
     end
 
     def filter_numeric_input(klass, method, options = {})
+      field_name = "#{method}_numeric"
       filters = numeric_filters_for_method(method, options.delete(:filters) || default_numeric_filters)
       current_filter = current_numeric_scope(klass, filters)
-      filter_select = select_tag '', options_for_select(filters, current_filter), :onchange => "document.getElementById('#{method}_numeric').name = '' + this.value + '';"
-      filter_input = text_field_tag(current_filter, params[current_filter] || '', :size => 10, :id => "#{method}_numeric")
-
-      [ label_tag(method, options[:title]), filter_select, " ", filter_input].join("\n").html_safe
+      label_content = options[:title] || options[:label] || "#{method.to_s.titlecase}" unless options[:label] == false
+
+      content = []
+      content << label(field_name, label_content) unless label_content.blank?
+      content << select_tag('', options_for_select(filters, current_filter),
+        {:onchange => "document.getElementById('#{method}_numeric').name = '' + this.value + '';"}.merge(options[:input_html] || {}))
+      content << " "
+      content << text_field_tag(current_filter, params[current_filter] || '', {:size => 10, :id => field_name}.merge(options[:input_html] || {}))
+      content.join("\n").html_safe
     end
 
     def numeric_filters_for_method(method, filters)
@@ -63,7 +94,7 @@ module SimpleAdmin
 
     def filter_select_input(klass, method, options = {})
       association_name = method.to_s.gsub(/_id$/, '').to_sym
-      input_name = if reflection = reflection_for(klass, association_name)
+      field_name = if reflection = reflection_for(klass, association_name)
         if [:has_and_belongs_to_many, :has_many].include?(reflection.macro)
           "#{association_name.to_s.singularize}_ids"
         else
@@ -72,11 +103,15 @@ module SimpleAdmin
       else
         association_name
       end
-      input_name = (input_name.to_s + "_eq").to_sym
+      field_name = (field_name.to_s + "_eq")
       collection = find_collection_for_column(klass, association_name, options)
-      [ label(input_name, options[:title] || method.to_s.titlecase),
-        select_tag(input_name, options_for_select(collection, params[input_name]), :include_blank => options[:include_blank] || 'Any')
-      ].join("\n").html_safe
+      label_content = options[:title] || options[:label] || "#{method.to_s.titlecase}" unless options[:label] == false
+
+      content = []
+      content << label(field_name, label_content) unless label_content.blank?
+      content << select_tag(field_name, options_for_select(collection, params[field_name.to_sym]),
+        {:include_blank => options[:include_blank] || 'Any'}.merge(options[:input_html] || {}))
+      content.join("\n").html_safe
     end
 
     def generate_association_input_name(klass, method) #:nodoc:
@@ -110,26 +145,40 @@ module SimpleAdmin
    end
 
     def boolean_collection(klass, column, options)
-      [['Yes', true], ['No', false]]
+      [['No', false], ['Yes', true]]
+    end
+
+    def filter_boolean_input(klass, method, options = {})
+      field_name = options[:name] || (generate_association_input_name(klass, method).to_s + "_in")
+      label_content = options[:title] || options[:label] || "#{method.to_s.titlecase}" unless options[:label] == false
+
+      content = []
+      content << check_box_tag(field_name, true, params[field_name.to_sym], options)
+      content << label(field_name, label_content) unless label_content.blank?
+      content.join("\n").html_safe
     end
 
     def filter_check_boxes_input(klass, method, options = {})
-      input_name = (generate_association_input_name(klass, method).to_s + "_in").to_sym
+      field_name = options[:name] || (generate_association_input_name(klass, method).to_s + "_in")
       collection = find_collection_for_column(klass, method, options)
-      selected_values = params[input_name] || []
+      selected_values = params[field_name.to_sym] || []
       checkboxes = content_tag :div, :class => "check_boxes_wrapper" do
         collection.map do |c|
           label = c.is_a?(Array) ? c.first : c
           value = c.is_a?(Array) ? c.last : c
-          "<label><input type=\"checkbox\" name=\"#{input_name}[]\" value=\"#{value}\" #{selected_values.include?(value) ? "checked" : ""}/> #{label}</label>"
+          "<label><input type=\"checkbox\" name=\"#{field_name}[]\" value=\"#{value}\" #{selected_values.include?(value) ? "checked" : ""}/> #{label}</label>"
         end.join("\n").html_safe
       end
+      label_content = options[:title] || options[:label] || "#{method.to_s.titlecase}" unless options[:label] == false
 
-      [ label(input_name, options[:title] || method.to_s.titlecase),
-        checkboxes
-      ].join("\n").html_safe
+      content = []
+      content << label(field_name, label_content) unless label_content.blank?
+      content << checkboxes
+      content.join("\n").html_safe
     end
 
+    alias_method :filter_checkboxes_input, :filter_check_boxes_input
+
     # Returns the default filter type for a given attribute
     def default_filter_type(klass, method)
       if column = column_for(klass, method)
@@ -143,6 +192,8 @@ module SimpleAdmin
           return :numeric
         when :float, :decimal
           return :numeric
+        when :boolean
+          return :boolean
         end
       end
 

data/app/helpers/simple_admin/form_helper.rb

@@ -9,7 +9,7 @@ module SimpleAdmin
         when :attribute
           form.input col.attribute, options
         when :content
-          instance_exec(@resource, &col.data)
+          instance_exec(@resource, form, col, &col.data)
         when :fieldset
           content_tag :fieldset, options do
             content_tag :legend do
@@ -24,5 +24,11 @@ module SimpleAdmin
         end
       end.join.html_safe
     end
+
+    def form_field(form, col)
+      options = (col.options || {}).dup
+      expand_block_options!(options)
+      form.input col.attribute, options
+    end
   end
 end

data/app/helpers/simple_admin/header_helper.rb

@@ -35,12 +35,12 @@ module SimpleAdmin
         content = ""
         # If we are currently showing, then check for edit and destroy action items
         if params[:action].to_sym == :show
-          if controller.action_methods.include?('edit')
+          if @interface.actions.include?(:edit)
             content << link_to("Edit #{@interface.member.titlecase}",
               send("edit_simple_admin_#{@interface.member}_path", @object))
           end
           content << "&nbsp;"
-          if controller.action_methods.include?("destroy")
+          if @interface.actions.include?(:destroy)
             content << link_to("Delete #{@interface.member.titlecase}",
               send("simple_admin_#{@interface.member}_path", @object),
               :method => :delete, :confirm => "Are you sure you want to delete this?")
@@ -48,9 +48,11 @@ module SimpleAdmin
         end
         # If we are not showing an item or creating a new one, then check for new action items
         unless [:new, :show, :dashboard].include?(params[:action].to_sym)
-          if controller.action_methods.include?('new')
-            content << link_to("New #{@interface.member.titlecase}",
-              send("new_simple_admin_#{@interface.member}_path"))
+          if @interface.constant && @interface.member
+            if @interface.actions.include?(:new)
+              content << link_to("New #{@interface.member.titlecase}",
+                send("new_simple_admin_#{@interface.member}_path"))
+            end
           end
         end
         content.html_safe

data/app/helpers/simple_admin/path_helper.rb

@@ -1,10 +1,10 @@
 module SimpleAdmin
   module PathHelper
-    def resource_path(res)
+    def resource_path(res, options={})
       if res.new_record?
-        send("simple_admin_#{@interface.collection}_path")
+        send("simple_admin_#{@interface.collection}_path", options)
       else
-        send("simple_admin_#{@interface.member}_path", res)
+        send("simple_admin_#{@interface.member}_path", res, options)
       end
     end
   end

data/app/helpers/simple_admin/table_helper.rb

@@ -30,10 +30,11 @@ module SimpleAdmin
     end
 
     def resource_actions(object)
-      links = link_to "View",  send("simple_admin_#{@interface.member}_path", object), :class => "member_link view_link"
-      links += link_to "Edit", send("edit_simple_admin_#{@interface.member}_path", object), :class => "member_link edit_link"
-      links += link_to "Delete", send("simple_admin_#{@interface.member}_path", object), :method => :delete, :confirm => "Are you sure you want to delete this?", :class => "member_link delete_link"
-      links
+      links = ""
+      links += link_to "View",  send("simple_admin_#{@interface.member}_path", object), :class => "member_link view_link" if @interface.actions.include?(:show)
+      links += link_to "Edit", send("edit_simple_admin_#{@interface.member}_path", object), :class => "member_link edit_link" if @interface.actions.include?(:edit)
+      links += link_to "Delete", send("simple_admin_#{@interface.member}_path", object), :method => :delete, :confirm => "Are you sure you want to delete this?", :class => "member_link delete_link" if @interface.actions.include?(:destroy)
+      raw links
     end
   end
 end

data/app/views/layouts/simple_admin.html.erb

@@ -24,6 +24,9 @@
             <%= yield :content %>
           </div>
         </div>
+        <div id="filters">
+          <%= yield :filters %>
+        </div>
         <div id="sidebar">
           <%= yield :sidebar %>
         </div>

data/app/views/simple_admin/admin/index.html.erb

@@ -1,82 +1,117 @@
 <% content_for :content do %>
-  <div class="paginated_collection">
-    <div class="pagination_information">
-      <% if @collection.num_pages < 2 %>
-        <% if @collection.size == 0 %>
-          No <%= @interface.collection.titleize %> found
+  <% if @collection %>
+    <div class="paginated_collection <%= @interface.collection.to_s %>">
+      <div class="pagination_information">
+        <% if @collection.num_pages < 2 %>
+          <% if @collection.size == 0 %>
+            No <%= @interface.collection.titleize %> found
+          <% elsif @collection.size == 1 %>
+            Displaying <b>1</b> <%= @interface.member.titleize %>
+          <% else %>
+            Displaying <b>all <%= @collection.size %></b> <%= @interface.collection.titleize %>
+          <% end %>
         <% elsif @collection.size == 1 %>
-          Displaying <b>1</b> <%= @interface.member.titleize %>
+           Displaying <%= @interface.member.titleize %>: <%= pretty_format(@collection.first) %>;
+           <b><%= @collection.total_count %></b> in total
         <% else %>
-          Displaying <b>all <%= @collection.size %></b> <%= @interface.collection.titleize %>
+           Displaying <%= @interface.collection.titleize %>
+           <b><%= (@collection.current_page * (params[:per_page] || SimpleAdmin.default_per_page).to_i) - (params[:per_page] || SimpleAdmin.default_per_page).to_i + 1 %>&nbsp;-&nbsp;<%= (@collection.current_page * (params[:per_page] || SimpleAdmin.default_per_page).to_i) > @collection.total_count ? @collection.total_count : (@collection.current_page * (params[:per_page] || SimpleAdmin.default_per_page).to_i) %></b>
+           of <b><%= @collection.total_count %></b> in total
         <% end %>
-      <% else %>
-         Displaying <%= @interface.collection.titleize %>
-         <b><%= (@collection.current_page * SimpleAdmin.default_per_page) - SimpleAdmin.default_per_page + 1 %>&nbsp;-&nbsp;<%= (@collection.current_page * SimpleAdmin.default_per_page) > @collection.total_count ? @collection.total_count : (@collection.current_page * SimpleAdmin.default_per_page) %></b>
-         of <b><%= @collection.total_count %></b> in total
-      <% end %>
-    </div>
-    <div class="paginated_collection_contents">
-      <div class="index_content">
-        <div class="index_as_table">
-          <table border="0" class="index_table" cellspacing="0" cellpadding="0" id="<%= @interface.collection %>">
-            <thead>
-              <tr>
-                <% @interface.attributes_for(:index).each do |col| %>
-                  <th class="<%= sortable_header_classes_for(col) %>">
-                    <%= link_to(col.title,
-                      request.query_parameters.merge(:order => "#{col.sort_key}_#{order_for_sort_key(col.sort_key)}").except(:page)) %>
-                  </th>
+        <% editable = @interface.attributes_for(:index).any? {|a| a.editable} %>
+        <% if editable %>
+        | <%= link_to((params[:editing] ? 'Stop Editing' : 'Edit'), request.query_parameters.merge(:editing => (params[:editing] ? nil : 1))) %>
+        | <%= link_to((params[:mode] == 'approvals' ? 'Rows' : 'Approvals'), request.query_parameters.merge(
+              :mode => (params[:mode] == 'approvals' ? nil : 'approvals'),
+              :per_page => (params[:mode] == 'approvals' ? nil : 1))) %>
+        <% end %>
+      </div>
+      <div class="paginated_collection_contents <%= params[:mode] || 'rows' %> <%= 'editing' if params[:editing] %>">
+        <div class="index_content">
+          <% if params[:mode] == 'approvals' %>
+            <div class="index_as_pages">
+              <%= paginate(@collection) %>
+              <% if @resource = @collection.first %>
+                <%= send(SimpleAdmin.form_for_helper, @resource, :as => @interface.member.to_sym,
+                  :url => resource_path(@resource), :id => "#{@interface.member}_#{@resource.id}", :html => {:onsubmit => "return false", :class => "inline simple_form formtastic #{@interface.member}"}) do |form| %>
+                  <%= form_fields(form, @interface.attributes_for(:index, 'approvals')) %>
                 <% end %>
-                <th>&nbsp;</th>
-              </tr>
-            </thead>
-            <tbody>
-              <% @collection.each do |object| %>
-                <tr class="<%= cycle('odd', 'even') %>">
+              <% end %>
+            </div>
+          <% else %>
+          <div class="index_as_table">
+            <table border="0" class="index_table" cellspacing="0" cellpadding="0" id="<%= @interface.collection %>">
+              <thead>
+                <tr>
                   <% @interface.attributes_for(:index).each do |col| %>
-                    <td>
-                      <% if col.data %>
-                        <%= instance_exec(object, &col.data) %>
-                      <% else %>
-                        <%= pretty_format(object.send(col.attribute)) %>
-                      <% end %>
-                    </td>
+                    <th class="<%= sortable_header_classes_for(col) %> <%= col.attribute %>">
+                      <%= link_to(col.title,
+                        request.query_parameters.merge(:order => "#{col.sort_key}_#{order_for_sort_key(col.sort_key)}").except(:page)) %>
+                    </th>
                   <% end %>
-                  <td><%= resource_actions(object) %></td>
+                  <th>&nbsp;</th>
                 </tr>
-              <% end %>
-            </tbody>
-          </table>
+              </thead>
+              <tbody>
+                <% @collection.each do |object| %>
+                  <tr class="<%= cycle('odd', 'even') %>">
+                    <% @interface.attributes_for(:index).each do |col| %>
+                      <td class="<%= col.attribute %>">
+                        <% if col.editable && params[:editing] %>
+                          <%= send(SimpleAdmin.form_for_helper, object, :as => @interface.member.to_sym,
+                            :url => resource_path(object), :id => "#{@interface.member}_#{object.id}", :html => {:class => "inline simple_form formtastic #{@interface.member}"}) do |form| %>
+                            <%= form_field(form, col) %>
+                          <% end %>
+                        <% elsif col.data %>
+                          <%= instance_exec(object, &col.data) %>
+                        <% else %>
+                          <%= pretty_format(object.send(col.attribute)) %>
+                        <% end %>
+                      </td>
+                    <% end %>
+                    <td><%= resource_actions(object) %></td>
+                  </tr>
+                <% end %>
+              </tbody>
+            </table>
+          </div>
+          <% end %>
         </div>
       </div>
+      <% if params[:mode] != 'approvals' %>
+        <div id="index_footer">
+          Download:&nbsp;
+          <% [:csv, :xml, :json].each do |format| %>
+            <%= link_to format.to_s.upcase, { :format => format}.merge(request.query_parameters.except(:commit, :format)) %>
+          <% end %>
+        </div>
+        <%= paginate(@collection) %>
+     <% end %>
+
     </div>
-    <div id="index_footer">
-      Download:&nbsp;
-      <% [:csv, :xml, :json].each do |format| %>
-        <%= link_to format.to_s.upcase, { :format => format}.merge(request.query_parameters.except(:commit, :format)) %>
-      <% end %>
-    </div>
-    <%= paginate(@collection) %>
-  </div>
+  <% end %>
 <% end %>
 
-<% content_for :sidebar do %>
-  <div class="panel sidebar_section" id="filters_sidebar_section">
-    <h3>Filters</h3>
-    <div class="panel_contents">
-      <%= form_tag '', :class => "q_search", :id => "q_search", :method => "get" do %>
-        <% @interface.filters_for(:index).each do |col| %>
-          <%= filter_for(col.attribute, @interface.constant, col.options) %>
+<% content_for :filters do %>
+  <% filters = @interface.filters_for(:index) %>
+  <% unless filters.blank? %>
+    <div class="panel sidebar_section" id="filters_sidebar_section">
+      <h3>Filters</h3>
+      <div class="panel_contents">
+        <%= form_tag '', :class => "q_search", :id => "q_search", :method => "get" do %>
+          <%= filter_fields(filters) %>
+          <div class="buttons">
+            <input name="commit" type="submit" value="Filter" />
+            <a href="?" class="clear_filters_btn">Clear Filters</a>
+            <input id="order" name="order" type="hidden" value="id_desc" />
+            <input id="scope" name="scope" type="hidden" />
+          </div>
         <% end %>
-        <div class="buttons">
-          <input name="commit" type="submit" value="Filter" />
-          <a href="?" class="clear_filters_btn">Clear Filters</a>
-          <input id="order" name="order" type="hidden" value="id_desc" />
-          <input id="scope" name="scope" type="hidden" />
-        </div>
-      <% end %>
+      </div>
     </div>
-  </div>
+  <% end %>
+<% end %>
 
+<% content_for :sidebar do %>
   <%= sidebars %>
 <% end %>

data/config/routes.rb

@@ -1,7 +1,7 @@
 SimpleAdmin::Engine.routes.draw do
   root :to => "admin#dashboard"
   SimpleAdmin::registered.each do |interface|
-    resources interface.collection,
+    resources interface.route,
               :controller => :admin,
               :as => "simple_admin_#{interface.collection}",
               :defaults => {:interface => interface.collection}

data/lib/simple_admin.rb

@@ -111,4 +111,12 @@ module SimpleAdmin
       @message = "SimpleAdmin interface unknown, make sure you mount SimpleAdmin in your routes and that you have registered an interface for this resource"
     end
   end
+
+  class ActionNotAllowed < StandardError
+    attr_accessor :message
+
+    def initialize(action)
+      @message = "SimpleAdmin #{action} action undefined, make sure you have allowed this action in your interface definition."
+    end
+  end
 end

data/lib/simple_admin/attributes.rb

@@ -33,7 +33,7 @@ module SimpleAdmin
     #   :sort_key a column name used when sorting this column (defaults to the column for this attribute)
     #
     def attribute(name, options={}, &block)
-      attr = @attributes.find {|attr| attr.attribute == name.to_sym }
+      attr = @attributes.find {|attr| attr.attribute == name.to_sym && attr.mode == options[:mode]}
       unless attr
         attr = OpenStruct.new
         @attributes << attr
@@ -44,6 +44,8 @@ module SimpleAdmin
       attr.data = block
       attr.title = options[:title] || name.to_s.titleize
       attr.sortable = options[:sortable].nil? || !(options[:sortable] === false)
+      attr.editable = options[:editable] === true
+      attr.mode = options[:mode]
       attr.sort_key = (options[:sort_key] || name).to_s
       attr
     end
@@ -58,6 +60,7 @@ module SimpleAdmin
       cont.kind = :content
       cont.options = options
       cont.data = block
+      cont.mode = options[:mode]
       cont
     end
 
@@ -81,6 +84,7 @@ module SimpleAdmin
       @attributes << sect
       sect.kind = options.delete(:kind) || :section
       sect.options = options
+      sect.mode = options[:mode]
       sect.attributes = []
       save_attributes = @attributes
       @attributes = sect.attributes
@@ -100,21 +104,23 @@ module SimpleAdmin
     #   :except An array of excluded attribute names as symbols
     #   :only An array of attribute names for this view
     #
-     def defaults(options={})
+    def defaults(options={})
       clear
       if @section.section == :form
-        association_columns = @interface.constant.reflections.map do |name, ref|
+        reflections = @interface.constant.reflections rescue []
+        association_columns = reflections.map do |name, ref|
           if ref.macro == :belongs_to && ref.options[:polymorphic] != true
             name.to_sym
           end
         end.compact
 
-        cols = @interface.constant.content_columns.map {|col| col.name.to_sym }
+        content_columns = @interface.constant.content_columns rescue []
+        cols = content_columns.map {|col| col.name.to_sym }
         cols += association_columns
         cols -= SKIPPED_COLUMNS
         cols.compact!
       else
-        cols = @interface.constant.columns.map{|col| col.name.to_sym }
+        cols = @interface.constant.columns.map{|col| col.name.to_sym } rescue []
       end
       cols -= options[:except] if options[:except]
       cols &= options[:only] if options[:only]

data/lib/simple_admin/engine.rb

@@ -6,7 +6,7 @@ module SimpleAdmin
     isolate_namespace SimpleAdmin
     initializer 'simple_admin' do |app|
       if Rails.env == "development"
-        simple_admin_reloader = ActiveSupport::FileUpdateChecker.new(Dir["app/admin/**/*"], true) do
+        simple_admin_reloader = ActiveSupport::FileUpdateChecker.new(Dir["app/admin/**/*"], {}) do
           SimpleAdmin.unregister
           Rails.application.reload_routes!
         end

data/lib/simple_admin/interface.rb

@@ -9,24 +9,28 @@ module SimpleAdmin
         @constant = resource
         @symbol = resource.name.underscore.to_sym
       else
-        @constant = resource.to_s.camelize.singularize.constantize
+        @constant = resource.to_s.camelize.singularize.constantize rescue nil
         @symbol = resource.to_sym
       end
       @member = @symbol.to_s.singularize
       @collection = @symbol.to_s.pluralize
       @options = options
       @sections = {}
+      @block = block
       @before = []
-      @builder = SimpleAdmin::Builder.new(self, &block)
       self
     end
 
+    def route
+      @options[:route] || @collection
+    end
+
     def filters_for(sym)
       options_for(sym)[:filters].attributes
     end
 
-    def attributes_for(sym)
-      options_for(sym)[:attributes].attributes
+    def attributes_for(sym, mode=nil)
+      options_for(sym)[:attributes].attributes.select{|a| a.mode == mode}
     end
 
     def sidebars_for(sym)
@@ -48,6 +52,7 @@ module SimpleAdmin
     private
 
     def section(sym)
+      @builder ||= SimpleAdmin::Builder.new(self, &@block)
       @sections[sym] ||= SimpleAdmin::Section.new(self, sym)
       @sections[sym]
     end

data/lib/simple_admin/version.rb

@@ -1,3 +1,3 @@
 module SimpleAdmin
-  VERSION = "0.5.2"
+  VERSION = "0.6.0"
 end

data/simple_admin.gemspec

@@ -20,9 +20,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Formtastic is a dependency if you are using the default form helper
-  s.add_runtime_dependency("rails", [">= 3.1.0rc4"])
+  s.add_runtime_dependency("rails", [">= 3.1.0"])
   s.add_runtime_dependency("kaminari", [">= 0"])
-  s.add_runtime_dependency("meta_search", [">= 1.1.0.pre"])
 
   s.add_development_dependency("rspec", [">= 2.6.0"])
   s.add_development_dependency("rspec-rails", [">= 2.6.0"])

data/spec/controllers/simple_admin/admin_controller_spec.rb

@@ -92,4 +92,13 @@ describe SimpleAdmin::AdminController do
     end
   end
 
+  context "action limits" do
+    it "should prevent destroy from firing" do
+      SimpleAdmin::Interface.any_instance.expects(:actions).returns([:index, :show, :edit])
+      expect {
+        delete :destroy, :id => @thing.id, :interface => "things"
+      }.to raise_error(SimpleAdmin::ActionNotAllowed)
+    end
+  end
+
 end

data/spec/simple_admin/interface_spec.rb

@@ -44,11 +44,19 @@ describe SimpleAdmin::Interface do
     @interface.should_not be_nil
   end
 
-  it "executes a block using a builder if submitted" do
+  it "doesn't execute a block using a builder when initialized" do
+    SimpleAdmin::Builder.any_instance.expects(:success).never
+    @interface = SimpleAdmin.register(:things) do
+      success
+    end
+  end
+
+  it "executes a block using a builder if a section is requested" do
     SimpleAdmin::Builder.any_instance.expects(:success)
     @interface = SimpleAdmin.register(:things) do
       success
     end
+    @interface.send(:section, :custom)
   end
 
   it "retrieves the attributes for a section" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_admin
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
-  - 2
-  version: 0.5.2
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Jeff Rafter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-17 00:00:00 -07:00
+date: 2012-03-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,14 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15424109
+        hash: 3
         segments: 
         - 3
         - 1
         - 0
-        - rc
-        - 4
-        version: 3.1.0rc4
+        version: 3.1.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -50,27 +48,10 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: meta_search
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 961915996
-        segments: 
-        - 1
-        - 1
-        - 0
-        - pre
-        version: 1.1.0.pre
-  type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -82,11 +63,11 @@ dependencies:
         - 0
         version: 2.6.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -98,11 +79,11 @@ dependencies:
         - 0
         version: 2.6.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: shoulda
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -112,11 +93,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: factory_girl
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -126,11 +107,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -140,11 +121,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: capybara
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -156,11 +137,11 @@ dependencies:
         - 0
         version: 0.4.0
   type: :development
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -170,7 +151,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id009
 description: Use SimpleAdmin to build out filtering, searchable, editable interfaces for your models
 email: 
 - jeffrafter@gmail.com