sferik-merb-admin 0.2.7 → 0.2.8

data/README.markdown

@@ -14,8 +14,8 @@ At the command prompt, type:
 
 In your app, add the following dependency to `config/dependencies.rb`:
 
-    dependency "sferik-merb-admin", "0.2.7", :require_as => "merb-admin"
-    dependency "dm-is-paginated", "0.0.1" # required for pagination
+    dependency "sferik-merb-admin", "0.2.8", :require_as => "merb-admin"
+    dependency "dm-is-paginated", "0.0.1" # if you want pagination support
 
 Add the following route to `config/router.rb`:
 
@@ -51,6 +51,11 @@ MerbAdmin does not implement any authorization scheme. Make sure to apply author
 
 ## Acknowledgements
 
-Many thanks to [Wilson Miner](http://www.wilsonminer.com) for contributing the stylesheets and javascripts from [Django](http://www.djangoproject.com).
+Many thanks to:
+
+* [Wilson Miner](http://www.wilsonminer.com) for contributing the stylesheets and javascripts from [Django](http://www.djangoproject.com)
+* [Lori Holden](http://loriholden.com/) for providing pagination via [dm-is-paginated](http://github.com/lholden/dm-is-paginated)
+* [Aaron Wheeler](http://fightinjoe.com/) for contributing libraries from [Merb AutoScaffold](http://github.com/fightinjoe/merb-autoscaffold)
+* [why the lucky stiff](http://whytheluckystiff.net/) for [metaid](http://whytheluckystiff.net/articles/seeingMetaclassesClearly.html)
 
 Also, thanks to [beer](http://www.anchorbrewing.com).

data/Rakefile

@@ -12,7 +12,7 @@ AUTHOR = "Erik Michaels-Ober"
 EMAIL = "sferik@gmail.com"
 HOMEPAGE = "http://twitter.com/sferik"
 SUMMARY = "MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data."
-GEM_VERSION = "0.2.7"
+GEM_VERSION = "0.2.8"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = "merb"

data/app/controllers/main.rb

@@ -1,3 +1,6 @@
+require File.join( File.dirname(__FILE__), '..', '..', 'lib', 'abstract_model' )
+require File.join( File.dirname(__FILE__), '..', '..', 'lib', 'metaid' )
+
 class MerbAdmin::Main < MerbAdmin::Application
 
   before :find_models, :only => ['index']
@@ -10,54 +13,36 @@ class MerbAdmin::Main < MerbAdmin::Application
 
   def list
     options = {}
-    filters = params[:filter] || {}
-    filters.each_pair do |key, value|
-      if @model.properties[key].primitive.to_s == "TrueClass"
-        options.merge!(key.to_sym => (value == "true"))
-      elsif @model.properties[key].primitive.to_s == "Integer" && @model.properties[key].type.respond_to?(:flag_map)
-        options.merge!(key.to_sym => value.to_sym)
-      end
-    end
-    if params[:query]
-      condition_statement = []
-      conditions = []
-      @properties.each do |property|
-        next unless property.type.to_s == "String"
-        condition_statement << "#{property.field} LIKE ?"
-        conditions << "%#{params[:query]}%"
-      end
-      conditions.unshift(condition_statement.join(" OR "))
-      options.merge!(:conditions => conditions) unless conditions == [""]
-    end
-    if params[:sort]
-      order = "[:#{params[:sort]}.#{params[:sort_reverse] ? 'desc' : 'asc'}]"
-      options.merge!(:order => eval(order))
-    end
+    merge_filter(options) 
+    merge_query(options)
+    merge_sort(options)
+
     if !MerbAdmin[:paginate] || params[:all]
       options = {
         :limit => 200,
       }.merge(options)
-      @objects = @model.all(options).reverse
+      @objects = @abstract_model.find_all(options).reverse
     else
       # monkey patch pagination
-      @model.class_eval("is_paginated") unless @model.respond_to?(:paginated)
+      @abstract_model.model.class_eval("is_paginated") unless @abstract_model.model.respond_to?(:paginated)
       @current_page = (params[:page] || 1).to_i
       options = {
         :page => @current_page,
         :per_page => MerbAdmin[:per_page],
       }.merge(options)
-      @page_count, @objects = @model.paginated(options)
+      @page_count, @objects = @abstract_model.model.paginated(options)
+      options.delete(:page)
+      options.delete(:per_page)
+      options.delete(:offset)
+      options.delete(:limit)
     end
-    options.delete(:page)
-    options.delete(:per_page)
-    options.delete(:offset)
-    options.delete(:limit)
-    @record_count = @model.count(options)
+
+    @record_count = @abstract_model.count(options)
     render(:layout => "list")
   end
 
   def new
-    @object = @model.new
+    @object = @abstract_model.new
     render(:layout => "form")
   end
 
@@ -66,34 +51,44 @@ class MerbAdmin::Main < MerbAdmin::Application
   end
 
   def create
-    object = eval("params[:#{@model_name.snake_case}]") || {}
-    @object = @model.new(object)
-    if @object.save
+    object = params[@abstract_model.singular_name] || {}
+    # Delete fields that are blank
+    object.each do |key, value|
+      object.delete(key) if value.blank?
+    end
+    associations = @abstract_model.has_many_associations.map{|association| [association, (params[:associations] || {}).delete(association[:name])]}
+    @object = @abstract_model.new(object)
+    if @object.save && associations.each{|association, ids| update_has_many_association(association, ids)}
       if params[:_continue]
-        redirect(slice_url(:admin_edit, :model_name => @model_name.snake_case, :id => @object.id), :message => {:notice => "#{@model_name} was successfully created"})
+        redirect(slice_url(:admin_edit, :model_name => @abstract_model.singular_name, :id => @object.id), :message => {:notice => "#{@abstract_model.pretty_name.capitalize} was successfully created"})
       elsif params[:_add_another]
-        redirect(slice_url(:admin_new, :model_name => @model_name.snake_case), :message => {:notice => "#{@model_name} was successfully created"})
+        redirect(slice_url(:admin_new, :model_name => @abstract_model.singular_name), :message => {:notice => "#{@abstract_model.pretty_name.capitalize} was successfully created"})
       else
-        redirect(slice_url(:admin_list, :model_name => @model_name.snake_case), :message => {:notice => "#{@model_name} was successfully created"})
+        redirect(slice_url(:admin_list, :model_name => @abstract_model.singular_name), :message => {:notice => "#{@abstract_model.pretty_name.capitalize} was successfully created"})
       end
     else
-      message[:error] = "#{@model_name} failed to be created"
+      message[:error] = "#{@abstract_model.pretty_name.capitalize} failed to be created"
       render(:new, :layout => "form")
     end
   end
 
   def update
-    object = eval("params[:#{@model_name.snake_case}]") || {}
-    if @object.update_attributes(object)
+    object = params[@abstract_model.singular_name] || {}
+    # Delete fields that are blank
+    object.each do |key, value|
+      object.delete(key) if value.blank?
+    end
+    associations = @abstract_model.has_many_associations.map{|association| [association, (params[:associations] || {}).delete(association[:name])]}
+    if @object.update_attributes(object) && associations.each{|association, ids| update_has_many_association(association, ids)}
       if params[:_continue]
-        redirect(slice_url(:admin_edit, :model_name => @model_name.snake_case, :id => @object.id), :message => {:notice => "#{@model_name} was successfully updated"})
+        redirect(slice_url(:admin_edit, :model_name => @abstract_model.singular_name, :id => @object.id), :message => {:notice => "#{@abstract_model.pretty_name.capitalize} was successfully updated"})
       elsif params[:_add_another]
-        redirect(slice_url(:admin_new, :model_name => @model_name.snake_case), :message => {:notice => "#{@model_name} was successfully updated"})
+        redirect(slice_url(:admin_new, :model_name => @abstract_model.singular_name), :message => {:notice => "#{@abstract_model.pretty_name.capitalize} was successfully updated"})
       else
-        redirect(slice_url(:admin_list, :model_name => @model_name.snake_case), :message => {:notice => "#{@model_name} was successfully updated"})
+        redirect(slice_url(:admin_list, :model_name => @abstract_model.singular_name), :message => {:notice => "#{@abstract_model.pretty_name.capitalize} was successfully updated"})
       end
     else
-      message[:error] = "#{@model_name} failed to be updated"
+      message[:error] = "#{@abstract_model.pretty_name.capitalize} failed to be updated"
       render(:edit, :layout => "form")
     end
   end
@@ -104,7 +99,7 @@ class MerbAdmin::Main < MerbAdmin::Application
 
   def destroy
     if @object.destroy
-      redirect(slice_url(:admin_list, :model_name => @model_name.snake_case), :message => {:notice => "#{@model_name} was successfully destroyed"})
+      redirect(slice_url(:admin_list, :model_name => @abstract_model.singular_name), :message => {:notice => "#{@abstract_model.pretty_name.capitalize} was successfully destroyed"})
     else
       raise BadRequest
     end
@@ -113,28 +108,67 @@ class MerbAdmin::Main < MerbAdmin::Application
   private
 
   def find_models
-    @models = DataMapper::Resource.descendants.to_a.sort{|a, b| a.to_s <=> b.to_s}
-    # remove DataMapperSessionStore because it's included by default
-    @models -= [Merb::DataMapperSessionStore] if Merb.const_defined?(:DataMapperSessionStore)
+    @abstract_models = MerbAdmin::AbstractModel.all
   end
 
   def find_model
-    @model_name = params[:model_name].camel_case.singularize
-    begin
-      @model = eval(@model_name)
-    rescue StandardError
-      raise NotFound
-    end
+    model_name = params[:model_name].camel_case
+    @abstract_model = MerbAdmin::AbstractModel.new(model_name)
     find_properties
   end
 
   def find_properties
-    @properties = @model.properties.to_a
+    @properties = @abstract_model.properties
   end
 
   def find_object
-    @object = @model.get(params[:id])
+    @object = @abstract_model.find(params[:id])
     raise NotFound unless @object
   end
 
+  def merge_filter(options)
+    return unless params[:filter]
+    params[:filter].each_pair do |key, value|
+      @properties.each do |property|
+        next unless property[:name] == key.to_sym
+        if property[:type] == :boolean
+          options.merge!(key.to_sym => (value == "true"))
+        elsif property[:type] == :integer && property[:flag_map]
+          options.merge!(key.to_sym => value.to_sym)
+        end
+      end
+    end
+  end
+
+  def merge_query(options)
+    return unless params[:query]
+    condition_statement = []
+    conditions = []
+    @properties.each do |property|
+      next unless property[:type] == :string
+      condition_statement << "#{property[:field]} LIKE ?"
+      conditions << "%#{params[:query]}%"
+    end
+    conditions.unshift(condition_statement.join(" OR "))
+    options.merge!(:conditions => conditions) unless conditions == [""]
+  end
+
+  def merge_sort(options)
+    return unless params[:sort]
+    options.merge!(:order => [params[:sort].to_sym.send(params[:sort_reverse] ? :desc : :asc)])
+  end
+
+  def update_has_many_association(association, ids)
+    # Remove all of the associated items
+    relationship = @object.send(association[:name])
+    @object.clear_association(relationship)
+    # Add all of the objects to the relationship
+    conditions = {association[:parent_key].first => ids}
+    model = MerbAdmin::AbstractModel.new(association[:child_model])
+    for object in model.find_all(conditions)
+      relationship << object
+    end
+    @object.save
+  end
+
 end

data/app/helpers/main_helper.rb

@@ -2,6 +2,9 @@ require 'builder'
 module Merb
   module MerbAdmin
     module MainHelper
+      def object_title(object)
+        object.try(:name) || object.try(:title) || "#{object.class.to_s} ##{object.id}"
+      end
 
       # Given a page count and the current page, we generate a set of pagination
       # links.

data/app/views/layout/form.html.erb

@@ -1,6 +1,6 @@
 <%
   slice_name = "MerbAdmin" + (MerbAdmin[:app_name].blank? ? "" : " for #{MerbAdmin[:app_name]}")
-  page_name = action_name.capitalize + " " + @model_name.snake_case.gsub('_', ' ')
+  page_name = action_name.capitalize + " " + @abstract_model.pretty_name
 %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us">
@@ -35,7 +35,7 @@
       </div>
       <div class="breadcrumbs">
         <%= link_to("Home", url(:admin_dashboard)) %> &rsaquo;
-        <%= link_to(@model_name.pluralize, url(:admin_list, :model_name => @model_name.snake_case)) %> &rsaquo;
+        <%= link_to(@abstract_model.plural_name.to_s.capitalize, url(:admin_list, :model_name => @abstract_model.singular_name)) %> &rsaquo;
         <%= page_name %>
       </div>
 <%= partial('layout/message', :message => message) unless message.blank? -%>

data/app/views/layout/list.html.erb

@@ -1,6 +1,6 @@
 <%
   slice_name = "MerbAdmin" + (MerbAdmin[:app_name].blank? ? "" : " for #{MerbAdmin[:app_name]}")
-  page_name = "Select " + @model_name.snake_case.gsub('_', ' ') + " to edit"
+  page_name = "Select " + @abstract_model.pretty_name + " to edit"
 %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us">
@@ -30,7 +30,7 @@
       </div>
       <div class="breadcrumbs">
         <%= link_to("Home", url(:admin_dashboard)) %> &rsaquo;
-        <%=h @model_name.pluralize %>
+        <%= @abstract_model.plural_name.to_s.capitalize %>
       </div>
 <%= partial('layout/message', :message => message) unless message.blank? -%>
       <div id="content" class="flex">

data/app/views/main/_big_decimal.html.erb

@@ -1,6 +1,6 @@
                 <div>
-                  <%= text_field(property.name, :maxlength => property.length, :label => property.field.capitalize.gsub('_', ' ')) %>
+                  <%= text_field(property[:name], :maxlength => property[:length], :label => property[:pretty_name].capitalize) %>
                   <p class="help">
-                    <%= !property.nullable? || property.serial? ? "Required." : "Optional." %>
+                    <%= !property[:nullable?] || property[:serial?] ? "Required." : "Optional." %>
                   </p>
                 </div>

data/app/views/main/_boolean.html.erb

@@ -0,0 +1,3 @@
+                <div>
+                  <%= check_box(property[:name], :label => property[:pretty_name].capitalize) %>
+                </div>

data/app/views/main/_date.html.erb

@@ -1,7 +1,7 @@
-<% value = eval("@object.#{property.field}") %>
+<% value = @object.send(property[:name]) %>
                 <div>
-                  <%= text_field(property.name, :class => "vDateField", :label => property.field.capitalize.gsub('_', ' '), :value => value.respond_to?(:strftime) ? value.strftime("%Y-%m-%d") : nil) %>
+                  <%= text_field(property[:name], :class => "vDateField", :label => property[:pretty_name].capitalize, :value => value.respond_to?(:strftime) ? value.strftime("%Y-%m-%d") : nil) %>
                   <p class="help">
-                    <%= !property.nullable? ? "Required." : "Optional." %>
+                    <%= !property[:nullable?] ? "Required." : "Optional." %>
                   </p>
                 </div>

data/app/views/main/_date_time.html.erb

@@ -1,7 +1,7 @@
-<% value = eval("@object.#{property.field}") %>
+<% value = @object.send(property[:name]) %>
                 <div>
-                  <%= text_field(property.name, :class => "vDateField", :label => property.field.capitalize.gsub('_', ' '), :value => value.respond_to?(:strftime) ? value.strftime("%Y-%m-%d %H:%M:%S") : nil) %>
+                  <%= text_field(property[:name], :class => "vDateField", :label => property[:pretty_name].capitalize, :value => value.respond_to?(:strftime) ? value.strftime("%Y-%m-%d %H:%M:%S") : nil) %>
                   <p class="help">
-                    <%= !property.nullable? ? "Required." : "Optional." %>
+                    <%= !property[:nullable?] ? "Required." : "Optional." %>
                   </p>
                 </div>

data/app/views/main/_float.html.erb

@@ -1,6 +1,6 @@
                 <div>
-                  <%= text_field(property.name, :maxlength => property.length, :label => property.field.capitalize.gsub('_', ' ')) %>
+                  <%= text_field(property[:name], :maxlength => property[:length], :label => property[:pretty_name].capitalize) %>
                   <p class="help">
-                    <%= !property.nullable? || property.serial? ? "Required." : "Optional." %>
+                    <%= !property[:nullable?] || property[:serial?] ? "Required." : "Optional." %>
                   </p>
                 </div>

data/app/views/main/_has_many.html.erb

@@ -0,0 +1,10 @@
+            <fieldset class="module aligned">
+              <h2><%= association[:pretty_name].capitalize %></h2>
+              <div class="form-row">
+                <div>
+                  <%= select(:name => "associations[#{association[:name]}][]", :id => association[:name], :collection => MerbAdmin::AbstractModel.new(association[:child_model]).find_all.map{|o| [o.id, object_title(o)]}.sort_by{|o| o[1]}, :selected => @object.send(association[:name]).map{|o| o.id.to_s}, :label => association[:pretty_name].capitalize, :multiple => true) %>
+                  <script type="text/javascript">addEvent(window, "load", function(e) {SelectFilter.init("<%= association[:name] %>", "<%= association[:name] %>", 0, "<%= image_path %>"); });</script>
+                  <p class="help">Hold down "Control", or "Command" on a Mac, to select more than one.</p>
+                </div>
+              </div>
+            </fieldset>

data/app/views/main/_integer.html.erb

@@ -1,10 +1,10 @@
                 <div>
-                  <% if property.type.respond_to?(:flag_map) #Enum or Flag type %>
-                  <%= select(property.name, :collection => property.type.flag_map.map{|x| [x[1], x[1].to_s.capitalize.gsub('_', ' ')]}.sort{|a, b| a[1] <=> b[1]}, :label => property.field.capitalize.gsub('_', ' ')) %>
+                  <% if property[:flag_map] # Enum or Flag type %>
+                  <%= select(property[:name], :collection => property[:flag_map].map{|x| [x[1], x[1].to_s.capitalize.gsub('_', ' ')]}.sort{|a, b| a[1] <=> b[1]}, :label => property[:pretty_name].capitalize) %>
                   <% else %>
-                  <%= text_field(property.name, :maxlength => property.length, :label => property.field.capitalize.gsub('_', ' ')) %>
-                  <% end %>
+                  <%= text_field(property[:name], :maxlength => property[:length], :label => property[:pretty_name].capitalize) %>
                   <p class="help">
-                    <%= !property.nullable? || property.serial? ? "Required." : "Optional." %>
+                    <%= !property[:nullable?] || property[:serial?] ? "Required." : "Optional." %>
                   </p>
+                  <% end %>
                 </div>

data/app/views/main/_string.html.erb

@@ -1,14 +1,6 @@
                 <div>
-                  <% case property.type.to_s %>
-                  <% when "DataMapper::Types::Text" %>
-                    <%= text_area(property.name, :cols => 80, :label => property.field.capitalize.gsub('_', ' ')) %>
-                    <p class="help">
-                      <%= property.nullable? ? "Required." : "Optional." %>
-                    </p>
-                  <% else %>
-                    <%= text_field(property.name, :size => [50, property.length].min, :maxlength => property.length, :label => property.field.capitalize.gsub('_', ' ')) %>
-                    <p class="help">
-                      <%= !property.nullable? ? "Required." : "Optional." %> <%= property.length %> <%= property.length == 1 ? "character." : "characters or fewer." %>
-                    </p>
-                  <% end %>
+                  <%= text_field(property[:name], :size => [50, property[:length]].min, :maxlength => property[:length], :label => property[:pretty_name].capitalize) %>
+                  <p class="help">
+                    <%= !property[:nullable?] ? "Required." : "Optional." %> <%= property[:length] %> <%= property[:length] == 1 ? "character." : "characters or fewer." %>
+                  </p>
                 </div>

data/app/views/main/_text.html.erb

@@ -0,0 +1,6 @@
+                <div>
+                  <%= text_area(property[:name], :cols => 80, :label => property[:pretty_name].capitalize) %>
+                  <p class="help">
+                    <%= property[:nullable?] ? "Required." : "Optional." %>
+                  </p>
+                </div>

data/app/views/main/_time.html.erb

@@ -1,7 +1,7 @@
-<% value = eval("@object.#{property.field}") %>
+<% value = @object.send(property[:name]) %>
                 <div>
-                  <%= text_field(property.name, :class => "vTimeField", :label => property.field.capitalize.gsub('_', ' '), :value => value.respond_to?(:strftime) ? value.strftime("%H:%M:%S") : nil) %>
+                  <%= text_field(property[:name], :class => "vTimeField", :label => property[:pretty_name].capitalize, :value => value.respond_to?(:strftime) ? value.strftime("%H:%M:%S") : nil) %>
                   <p class="help">
-                    <%= !property.nullable? ? "Required." : "Optional." %>
+                    <%= !property[:nullable?] ? "Required." : "Optional." %>
                   </p>
                 </div>

data/app/views/main/delete.html.erb

@@ -1,10 +1,10 @@
-        <p>Are you sure you want to delete the <%= @model_name.snake_case.gsub('_', ' ') %>? All of the following related items will be deleted:</p>
+        <p>Are you sure you want to delete the <%= @abstract_model.pretty_name %>? All of the following related items will be deleted:</p>
         <ul>
           <li>
-            <%= link_to(@model_name, slice_url(:admin_edit, :model_name => @model_name.snake_case, :id => @object.id))%>
+            <%= link_to(@model_name, slice_url(:admin_edit, :model_name => @abstract_model.singular_name, :id => @object.id))%>
           </li>
         </ul>
-        <%= form_for(@object, :action => slice_url(:admin_destroy, :model_name => @model_name.snake_case, :id => @object.id), :method => :delete) do %>
+        <%= form_for(@object, :action => slice_url(:admin_destroy, :model_name => @abstract_model.singular_name, :id => @object.id), :method => :delete) do %>
           <div>
             <%= submit "Yes, I'm sure" %>
           </div>

data/app/views/main/edit.html.erb

@@ -1,30 +1,33 @@
         <div id="content-main">
         <ul class="object-tools">
           <li>
-            <%= link_to("View on site", "/#{@model_name.snake_case}/#{@object.id}", :target => "_blank", :class => "viewsitelink") %>
+            <%= link_to("View on site", "/#{@abstract_model.singular_name}/#{@object.id}", :target => "_blank", :class => "viewsitelink") %>
           </li>
         </ul>
-        <%= form_for(@object, :action => slice_url(:admin_update, :model_name => @model_name.snake_case, :id => @object.id)) do %>
+        <%= form_for(@object, :action => slice_url(:admin_update, :model_name => @abstract_model.singular_name, :id => @object.id)) do %>
           <div>
             <fieldset class="module aligned">
               <% @properties.each do |property| %>
-                <% next if [:id, :created_at, :created_on, :updated_at, :updated_on].include?(property.name) %>
-              <div class="<%= @object.errors[property.name] ? "form-row errors" : "form-row"%>">
-                <% if @object.errors[property.name] %>
+              <% next if [:id, :created_at, :created_on, :updated_at, :updated_on].include?(property[:name]) %>
+              <div class="<%= @object.errors[property[:name]] ? "form-row errors" : "form-row"%>">
+                <% if @object.errors[property[:name]] %>
                 <ul class="errorlist">
-                  <% @object.errors[property.name].each do |error| %>
+                  <% @object.errors[property[:name]].each do |error| %>
                   <li><%= error %></li>
                   <% end %>
                 </ul>
                 <% end %>
-<%= partial(property.primitive.to_s.snake_case, :property => property) -%>
+<%= partial(property[:type].to_s, :property => property) -%>
               </div>
               <% end %>
             </fieldset>
+            <% @abstract_model.has_many_associations.each do |association| %>
+<%= partial('has_many', :association => association) %>
+            <% end %>
             <div class="submit-row" >
               <%= submit "Save", :class => "default", :name => "_save" %>
               <p class="deletelink-box">
-                <%= link_to("Delete", slice_url(:admin_delete, :model_name => @model_name.snake_case, :id => @object.id), :class => "deletelink") %>
+                <%= link_to("Delete", slice_url(:admin_delete, :model_name => @abstract_model.singular_name, :id => @object.id), :class => "deletelink") %>
               </p>
               <%= submit "Save and add another", :name => "_add_another" %>
               <%= submit "Save and continue editing", :name => "_continue" %>

data/app/views/main/index.html.erb

@@ -4,16 +4,16 @@
               <caption>
                 <%= link_to("Models", slice_url(:admin_dashboard), :class => "section") %>
               </caption>
-              <% @models.map{|m| m.to_s}.each do |model_name| %>
+              <% @abstract_models.each do |abstract_model| %>
               <tr>
                 <th scope="row">
-                  <%= link_to(model_name.pluralize, slice_url(:admin_list, :model_name => model_name.snake_case)) %>
+                  <%= link_to(abstract_model.plural_name.to_s.capitalize, slice_url(:admin_list, :model_name => abstract_model.singular_name)) %>
                 </th>
                 <td>
-                  <%= link_to("Add", slice_url(:admin_new, :model_name => model_name.snake_case), :class => "addlink") %>
+                  <%= link_to("Add", slice_url(:admin_new, :model_name => abstract_model.singular_name), :class => "addlink") %>
                 </td>
                 <td>
-                  <%= link_to("Edit", slice_url(:admin_list, :model_name => model_name.snake_case), :class => "changelink") %>
+                  <%= link_to("Edit", slice_url(:admin_list, :model_name => abstract_model.singular_name), :class => "changelink") %>
                 </td>
               </tr>
               <% end %>

data/app/views/main/list.html.erb

@@ -2,7 +2,7 @@
         <div id="content-main">
           <ul class="object-tools">
             <li>
-              <%= link_to("Add #{@model_name.snake_case.gsub('_', ' ')}", slice_url(:admin_new, :model_name => @model_name.snake_case), :class => "addlink") %>
+              <%= link_to("Add #{@abstract_model.pretty_name}", slice_url(:admin_new, :model_name => @abstract_model.singular_name), :class => "addlink") %>
             </li>
           </ul>
           <div class="module filtered" id="changelist">
@@ -13,7 +13,7 @@
                 <input type="text" size="40" name="query" value="" id="searchbar" />
                 <input type="submit" value="Search" />
                 <% if params[:query] || params[:filter] %>
-                <span class="small quiet"><%= @record_count %> <%= @record_count == 1 ? "result" : "results" %> (<a href="?"><%= @model.count %> total</a>)</span>
+                <span class="small quiet"><%= @record_count %> <%= @record_count == 1 ? "result" : "results" %> (<a href="?"><%= @abstract_model.count %> total</a>)</span>
                 <% end %>
                 <% if params[:filter] %>
                 <% params[:filter].each do |name, value| %>
@@ -27,28 +27,28 @@
             <div id="changelist-filter">
               <h2>Filter</h2>
               <% @properties.each do |property| %>
-              <% if property.primitive.to_s == "TrueClass" %>
-              <h3>By <%= property.field.gsub('_', ' ') %></h3>
+              <% if property[:type] == :boolean %>
+              <h3>By <%= property[:pretty_name] %></h3>
               <ul>
-                <li class="<%= params[:filter].nil? || params[:filter][property.name].blank? ? "selected" : nil %>">
-                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (params[:filter] || {}).reject{|key, value| key.to_sym == property.name})) %>">All</a>
+                <li class="<%= params[:filter].nil? || params[:filter][property[:name]].blank? ? "selected" : nil %>">
+                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (params[:filter] || {}).reject{|key, value| key.to_sym == property[:name]})) %>">All</a>
                 </li>
-                <li class="<%= params[:filter] && params[:filter][property.name] == "true" ? "selected" : nil %>">
-                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (params[:filter] || {}).merge({property.name => "true"}))) %>">Yes</a>
+                <li class="<%= params[:filter] && params[:filter][property[:name]] == "true" ? "selected" : nil %>">
+                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (params[:filter] || {}).merge({property[:name] => "true"}))) %>">Yes</a>
                 </li>
-                <li class="<%= params[:filter] && params[:filter][property.name] == "false" ? "selected" : nil %>">
-                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (params[:filter] || {}).merge({property.name => "false"}))) %>">No</a>
+                <li class="<%= params[:filter] && params[:filter][property[:name]] == "false" ? "selected" : nil %>">
+                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (params[:filter] || {}).merge({property[:name] => "false"}))) %>">No</a>
                 </li>
               </ul>
-              <% elsif property.primitive.to_s == "Integer" && property.type.respond_to?(:flag_map) %>
-              <h3>By <%= property.field.gsub('_', ' ') %></h3>
+              <% elsif property[:type] == :integer && property[:flag_map] %>
+              <h3>By <%= property[:pretty_name] %></h3>
               <ul>
-                <li class="<%= params[:filter].nil? || params[:filter][property.name].blank? ? "selected" : nil %>">
-                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (params[:filter] || {}).reject{|key, value| key.to_sym == property.name})) %>">All</a>
+                <li class="<%= params[:filter].nil? || params[:filter][property[:name]].blank? ? "selected" : nil %>">
+                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (params[:filter] || {}).reject{|key, value| key.to_sym == property[:name]})) %>">All</a>
                 </li>
-                <% property.type.flag_map.each do |value, name| %>
-                <li class="<%= params[:filter] && params[:filter][property.name] == name.to_s ? "selected" : nil %>">
-                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (params[:filter] || {}).merge({property.name => name}))) %>"><%= name.to_s.capitalize.gsub('_', ' ')%></a>
+                <% property[:flag_map].each do |value, name| %>
+                <li class="<%= params[:filter] && params[:filter][property[:name]] == name.to_s ? "selected" : nil %>">
+                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (params[:filter] || {}).merge({property[:name] => name}))) %>"><%= name.to_s.capitalize.gsub('_', ' ')%></a>
                 </li>
                 <% end %>
               </ul>
@@ -59,8 +59,8 @@
               <thead>
                 <tr>
                   <% @properties.each do |property| %>
-                  <th class="<%= params[:sort] == property.field ? params[:sort_reverse] ? 'sorted descending' : 'sorted ascending' : nil %>">
-                    <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:sort => property.field).reject{|key, value| key.to_sym == :sort_reverse}.merge(params[:sort] == property.field && params[:sort_reverse] != "true" ? {:sort_reverse => "true"} : {})) %>"><%= property.field.capitalize.gsub('_', ' ') %></a>
+                  <th class="<%= params[:sort] == property[:field] ? params[:sort_reverse] ? 'sorted descending' : 'sorted ascending' : nil %>">
+                    <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:sort => property[:field]).reject{|key, value| key.to_sym == :sort_reverse}.merge(params[:sort] == property[:field] && params[:sort_reverse] != "true" ? {:sort_reverse => "true"} : {})) %>"><%= property[:pretty_name].capitalize %></a>
                   </th>
                   <% end %>
                 </tr>
@@ -70,35 +70,29 @@
                 <tr class="row<%= index % 2 == 0 ? '1' : '2' %>">
                   <% @properties.each do |property| %>
                   <td>
-                    <a href="<%= slice_url(:admin_edit, :model_name => @model_name.snake_case, :id => eval("object.id")) %>">
-                      <% case property.primitive.to_s %>
-                      <% when "TrueClass" %>
-                      <% if eval("object.#{property.field}") == true %>
+                    <a href="<%= slice_url(:admin_edit, :model_name => @abstract_model.singular_name, :id => object.id) %>">
+                      <% case property[:type] %>
+                      <% when :boolean %>
+                      <% if object.send(property[:name]) == true %>
                       <img alt="True" src="<%= image_path("icon-yes.gif") %>"/>
                       <% else %>
                       <img alt="False" src="<%= image_path("icon-no.gif") %>"/>
                       <% end %>
-                      <% when "DateTime" %>
-                        <% value = eval("object.#{property.field}") %>
+                      <% when :date_time %>
+                      <% value = object.send(property[:name]) %>
                       <%= value.respond_to?(:strftime) ? value.strftime("%b. %d, %Y, %I:%M%p") : nil %>
-                      <% when "Date" %>
-                        <% value = eval("object.#{property.field}") %>
+                      <% when :date %>
+                      <% value = object.send(property[:name]) %>
                       <%= value.respond_to?(:strftime) ? value.strftime("%b. %d, %Y") : nil %>
-                      <% when "Time" %>
-                        <% value = eval("object.#{property.field}") %>
+                      <% when :time %>
+                      <% value = object.send(property[:name]) %>
                       <%= value.respond_to?(:strftime) ? value.strftime("%I:%M%p") : nil %>
-                      <% when "Integer" %>
-                      <% if property.type.respond_to?(:flag_map) #Enum or Flag type %>
-                      <%= eval("object.#{property.field}").to_s.capitalize.gsub('_', ' ') %>
+                      <% when :string %>
+                      <%= object.send(property[:name]).to_s.truncate(50) %>
+                      <% when :text %>
+                      <%= object.send(property[:name]).to_s.truncate(50) %>
                       <% else %>
-                      <%= eval("object.#{property.field}") %>
-                      <% end %>
-                      <% when "BigDecimal" %>
-                      <%= eval("object.#{property.field}") %>
-                      <% when "Float" %>
-                      <%= eval("object.#{property.field}") %>
-                      <% when "String" %>
-                      <%= eval("object.#{property.field}").to_s.truncate(50) %>
+                      <%= object.send(property[:name]) %>
                       <% end %>
                     </a>
                   </td>
@@ -111,7 +105,7 @@
               <% if @page_count.to_i > 1 %>
               <%= paginate(@current_page, @page_count, :url => '?' + Merb::Parse.params_to_query_string(params)) %>
               <% end %>
-              <%= @record_count %> <%= @record_count == 1 ? @model_name.snake_case.gsub('_', ' ') : @model_name.snake_case.gsub('_', ' ').pluralize %>
+              <%= @record_count %> <%= @record_count == 1 ? @abstract_model.pretty_name : @abstract_model.pretty_name.pluralize %>
               <% if @page_count.to_i == 2 %>
               <%= link_to("Show all", '?' + Merb::Parse.params_to_query_string(params.merge(:all => true)), :class => "showall") %>
               <% end %>

data/app/views/main/new.html.erb

@@ -1,21 +1,24 @@
         <div id="content-main">
-        <%= form_for(@object, :action => slice_url(:admin_create, :model_name => @model_name.snake_case)) do %>
+        <%= form_for(@object, :action => slice_url(:admin_create, :model_name => @abstract_model.singular_name)) do %>
           <div>
             <fieldset class="module aligned">
               <% @properties.each do |property| %>
-                <% next if [:id, :created_at, :created_on, :updated_at, :updated_on].include?(property.name) %>
-              <div class="<%= @object.errors[property.name] ? "form-row errors" : "form-row"%>">
-                <% if @object.errors[property.name] %>
+                <% next if [:id, :created_at, :created_on, :updated_at, :updated_on].include?(property[:name]) %>
+              <div class="<%= @object.errors[property[:name]] ? "form-row errors" : "form-row"%>">
+                <% if @object.errors[property[:name]] %>
                 <ul class="errorlist">
-                  <% @object.errors[property.name].each do |error| %>
+                  <% @object.errors[property[:name]].each do |error| %>
                   <li><%= error %></li>
                   <% end %>
                 </ul>
                 <% end %>
-<%= partial(property.primitive.to_s.snake_case, :property => property) -%>
+<%= partial(property[:type].to_s, :property => property) -%>
               </div>
               <% end %>
             </fieldset>
+            <% @abstract_model.has_many_associations.each do |association| %>
+<%= partial('has_many', :association => association) %>
+            <% end %>
             <div class="submit-row" >
               <%= submit "Save", :class => "default", :name => "_save" %>
               <%= submit "Save and add another", :name => "_add_another" %>

data/lib/abstract_model.rb

@@ -0,0 +1,171 @@
+module MerbAdmin
+  class AbstractModel
+
+    # Returns all models for a given Merb app
+    def self.all
+      return @models if @models
+      @models ||= []
+      case Merb.orm
+      when :datamapper
+        DataMapper::Resource.descendants.each do |m|
+          # Remove DataMapperSessionStore because it's included by default
+          next if m == Merb::DataMapperSessionStore if Merb.const_defined?(:DataMapperSessionStore)
+          model = lookup(m.to_s.to_sym)
+          @models << new(model) if model
+        end
+        @models.sort{|a, b| a.to_s <=> b.to_s}
+      else
+        raise "MerbAdmin does not currently support the #{Merb.orm} ORM"
+      end
+    end
+
+    # Given a symbol +model_name+, finds the corresponding model class
+    def self.lookup(model_name)
+      model = const_get(model_name)
+      raise "could not find model #{model_name}" if model.nil?
+      return model if model.include?(DataMapper::Resource)
+      nil
+    end
+
+    attr_accessor :model
+
+    def initialize(model)
+      model = self.class.lookup(model.camel_case.to_sym) unless model.is_a?(Class)
+      @model = model
+      self.extend(GenericSupport)
+      case Merb.orm
+      when :datamapper
+        self.extend(DatamapperSupport)
+      else
+        raise "MerbAdmin does not currently support the #{Merb.orm} ORM"
+      end
+    end
+
+    module GenericSupport
+      def singular_name
+        model.to_s.snake_case.to_sym
+      end
+
+      def plural_name
+        model.to_s.snake_case.pluralize.to_sym
+      end
+
+      def pretty_name
+        model.to_s.snake_case.gsub('_', ' ')
+      end
+    end
+
+    module DatamapperSupport
+      def count(options = {})
+        model.count(options)
+      end
+
+      def find_all(options = {})
+        model.all(options)
+      end
+
+      def find(id)
+        model.get(id).extend(InstanceMethods)
+      end
+
+      def new(params = {})
+        model.new(params).extend(InstanceMethods)
+      end
+
+      def has_many_associations
+        associations.select do |association|
+          association[:type] == :has_many
+        end
+      end
+
+      def has_one_associations
+        associations.select do |association|
+          association[:type] == :has_one
+        end
+      end
+
+      def belongs_to_associations
+        associations.select do |association|
+          association[:type] == :belongs_to
+        end
+      end
+
+      def associations
+        model.relationships.to_a.map do |name, relationship|
+          {
+            :name => name,
+            :pretty_name => name.to_s.gsub('_', ' '),
+            :type => association_type_lookup(relationship),
+            :parent_model => relationship.parent_model,
+            :parent_key => relationship.parent_key.map{|p| p.name},
+            :child_model => relationship.child_model,
+            :child_key => relationship.child_key.map{|p| p.name},
+            :remote_relationship => relationship.options[:remote_relationship_name],
+            :near_relationship => relationship.options[:near_relationship_name],
+          }
+        end
+      end
+
+      def association_names
+        associations.map do |association|
+          association[:type] == :belongs_to ? association[:parent_name] : association[:child_name]
+        end
+      end
+
+      def properties
+        model.properties.map do |property|
+          {
+            :name => property.name,
+            :pretty_name => property.field.gsub('_', ' '),
+            :nullable? => property.nullable?,
+            :serial? => property.serial?,
+            :key? => property.key?,
+            :field => property.field,
+            :length => property.length,
+            :type => type_lookup(property),
+            :flag_map => property.type.respond_to?(:flag_map) ? property.type.flag_map : nil,
+          }
+        end
+      end
+
+      private
+
+      def association_type_lookup(relationship)
+        if self.model == relationship.parent_model
+          relationship.options[:max] > 1 ? :has_many : :has_one
+        elsif self.model == relationship.child_model
+          :belongs_to
+        else
+          raise "Unknown association type"
+        end
+      end
+
+      def type_lookup(property)
+        type = {
+          DataMapper::Types::Serial => :integer,
+          DataMapper::Types::Boolean => :boolean,
+          DataMapper::Types::Text => :text,
+          DataMapper::Types::ParanoidDateTime => :date_time,
+          Integer => :integer,
+          Fixnum => :integer,
+          Float => :float,
+          BigDecimal => :big_decimal,
+          TrueClass => :boolean,
+          String => :string,
+          DateTime => :date_time,
+          Date => :date,
+          Time => :time,
+        }
+        type[property.type] || type[property.primitive]
+      end
+
+      module InstanceMethods
+        def clear_association(association)
+          association.clear
+        end
+      end
+
+    end
+
+  end
+end

data/lib/merb-admin.rb

@@ -22,8 +22,8 @@ if defined?(Merb::Plugins)
   module MerbAdmin
 
     # Slice metadata
-    self.description = "MerbAdmin is a merb slice that uses your DataMapper models to provide an easy-to-use, Django-style interface for content managers."
-    self.version = "0.2.7"
+    self.description = "MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data."
+    self.version = "0.2.8"
     self.author = "Erik Michaels-Ober"
 
     # Stub classes loaded hook - runs before LoadClasses BootLoader

data/lib/metaid.rb

@@ -0,0 +1,19 @@
+class Object
+  # The hidden singleton lurks behind everyone
+  def metaclass; class << self; self; end; end
+  def meta_eval &blk; metaclass.instance_eval &blk; end
+
+  # Adds methods to a metaclass
+  def meta_def name, &blk
+    meta_eval { define_method name, &blk }
+  end
+
+  # Defines an instance method within a class
+  def class_def name, &blk
+    class_eval { define_method name, &blk }
+  end
+
+  def try( method )
+    self.send( method ) if self.respond_to?( method )
+  end
+end

data/public/javascripts/SelectFilter2.js

@@ -36,7 +36,7 @@ var SelectFilter = {
         quickElement('h2', selector_available, interpolate(gettext('Available %s'), [field_name]));
         var filter_p = quickElement('p', selector_available, '');
         filter_p.className = 'selector-filter';
-        quickElement('img', filter_p, '', 'src', admin_media_prefix + 'images/selector-search.gif');
+        quickElement('img', filter_p, '', 'src', admin_media_prefix + '/selector-search.gif');
         filter_p.appendChild(document.createTextNode(' '));
         var filter_input = quickElement('input', filter_p, '', 'type', 'text');
         filter_input.id = field_id + '_input';
@@ -58,7 +58,7 @@ var SelectFilter = {
         quickElement('h2', selector_chosen, interpolate(gettext('Chosen %s'), [field_name]));
         var selector_filter = quickElement('p', selector_chosen, gettext('Select your choice(s) and click '));
         selector_filter.className = 'selector-filter';
-        quickElement('img', selector_filter, '', 'src', admin_media_prefix + (is_stacked ? 'images/selector_stacked-add.gif':'images/selector-add.gif'), 'alt', 'Add');
+        quickElement('img', selector_filter, '', 'src', admin_media_prefix + (is_stacked ? '/selector_stacked-add.gif':'/selector-add.gif'), 'alt', 'Add');
         var to_box = quickElement('select', selector_chosen, '', 'id', field_id + '_to', 'multiple', 'multiple', 'size', from_box.size, 'name', from_box.getAttribute('name'));
         to_box.className = 'filtered';
         var clear_all = quickElement('a', selector_chosen, gettext('Clear all'), 'href', 'javascript: (function() { SelectBox.move_all("' + field_id + '_to", "' + field_id + '_from");})()');

data/spec/fixtures/player_fixture.rb

@@ -8,7 +8,7 @@ class Player
   property :team_id, Integer, :nullable => false, :index => true
   property :number, Integer, :nullable => false
   property :name, String, :length => 100, :nullable => false
-  property :position, Flag[:pitcher, :catcher, :first, :second, :third, :shortstop, :left, :center, :right]
+  property :position, Enum[:pitcher, :catcher, :first, :second, :third, :shortstop, :left, :center, :right]
   property :sex, Enum[:male, :female]
   property :batting_average, Float, :default => 0.0, :precision => 4, :scale => 3
   property :injured, Boolean, :default => false
@@ -24,5 +24,6 @@ Player.fixture {{
   :team_id => /\d{1,2}/.gen,
   :number => /\d{1,2}/.gen,
   :name => "#{/\w{3,10}/.gen.capitalize} #{/\w{5,10}/.gen.capitalize}",
+  :position => Player.properties[:position].type.flag_map.values[rand(Player.properties[:position].type.flag_map.length)],
   :sex => Player.properties[:sex].type.flag_map.values[rand(Player.properties[:sex].type.flag_map.length)],
 }}

data/spec/requests/main_spec.rb

@@ -28,7 +28,7 @@ describe "MerbAdmin" do
       @response.should be_successful
     end
 
-    it "should should contain \"Site administration\"" do
+    it "should contain \"Site administration\"" do
       @response.body.should contain("Site administration")
     end
   end
@@ -43,7 +43,7 @@ describe "MerbAdmin" do
     end
 
     it "should contain \"Select model to edit\"" do
-      @response.body.should contain("Select #{"player".gsub('_', ' ')} to edit")
+      @response.body.should contain("Select player to edit")
     end
   end
 
@@ -119,27 +119,7 @@ describe "MerbAdmin" do
     end
   end
 
-  describe "list with enum filter" do
-    before(:each) do
-      Player.gen(:name => "Jackie Robinson", :sex => :male)
-      Player.gen(:name => "Dottie Hinson", :sex => :female)
-      @response = request(url(:admin_list, :model_name => "player"), :params => {:filter => {:sex => :male}})
-    end
-
-    it "should respond sucessfully" do
-      @response.should be_successful
-    end
-
-    it "should contain matching results" do
-      @response.body.should contain("Jackie Robinson")
-    end
-
-    it "should not contain non-matching results" do
-      @response.body.should_not contain("Dottie Hinson")
-    end
-  end
-
-  describe "list with 2 players", :given => "two players exist" do
+  describe "list with 2 objects", :given => "two players exist" do
     before(:each) do
       MerbAdmin[:paginate] = true
       MerbAdmin[:per_page] = 1
@@ -151,72 +131,68 @@ describe "MerbAdmin" do
     end
 
     it "should contain \"2 results\"" do
-      @response.body.should contain("2 #{"player".gsub('_', ' ').pluralize}")
+      @response.body.should contain("2 players")
     end
   end
 
-  describe "list with 2 players, show all", :given => "two players exist" do
+  describe "list with 20 objects", :given => "twenty players exist" do
     before(:each) do
       MerbAdmin[:paginate] = true
       MerbAdmin[:per_page] = 1
-      @response = request(url(:admin_list, :model_name => "player"), :params => {:all => true})
+      @response = request(url(:admin_list, :model_name => "player"))
     end
 
     it "should respond sucessfully" do
       @response.should be_successful
     end
 
-    it "should contain \"2 results\"" do
-      @response.body.should contain("2 #{"player".gsub('_', ' ').pluralize}")
+    it "should contain \"20 results\"" do
+      @response.body.should contain("20 players")
     end
   end
 
-  describe "list with 20 players", :given => "twenty players exist" do
+  describe "list with 20 objects, page 8", :given => "twenty players exist" do
     before(:each) do
       MerbAdmin[:paginate] = true
       MerbAdmin[:per_page] = 1
-      @response = request(url(:admin_list, :model_name => "player"))
+      @response = request(url(:admin_list, :model_name => "player"), :params => {:page => 8})
     end
 
     it "should respond sucessfully" do
       @response.should be_successful
     end
 
-    it "should contain \"20 results\"" do
-      @response.body.should contain("20 #{"player".gsub('_', ' ').pluralize}")
+    it "should paginate correctly" do
+      @response.body.should contain(/1 2[^0-9]*5 6 7 8 9 10 11[^0-9]*19 20/)
     end
   end
 
-  describe "list with 20 players, page 8", :given => "twenty players exist" do
+  describe "list with 20 objects, page 17", :given => "twenty players exist" do
     before(:each) do
       MerbAdmin[:paginate] = true
       MerbAdmin[:per_page] = 1
-      @response = request(url(:admin_list, :model_name => "player"), :params => {:page => 8})
+      @response = request(url(:admin_list, :model_name => "player"), :params => {:page => 17})
     end
 
     it "should respond sucessfully" do
       @response.should be_successful
     end
 
-    it "should contain \"20 results\"" do
-      @response.body.should contain("20 #{"player".gsub('_', ' ').pluralize}")
+    it "should paginate correctly" do
+      @response.body.should contain(/1 2[^0-9]*12 13 14 15 16 17 18 19 20/)
     end
   end
 
-  describe "list with 20 players, page 17", :given => "twenty players exist" do
+  describe "list show all", :given => "two players exist" do
     before(:each) do
       MerbAdmin[:paginate] = true
       MerbAdmin[:per_page] = 1
-      @response = request(url(:admin_list, :model_name => "player"), :params => {:page => 17})
+      @response = request(url(:admin_list, :model_name => "player"), :params => {:all => true})
     end
 
     it "should respond sucessfully" do
       @response.should be_successful
     end
-
-    it "should contain \"20 results\"" do
-      @response.body.should contain("20 #{"player".gsub('_', ' ').pluralize}")
-    end
   end
 
   describe "new" do
@@ -229,7 +205,7 @@ describe "MerbAdmin" do
     end
 
     it "should contain \"New model\"" do
-      @response.body.should contain("New #{"player".gsub('_', ' ')}")
+      @response.body.should contain("New player")
     end
   end
 
@@ -243,7 +219,7 @@ describe "MerbAdmin" do
     end
 
     it "should contain \"Edit model\"" do
-      @response.body.should contain("Edit #{"player".gsub('_', ' ')}")
+      @response.body.should contain("Edit player")
     end
   end
 
@@ -259,7 +235,7 @@ describe "MerbAdmin" do
 
   describe "create" do
     before(:each) do
-      @response = request(url(:admin_create, :model_name => "player"), :method => "post", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :sex => :male}})
+      @response = request(url(:admin_create, :model_name => "player"), :method => "post", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :position => :second, :sex => :male}})
     end
 
     it "should redirect to list" do
@@ -271,19 +247,9 @@ describe "MerbAdmin" do
     end
   end
 
-  describe "create with invalid object" do
-    before(:each) do
-      @response = request(url(:admin_create, :model_name => "player"), :method => "post", :params => {:player => {}})
-    end
-
-    it "should have an error message" do
-      @response.body.should contain("Player failed to be created")
-    end
-  end
-
   describe "create and edit" do
     before(:each) do
-      @response = request(url(:admin_create, :model_name => "player"), :method => "post", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :sex => :male}, :_continue => true})
+      @response = request(url(:admin_create, :model_name => "player"), :method => "post", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :position => :second, :sex => :male}, :_continue => true})
     end
 
     it "should redirect to edit" do
@@ -297,7 +263,7 @@ describe "MerbAdmin" do
 
   describe "create and add another" do
     before(:each) do
-      @response = request(url(:admin_create, :model_name => "player"), :method => "post", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :sex => :male}, :_add_another => true})
+      @response = request(url(:admin_create, :model_name => "player"), :method => "post", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :position => :second, :sex => :male}, :_add_another => true})
     end
 
     it "should redirect to new" do
@@ -309,37 +275,27 @@ describe "MerbAdmin" do
     end
   end
 
-  describe "update", :given => "an object exists" do
+  describe "create with invalid object" do
     before(:each) do
-      @response = request(url(:admin_update, :model_name => "player", :id => @player.id), :method => "put", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :sex => :male}})
-    end
-
-    it "should redirect to list" do
-      @response.should redirect_to(url(:admin_list, :model_name => "player"))
+      @response = request(url(:admin_create, :model_name => "player"), :method => "post", :params => {:player => {}})
     end
 
-    it "should update an object that already exists" do
-      Player.first(:id => @player.id).name.should eql("Jackie Robinson")
+    it "should contain an error message" do
+      @response.body.should contain("Player failed to be created")
     end
   end
 
-  describe "update with invalid object", :given => "an object exists" do
+  describe "update", :given => "an object exists" do
     before(:each) do
-      @response = request(url(:admin_update, :model_name => "player", :id => @player.id), :method => "put", :params => {:player => {:number => nil}})
-    end
-
-    it "should have an error message" do
-      @response.body.should contain("Player failed to be updated")
+      @response = request(url(:admin_update, :model_name => "player", :id => @player.id), :method => "put", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :sex => :male}})
     end
-  end
 
-  describe "update with missing object" do
-    before(:each) do
-      @response = request(url(:admin_update, :model_name => "player", :id => 1), :method => "put", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :sex => :male}})
+    it "should redirect to list" do
+      @response.should redirect_to(url(:admin_list, :model_name => "player"))
     end
 
-    it "should raise NotFound" do
-      @response.status.should == 404
+    it "should update an object that already exists" do
+      Player.first(:id => @player.id).name.should eql("Jackie Robinson")
     end
   end
 
@@ -371,6 +327,26 @@ describe "MerbAdmin" do
     end
   end
 
+  describe "update with missing object" do
+    before(:each) do
+      @response = request(url(:admin_update, :model_name => "player", :id => 1), :method => "put", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :sex => :male}})
+    end
+
+    it "should raise NotFound" do
+      @response.status.should == 404
+    end
+  end
+
+  describe "update with invalid object", :given => "an object exists" do
+    before(:each) do
+      @response = request(url(:admin_update, :model_name => "player", :id => @player.id), :method => "put", :params => {:player => {:number => "a"}})
+    end
+
+    it "should contain an error message" do
+      @response.body.should contain("Player failed to be updated")
+    end
+  end
+
   describe "delete", :given => "an object exists" do
     before(:each) do
       @response = request(url(:admin_delete, :model_name => "player", :id => @player.id))
@@ -381,7 +357,7 @@ describe "MerbAdmin" do
     end
 
     it "should contain \"Delete model\"" do
-      @response.body.should contain("Delete #{"player".gsub('_', ' ')}")
+      @response.body.should contain("Delete player")
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sferik-merb-admin
 version: !ruby/object:Gem::Version 
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-22 00:00:00 -07:00
+date: 2009-08-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,11 +55,13 @@ files:
 - LICENSE
 - README.markdown
 - Rakefile
+- lib/abstract_model.rb
 - lib/merb-admin
 - lib/merb-admin/merbtasks.rb
 - lib/merb-admin/slicetasks.rb
 - lib/merb-admin/spectasks.rb
 - lib/merb-admin.rb
+- lib/metaid.rb
 - spec/controllers
 - spec/controllers/main_spec.rb
 - spec/fixtures
@@ -85,13 +87,15 @@ files:
 - app/views/layout/list.html.erb
 - app/views/main
 - app/views/main/_big_decimal.html.erb
+- app/views/main/_boolean.html.erb
 - app/views/main/_date.html.erb
 - app/views/main/_date_time.html.erb
 - app/views/main/_float.html.erb
+- app/views/main/_has_many.html.erb
 - app/views/main/_integer.html.erb
 - app/views/main/_string.html.erb
+- app/views/main/_text.html.erb
 - app/views/main/_time.html.erb
-- app/views/main/_true_class.html.erb
 - app/views/main/delete.html.erb
 - app/views/main/edit.html.erb
 - app/views/main/index.html.erb

data/app/views/main/_true_class.html.erb

@@ -1,3 +0,0 @@
-                <div>
-                  <%= check_box(property.name, :label => property.field.capitalize.gsub('_', ' ')) %>
-                </div>