sferik-merb-admin 0.2.6 → 0.2.7

data/README.markdown

@@ -14,7 +14,8 @@ At the command prompt, type:
 
 In your app, add the following dependency to `config/dependencies.rb`:
 
-    dependency "sferik-merb-admin", "0.2.6", :require_as => "merb-admin"
+    dependency "sferik-merb-admin", "0.2.7", :require_as => "merb-admin"
+    dependency "dm-is-paginated", "0.0.1" # required for pagination
 
 Add the following route to `config/router.rb`:
 
@@ -31,6 +32,7 @@ You can configuring the merb-admin slice in a before_app_loads block:
     Merb::BootLoader.before_app_loads do
       Merb::Slices::config[:merb_admin][:app_name] = "My App"
       Merb::Slices::config[:merb_admin][:paginate] = true
+      Merb::Slices::config[:merb_admin][:per_page] = 100
     end
 
 ## Run it

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.6"
+GEM_VERSION = "0.2.7"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = "merb"
@@ -29,7 +29,6 @@ spec = Gem::Specification.new do |s|
   s.add_dependency("merb-slices", ">= 1.0.12")
   s.add_dependency("merb_datamapper", ">= 1.0.12")
   s.add_dependency("dm-core", ">= 0.9.11")
-  s.add_dependency("dm-is-paginated", ">= 0.0.1")
   s.require_path = "lib"
   s.files = %w(LICENSE README.markdown Rakefile) + Dir.glob("{lib,spec,app,public,stubs}/**/*")
   s.post_install_message = <<-POST_INSTALL_MESSAGE

data/app/controllers/application.rb

@@ -1,17 +1,5 @@
-class MerbAdmin::Application < Merb::Controller
-  
-  controller_for_slice
-
-  before :set_model, :exclude => "index"
+class MerbAdmin::Application < Merb::Controller  
 
-  def set_model
-    @model_name = params[:model_name].to_s.camel_case.singularize
-    begin
-      @model = eval(@model_name)
-    rescue StandardError
-      raise NotFound
-    end
-    @properties = @model.properties.to_a
-  end
+  controller_for_slice
 
 end

data/app/controllers/{forms.rb → main.rb}

@@ -1,10 +1,10 @@
-class MerbAdmin::Forms < MerbAdmin::Application
-  layout :form
+class MerbAdmin::Main < MerbAdmin::Application
+
+  before :find_models, :only => ['index']
+  before :find_model, :exclude => ['index']
+  before :find_object, :only => ['edit', 'update', 'delete', 'destroy']
 
   def index
-    @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)
     render(:layout => "dashboard")
   end
 
@@ -37,40 +37,40 @@ class MerbAdmin::Forms < MerbAdmin::Application
       options = {
         :limit => 200,
       }.merge(options)
-      @instances = @model.all(options).reverse
+      @objects = @model.all(options).reverse
     else
       # monkey patch pagination
       @model.class_eval("is_paginated") unless @model.respond_to?(:paginated)
       @current_page = (params[:page] || 1).to_i
       options = {
         :page => @current_page,
-        :per_page => 100,
+        :per_page => MerbAdmin[:per_page],
       }.merge(options)
-      @page_count, @instances = @model.paginated(options)
-      options.delete(:page)
-      options.delete(:per_page)
+      @page_count, @objects = @model.paginated(options)
     end
+    options.delete(:page)
+    options.delete(:per_page)
+    options.delete(:offset)
+    options.delete(:limit)
     @record_count = @model.count(options)
     render(:layout => "list")
   end
 
   def new
-    @instance = @model.new
+    @object = @model.new
     render(:layout => "form")
   end
 
-  def edit(id)
-    @instance = @model.get(id)
-    raise NotFound unless @instance
+  def edit
     render(:layout => "form")
   end
 
   def create
-    instance = eval("params[:#{@model_name.snake_case}]")
-    @instance = @model.new(instance)
-    if @instance.save
+    object = eval("params[:#{@model_name.snake_case}]") || {}
+    @object = @model.new(object)
+    if @object.save
       if params[:_continue]
-        redirect(slice_url(:admin_edit, :model_name => @model_name.snake_case, :id => @instance.id), :message => {:notice => "#{@model_name} was successfully created"})
+        redirect(slice_url(:admin_edit, :model_name => @model_name.snake_case, :id => @object.id), :message => {:notice => "#{@model_name} 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"})
       else
@@ -82,13 +82,11 @@ class MerbAdmin::Forms < MerbAdmin::Application
     end
   end
 
-  def update(id)
-    instance = eval("params[:#{@model_name.snake_case}]")
-    @instance = @model.get(id)
-    raise NotFound unless @instance
-    if @instance.update_attributes(instance)
+  def update
+    object = eval("params[:#{@model_name.snake_case}]") || {}
+    if @object.update_attributes(object)
       if params[:_continue]
-        redirect(slice_url(:admin_edit, :model_name => @model_name.snake_case, :id => @instance.id), :message => {:notice => "#{@model_name} was successfully updated"})
+        redirect(slice_url(:admin_edit, :model_name => @model_name.snake_case, :id => @object.id), :message => {:notice => "#{@model_name} 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"})
       else
@@ -100,20 +98,43 @@ class MerbAdmin::Forms < MerbAdmin::Application
     end
   end
 
-  def delete(id)
-    @instance = @model.get(id)
-    raise NotFound unless @instance
+  def delete
     render(:layout => "form")
   end
 
-  def destroy(id)
-    @instance = @model.get(id)
-    raise NotFound unless @instance
-    if @instance.destroy
+  def destroy
+    if @object.destroy
       redirect(slice_url(:admin_list, :model_name => @model_name.snake_case), :message => {:notice => "#{@model_name} was successfully destroyed"})
     else
-      raise InternalServerError
+      raise BadRequest
     end
   end
 
+  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)
+  end
+
+  def find_model
+    @model_name = params[:model_name].camel_case.singularize
+    begin
+      @model = eval(@model_name)
+    rescue StandardError
+      raise NotFound
+    end
+    find_properties
+  end
+
+  def find_properties
+    @properties = @model.properties.to_a
+  end
+
+  def find_object
+    @object = @model.get(params[:id])
+    raise NotFound unless @object
+  end
+
 end

data/app/helpers/{forms_helper.rb → main_helper.rb}

@@ -1,7 +1,7 @@
 require 'builder'
 module Merb
   module MerbAdmin
-    module FormsHelper
+    module MainHelper
 
       # Given a page count and the current page, we generate a set of pagination
       # links.

data/app/views/{forms → main}/_date.html.erb

@@ -1,4 +1,4 @@
-<% value = eval("@instance.#{property.field}") %>
+<% value = eval("@object.#{property.field}") %>
                 <div>
                   <%= text_field(property.name, :class => "vDateField", :label => property.field.capitalize.gsub('_', ' '), :value => value.respond_to?(:strftime) ? value.strftime("%Y-%m-%d") : nil) %>
                   <p class="help">

data/app/views/{forms → main}/_date_time.html.erb

@@ -1,4 +1,4 @@
-<% value = eval("@instance.#{property.field}") %>
+<% value = eval("@object.#{property.field}") %>
                 <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) %>
                   <p class="help">

data/app/views/{forms → main}/_time.html.erb

@@ -1,4 +1,4 @@
-<% value = eval("@instance.#{property.field}") %>
+<% value = eval("@object.#{property.field}") %>
                 <div>
                   <%= text_field(property.name, :class => "vTimeField", :label => property.field.capitalize.gsub('_', ' '), :value => value.respond_to?(:strftime) ? value.strftime("%H:%M:%S") : nil) %>
                   <p class="help">

data/app/views/{forms → 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>
         <ul>
           <li>
-            <%= link_to(@model_name, slice_url(:admin_edit, :model_name => @model_name.snake_case, :id => @instance.id))%>
+            <%= link_to(@model_name, slice_url(:admin_edit, :model_name => @model_name.snake_case, :id => @object.id))%>
           </li>
         </ul>
-        <%= form_for(@instance, :action => slice_url(:admin_destroy, :model_name => @model_name.snake_case, :id => @instance.id), :method => :delete) do %>
+        <%= form_for(@object, :action => slice_url(:admin_destroy, :model_name => @model_name.snake_case, :id => @object.id), :method => :delete) do %>
           <div>
             <%= submit "Yes, I'm sure" %>
           </div>

data/app/views/{forms → main}/edit.html.erb

@@ -1,18 +1,18 @@
         <div id="content-main">
         <ul class="object-tools">
           <li>
-            <%= link_to("View on site", "/#{@model_name.snake_case}/#{@instance.id}", :target => "_blank", :class => "viewsitelink") %>
+            <%= link_to("View on site", "/#{@model_name.snake_case}/#{@object.id}", :target => "_blank", :class => "viewsitelink") %>
           </li>
         </ul>
-        <%= form_for(@instance, :action => slice_url(:admin_update, :model_name => @model_name.snake_case, :id => @instance.id)) do %>
+        <%= form_for(@object, :action => slice_url(:admin_update, :model_name => @model_name.snake_case, :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="<%= @instance.errors[property.name] ? "form-row errors" : "form-row"%>">
-                <% if @instance.errors[property.name] %>
+              <div class="<%= @object.errors[property.name] ? "form-row errors" : "form-row"%>">
+                <% if @object.errors[property.name] %>
                 <ul class="errorlist">
-                  <% @instance.errors[property.name].each do |error| %>
+                  <% @object.errors[property.name].each do |error| %>
                   <li><%= error %></li>
                   <% end %>
                 </ul>
@@ -24,7 +24,7 @@
             <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 => @instance.id), :class => "deletelink") %>
+                <%= link_to("Delete", slice_url(:admin_delete, :model_name => @model_name.snake_case, :id => @object.id), :class => "deletelink") %>
               </p>
               <%= submit "Save and add another", :name => "_add_another" %>
               <%= submit "Save and continue editing", :name => "_continue" %>

data/app/views/{forms → main}/list.html.erb

@@ -66,39 +66,39 @@
                 </tr>
               </thead>
               <tbody>
-                <% @instances.each_with_index do |instance, index| %>
+                <% @objects.each_with_index do |object, index| %>
                 <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("instance.id")) %>">
+                    <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("instance.#{property.field}") == true %>
+                      <% if eval("object.#{property.field}") == 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("instance.#{property.field}") %>
+                        <% value = eval("object.#{property.field}") %>
                       <%= value.respond_to?(:strftime) ? value.strftime("%b. %d, %Y, %I:%M%p") : nil %>
                       <% when "Date" %>
-                        <% value = eval("instance.#{property.field}") %>
+                        <% value = eval("object.#{property.field}") %>
                       <%= value.respond_to?(:strftime) ? value.strftime("%b. %d, %Y") : nil %>
                       <% when "Time" %>
-                        <% value = eval("instance.#{property.field}") %>
+                        <% value = eval("object.#{property.field}") %>
                       <%= value.respond_to?(:strftime) ? value.strftime("%I:%M%p") : nil %>
                       <% when "Integer" %>
                       <% if property.type.respond_to?(:flag_map) #Enum or Flag type %>
-                      <%= eval("instance.#{property.field}").to_s.capitalize.gsub('_', ' ') %>
+                      <%= eval("object.#{property.field}").to_s.capitalize.gsub('_', ' ') %>
                       <% else %>
-                      <%= eval("instance.#{property.field}") %>
+                      <%= eval("object.#{property.field}") %>
                       <% end %>
                       <% when "BigDecimal" %>
-                      <%= eval("instance.#{property.field}") %>
+                      <%= eval("object.#{property.field}") %>
                       <% when "Float" %>
-                      <%= eval("instance.#{property.field}") %>
+                      <%= eval("object.#{property.field}") %>
                       <% when "String" %>
-                      <%= eval("instance.#{property.field}").to_s.truncate(50) %>
+                      <%= eval("object.#{property.field}").to_s.truncate(50) %>
                       <% end %>
                     </a>
                   </td>

data/app/views/{forms → main}/new.html.erb

@@ -1,13 +1,13 @@
         <div id="content-main">
-        <%= form_for(@instance, :action => slice_url(:admin_create, :model_name => @model_name.snake_case)) do %>
+        <%= form_for(@object, :action => slice_url(:admin_create, :model_name => @model_name.snake_case)) 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="<%= @instance.errors[property.name] ? "form-row errors" : "form-row"%>">
-                <% if @instance.errors[property.name] %>
+              <div class="<%= @object.errors[property.name] ? "form-row errors" : "form-row"%>">
+                <% if @object.errors[property.name] %>
                 <ul class="errorlist">
-                  <% @instance.errors[property.name].each do |error| %>
+                  <% @object.errors[property.name].each do |error| %>
                   <li><%= error %></li>
                   <% end %>
                 </ul>

data/lib/merb-admin.rb

@@ -16,13 +16,14 @@ if defined?(Merb::Plugins)
   # :layout - the layout to use; defaults to :merb-admin
   # :mirror - which path component types to use on copy operations; defaults to all
   Merb::Slices::config[:merb_admin][:layout] ||= :merb_admin
+  Merb::Slices::config[:merb_admin][:per_page] ||= 100
   
   # All Slice code is expected to be namespaced inside a module
   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.6"
+    self.version = "0.2.7"
     self.author = "Erik Michaels-Ober"
 
     # Stub classes loaded hook - runs before LoadClasses BootLoader
@@ -44,35 +45,35 @@ if defined?(Merb::Plugins)
 
     def self.setup_router(scope)
       scope.match("/admin(/index)", :method => :get).
-        to(:controller => "forms", :action => "index").
+        to(:controller => "main", :action => "index").
         name(:admin_dashboard)
 
       scope.match("/admin/:model_name(/index)", :method => :get).
-        to(:controller => "forms", :action => "list").
+        to(:controller => "main", :action => "list").
         name(:admin_list)
 
       scope.match("/admin/:model_name/new", :method => :get).
-        to(:controller => "forms", :action => "new").
+        to(:controller => "main", :action => "new").
         name(:admin_new)
 
       scope.match("/admin/:model_name/:id/edit", :method => :get).
-        to(:controller => "forms", :action => "edit").
+        to(:controller => "main", :action => "edit").
         name(:admin_edit)
 
       scope.match("/admin/:model_name", :method => :post).
-        to(:controller => "forms", :action => "create").
+        to(:controller => "main", :action => "create").
         name(:admin_create)
 
       scope.match("/admin/:model_name/:id", :method => :put).
-        to(:controller => "forms", :action => "update").
+        to(:controller => "main", :action => "update").
         name(:admin_update)
 
       scope.match("/admin/:model_name/:id/delete", :method => :get).
-        to(:controller => "forms", :action => "delete").
+        to(:controller => "main", :action => "delete").
         name(:admin_delete)
 
       scope.match("/admin/:model_name/:id(.:format)", :method => :delete).
-        to(:controller => "forms", :action => "destroy").
+        to(:controller => "main", :action => "destroy").
         name(:admin_destroy)
     end
 

data/spec/controllers/main_spec.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe MerbAdmin::Main do 
+
+  before(:each) do
+    mount_slice
+  end
+
+  it "should have helper methods for dealing with public paths" do
+    @controller = dispatch_to(MerbAdmin::Main, :index)
+
+    @controller.public_path_for(:image).should == "/slices/merb-admin/images"
+    @controller.public_path_for(:javascript).should == "/slices/merb-admin/javascripts"
+    @controller.public_path_for(:stylesheet).should == "/slices/merb-admin/stylesheets"
+
+    @controller.image_path.should == "/slices/merb-admin/images"
+    @controller.javascript_path.should == "/slices/merb-admin/javascripts"
+    @controller.stylesheet_path.should == "/slices/merb-admin/stylesheets"
+
+    @controller.app_path_for(:image).should == "#{Merb.root}/public/slices/merb-admin/images"
+    @controller.app_path_for(:javascript).should == "#{Merb.root}/public/slices/merb-admin/javascripts"
+    @controller.app_path_for(:stylesheet).should == "#{Merb.root}/public/slices/merb-admin/stylesheets"
+
+    @controller.slice_path_for(:image).should == "#{Merb.root}/public/images"
+    @controller.slice_path_for(:javascript).should == "#{Merb.root}/public/javascripts"
+    @controller.slice_path_for(:stylesheet).should == "#{Merb.root}/public/stylesheets"  
+  end
+
+end

data/spec/fixtures.rb

@@ -4,6 +4,7 @@ require 'dm-sweatshop'
 require 'dm-types'
 require 'dm-aggregates'
 require 'dm-validations'
+require 'dm-is-paginated'
 
 Dir['spec/fixtures/**/*_fixture.rb'].sort.each do |fixture_file|
   require fixture_file

data/spec/fixtures/division_fixture.rb

@@ -0,0 +1,17 @@
+class Division
+  include DataMapper::Resource
+
+  property :id, Serial
+  property :created_at, DateTime
+  property :updated_at, DateTime
+  property :league_id, Integer, :nullable => false, :index => true
+  property :name, String, :nullable => false, :index => true
+
+  belongs_to :league
+  has n, :teams
+end
+
+Division.fixture {{
+  :league_id => /\d{1,2}/.gen,
+  :name => /\w{5,10}/.gen.capitalize,
+}}

data/spec/fixtures/league_fixture.rb

@@ -0,0 +1,15 @@
+class League
+  include DataMapper::Resource
+
+  property :id, Serial
+  property :created_at, DateTime
+  property :updated_at, DateTime
+  property :name, String, :nullable => false, :index => true
+
+  has n, :divisions
+  has n, :teams
+end
+
+League.fixture {{
+  :name => /\w{5,10}/.gen.capitalize,
+}}

data/spec/fixtures/{user_fixture.rb → player_fixture.rb}

@@ -6,7 +6,8 @@ class Player
   property :updated_at, DateTime
   property :deleted_at, ParanoidDateTime
   property :team_id, Integer, :nullable => false, :index => true
-  property :name, String, :length => 100, :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 :sex, Enum[:male, :female]
   property :batting_average, Float, :default => 0.0, :precision => 4, :scale => 3
@@ -16,11 +17,12 @@ class Player
   property :wake_at, Time
   property :notes, Text
 
-  # belongs_to :team
+  belongs_to :team
 end
 
 Player.fixture {{
+  :team_id => /\d{1,2}/.gen,
+  :number => /\d{1,2}/.gen,
   :name => "#{/\w{3,10}/.gen.capitalize} #{/\w{5,10}/.gen.capitalize}",
   :sex => Player.properties[:sex].type.flag_map.values[rand(Player.properties[:sex].type.flag_map.length)],
-  :team_id => 1,
 }}

data/spec/fixtures/team_fixture.rb

@@ -0,0 +1,20 @@
+class Team
+  include DataMapper::Resource
+
+  property :id, Serial
+  property :created_at, DateTime
+  property :updated_at, DateTime
+  property :league_id, Integer, :nullable => false, :index => true
+  property :division_id, Integer, :nullable => false, :index => true
+  property :name, String, :nullable => false, :index => true
+
+  belongs_to :league
+  belongs_to :division
+  has n, :players
+end
+
+Team.fixture {{
+  :league_id => /\d{1,2}/.gen,
+  :division_id => /\d{1,2}/.gen,
+  :name => /\w{5,10}/.gen.capitalize,
+}}

data/spec/requests/main_spec.rb

@@ -0,0 +1,422 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
+
+given "an object exists" do
+  @player = Player.gen
+end
+
+given "two players exist" do
+  @players = 2.times{Player.gen}
+end
+
+given "twenty players exist" do
+  @players = 20.times{Player.gen}
+end
+
+describe "MerbAdmin" do
+
+  before(:each) do
+    mount_slice
+    Player.all.destroy!
+  end
+
+  describe "dashboard" do
+    before(:each) do
+      @response = request(url(:admin_dashboard))
+    end
+
+    it "should respond sucessfully" do
+      @response.should be_successful
+    end
+
+    it "should should contain \"Site administration\"" do
+      @response.body.should contain("Site administration")
+    end
+  end
+
+  describe "list" do
+    before(:each) do
+      @response = request(url(:admin_list, :model_name => "player"))
+    end
+
+    it "should respond sucessfully" do
+      @response.should be_successful
+    end
+
+    it "should contain \"Select model to edit\"" do
+      @response.body.should contain("Select #{"player".gsub('_', ' ')} to edit")
+    end
+  end
+
+  describe "list with query" do
+    before(:each) do
+      Player.gen(:name => "Jackie Robinson")
+      Player.gen(:name => "Sandy Koufax")
+      @response = request(url(:admin_list, :model_name => "player"), :params => {:query => "Jackie Robinson"})
+    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("Sandy Koufax")
+    end
+  end
+
+  describe "list with sort" do
+    before(:each) do
+      Player.gen(:name => "Jackie Robinson")
+      Player.gen(:name => "Sandy Koufax")
+      @response = request(url(:admin_list, :model_name => "player"), :params => {:sort => :name})
+    end
+
+    it "should respond sucessfully" do
+      @response.should be_successful
+    end
+
+    it "should be ordered correctly" do
+      @response.body.should contain(/Sandy Koufax.*Jackie Robinson/m)
+    end
+  end
+
+  describe "list with reverse sort" do
+    before(:each) do
+      Player.gen(:name => "Jackie Robinson")
+      Player.gen(:name => "Sandy Koufax")
+      @response = request(url(:admin_list, :model_name => "player"), :params => {:sort => :name, :sort_reverse => true})
+    end
+
+    it "should respond sucessfully" do
+      @response.should be_successful
+    end
+
+    it "should be ordered correctly" do
+      @response.body.should contain(/Jackie Robinson.*Sandy Koufax/m)
+    end
+  end
+
+  describe "list with boolean filter" do
+    before(:each) do
+      Player.gen(:name => "Jackie Robinson", :retired => true)
+      Player.gen(:name => "David Wright", :retired => false)
+      @response = request(url(:admin_list, :model_name => "player"), :params => {:filter => {:retired => true}})
+    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("David Wright")
+    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
+    before(:each) do
+      MerbAdmin[:paginate] = true
+      MerbAdmin[:per_page] = 1
+      @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}")
+    end
+  end
+
+  describe "list with 2 players, 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 => {:all => true})
+    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}")
+    end
+  end
+
+  describe "list with 20 players", :given => "twenty players exist" do
+    before(:each) do
+      MerbAdmin[:paginate] = true
+      MerbAdmin[:per_page] = 1
+      @response = request(url(:admin_list, :model_name => "player"))
+    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 "list with 20 players, 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"), :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}")
+    end
+  end
+
+  describe "list with 20 players, 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 => 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}")
+    end
+  end
+
+  describe "new" do
+    before(:each) do
+      @response = request(url(:admin_new, :model_name => "player"))
+    end
+
+    it "should respond sucessfully" do
+      @response.should be_successful
+    end
+
+    it "should contain \"New model\"" do
+      @response.body.should contain("New #{"player".gsub('_', ' ')}")
+    end
+  end
+
+  describe "edit", :given => "an object exists" do
+    before(:each) do
+      @response = request(url(:admin_edit, :model_name => "player", :id => @player.id))
+    end
+
+    it "should respond sucessfully" do
+      @response.should be_successful
+    end
+
+    it "should contain \"Edit model\"" do
+      @response.body.should contain("Edit #{"player".gsub('_', ' ')}")
+    end
+  end
+
+  describe "edit with missing object" do
+    before(:each) do
+      @response = request(url(:admin_edit, :model_name => "player", :id => 1))
+    end
+
+    it "should raise NotFound" do
+      @response.status.should == 404
+    end
+  end
+
+  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}})
+    end
+
+    it "should redirect to list" do
+      @response.should redirect_to(url(:admin_list, :model_name => "player"))
+    end
+
+    it "should create a new player" do
+      Player.first.should_not be_nil
+    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})
+    end
+
+    it "should redirect to edit" do
+      @response.should redirect_to(url(:admin_edit, :model_name => "player", :id => Player.first.id))
+    end
+
+    it "should create a new player" do
+      Player.first.should_not be_nil
+    end
+  end
+
+  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})
+    end
+
+    it "should redirect to new" do
+      @response.should redirect_to(url(:admin_new, :model_name => "player"))
+    end
+
+    it "should create a new player" do
+      Player.first.should_not be_nil
+    end
+  end
+
+  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 => {: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"))
+    end
+
+    it "should update an object that already exists" do
+      Player.first(:id => @player.id).name.should eql("Jackie Robinson")
+    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 => nil}})
+    end
+
+    it "should have an error message" do
+      @response.body.should contain("Player failed to be updated")
+    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 and edit", :given => "an object 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, :sex => :male}, :_continue => true})
+    end
+
+    it "should redirect to edit" do
+      @response.should redirect_to(url(:admin_edit, :model_name => "player", :id => @player.id))
+    end
+
+    it "should update an object that already exists" do
+      Player.first(:id => @player.id).name.should eql("Jackie Robinson")
+    end
+  end
+
+  describe "update and add another", :given => "an object 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, :sex => :male}, :_add_another => true})
+    end
+
+    it "should redirect to new" do
+      @response.should redirect_to(url(:admin_new, :model_name => "player"))
+    end
+
+    it "should update an object that already exists" do
+      Player.first(:id => @player.id).name.should eql("Jackie Robinson")
+    end
+  end
+
+  describe "delete", :given => "an object exists" do
+    before(:each) do
+      @response = request(url(:admin_delete, :model_name => "player", :id => @player.id))
+    end
+
+    it "should respond sucessfully" do
+      @response.should be_successful
+    end
+
+    it "should contain \"Delete model\"" do
+      @response.body.should contain("Delete #{"player".gsub('_', ' ')}")
+    end
+  end
+
+  describe "delete with missing object" do
+    before(:each) do
+      @response = request(url(:admin_delete, :model_name => "player", :id => 1))
+    end
+
+    it "should raise NotFound" do
+      @response.status.should == 404
+    end
+  end
+
+  describe "destroy", :given => "an object exists" do
+    before(:each) do
+      @response = request(url(: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"))
+    end
+
+    it "should destroy an object" do
+      Player.first(:id => @player.id).should be_nil
+    end
+  end
+
+  describe "destroy with missing object" do
+    before(:each) do
+      @response = request(url(: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

@@ -3,7 +3,6 @@ require 'merb-core'
 require 'merb-slices'
 require 'merb-helpers'
 require 'merb-assets'
-require 'merb-action-args'
 require 'spec'
 require 'spec/fixtures'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sferik-merb-admin
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-18 00:00:00 -07:00
+date: 2009-08-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,16 +42,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.11
     version: 
-- !ruby/object:Gem::Dependency 
-  name: dm-is-paginated
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.0.1
-    version: 
 description: MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data.
 email: sferik@gmail.com
 executables: []
@@ -71,39 +61,42 @@ files:
 - lib/merb-admin/spectasks.rb
 - lib/merb-admin.rb
 - spec/controllers
-- spec/controllers/forms_spec.rb
+- spec/controllers/main_spec.rb
 - spec/fixtures
-- spec/fixtures/user_fixture.rb
+- spec/fixtures/division_fixture.rb
+- spec/fixtures/league_fixture.rb
+- spec/fixtures/player_fixture.rb
+- spec/fixtures/team_fixture.rb
 - spec/fixtures.rb
 - spec/requests
-- spec/requests/forms_spec.rb
+- spec/requests/main_spec.rb
 - spec/spec_helper.rb
 - app/controllers
 - app/controllers/application.rb
-- app/controllers/forms.rb
+- app/controllers/main.rb
 - app/helpers
 - app/helpers/application_helper.rb
-- app/helpers/forms_helper.rb
+- app/helpers/main_helper.rb
 - app/views
-- app/views/forms
-- app/views/forms/_big_decimal.html.erb
-- app/views/forms/_date.html.erb
-- app/views/forms/_date_time.html.erb
-- app/views/forms/_float.html.erb
-- app/views/forms/_integer.html.erb
-- app/views/forms/_string.html.erb
-- app/views/forms/_time.html.erb
-- app/views/forms/_true_class.html.erb
-- app/views/forms/delete.html.erb
-- app/views/forms/edit.html.erb
-- app/views/forms/index.html.erb
-- app/views/forms/list.html.erb
-- app/views/forms/new.html.erb
 - app/views/layout
 - app/views/layout/_message.html.erb
 - app/views/layout/dashboard.html.erb
 - app/views/layout/form.html.erb
 - app/views/layout/list.html.erb
+- app/views/main
+- app/views/main/_big_decimal.html.erb
+- app/views/main/_date.html.erb
+- app/views/main/_date_time.html.erb
+- app/views/main/_float.html.erb
+- app/views/main/_integer.html.erb
+- app/views/main/_string.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
+- app/views/main/list.html.erb
+- app/views/main/new.html.erb
 - public/images
 - public/images/arrow-down.gif
 - public/images/arrow-up.gif

data/spec/controllers/forms_spec.rb

@@ -1,20 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe MerbAdmin::Forms do 
-
-  before(:each) do
-    mount_slice
-  end
-
-  it "should have helper methods for dealing with public paths" do
-    @controller = dispatch_to(MerbAdmin::Forms, :index)
-    @controller.public_path_for(:image).should == "/slices/merb-admin/images"
-    @controller.public_path_for(:javascript).should == "/slices/merb-admin/javascripts"
-    @controller.public_path_for(:stylesheet).should == "/slices/merb-admin/stylesheets"
-    
-    @controller.image_path.should == "/slices/merb-admin/images"
-    @controller.javascript_path.should == "/slices/merb-admin/javascripts"
-    @controller.stylesheet_path.should == "/slices/merb-admin/stylesheets"
-  end
-
-end

data/spec/requests/forms_spec.rb

@@ -1,204 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
-
-given "a model exists" do
-  @model_name = 'Player'
-  @model = eval(@model_name)
-  @model.all.destroy!
-end
-
-given "an instance exists" do
-  @model_name = 'Player'
-  @model = eval(@model_name)
-  @model.all.destroy!
-  @instance = @model.gen
-end
-
-describe "MerbAdmin" do
-
-  before(:each) do
-    mount_slice
-  end
-
-  describe "dashboard" do
-    before(:each) do
-      @response = request(url(:admin_dashboard))
-    end
-
-    it "should respond sucessfully" do
-      @response.should be_successful
-    end
-
-    it "should should contain \"Site administration\"" do
-      @response.body.should contain("Site administration")
-    end
-  end
-
-  describe "list", :given => "a model exists" do
-    before(:each) do
-      @response = request(url(:admin_list, :model_name => @model_name.snake_case))
-    end
-
-    it "should respond sucessfully" do
-      @response.should be_successful
-    end
-
-    it "should contain \"Select model to edit\"" do
-      @response.body.should contain("Select #{@model_name.snake_case.gsub('_', ' ')} to edit")
-    end
-  end
-
-  describe "list with query", :given => "a model exists" do
-    before(:each) do
-      @response = request(url(:admin_list, :model_name => @model_name.snake_case), :params => {:query => "Jackie Robinson"})
-    end
-
-    it "should respond sucessfully" do
-      @response.should be_successful
-    end
-
-    it "should contain \"results\"" do
-      @response.body.should contain("results")
-    end
-  end
-
-  describe "new", :given => "a model exists" do
-    before(:each) do
-      @response = request(url(:admin_new, :model_name => @model_name.snake_case))
-    end
-
-    it "should respond sucessfully" do
-      @response.should be_successful
-    end
-
-    it "should contain \"New model\"" do
-      @response.body.should contain("New #{@model_name.snake_case.gsub('_', ' ')}")
-    end
-  end
-
-  describe "edit", :given => "an instance exists" do
-    before(:each) do
-      @response = request(url(:admin_edit, :model_name => @model_name.snake_case, :id => @instance.id))
-    end
-
-    it "should respond sucessfully" do
-      @response.should be_successful
-    end
-
-    it "should contain \"Edit model\"" do
-      @response.body.should contain("Edit #{@model_name.snake_case.gsub('_', ' ')}")
-    end
-  end
-
-  describe "create", :given => "a model exists" do
-    before(:each) do
-      @response = request(url(:admin_create, :model_name => @model_name.snake_case), :method => "post", :params => {:player => {:name => "Jackie Robinson", :team_id => 1, :sex => :male}})
-    end
-
-    it "should create a new instance" do
-      @model.first.should_not be_nil
-    end
-
-    it "should redirect to list" do
-      @response.should redirect_to(url(:admin_list, :model_name => @model_name.snake_case))
-    end
-  end
-
-  describe "create and edit", :given => "a model exists" do
-    before(:each) do
-      @response = request(url(:admin_create, :model_name => @model_name.snake_case), :method => "post", :params => {:player => {:name => "Jackie Robinson", :team_id => 1, :sex => :male}, :_continue => true})
-    end
-
-    it "should create a new instance" do
-      @model.first.should_not be_nil
-    end
-
-    it "should redirect to edit" do
-      @response.should redirect_to(url(:admin_edit, :model_name => @model_name.snake_case, :id => @model.first.id))
-    end
-  end
-
-  describe "create and add another", :given => "a model exists" do
-    before(:each) do
-      @response = request(url(:admin_create, :model_name => @model_name.snake_case), :method => "post", :params => {:player => {:name => "Jackie Robinson", :team_id => 1, :sex => :male}, :_add_another => true})
-    end
-
-    it "should create a new instance" do
-      @model.first.should_not be_nil
-    end
-
-    it "should redirect to new" do
-      @response.should redirect_to(url(:admin_new, :model_name => @model_name.snake_case))
-    end
-  end
-
-  describe "update", :given => "an instance exists" do
-    before(:each) do
-      @response = request(url(:admin_update, :model_name => @model_name.snake_case, :id => @instance.id), :method => "put", :params => {:player => {:name => "Jackie Robinson", :team_id => 1, :sex => :male}})
-    end
-
-    it "should update an instance that already exists" do
-      @model.first(:id => @instance.id).name.should eql("Jackie Robinson")
-    end
-
-    it "should redirect to list" do
-      @response.should redirect_to(url(:admin_list, :model_name => @model_name.snake_case))
-    end
-  end
-
-  describe "update and edit", :given => "an instance exists" do
-    before(:each) do
-      @response = request(url(:admin_update, :model_name => @model_name.snake_case, :id => @instance.id), :method => "put", :params => {:player => {:name => "Jackie Robinson", :team_id => 1, :sex => :male}, :_continue => true})
-    end
-
-    it "should update an instance that already exists" do
-      @model.first(:id => @instance.id).name.should eql("Jackie Robinson")
-    end
-
-    it "should redirect to edit" do
-      @response.should redirect_to(url(:admin_edit, :model_name => @model_name.snake_case, :id => @instance.id))
-    end
-  end
-
-  describe "update and add another", :given => "an instance exists" do
-    before(:each) do
-      @response = request(url(:admin_update, :model_name => @model_name.snake_case, :id => @instance.id), :method => "put", :params => {:player => {:name => "Jackie Robinson", :team_id => 1, :sex => :male}, :_add_another => true})
-    end
-
-    it "should update an instance that already exists" do
-      @model.first(:id => @instance.id).name.should eql("Jackie Robinson")
-    end
-
-    it "should redirect to new" do
-      @response.should redirect_to(url(:admin_new, :model_name => @model_name.snake_case))
-    end
-  end
-
-  describe "delete", :given => "an instance exists" do
-    before(:each) do
-      @response = request(url(:admin_delete, :model_name => @model_name.snake_case, :id => @instance.id))
-    end
-
-    it "should respond sucessfully" do
-      @response.should be_successful
-    end
-
-    it "should contain \"Delete model\"" do
-      @response.body.should contain("Delete #{@model_name.snake_case.gsub('_', ' ')}")
-    end
-  end
-
-  describe "destroy", :given => "an instance exists" do
-    before(:each) do
-      @response = request(url(:admin_update, :model_name => @model_name.snake_case, :id => @instance.id), :method => "delete")
-    end
-
-    it "should destroy an instance" do
-      @model.first(:id => @instance.id).should be_nil
-    end
-
-    it "should redirect to list" do
-      @response.should redirect_to(url(:admin_list, :model_name => @model_name.snake_case))
-    end
-  end
-
-end