merb-admin 0.4.8 → 0.4.9

data/README.markdown

@@ -16,11 +16,11 @@ At the command prompt, type:
 
 In your app, add the following dependency to `config/dependencies.rb`:
 
-    dependency "merb-admin", "0.4.8"
+    dependency "merb-admin", "0.4.9"
 
 Add the following route to `config/router.rb`:
 
-    add_slice(:merb_admin, :name_prefix => nil, :path_prefix => "admin", :default_routes => false)
+    add_slice(:merb_admin, :path_prefix => "admin")
 
 Then, run the following rake task:
 

data/Rakefile

@@ -9,7 +9,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.4.8"
+GEM_VERSION = "0.4.9"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = "merb"

data/app/controllers/main.rb

@@ -60,11 +60,11 @@ class MerbAdmin::Main < MerbAdmin::Application
     @object = @abstract_model.new(object)
     if @object.save && has_one_associations.each{|association, id| update_has_one_association(association, id)} && has_many_associations.each{|association, ids| update_has_many_association(association, ids)}
       if params[:_continue]
-        redirect(url(:admin_edit, :model_name => @abstract_model.singular_name, :id => @object.id), :message => {:notice => "#{@abstract_model.pretty_name} was successfully created"})
+        redirect(url(:merb_admin_edit, :model_name => @abstract_model.singular_name, :id => @object.id), :message => {:notice => "#{@abstract_model.pretty_name} was successfully created"})
       elsif params[:_add_another]
-        redirect(url(:admin_new, :model_name => @abstract_model.singular_name), :message => {:notice => "#{@abstract_model.pretty_name} was successfully created"})
+        redirect(url(:merb_admin_new, :model_name => @abstract_model.singular_name), :message => {:notice => "#{@abstract_model.pretty_name} was successfully created"})
       else
-        redirect(url(:admin_list, :model_name => @abstract_model.singular_name), :message => {:notice => "#{@abstract_model.pretty_name} was successfully created"})
+        redirect(url(:merb_admin_list, :model_name => @abstract_model.singular_name), :message => {:notice => "#{@abstract_model.pretty_name} was successfully created"})
       end
     else
       message[:error] = "#{@abstract_model.pretty_name} failed to be created"
@@ -82,11 +82,11 @@ class MerbAdmin::Main < MerbAdmin::Application
     has_many_associations = @abstract_model.has_many_associations.map{|association| [association, (params[:associations] || {}).delete(association[:name])]}
     if @object.update_attributes(object) && has_one_associations.each{|association, id| update_has_one_association(association, id)} && has_many_associations.each{|association, ids| update_has_many_association(association, ids)} 
       if params[:_continue]
-        redirect(url(:admin_edit, :model_name => @abstract_model.singular_name, :id => @object.id), :message => {:notice => "#{@abstract_model.pretty_name} was successfully updated"})
+        redirect(url(:merb_admin_edit, :model_name => @abstract_model.singular_name, :id => @object.id), :message => {:notice => "#{@abstract_model.pretty_name} was successfully updated"})
       elsif params[:_add_another]
-        redirect(url(:admin_new, :model_name => @abstract_model.singular_name), :message => {:notice => "#{@abstract_model.pretty_name} was successfully updated"})
+        redirect(url(:merb_admin_new, :model_name => @abstract_model.singular_name), :message => {:notice => "#{@abstract_model.pretty_name} was successfully updated"})
       else
-        redirect(url(:admin_list, :model_name => @abstract_model.singular_name), :message => {:notice => "#{@abstract_model.pretty_name} was successfully updated"})
+        redirect(url(:merb_admin_list, :model_name => @abstract_model.singular_name), :message => {:notice => "#{@abstract_model.pretty_name} was successfully updated"})
       end
     else
       message[:error] = "#{@abstract_model.pretty_name} failed to be updated"
@@ -100,7 +100,7 @@ class MerbAdmin::Main < MerbAdmin::Application
 
   def destroy
     if @object.destroy
-      redirect(url(:admin_list, :model_name => @abstract_model.singular_name), :message => {:notice => "#{@abstract_model.pretty_name} was successfully destroyed"})
+      redirect(url(:merb_admin_list, :model_name => @abstract_model.singular_name), :message => {:notice => "#{@abstract_model.pretty_name} was successfully destroyed"})
     else
       raise BadRequest
     end

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

@@ -31,8 +31,8 @@
         </div>
       </div>
       <div class="breadcrumbs">
-        <%= link_to("Home", url(:admin_dashboard)) %> &rsaquo;
-        <%= link_to(@abstract_model.plural_name.to_s.capitalize, url(:admin_list, :model_name => @abstract_model.singular_name)) %> &rsaquo;
+        <%= link_to("Home", url(:merb_admin_dashboard)) %> &rsaquo;
+        <%= link_to(@abstract_model.plural_name.to_s.capitalize, url(:merb_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

@@ -26,7 +26,7 @@
         </div>
       </div>
       <div class="breadcrumbs">
-        <%= link_to("Home", url(:admin_dashboard)) %> &rsaquo;
+        <%= link_to("Home", url(:merb_admin_dashboard)) %> &rsaquo;
         <%= @abstract_model.plural_name.to_s.capitalize %>
       </div>
 <%= partial('layout/message', :message => message) unless message.blank? -%>

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

@@ -1,10 +1,10 @@
         <p>Are you sure you want to delete the <%= @abstract_model.pretty_name.downcase %>? All of the following related items will be deleted:</p>
         <ul>
           <li>
-            <%= link_to(@model_name, url(:admin_edit, :model_name => @abstract_model.singular_name, :id => @object.id))%>
+            <%= link_to(@model_name, url(:merb_admin_edit, :model_name => @abstract_model.singular_name, :id => @object.id))%>
           </li>
         </ul>
-        <%= form_for(@object, :action => url(:admin_destroy, :model_name => @abstract_model.singular_name, :id => @object.id), :method => :delete) do %>
+        <%= form_for(@object, :action => url(:merb_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,20 +1,14 @@
         <div id="content-main">
-        <%= form_for(@object, :action => url(:admin_update, :model_name => @abstract_model.singular_name, :id => @object.id)) do %>
+        <%= form_for(@object, :action => url(:merb_admin_update, :model_name => @abstract_model.singular_name, :id => @object.id)) do %>
           <div>
 <%= partial('properties', :properties => @properties) -%>
-            <% @abstract_model.belongs_to_associations.each do |association| %>
-<%= partial('belongs_to', :association => association) -%>
-            <% end %>
-            <% @abstract_model.has_one_associations.each do |association| %>
-<%= partial('has_one', :association => association) -%>
-            <% end %>
-            <% @abstract_model.has_many_associations.each do |association| %>
-<%= partial('has_many', :association => association) -%>
-            <% end %>
+<%= partial('belongs_to', :with => @abstract_model.belongs_to_associations, :as => :association) -%>
+<%= partial('has_one', :with => @abstract_model.has_one_associations, :as => :association) -%>
+<%= partial('has_many', :with => @abstract_model.has_many_associations, :as => :association) -%>
             <div class="submit-row" >
               <%= submit "Save", :class => "default", :name => "_save" %>
               <p class="deletelink-box">
-                <%= link_to("Delete", url(:admin_delete, :model_name => @abstract_model.singular_name, :id => @object.id), :class => "deletelink") %>
+                <%= link_to("Delete", url(:merb_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

@@ -2,18 +2,18 @@
           <div class="module">
             <table summary="Models available in the application.">
               <caption>
-                <%= link_to("Models", url(:admin_dashboard), :class => "section") %>
+                <%= link_to("Models", url(:merb_admin_dashboard), :class => "section") %>
               </caption>
               <% @abstract_models.each do |abstract_model| %>
               <tr>
                 <th scope="row">
-                  <%= link_to(abstract_model.plural_name.to_s.capitalize, url(:admin_list, :model_name => abstract_model.singular_name)) %>
+                  <%= link_to(abstract_model.plural_name.to_s.capitalize, url(:merb_admin_list, :model_name => abstract_model.singular_name)) %>
                 </th>
                 <td>
-                  <%= link_to("Add", url(:admin_new, :model_name => abstract_model.singular_name), :class => "addlink") %>
+                  <%= link_to("Add", url(:merb_admin_new, :model_name => abstract_model.singular_name), :class => "addlink") %>
                 </td>
                 <td>
-                  <%= link_to("Edit", url(:admin_list, :model_name => abstract_model.singular_name), :class => "changelink") %>
+                  <%= link_to("Edit", url(:merb_admin_list, :model_name => abstract_model.singular_name), :class => "changelink") %>
                 </td>
               </tr>
               <% end %>

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

@@ -8,7 +8,7 @@
         <div id="content-main">
           <ul class="object-tools">
             <li>
-              <%= link_to("Add #{@abstract_model.pretty_name.downcase}", url(:admin_new, :model_name => @abstract_model.singular_name), :class => "addlink") %>
+              <%= link_to("Add #{@abstract_model.pretty_name.downcase}", url(:merb_admin_new, :model_name => @abstract_model.singular_name), :class => "addlink") %>
             </li>
           </ul>
           <div class="module filtered" id="changelist">
@@ -19,7 +19,7 @@
                 <input type="text" size="40" name="query" value="<%= query %>" id="searchbar" />
                 <input type="submit" value="Search" />
                 <% if query || filter %>
-                <span class="small quiet"><%= @record_count %> <%= @record_count == 1 ? "result" : "results" %> (<a href="?"><%= @abstract_model.count %> total</a>)</span>
+                  <span class="small quiet"><%= @record_count %> <%= @record_count == 1 ? "result" : "results" %> (<%= link_to("#{@abstract_model.count} total", "?") %>)</span>
                 <% end %>
                 <% if filter %>
                 <% filter.each do |name, value| %>
@@ -40,13 +40,13 @@
               <h3>By <%= property_pretty_name %></h3>
               <ul>
                 <li class="<%= filter.nil? || filter[property_name].blank? ? "selected" : nil %>">
-                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (filter || {}).reject{|key, value| key.to_sym == property_name})) %>">All</a>
+                  <%= link_to("All", "?" + Merb::Parse.params_to_query_string(params.merge(:filter => (filter || {}).reject{|key, value| key.to_sym == property_name}))) %>
                 </li>
                 <li class="<%= filter && filter[property_name] == "true" ? "selected" : nil %>">
-                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (filter || {}).merge({property_name => "true"}))) %>">Yes</a>
+                  <%= link_to("Yes", "?" + Merb::Parse.params_to_query_string(params.merge(:filter => (filter || {}).merge({property_name => "true"})))) %>
                 </li>
                 <li class="<%= filter && filter[property_name] == "false" ? "selected" : nil %>">
-                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (filter || {}).merge({property_name => "false"}))) %>">No</a>
+                  <%= link_to("No", "?" + Merb::Parse.params_to_query_string(params.merge(:filter => (filter || {}).merge({property_name => "false"})))) %>
                 </li>
               </ul>
               <% end %>
@@ -59,19 +59,17 @@
                   <% property_name = property[:name] %>
                   <% property_pretty_name = property[:pretty_name] %>
                   <th class="<%= sort == property_name.to_s ? sort_reverse ? 'sorted descending' : 'sorted ascending' : nil %>">
-                    <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:sort => property_name).reject{|key, value| key.to_sym == :sort_reverse}.merge(sort == property_name.to_s && sort_reverse != "true" ? {:sort_reverse => "true"} : {})) %>"><%= property_pretty_name %></a>
+                    <%= link_to(property_pretty_name, "?" + Merb::Parse.params_to_query_string(params.merge(:sort => property_name).reject{|key, value| key.to_sym == :sort_reverse}.merge(sort == property_name.to_s && sort_reverse != "true" ? {:sort_reverse => "true"} : {}))) %>
                   </th>
                   <% end %>
                 </tr>
               </thead>
               <tbody>
                 <% @objects.each_with_index do |object, index| %>
-                <tr class="row<%= index % 2 == 0 ? '1' : '2' %>">
+                <tr class="row<%= index % 2 == 0 ? "1" : "2" %>">
                   <% @properties.each do |property| %>
                   <td>
-                    <a href="<%= url(:admin_edit, :model_name => @abstract_model.singular_name, :id => object.id) %>">
-                      <%= object_property(object, property) %>
-                    </a>
+                    <%= link_to(object_property(object, property), url(:merb_admin_edit, :model_name => @abstract_model.singular_name, :id => object.id)) %>
                   </td>
                   <% end %>
                 </tr>
@@ -80,11 +78,11 @@
             </table>
             <p class="paginator">
               <% if @page_count.to_i > 1 %>
-              <%= paginate(@current_page, @page_count, :url => '?' + Merb::Parse.params_to_query_string(params)) %>
+              <%= paginate(@current_page, @page_count, :url => "?" + Merb::Parse.params_to_query_string(params)) %>
               <% end %>
               <%= @record_count %> <%= @record_count == 1 ? @abstract_model.pretty_name.downcase : @abstract_model.pretty_name.downcase.pluralize %>
               <% if @page_count.to_i == 2 %>
-              <%= link_to("Show all", '?' + Merb::Parse.params_to_query_string(params.merge(:all => true)), :class => "showall") %>
+              <%= link_to("Show all", "?" + Merb::Parse.params_to_query_string(params.merge(:all => true)), :class => "showall") %>
               <% end %>
             </p>
           </div>

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

@@ -1,16 +1,10 @@
         <div id="content-main">
-        <%= form_for(@object, :action => url(:admin_create, :model_name => @abstract_model.singular_name)) do %>
+        <%= form_for(@object, :action => url(:merb_admin_create, :model_name => @abstract_model.singular_name)) do %>
           <div>
 <%= partial('properties', :properties => @properties) -%>
-            <% @abstract_model.belongs_to_associations.each do |association| %>
-<%= partial('belongs_to', :association => association) -%>
-            <% end %>
-            <% @abstract_model.has_one_associations.each do |association| %>
-<%= partial('has_one', :association => association) -%>
-            <% end %>
-            <% @abstract_model.has_many_associations.each do |association| %>
-<%= partial('has_many', :association => association) -%>
-            <% end %>
+<%= partial('belongs_to', :with => @abstract_model.belongs_to_associations, :as => :association) -%>
+<%= partial('has_one', :with => @abstract_model.has_one_associations, :as => :association) -%>
+<%= partial('has_many', :with => @abstract_model.has_many_associations, :as => :association) -%>
             <div class="submit-row" >
               <%= submit "Save", :class => "default", :name => "_save" %>
               <%= submit "Save and add another", :name => "_add_another" %>

data/lib/merb-admin.rb

@@ -23,7 +23,7 @@ if defined?(Merb::Plugins)
 
     # Slice metadata
     self.description = "MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data."
-    self.version = "0.4.8"
+    self.version = "0.4.9"
     self.author = "Erik Michaels-Ober"
 
     # Stub classes loaded hook - runs before LoadClasses BootLoader
@@ -46,35 +46,35 @@ if defined?(Merb::Plugins)
     def self.setup_router(scope)
       scope.match("/", :method => :get).
         to(:controller => "main", :action => "index").
-        name(:admin_dashboard)
+        name(:dashboard)
 
       scope.match("/:model_name", :method => :get).
         to(:controller => "main", :action => "list").
-        name(:admin_list)
+        name(:list)
 
       scope.match("/:model_name/new", :method => :get).
         to(:controller => "main", :action => "new").
-        name(:admin_new)
+        name(:new)
 
       scope.match("/:model_name/:id/edit", :method => :get).
         to(:controller => "main", :action => "edit").
-        name(:admin_edit)
+        name(:edit)
 
       scope.match("/:model_name", :method => :post).
         to(:controller => "main", :action => "create").
-        name(:admin_create)
+        name(:create)
 
       scope.match("/:model_name/:id", :method => :put).
         to(:controller => "main", :action => "update").
-        name(:admin_update)
+        name(:update)
 
       scope.match("/:model_name/:id/delete", :method => :get).
         to(:controller => "main", :action => "delete").
-        name(:admin_delete)
+        name(:delete)
 
       scope.match("/:model_name/:id(.:format)", :method => :delete).
         to(:controller => "main", :action => "destroy").
-        name(:admin_destroy)
+        name(:destroy)
     end
 
   end

data/schema/migrations/004_create_players_migration.rb

@@ -6,15 +6,12 @@ class CreatePlayersMigration < ActiveRecord::Migration
       t.integer :team_id
       t.string :name, :limit => 100, :null => false
       t.string :position, :limit => 50
-      t.integer :number
-      t.float :batting_average, :default => 0.0
+      t.integer :number, :null => false
       t.boolean :retired, :default => false
       t.boolean :injured, :default => false
       t.date :born_on
-      t.timestamp :wake_at
       t.text :notes
     end
-    add_index :players, :team_id
   end
 
   def self.down

data/schema/migrations/005_create_teams_migration.rb

@@ -5,10 +5,19 @@ class CreateTeamsMigration < ActiveRecord::Migration
       t.integer :league_id
       t.integer :division_id
       t.string :name, :limit => 50, :null => false
+      t.string :logo_image_url, :limit => 255
+      t.string :manager, :limit => 100, :null => false
+      t.string :ballpark, :limit => 100
+      t.string :mascot, :limit => 100
+      t.integer :founded
+      t.integer :wins
+      t.integer :losses
+      t.float :win_percentage
     end
     add_index :teams, :division_id
     add_index :teams, :league_id
     add_index :teams, :name
+    add_index :teams, :manager
   end
 
   def self.down

data/spec/models/activerecord/division.rb

@@ -1,6 +1,5 @@
 class Division < ActiveRecord::Base
-  validates_presence_of :league_id
-  validates_numericality_of :league_id
+  validates_numericality_of :league_id, :only_integer => true
   validates_presence_of :name
 
   belongs_to :league

data/spec/models/activerecord/draft.rb

@@ -1,15 +1,10 @@
 class Draft < ActiveRecord::Base
-  validates_presence_of :player_id
-  validates_numericality_of :player_id
-  validates_presence_of :team_id
-  validates_numericality_of :team_id
+  validates_numericality_of :player_id, :only_integer => true
+  validates_numericality_of :team_id, :only_integer => true
   validates_presence_of :date
-  validates_presence_of :round
-  validates_numericality_of :round
-  validates_presence_of :pick
-  validates_numericality_of :pick
-  validates_presence_of :overall
-  validates_numericality_of :overall
+  validates_numericality_of :round, :only_integer => true
+  validates_numericality_of :pick, :only_integer => true
+  validates_numericality_of :overall, :only_integer => true
 
   belongs_to :team
   belongs_to :player

data/spec/models/activerecord/player.rb

@@ -1,9 +1,7 @@
 class Player < ActiveRecord::Base
-  validates_presence_of :team_id
-  validates_numericality_of :team_id
   validates_presence_of :name
-  validates_presence_of :number
-  validates_numericality_of :number
+  validates_numericality_of :number, :only_integer => true
+  validates_uniqueness_of :number, :scope => :team_id, :message => "There is already a player with that number on this team"
 
   belongs_to :team
   has_one :draft

data/spec/models/activerecord/team.rb

@@ -1,9 +1,12 @@
 class Team < ActiveRecord::Base
-  validates_presence_of :league_id
-  validates_numericality_of :league_id
-  validates_presence_of :division_id
-  validates_numericality_of :division_id
+  validates_numericality_of :league_id, :only_integer => true
+  validates_numericality_of :division_id, :only_integer => true
   validates_presence_of :name
+  validates_presence_of :manager
+  validates_numericality_of :founded, :only_integer => true
+  validates_numericality_of :wins, :only_integer => true
+  validates_numericality_of :losses, :only_integer => true
+  validates_numericality_of :win_percentage
 
   belongs_to :league
   belongs_to :division

data/spec/models/datamapper/player.rb

@@ -5,17 +5,17 @@ class Player
   property :created_at, DateTime
   property :updated_at, DateTime
   property :deleted_at, ParanoidDateTime
-  property :team_id, Integer, :nullable => false, :index => true
-  property :name, String, :length => 100, :nullable => false
+  property :team_id, Integer
+  property :name, String, :length => 100, :nullable => false, :index => true
   property :position, String
   property :number, Integer, :nullable => false
-  property :batting_average, Float, :default => 0.0, :precision => 4, :scale => 3
   property :retired, Boolean, :default => false
   property :injured, Boolean, :default => false
   property :born_on, Date
-  property :wake_at, Time
   property :notes, Text
 
+  validates_is_unique :number, :scope => :team_id, :message => "There is already a player with that number on this team"
+
   belongs_to :team
   has 1, :draft
 end

data/spec/models/datamapper/team.rb

@@ -7,6 +7,14 @@ class Team
   property :league_id, Integer, :nullable => false, :index => true
   property :division_id, Integer, :nullable => false, :index => true
   property :name, String, :nullable => false, :index => true
+  property :logo_image_url, String, :length => 255
+  property :manager, String, :length => 100, :nullable => false, :index => true
+  property :ballpark, String, :length => 100
+  property :mascot, String, :length => 100
+  property :founded, Integer, :nullable => false
+  property :wins, Integer, :nullable => false
+  property :losses, Integer, :nullable => false
+  property :win_percentage, Float, :nullable => false, :precision => 4, :scale => 3
 
   belongs_to :league
   belongs_to :division

data/spec/requests/main_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
 
 given "a player exists" do
-  @player = MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => rand(99), :name => "Player 1")
+  @player = MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 1, :name => "Player 1")
 end
 
 given "a draft exists" do
@@ -11,27 +11,27 @@ end
 given "two players exist" do
   @players = []
   2.times do |i|
-    @players << MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => rand(99), :name => "Player #{i}")
+    @players << MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => i + 1, :name => "Player #{i + 1}")
   end
 end
 
 given "three teams exist" do
   @teams = []
   3.times do |i|
-    @teams << MerbAdmin::AbstractModel.new("Team").create(:league_id => rand(99999), :division_id => rand(99999), :name => "Team #{i}")
+    @teams << MerbAdmin::AbstractModel.new("Team").create(:league_id => rand(99999), :division_id => rand(99999), :name => "Team #{i + 1}", :manager => "Manager #{i + 1}", :founded => 1869 + rand(130), :wins => (wins = rand(163)), :losses => 162 - wins, :win_percentage => "%.3f" % (wins.to_f / 162))
   end
 end
 
 given "a player exists and a draft exists" do
-  @player = MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => rand(99), :name => "Player 1")
+  @player = MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 1, :name => "Player 1")
   @draft = MerbAdmin::AbstractModel.new("Draft").create(:player_id => rand(99999), :team_id => rand(99999), :date => Date.today, :round => rand(50), :pick => rand(30), :overall => rand(1500))
 end
 
 given "a player exists and three teams exist" do
-  @player = MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => rand(99), :name => "Player 1")
+  @player = MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 1, :name => "Player 1")
   @teams = []
   3.times do |i|
-    @teams << MerbAdmin::AbstractModel.new("Team").create(:league_id => rand(99999), :division_id => rand(99999), :name => "Team #{i}")
+    @teams << MerbAdmin::AbstractModel.new("Team").create(:league_id => rand(99999), :division_id => rand(99999), :name => "Team #{i + 1}", :manager => "Manager #{i + 1}", :founded => 1869 + rand(130), :wins => (wins = rand(163)), :losses => 162 - wins, :win_percentage => "%.3f" % (wins.to_f / 162))
   end
 end
 
@@ -39,19 +39,18 @@ given "a league exists and three teams exist" do
   @league = League.create(:name => "League 1")
   @teams = []
   3.times do |i|
-    @teams << MerbAdmin::AbstractModel.new("Team").create(:league_id => rand(99999), :division_id => rand(99999), :name => "Team #{i}")
+    @teams << MerbAdmin::AbstractModel.new("Team").create(:league_id => rand(99999), :division_id => rand(99999), :name => "Team #{i + 1}", :manager => "Manager #{i + 1}", :founded => 1869 + rand(130), :wins => (wins = rand(163)), :losses => 162 - wins, :win_percentage => "%.3f" % (wins.to_f / 162))
   end
 end
 
 given "twenty players exist" do
   @players = []
   20.times do |i|
-    @players << MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => rand(99), :name => "Player #{i}")
+    @players << MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => i + 1, :name => "Player #{i + 1}")
   end
 end
 
 describe "MerbAdmin" do
-
   before(:each) do
     mount_slice
     MerbAdmin::AbstractModel.new("Division").destroy_all!
@@ -63,7 +62,7 @@ describe "MerbAdmin" do
 
   describe "dashboard" do
     before(:each) do
-      @response = request(url(:admin_dashboard))
+      @response = request(url(:merb_admin_dashboard))
     end
 
     it "should respond sucessfully" do
@@ -77,7 +76,7 @@ describe "MerbAdmin" do
 
   describe "list" do
     before(:each) do
-      @response = request(url(:admin_list, :model_name => "player"))
+      @response = request(url(:merb_admin_list, :model_name => "player"))
     end
 
     it "should respond sucessfully" do
@@ -87,13 +86,21 @@ describe "MerbAdmin" do
     it "should show \"Select model to edit\"" do
       @response.body.should contain("Select player to edit")
     end
+
+    it "should show filters" do
+      @response.body.should contain(/Filter\n\s*By Retired\n\s*All\n\s*Yes\n\s*No\n\s*By Injured\n\s*All\n\s*Yes\n\s*No/)
+    end
+
+    it "should show column headers" do
+      @response.body.should contain(/Id\n\s*Created at\n\s*Updated at\n\s*Deleted at\n\s*Team\n\s*Name\n\s*Position\n\s*Number\n\s*Retired\n\s*Injured\n\s*Born on\n\s*Notes/)
+    end
   end
 
   describe "list with sort" do
     before(:each) do
-      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 32, :name => "Sandy Koufax", :position => "pitcher")
-      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 42, :name => "Jackie Robinson", :position => "second")
-      @response = request(url(:admin_list, :model_name => "player"), :params => {:sort => "name"})
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 32, :name => "Sandy Koufax", :position => "Starting patcher")
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 42, :name => "Jackie Robinson", :position => "Second baseman")
+      @response = request(url(:merb_admin_list, :model_name => "player"), :params => {:sort => "name"})
     end
 
     it "should respond sucessfully" do
@@ -107,9 +114,9 @@ describe "MerbAdmin" do
 
   describe "list with reverse sort" do
     before(:each) do
-      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 32, :name => "Sandy Koufax", :position => "pitcher")
-      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 42, :name => "Jackie Robinson", :position => "second")
-      @response = request(url(:admin_list, :model_name => "player"), :params => {:sort => "name", :sort_reverse => "true"})
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 32, :name => "Sandy Koufax", :position => "Starting patcher")
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 42, :name => "Jackie Robinson", :position => "Second baseman")
+      @response = request(url(:merb_admin_list, :model_name => "player"), :params => {:sort => "name", :sort_reverse => "true"})
     end
 
     it "should respond sucessfully" do
@@ -123,9 +130,9 @@ describe "MerbAdmin" do
 
   describe "list with query" do
     before(:each) do
-      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 32, :name => "Sandy Koufax", :position => "pitcher")
-      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 42, :name => "Jackie Robinson", :position => "second")
-      @response = request(url(:admin_list, :model_name => "player"), :params => {:query => "Jackie Robinson"})
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 32, :name => "Sandy Koufax", :position => "Starting patcher")
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 42, :name => "Jackie Robinson", :position => "Second baseman")
+      @response = request(url(:merb_admin_list, :model_name => "player"), :params => {:query => "Jackie Robinson"})
     end
 
     it "should respond sucessfully" do
@@ -143,11 +150,11 @@ describe "MerbAdmin" do
 
   describe "list with query and boolean filter" do
     before(:each) do
-      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 32, :name => "Sandy Koufax", :position => "pitcher", :retired => true, :injured => true)
-      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 42, :name => "Jackie Robinson", :position => "second", :retired => true, :injured => false)
-      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 18, :name => "Moises Alou", :position => "left", :retired => false, :injured => true)
-      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 5, :name => "David Wright", :position => "third", :retired => false, :injured => false)
-      @response = request(url(:admin_list, :model_name => "player"), :params => {:query => "Sandy Koufax", :filter => {:injured => "true"}})
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 32, :name => "Sandy Koufax", :position => "Starting patcher", :retired => true, :injured => true)
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 42, :name => "Jackie Robinson", :position => "Second baseman", :retired => true, :injured => false)
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 18, :name => "Moises Alou", :position => "Left fielder", :retired => false, :injured => true)
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 5, :name => "David Wright", :position => "Third baseman", :retired => false, :injured => false)
+      @response = request(url(:merb_admin_list, :model_name => "player"), :params => {:query => "Sandy Koufax", :filter => {:injured => "true"}})
     end
 
     it "should respond sucessfully" do
@@ -168,9 +175,9 @@ describe "MerbAdmin" do
 
   describe "list with boolean filter" do
     before(:each) do
-      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 18, :name => "Moises Alou", :position => "left", :injured => true)
-      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 5, :name => "David Wright", :position => "third", :injured => false)
-      @response = request(url(:admin_list, :model_name => "player"), :params => {:filter => {:injured => "true"}})
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 18, :name => "Moises Alou", :position => "Left fielder", :injured => true)
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 5, :name => "David Wright", :position => "Third baseman", :injured => false)
+      @response = request(url(:merb_admin_list, :model_name => "player"), :params => {:filter => {:injured => "true"}})
     end
 
     it "should respond sucessfully" do
@@ -188,11 +195,11 @@ describe "MerbAdmin" do
 
   describe "list with boolean filters" do
     before(:each) do
-      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 32, :name => "Sandy Koufax", :position => "pitcher", :retired => true, :injured => true)
-      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 42, :name => "Jackie Robinson", :position => "second", :retired => true, :injured => false)
-      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 18, :name => "Moises Alou", :position => "left", :retired => false, :injured => true)
-      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 5, :name => "David Wright", :position => "third", :retired => false, :injured => false)
-      @response = request(url(:admin_list, :model_name => "player"), :params => {:filter => {:retired => "true", :injured => "true"}})
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 32, :name => "Sandy Koufax", :position => "Starting patcher", :retired => true, :injured => true)
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 42, :name => "Jackie Robinson", :position => "Second baseman", :retired => true, :injured => false)
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 18, :name => "Moises Alou", :position => "Left fielder", :retired => false, :injured => true)
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 5, :name => "David Wright", :position => "Third baseman", :retired => false, :injured => false)
+      @response = request(url(:merb_admin_list, :model_name => "player"), :params => {:filter => {:retired => "true", :injured => "true"}})
     end
 
     it "should respond sucessfully" do
@@ -213,7 +220,7 @@ describe "MerbAdmin" do
     before(:each) do
       MerbAdmin[:paginate] = true
       MerbAdmin[:per_page] = 1
-      @response = request(url(:admin_list, :model_name => "player"))
+      @response = request(url(:merb_admin_list, :model_name => "player"))
     end
 
     it "should respond sucessfully" do
@@ -229,7 +236,7 @@ describe "MerbAdmin" do
     before(:each) do
       MerbAdmin[:paginate] = true
       MerbAdmin[:per_page] = 1
-      @response = request(url(:admin_list, :model_name => "player"))
+      @response = request(url(:merb_admin_list, :model_name => "player"))
     end
 
     it "should respond sucessfully" do
@@ -245,7 +252,7 @@ describe "MerbAdmin" 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(:merb_admin_list, :model_name => "player"), :params => {:page => 8})
     end
 
     it "should respond sucessfully" do
@@ -261,7 +268,7 @@ describe "MerbAdmin" 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(:merb_admin_list, :model_name => "player"), :params => {:page => 17})
     end
 
     it "should respond sucessfully" do
@@ -277,7 +284,7 @@ describe "MerbAdmin" 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(:merb_admin_list, :model_name => "player"), :params => {:all => true})
     end
 
     it "should respond sucessfully" do
@@ -287,7 +294,7 @@ describe "MerbAdmin" do
 
   describe "new" do
     before(:each) do
-      @response = request(url(:admin_new, :model_name => "player"))
+      @response = request(url(:merb_admin_new, :model_name => "player"))
     end
 
     it "should respond sucessfully" do
@@ -297,11 +304,24 @@ describe "MerbAdmin" do
     it "should show \"New model\"" do
       @response.body.should contain("New player")
     end
+
+    it "should show required fields as \"Required\"" do
+      @response.body.should contain(/Name\n\s*Required/)
+      @response.body.should contain(/Number\n\s*Required/)
+    end
+
+    it "should show non-required fields as \"Optional\"" do
+      @response.body.should contain(/Position\n\s*Optional/)
+      @response.body.should contain(/Born on\n\s*Optional/)
+      @response.body.should contain(/Notes\n\s*Optional/)
+      @response.body.should contain(/Draft\n\s*Optional/)
+      @response.body.should contain(/Team\n\s*Optional/)
+    end
   end
 
   describe "new with has-one association", :given => "a draft exists" do
     before(:each) do
-      @response = request(url(:admin_new, :model_name => "player"))
+      @response = request(url(:merb_admin_new, :model_name => "player"))
     end
 
     it "should respond sucessfully" do
@@ -311,7 +331,7 @@ describe "MerbAdmin" do
 
   describe "new with has-many association", :given => "three teams exist" do
     before(:each) do
-      @response = request(url(:admin_new, :model_name => "player"))
+      @response = request(url(:merb_admin_new, :model_name => "player"))
     end
 
     it "should respond sucessfully" do
@@ -321,7 +341,7 @@ describe "MerbAdmin" do
 
   describe "edit", :given => "a player exists" do
     before(:each) do
-      @response = request(url(:admin_edit, :model_name => "player", :id => @player.id))
+      @response = request(url(:merb_admin_edit, :model_name => "player", :id => @player.id))
     end
 
     it "should respond sucessfully" do
@@ -335,22 +355,20 @@ describe "MerbAdmin" do
     it "should show required fields as \"Required\"" do
       @response.body.should contain(/Name\n\s*Required/)
       @response.body.should contain(/Number\n\s*Required/)
-      @response.body.should contain(/Team\n\s*Required/)
     end
 
     it "should show non-required fields as \"Optional\"" do
       @response.body.should contain(/Position\n\s*Optional/)
-      @response.body.should contain(/Batting average\n\s*Optional/)
       @response.body.should contain(/Born on\n\s*Optional/)
-      @response.body.should contain(/Wake at\n\s*Optional/)
       @response.body.should contain(/Notes\n\s*Optional/)
       @response.body.should contain(/Draft\n\s*Optional/)
+      @response.body.should contain(/Team\n\s*Optional/)
     end
   end
 
   describe "edit with has-one association", :given => "a player exists and a draft exists" do
     before(:each) do
-      @response = request(url(:admin_edit, :model_name => "player", :id => @player.id))
+      @response = request(url(:merb_admin_edit, :model_name => "player", :id => @player.id))
     end
 
     it "should respond sucessfully" do
@@ -360,7 +378,7 @@ describe "MerbAdmin" do
 
   describe "edit with has-many association", :given => "a player exists and three teams exist" do
     before(:each) do
-      @response = request(url(:admin_edit, :model_name => "player", :id => @player.id))
+      @response = request(url(:merb_admin_edit, :model_name => "player", :id => @player.id))
     end
 
     it "should respond sucessfully" do
@@ -371,7 +389,7 @@ describe "MerbAdmin" do
 
   describe "edit with missing object" do
     before(:each) do
-      @response = request(url(:admin_edit, :model_name => "player", :id => 1))
+      @response = request(url(:merb_admin_edit, :model_name => "player", :id => 1))
     end
 
     it "should raise NotFound" do
@@ -381,11 +399,11 @@ 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, :position => "second"}})
+      @response = request(url(:merb_admin_create, :model_name => "player"), :method => "post", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :position => "Second baseman"}})
     end
 
     it "should redirect to list" do
-      @response.should redirect_to(url(:admin_list, :model_name => "player"))
+      @response.should redirect_to(url(:merb_admin_list, :model_name => "player"))
     end
 
     it "should create a new object" do
@@ -395,11 +413,11 @@ describe "MerbAdmin" do
 
   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, :position => "second"}, :_continue => true})
+      @response = request(url(:merb_admin_create, :model_name => "player"), :method => "post", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :position => "Second baseman"}, :_continue => true})
     end
 
     it "should redirect to edit" do
-      @response.should redirect_to(url(:admin_edit, :model_name => "player", :id => MerbAdmin::AbstractModel.new("Player").first.id))
+      @response.should redirect_to(url(:merb_admin_edit, :model_name => "player", :id => MerbAdmin::AbstractModel.new("Player").first.id))
     end
 
     it "should create a new object" do
@@ -409,11 +427,11 @@ 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, :position => "second"}, :_add_another => true})
+      @response = request(url(:merb_admin_create, :model_name => "player"), :method => "post", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :position => "Second baseman"}, :_add_another => true})
     end
 
     it "should redirect to new" do
-      @response.should redirect_to(url(:admin_new, :model_name => "player"))
+      @response.should redirect_to(url(:merb_admin_new, :model_name => "player"))
     end
 
     it "should create a new object" do
@@ -423,7 +441,7 @@ describe "MerbAdmin" do
 
   describe "create with has-one association", :given => "a draft exists" do
     before(:each) do
-      @response = request(url(:admin_create, :model_name => "player"), :method => "post", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :position => "second"}, :associations => {:draft => @draft.id}})
+      @response = request(url(:merb_admin_create, :model_name => "player"), :method => "post", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :position => "Second baseman"}, :associations => {:draft => @draft.id}})
     end
 
     it "should create a new object" do
@@ -437,7 +455,7 @@ describe "MerbAdmin" do
 
   describe "create with has-many association", :given => "three teams exist" do
     before(:each) do
-      @response = request(url(:admin_create, :model_name => "league"), :method => "post", :params => {:league => {:name => "National League"}, :associations => {:teams => [@teams[0].id, @teams[1].id]}})
+      @response = request(url(:merb_admin_create, :model_name => "league"), :method => "post", :params => {:league => {:name => "National League"}, :associations => {:teams => [@teams[0].id, @teams[1].id]}})
     end
 
     it "should create a new object" do
@@ -454,9 +472,19 @@ describe "MerbAdmin" do
     end
   end
 
+  describe "create with uniqueness constraint violated", :given => "a player exists" do
+    before(:each) do
+      @response = request(url(:merb_admin_create, :model_name => "player"), :method => "post", :params => {:player => {:name => @player.name, :number => @player.number, :team_id => @player.team_id, :position => @player.position}})
+    end
+
+    it "should show an error message" do
+      @response.body.should contain("There is already a player with that number on this team")
+    end
+  end
+
   describe "create with invalid object" do
     before(:each) do
-      @response = request(url(:admin_create, :model_name => "player"), :method => "post", :params => {:player => {}})
+      @response = request(url(:merb_admin_create, :model_name => "player"), :method => "post", :params => {:player => {}})
     end
 
     it "should show an error message" do
@@ -466,11 +494,11 @@ describe "MerbAdmin" do
 
   describe "update", :given => "a player exists" 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}})
+      @response = request(url(:merb_admin_update, :model_name => "player", :id => @player.id), :method => "put", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1}})
     end
 
     it "should redirect to list" do
-      @response.should redirect_to(url(:admin_list, :model_name => "player"))
+      @response.should redirect_to(url(:merb_admin_list, :model_name => "player"))
     end
 
     it "should update an object that already exists" do
@@ -480,11 +508,11 @@ describe "MerbAdmin" do
 
   describe "update and edit", :given => "a player exists" 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}, :_continue => true})
+      @response = request(url(:merb_admin_update, :model_name => "player", :id => @player.id), :method => "put", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1}, :_continue => true})
     end
 
     it "should redirect to edit" do
-      @response.should redirect_to(url(:admin_edit, :model_name => "player", :id => @player.id))
+      @response.should redirect_to(url(:merb_admin_edit, :model_name => "player", :id => @player.id))
     end
 
     it "should update an object that already exists" do
@@ -494,11 +522,11 @@ describe "MerbAdmin" do
 
   describe "update and add another", :given => "a player exists" 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}, :_add_another => true})
+      @response = request(url(:merb_admin_update, :model_name => "player", :id => @player.id), :method => "put", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1}, :_add_another => true})
     end
 
     it "should redirect to new" do
-      @response.should redirect_to(url(:admin_new, :model_name => "player"))
+      @response.should redirect_to(url(:merb_admin_new, :model_name => "player"))
     end
 
     it "should update an object that already exists" do
@@ -508,7 +536,7 @@ describe "MerbAdmin" do
 
   describe "update with has-one association", :given => "a player exists and a draft exists" 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, :position => "second"}, :associations => {:draft => @draft.id}})
+      @response = request(url(:merb_admin_update, :model_name => "player", :id => @player.id), :method => "put", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :position => "Second baseman"}, :associations => {:draft => @draft.id}})
     end
 
     it "should update an object that already exists" do
@@ -522,7 +550,7 @@ describe "MerbAdmin" do
 
   describe "update with has-many association", :given => "a league exists and three teams exist" do
     before(:each) do
-      @response = request(url(:admin_update, :model_name => "league", :id => @league.id), :method => "put", :params => {:league => {:name => "National League"}, :associations => {:teams => [@teams[0].id, @teams[1].id]}})
+      @response = request(url(:merb_admin_update, :model_name => "league", :id => @league.id), :method => "put", :params => {:league => {:name => "National League"}, :associations => {:teams => [@teams[0].id, @teams[1].id]}})
     end
 
     it "should update an object that already exists" do
@@ -541,7 +569,7 @@ describe "MerbAdmin" do
 
   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}})
+      @response = request(url(:merb_admin_update, :model_name => "player", :id => 1), :method => "put", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1}})
     end
 
     it "should raise NotFound" do
@@ -551,7 +579,7 @@ describe "MerbAdmin" do
 
   describe "update with invalid object", :given => "a player exists" do
     before(:each) do
-      @response = request(url(:admin_update, :model_name => "player", :id => @player.id), :method => "put", :params => {:player => {:number => "a"}})
+      @response = request(url(:merb_admin_update, :model_name => "player", :id => @player.id), :method => "put", :params => {:player => {:number => "a"}})
     end
 
     it "should show an error message" do
@@ -561,7 +589,7 @@ describe "MerbAdmin" do
 
   describe "delete", :given => "a player exists" do
     before(:each) do
-      @response = request(url(:admin_delete, :model_name => "player", :id => @player.id))
+      @response = request(url(:merb_admin_delete, :model_name => "player", :id => @player.id))
     end
 
     it "should respond sucessfully" do
@@ -575,7 +603,7 @@ describe "MerbAdmin" do
 
   describe "delete with missing object" do
     before(:each) do
-      @response = request(url(:admin_delete, :model_name => "player", :id => 1))
+      @response = request(url(:merb_admin_delete, :model_name => "player", :id => 1))
     end
 
     it "should raise NotFound" do
@@ -585,11 +613,11 @@ describe "MerbAdmin" do
 
   describe "destroy", :given => "a player exists" do
     before(:each) do
-      @response = request(url(:admin_destroy, :model_name => "player", :id => @player.id), :method => "delete")
+      @response = request(url(:merb_admin_destroy, :model_name => "player", :id => @player.id), :method => "delete")
     end
 
     it "should redirect to list" do
-      @response.should redirect_to(url(:admin_list, :model_name => "player"))
+      @response.should redirect_to(url(:merb_admin_list, :model_name => "player"))
     end
 
     it "should destroy an object" do
@@ -599,12 +627,11 @@ describe "MerbAdmin" do
 
   describe "destroy with missing object" do
     before(:each) do
-      @response = request(url(:admin_destroy, :model_name => "player", :id => 1), :method => "delete")
+      @response = request(url(:merb_admin_destroy, :model_name => "player", :id => 1), :method => "delete")
     end
 
     it "should raise NotFound" do
       @response.status.should == 404
     end
   end
-
 end

data/spec/spec_helper.rb

@@ -106,7 +106,7 @@ Merb::Test.add_helpers do
   def mount_slice
     if standalone?
       Merb::Router.reset!
-      Merb::Router.prepare{add_slice(:merb_admin, :name_prefix => nil, :path_prefix => "admin", :default_routes => false)}
+      Merb::Router.prepare{add_slice(:merb_admin, :path_prefix => "admin")}
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-admin
 version: !ruby/object:Gem::Version 
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-29 00:00:00 -07:00
+date: 2009-10-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency