sferik-merb-admin 0.3.4 → 0.3.6

data/README.markdown

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

data/Rakefile

@@ -4,15 +4,12 @@ require "rake/gempackagetask"
 require "merb-core"
 require "merb-core/tasks/merb"
 
-dependency "dm-core"
-dependency "merb_datamapper"
-
 GEM_NAME = "merb-admin"
 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.3.4"
+GEM_VERSION = "0.3.6"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = "merb"
@@ -27,8 +24,6 @@ spec = Gem::Specification.new do |s|
   s.email = EMAIL
   s.homepage = HOMEPAGE
   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.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/main.rb

@@ -18,20 +18,18 @@ class MerbAdmin::Main < MerbAdmin::Application
     merge_query(options)
     merge_sort(options)
 
-    if !MerbAdmin[:paginate] || params[:all]
+    if params[:all]
       options = {
-        :limit => 200,
+        :limit => MerbAdmin[:per_page] * 2,
       }.merge(options)
       @objects = @abstract_model.find_all(options).reverse
     else
-      # monkey patch pagination
-      @abstract_model.model.class_eval('is_paginated') unless @abstract_model.model.respond_to?(:paginated)
       @current_page = (params[:page] || 1).to_i
       options = {
         :page => @current_page,
         :per_page => MerbAdmin[:per_page],
       }.merge(options)
-      @page_count, @objects = @abstract_model.model.paginated(options)
+      @page_count, @objects = @abstract_model.paginated(options)
       options.delete(:page)
       options.delete(:per_page)
       options.delete(:offset)
@@ -157,8 +155,9 @@ class MerbAdmin::Main < MerbAdmin::Application
   end
 
   def merge_sort(options)
-    return unless params[:sort]
-    options.merge!(:order => [params[:sort].to_sym.send(params[:sort_reverse] ? :desc : :asc)])
+    sort = params[:sort] || "id"
+    order = params[:sort_reverse] == "true" ? :desc : :asc
+    options.merge!(:order => [sort.to_sym.send(order)])
   end
 
   def update_has_one_association(association, id)

data/app/helpers/main_helper.rb

@@ -8,15 +8,15 @@ module Merb
 
       # Given a page count and the current page, we generate a set of pagination
       # links.
-      # 
-      # * We use an inner and outer window into a list of links. For a set of 
+      #
+      # * We use an inner and outer window into a list of links. For a set of
       # 20 pages with the current page being 10:
       # outer_window:
       #   1 2  ..... 19 20
       # inner_window
       #   5 6 7 8 9 10 11 12 13 14
       #
-      # This is totally adjustable, or can be turned off by giving the 
+      # This is totally adjustable, or can be turned off by giving the
       # :inner_window setting a value of nil.
       #
       # * Options
@@ -41,25 +41,24 @@ module Merb
       #    Provides the base url to use in the page navigation links.
       #    Defaults to ''
       def paginate(current_page, page_count, options = {})
-        options.reverse_merge!({
-          :left_cut_label  => '…',
-          :right_cut_label => '…',
-          :outer_window    => 2,
-          :inner_window    => 7,
-          :page_param      => 'page',
-          :url             => ''
-        })
-        url = options.delete :url
+        options[:left_cut_label] ||= '…'
+        options[:right_cut_label] ||= '…'
+        options[:outer_window] ||= 2
+        options[:inner_window] ||= 7
+        options[:page_param] ||= 'page'
+        options[:url] ||= ''
+
+        url = options.delete(:url)
         url << (url.include?('?') ? '&' : '?') << options[:page_param]
 
-        pages = { 
-          :all => (1..page_count).to_a, 
-          :left => [], 
-          :center => [], 
-          :right => [] 
+        pages = {
+          :all => (1..page_count).to_a,
+          :left => [],
+          :center => [],
+          :right => []
         }
 
-        # Only worry about using our 'windows' if the page count is less then 
+        # Only worry about using our 'windows' if the page count is less then
         # our windows combined.
         if options[:inner_window].nil? || ((options[:outer_window] * 2) + options[:inner_window] + 2) >= page_count
           pages[:center] = pages[:all]

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

@@ -1,10 +1,10 @@
-<% if message && message[:error] %>
-<p class="errornote">
-  <%=h message[:error] %>
-</p>
-<% end %>
-<% if message && message[:notice] %>
-<ul class="messagelist">
-  <li><%=h message[:notice] %></li>
-</ul>
-<% end %>
+      <% if message && message[:error] %>
+      <p class="errornote">
+        <%=h message[:error] %>
+      </p>
+      <% end %>
+      <% if message && message[:notice] %>
+      <ul class="messagelist">
+        <li><%=h message[:notice] %></li>
+      </ul>
+      <% end %>

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

@@ -20,9 +20,6 @@
             <%= slice_name %>
           </h1>
         </div>
-        <div id="user-tools">
-          <!-- Welcome, <strong></strong>. <a href="">Log out</a> -->
-        </div>
       </div>
 <%= partial('layout/message', :message => message) unless message.blank? -%>      
       <div id="content" class="colMS">

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

@@ -29,9 +29,6 @@
             <%= slice_name %>
           </h1>
         </div>
-        <div id="user-tools">
-          <!-- Welcome, <strong></strong>. <a href="">Log out</a> -->
-        </div>
       </div>
       <div class="breadcrumbs">
         <%= link_to("Home", url(:admin_dashboard)) %> &rsaquo;

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

@@ -24,9 +24,6 @@
             <%= slice_name %>
           </h1>
         </div>
-        <div id="user-tools">
-          <!-- Welcome, <strong></strong>. <a href="">Log out</a> -->
-        </div>
       </div>
       <div class="breadcrumbs">
         <%= link_to("Home", url(:admin_dashboard)) %> &rsaquo;

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

@@ -1,22 +1,26 @@
 <%
-required = false
-@properties.each do |property|
-  next unless property[:name] == association[:child_key].first
-  required = true unless property[:nullable?]
-end
+  child_key = association[:child_key].first
+  collection = MerbAdmin::AbstractModel.new(association[:parent_model]).find_all.map{|o| [o.id, object_title(o)]}.sort_by{|o| o[1]}
+  selected = @object.send(child_key)
+  label = association[:pretty_name].capitalize
+  required = false
+  @properties.each do |property|
+    next unless property[:name] == child_key
+    required = true unless property[:nullable?]
+  end
 %>
             <fieldset class="module aligned">
-              <h2><%= association[:pretty_name].capitalize %></h2>
-              <div class="<%= @object.errors[association[:child_key].first] ? "form-row errors" : "form-row"%>">
-                <% if @object.errors[association[:child_key].first] %>
+              <h2><%= label %></h2>
+              <div class="<%= @object.errors[child_key] ? "form-row errors" : "form-row"%>">
+                <% if @object.errors[child_key] %>
                 <ul class="errorlist">
-                  <% @object.errors[association[:child_key].first].each do |error| %>
+                  <% @object.errors[child_key].each do |error| %>
                   <li><%= error %></li>
                   <% end %>
                 </ul>
                 <% end %>
                 <div>
-                  <%= select(association[:child_key].first, :collection => MerbAdmin::AbstractModel.new(association[:parent_model]).find_all.map{|o| [o.id, object_title(o)]}.sort_by{|o| o[1]}, :include_blank => true, :selected => @object.send(association[:child_key].first).to_s, :label => association[:pretty_name].capitalize) %>
+                  <%= select(child_key, :collection => collection, :include_blank => true, :selected => selected.to_s, :label => label) %>
                   <p class="help">
                     <%= required ? "Required." : "Optional." %>
                   </p>

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,23 +1,27 @@
 <%
-selected = MerbAdmin::AbstractModel.new(association[:child_model]).find_all(association[:child_key].first => @object.id).first
-required = false
-@properties.each do |property|
-  next unless property[:name] == association[:child_key].first
-  required = true unless property[:nullable?]
-end
+  child_key = association[:child_key].first
+  name = association[:name]
+  collection = MerbAdmin::AbstractModel.new(association[:child_model]).find_all.map{|o| [o.id, object_title(o)]}.sort_by{|o| o[1]}
+  selected = MerbAdmin::AbstractModel.new(association[:child_model]).find_all(child_key => @object.id).first
+  label = association[:pretty_name].capitalize
+  required = false
+  @properties.each do |property|
+    next unless property[:name] == child_key
+    required = true unless property[:nullable?]
+  end
 %>
             <fieldset class="module aligned">
-              <h2><%= association[:pretty_name].capitalize %></h2>
-              <div class="<%= @object.errors[association[:child_key].first] ? "form-row errors" : "form-row"%>">
-                <% if @object.errors[association[:child_key].first] %>
+              <h2><%= label %></h2>
+              <div class="<%= @object.errors[child_key] ? "form-row errors" : "form-row" %>">
+                <% if @object.errors[child_key] %>
                 <ul class="errorlist">
-                  <% @object.errors[association[:child_key].first].each do |error| %>
+                  <% @object.errors[child_key].each do |error| %>
                   <li><%= error %></li>
                   <% end %>
                 </ul>
                 <% end %>
                 <div>
-                  <%= select(:name => "associations[#{association[:name]}][]", :id => association[:name], :collection => MerbAdmin::AbstractModel.new(association[:child_model]).find_all.map{|o| [o.id, object_title(o)]}.sort_by{|o| o[1]}, :include_blank => true, :selected => selected ? selected.id.to_s : nil, :label => association[:pretty_name].capitalize) %>
+                  <%= select(:name => "associations[#{name}][]", :id => name, :collection => collection, :include_blank => true, :selected => selected ? selected.id.to_s : nil, :label => label) %>
                   <p class="help">
                     <%= required ? "Required." : "Optional." %>
                   </p>

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

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

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

@@ -1,12 +1,13 @@
             <fieldset class="module aligned">
               <% belongs_to_keys = @abstract_model.belongs_to_associations.map{|b| b[:child_key].first} %>
               <% properties.each do |property| %>
-              <% next if [:id, :created_at, :created_on, :deleted_at, :updated_at, :updated_on, :deleted_on].include?(property[:name]) %>
-              <% next if belongs_to_keys.include?(property[:name]) %>
-              <div class="<%= @object.errors[property[:name]] ? "form-row errors" : "form-row" %>">
-                <% if @object.errors[property[:name]] %>
+              <% name = property[:name] %>
+              <% next if [:id, :created_at, :created_on, :deleted_at, :updated_at, :updated_on, :deleted_on].include?(name) %>
+              <% next if belongs_to_keys.include?(name) %>
+              <div class="<%= @object.errors[name] ? "form-row errors" : "form-row" %>">
+                <% if @object.errors[name] %>
                 <ul class="errorlist">
-                  <% @object.errors[property[:name]].each do |error| %>
+                  <% @object.errors[name].each do |error| %>
                   <li><%= error %></li>
                   <% end %>
                 </ul>

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

@@ -1,6 +1,12 @@
+<%
+  name = property[:name]
+  length = property[:length]
+  label = property[:pretty_name].capitalize
+  required = !property[:nullable?]
+%>
                 <div>
-                  <%= text_field(property[:name], :size => [50, property[:length]].min, :maxlength => property[:length], :label => property[:pretty_name].capitalize) %>
+                  <%= text_field(name, :size => [50, length].min, :maxlength => length, :label => label) %>
                   <p class="help">
-                    <%= !property[:nullable?] ? "Required." : "Optional." %> <%= property[:length] %> <%= property[:length] == 1 ? "character." : "characters or fewer." %>
+                    <%= required ? "Required." : "Optional." %> <%= length %> <%= length == 1 ? "character." : "characters or fewer." %>
                   </p>
                 </div>

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

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

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

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

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

@@ -1,9 +1,4 @@
         <div id="content-main">
-        <ul class="object-tools">
-          <li>
-            <%= link_to("View on site", "/#{@abstract_model.singular_name}/#{@object.id}", :target => "_blank", :class => "viewsitelink") %>
-          </li>
-        </ul>
         <%= form_for(@object, :action => slice_url(:admin_update, :model_name => @abstract_model.singular_name, :id => @object.id)) do %>
           <div>
 <%= partial('properties', :properties => @properties) -%>

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

@@ -20,11 +20,3 @@
             </table>
           </div>
         </div>
-        <div id="content-related">
-          <div class="module" id="recent-actions-module">
-            <h2>Recent Actions</h2>
-            <h3>My Actions</h3>
-            <p>None available</p>
-          </div>
-        </div>
-        <br class="clear" />

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

@@ -1,4 +1,10 @@
-<% params = request.params.except(:action, :controller, :model_name) %>
+<%
+  params = request.params.except(:action, :controller, :model_name)
+  filter = params[:filter]
+  query = params[:query]
+  sort = params[:sort]
+  sort_reverse = params[:sort_reverse]
+%>
         <div id="content-main">
           <ul class="object-tools">
             <li>
@@ -12,11 +18,11 @@
                 <label for="searchbar"><img src="<%= image_path("icon_searchbox.png") %>" alt="Search" /></label>
                 <input type="text" size="40" name="query" value="" id="searchbar" />
                 <input type="submit" value="Search" />
-                <% if params[:query] || params[:filter] %>
+                <% if filter || query %>
                 <span class="small quiet"><%= @record_count %> <%= @record_count == 1 ? "result" : "results" %> (<a href="?"><%= @abstract_model.count %> total</a>)</span>
                 <% end %>
-                <% if params[:filter] %>
-                <% params[:filter].each do |name, value| %>
+                <% if filter %>
+                <% filter.each do |name, value| %>
                 <input type="hidden" name="filter[<%= name %>]" value="<%= value %>"/>
                 <% end %>
                 <% end %>
@@ -27,28 +33,32 @@
             <div id="changelist-filter">
               <h2>Filter</h2>
               <% @properties.each do |property| %>
-              <% if property[:type] == :boolean %>
-              <h3>By <%= property[:pretty_name] %></h3>
+              <% type = property[:type] %>
+              <% name = property[:name] %>
+              <% pretty_name = property[:pretty_name] %>
+              <% flag_map = property[:flag_map] %>
+              <% if type == :boolean %>
+              <h3>By <%= pretty_name %></h3>
               <ul>
-                <li class="<%= params[:filter].nil? || params[:filter][property[:name]].blank? ? "selected" : nil %>">
-                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (params[:filter] || {}).reject{|key, value| key.to_sym == property[:name]})) %>">All</a>
+                <li class="<%= filter.nil? || filter[name].blank? ? "selected" : nil %>">
+                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (filter || {}).reject{|key, value| key.to_sym == name})) %>">All</a>
                 </li>
-                <li class="<%= params[:filter] && params[:filter][property[:name]] == "true" ? "selected" : nil %>">
-                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (params[:filter] || {}).merge({property[:name] => "true"}))) %>">Yes</a>
+                <li class="<%= filter && filter[name] == "true" ? "selected" : nil %>">
+                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (filter || {}).merge({name => "true"}))) %>">Yes</a>
                 </li>
-                <li class="<%= params[:filter] && params[:filter][property[:name]] == "false" ? "selected" : nil %>">
-                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (params[:filter] || {}).merge({property[:name] => "false"}))) %>">No</a>
+                <li class="<%= filter && filter[name] == "false" ? "selected" : nil %>">
+                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (filter || {}).merge({name => "false"}))) %>">No</a>
                 </li>
               </ul>
-              <% elsif property[:type] == :integer && property[:flag_map] %>
-              <h3>By <%= property[:pretty_name] %></h3>
+              <% elsif type == :integer && flag_map %>
+              <h3>By <%= pretty_name %></h3>
               <ul>
-                <li class="<%= params[:filter].nil? || params[:filter][property[:name]].blank? ? "selected" : nil %>">
-                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (params[:filter] || {}).reject{|key, value| key.to_sym == property[:name]})) %>">All</a>
+                <li class="<%= filter.nil? || filter[name].blank? ? "selected" : nil %>">
+                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (filter || {}).reject{|key, value| key.to_sym == name})) %>">All</a>
                 </li>
-                <% property[:flag_map].each do |value, name| %>
-                <li class="<%= params[:filter] && params[:filter][property[:name]] == name.to_s ? "selected" : nil %>">
-                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (params[:filter] || {}).merge({property[:name] => name}))) %>"><%= name.to_s.capitalize.gsub('_', ' ')%></a>
+                <% flag_map.values.map{|v| v.to_s}.sort.each do |value| %>
+                <li class="<%= filter && filter[name] == value ? "selected" : nil %>">
+                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (filter || {}).merge({name => value}))) %>"><%= value.capitalize.gsub('_', ' ')%></a>
                 </li>
                 <% end %>
               </ul>
@@ -59,8 +69,10 @@
               <thead>
                 <tr>
                   <% @properties.each do |property| %>
-                  <th class="<%= params[:sort] == property[:name].to_s ? params[: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(params[:sort] == property[:name].to_s && params[:sort_reverse] != "true" ? {:sort_reverse => "true"} : {})) %>"><%= property[:pretty_name].capitalize %></a>
+                  <% name = property[:name] %>
+                  <% pretty_name = property[:pretty_name] %>
+                  <th class="<%= sort == name.to_s ? sort_reverse ? 'sorted descending' : 'sorted ascending' : nil %>">
+                    <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:sort => name).reject{|key, value| key.to_sym == :sort_reverse}.merge(sort == name.to_s && sort_reverse != "true" ? {:sort_reverse => "true"} : {})) %>"><%= pretty_name.capitalize %></a>
                   </th>
                   <% end %>
                 </tr>
@@ -69,30 +81,32 @@
                 <% @objects.each_with_index do |object, index| %>
                 <tr class="row<%= index % 2 == 0 ? '1' : '2' %>">
                   <% @properties.each do |property| %>
+                  <% type = property[:type] %>
+                  <% name = property[:name] %>
                   <td>
                     <a href="<%= slice_url(:admin_edit, :model_name => @abstract_model.singular_name, :id => object.id) %>">
-                      <% case property[:type] %>
+                      <% case type %>
                       <% when :boolean %>
-                      <% if object.send(property[:name]) == true %>
+                      <% if object.send(name) == true %>
                       <img alt="True" src="<%= image_path("icon-yes.gif") %>"/>
                       <% else %>
                       <img alt="False" src="<%= image_path("icon-no.gif") %>"/>
                       <% end %>
                       <% when :date_time %>
-                      <% value = object.send(property[:name]) %>
+                      <% value = object.send(name) %>
                       <%= value.respond_to?(:strftime) ? value.strftime("%b. %d, %Y, %I:%M%p") : nil %>
                       <% when :date %>
-                      <% value = object.send(property[:name]) %>
+                      <% value = object.send(name) %>
                       <%= value.respond_to?(:strftime) ? value.strftime("%b. %d, %Y") : nil %>
                       <% when :time %>
-                      <% value = object.send(property[:name]) %>
+                      <% value = object.send(name) %>
                       <%= value.respond_to?(:strftime) ? value.strftime("%I:%M%p") : nil %>
                       <% when :string %>
-                      <%= object.send(property[:name]).to_s.truncate(50) %>
+                      <%= object.send(name).to_s.truncate(50) %>
                       <% when :text %>
-                      <%= object.send(property[:name]).to_s.truncate(50) %>
+                      <%= object.send(name).to_s.truncate(50) %>
                       <% else %>
-                      <%= object.send(property[:name]) %>
+                      <%= object.send(name) %>
                       <% end %>
                     </a>
                   </td>

data/lib/datamapper_support.rb

@@ -13,6 +13,22 @@ module MerbAdmin
         model.get(id).extend(InstanceMethods)
       end
 
+      def paginated(options = {})
+        page = options.delete(:page) || 1
+        per_page = options.delete(:per_page) || MerbAdmin[:per_page]
+
+        options[:order] ||= [:id.desc]
+
+        page_count = (count(options).to_f / per_page).ceil
+
+        options.merge!({
+          :limit => per_page,
+          :offset => (page - 1) * per_page
+        })
+
+        [page_count, find_all(options)]
+      end
+
       def new(params = {})
         model.new(params).extend(InstanceMethods)
       end

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.3.4"
+    self.version = "0.3.6"
     self.author = "Erik Michaels-Ober"
 
     # Stub classes loaded hook - runs before LoadClasses BootLoader

data/spec/fixtures/division_fixture.rb

@@ -1,16 +1,3 @@
-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,5}/.gen,
   :name => /\w{5,10}/.gen.capitalize,

data/spec/fixtures/draft_fixture.rb

@@ -1,22 +1,3 @@
-class Draft
-  include DataMapper::Resource
-
-  property :id, Serial
-  property :created_at, DateTime
-  property :updated_at, DateTime
-  property :player_id, Integer, :nullable => false, :index => true
-  property :team_id, Integer, :nullable => false, :index => true
-  property :date, Date, :nullable => false
-  property :round, Integer, :nullable => false
-  property :pick, Integer, :nullable => false
-  property :overall, Integer, :nullable => false
-  property :college, String, :length => 100
-  property :notes, Text
-
-  belongs_to :team
-  belongs_to :player
-end
-
 Draft.fixture {{
   :player_id => /\d{1,5}/.gen,
   :team_id => /\d{1,5}/.gen,

data/spec/fixtures/league_fixture.rb

@@ -1,15 +1,3 @@
-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} League",
 }}

data/spec/fixtures/player_fixture.rb

@@ -1,26 +1,3 @@
-class Player
-  include DataMapper::Resource
-
-  property :id, Serial
-  property :created_at, DateTime
-  property :updated_at, DateTime
-  property :deleted_at, ParanoidDateTime
-  property :team_id, Integer, :nullable => false, :index => true
-  property :number, Integer, :nullable => false
-  property :name, String, :length => 100, :nullable => false
-  property :position, Enum[:pitcher, :catcher, :first, :second, :third, :shortstop, :left, :center, :right]
-  property :sex, Enum[:male, :female]
-  property :batting_average, Float, :default => 0.0, :precision => 4, :scale => 3
-  property :injured, Boolean, :default => false
-  property :retired, TrueClass, :default => false
-  property :born_on, Date
-  property :wake_at, Time
-  property :notes, Text
-
-  belongs_to :team
-  has 1, :draft
-end
-
 Player.fixture {{
   :team_id => /\d{1,5}/.gen,
   :number => /\d{1,2}/.gen,

data/spec/fixtures/team_fixture.rb

@@ -1,18 +1,3 @@
-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,5}/.gen,
   :division_id => /\d{1,5}/.gen,

data/spec/models/division.rb

@@ -0,0 +1,12 @@
+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

data/spec/models/draft.rb

@@ -0,0 +1,18 @@
+class Draft
+  include DataMapper::Resource
+  
+  property :id, Serial
+  property :created_at, DateTime
+  property :updated_at, DateTime
+  property :player_id, Integer, :nullable => false, :index => true
+  property :team_id, Integer, :nullable => false, :index => true
+  property :date, Date, :nullable => false
+  property :round, Integer, :nullable => false
+  property :pick, Integer, :nullable => false
+  property :overall, Integer, :nullable => false
+  property :college, String, :length => 100
+  property :notes, Text
+
+  belongs_to :team
+  belongs_to :player
+end

data/spec/models/league.rb

@@ -0,0 +1,11 @@
+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

data/spec/models/player.rb

@@ -0,0 +1,22 @@
+class Player
+  include DataMapper::Resource
+
+  property :id, Serial
+  property :created_at, DateTime
+  property :updated_at, DateTime
+  property :deleted_at, ParanoidDateTime
+  property :team_id, Integer, :nullable => false, :index => true
+  property :number, Integer, :nullable => false
+  property :name, String, :length => 100, :nullable => false
+  property :position, Enum[:pitcher, :catcher, :first, :second, :third, :shortstop, :left, :center, :right]
+  property :sex, Enum[:male, :female]
+  property :batting_average, Float, :default => 0.0, :precision => 4, :scale => 3
+  property :injured, Boolean, :default => false
+  property :retired, TrueClass, :default => false
+  property :born_on, Date
+  property :wake_at, Time
+  property :notes, Text
+
+  belongs_to :team
+  has 1, :draft
+end

data/spec/models/team.rb

@@ -0,0 +1,15 @@
+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
+  property :colors, Flag[:beige, :black, :blue, :bronze, :brown, :cool, :copper, :cream, :gold, :gray, :green, :khaki, :maroon, :midnight, :navy, :orange, :pink, :purple, :red, :silver, :tan, :turquoise, :violet, :white, :yellow]
+
+  belongs_to :league
+  belongs_to :division
+  has n, :players
+end

data/spec/requests/main_spec.rb

@@ -124,7 +124,7 @@ describe "MerbAdmin" do
     end
 
     it "should be ordered correctly" do
-      @response.body.should contain(/Sandy Koufax.*Jackie Robinson/m)
+      @response.body.should contain(/Jackie Robinson.*Sandy Koufax/m)
     end
   end
 
@@ -140,7 +140,7 @@ describe "MerbAdmin" do
     end
 
     it "should be ordered correctly" do
-      @response.body.should contain(/Jackie Robinson.*Sandy Koufax/m)
+      @response.body.should contain(/Sandy Koufax.*Jackie Robinson/m)
     end
   end
 

data/spec/spec_helper.rb

@@ -10,7 +10,10 @@ require 'dm-sweatshop'
 require 'dm-types'
 require 'dm-aggregates'
 require 'dm-validations'
-require 'dm-is-paginated'
+
+Dir[File.join(File.dirname(__FILE__), 'models', '**', '*.rb').to_s].each do |model_file|
+  require model_file
+end
 
 Dir[File.join(File.dirname(__FILE__), 'fixtures', '**', '*_fixture.rb').to_s].each do |fixture_file|
   require fixture_file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sferik-merb-admin
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-31 00:00:00 -07:00
+date: 2009-09-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,26 +22,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.12
     version: 
-- !ruby/object:Gem::Dependency 
-  name: merb_datamapper
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.12
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.11
-    version: 
 description: MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data.
 email: sferik@gmail.com
 executables: []
@@ -72,6 +52,12 @@ files:
 - spec/fixtures/league_fixture.rb
 - spec/fixtures/player_fixture.rb
 - spec/fixtures/team_fixture.rb
+- spec/models
+- spec/models/division.rb
+- spec/models/draft.rb
+- spec/models/league.rb
+- spec/models/player.rb
+- spec/models/team.rb
 - spec/requests
 - spec/requests/main_spec.rb
 - spec/spec_helper.rb
@@ -183,6 +169,7 @@ files:
 - public/stylesheets/widgets.css
 has_rdoc: false
 homepage: http://twitter.com/sferik
+licenses: 
 post_install_message: |
   ********************************************************************************
   
@@ -210,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: merb
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data.