merb-admin 0.4.3 → 0.4.4

data/README.markdown

@@ -8,13 +8,13 @@ It currently offers the features listed [here](http://sferik.tadalist.com/lists/
 
 At the command prompt, type:
 
-    sudo gem install sferik-merb-admin -s http://gems.github.com
+    sudo gem install merb-admin -s http://gemcutter.org
 
 ## Install it
 
 In your app, add the following dependency to `config/dependencies.rb`:
 
-    dependency "sferik-merb-admin", "0.4.3", :require_as => "merb-admin"
+    dependency "merb-admin", "0.4.4"
 
 Add the following route to `config/router.rb`:
 

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.3"
+GEM_VERSION = "0.4.4"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = "merb"

data/app/controllers/main.rb

@@ -13,6 +13,8 @@ class MerbAdmin::Main < MerbAdmin::Application
 
   def list
     options = {}
+    merge_sort!(options)
+    merge_sort_reverse!(options)
 
     if params[:all]
       options = {
@@ -123,6 +125,18 @@ class MerbAdmin::Main < MerbAdmin::Application
     raise NotFound unless @object
   end
 
+  def merge_sort!(options)
+    return unless params[:sort]
+    sort = params[:sort] || "id"
+    options.merge!(:sort => sort)
+  end
+
+  def merge_sort_reverse!(options)
+    return unless params[:sort_reverse]
+    reverse = params[:sort_reverse] == "true"
+    options.merge!(:sort_reverse => reverse)
+  end
+
   def update_has_one_association(association, id)
     model = MerbAdmin::AbstractModel.new(association[:child_model])
     if object = model.get(id)

data/app/helpers/main_helper.rb

@@ -3,7 +3,9 @@ module Merb
   module MerbAdmin
     module MainHelper
       def object_title(object)
-        if object.respond_to?(:name)
+        if object.nil?
+          nil
+        elsif object.respond_to?(:name)
           object.name
         elsif object.respond_to?(:title)
           object.title
@@ -12,6 +14,41 @@ module Merb
         end
       end
 
+      def object_property(object, property)
+        property_type = property[:type]
+        property_name = property[:name]
+        case property_type
+        when :boolean
+          if object.send(property_name) == true
+            Builder::XmlMarkup.new.img(:src => image_path("icon-yes.gif"), :alt => "True")
+          else
+            Builder::XmlMarkup.new.img(:src => image_path("icon-on.gif"), :alt => "False")
+          end
+        when :date_time
+          value = object.send(property_name)
+          value.respond_to?(:strftime) ? value.strftime("%b. %d, %Y, %I:%M%p") : nil
+        when :date
+          value = object.send(property_name)
+          value.respond_to?(:strftime) ? value.strftime("%b. %d, %Y") : nil
+        when :time
+          value = object.send(property_name)
+          value.respond_to?(:strftime) ? value.strftime("%I:%M%p") : nil
+        when :string
+          object.send(property_name).to_s.truncate(50)
+        when :text
+          object.send(property_name).to_s.truncate(50)
+        when :integer
+          association = @abstract_model.belongs_to_associations.select{|a| a[:child_key].first == property_name}.first
+          if association
+            object_title(object.send(association[:name]))
+          else
+            object.send(property_name)
+          end
+        else
+          object.send(property_name)
+        end
+      end
+
       # Given a page count and the current page, we generate a set of pagination
       # links.
       #

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

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

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

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

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

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

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

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

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

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

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

@@ -1,15 +1,15 @@
 <% 
-  name = association[:name]
+  association_name = association[:name]
   collection = MerbAdmin::AbstractModel.new(association[:child_model]).all.map{|o| [o.id, object_title(o)]}.sort_by{|o| o[1]}
-  selected = @object.send(name)
+  selected = @object.send(association_name)
   label = association[:pretty_name]
 %>
             <fieldset class="module aligned">
               <h2><%= label %></h2>
               <div class="form-row">
                 <div>
-                  <%= 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>
+                  <%= select(:name => "associations[#{association_name}][]", :id => association_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("<%= association_name %>", "<%= association_name %>", 0, "<%= image_path %>"); });</script>
                   <p class="help">Hold down "Control", or "Command" on a Mac, to select more than one.</p>
                 </div>
               </div>

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

@@ -1,8 +1,8 @@
 <%
   child_key = association[:child_key].first
-  name = association[:name]
+  association_name = association[:name]
   collection = MerbAdmin::AbstractModel.new(association[:child_model]).all.map{|o| [o.id, object_title(o)]}.sort_by{|o| o[1]}
-  selected = @object.send(association[:name])
+  selected = @object.send(association_name)
   label = association[:pretty_name]
   required = false
   @properties.each do |property|
@@ -21,7 +21,7 @@
                 </ul>
                 <% end %>
                 <div>
-                  <%= select(:name => "associations[#{name}][]", :id => name, :collection => collection, :include_blank => true, :selected => selected ? selected.id.to_s : nil, :label => label) %>
+                  <%= select(:name => "associations[#{association_name}][]", :id => association_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,16 +1,16 @@
 <%
   flag_map = property[:flag_map]
-  name = property[:name]
+  property_name = property[:name]
   label = property[:pretty_name]
   required = !property[:nullable?] || property[:serial?]
 %>
                 <div>
                   <% 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) %>
+                  <%= select(property_name, :collection => collection, :label => label) %>
                   <% else %>
                     <% length = property[:length] %>
-                  <%= text_field(name, :maxlength => length, :label => label) %>
+                  <%= text_field(property_name, :maxlength => length, :label => label) %>
                   <p class="help">
                     <%= required ? "Required." : "Optional." %>
                   </p>

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

@@ -1,18 +1,19 @@
             <fieldset class="module aligned">
               <% belongs_to_keys = @abstract_model.belongs_to_associations.map{|b| b[:child_key].first} %>
               <% properties.each do |property| %>
-              <% 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] %>
+              <% property_name = property[:name] %>
+              <% property_type = property[:type] %>
+              <% 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] %>
                 <ul class="errorlist">
-                  <% @object.errors[name].each do |error| %>
+                  <% @object.errors[property_name].each do |error| %>
                   <li><%= error %></li>
                   <% end %>
                 </ul>
                 <% end %>
-<%= partial(property[:type].to_s, :property => property) -%>
+<%= partial(property_type.to_s, :property => property) -%>
               </div>
               <% end %>
             </fieldset> 

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

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

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

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

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

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

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

@@ -1,5 +1,7 @@
 <%
   params = request.params.except(:action, :controller, :model_name)
+  sort = params[:sort]
+  sort_reverse = params[:sort_reverse]
 %>
         <div id="content-main">
           <ul class="object-tools">
@@ -12,10 +14,10 @@
               <thead>
                 <tr>
                   <% @properties.each do |property| %>
-                  <% name = property[:name] %>
-                  <% pretty_name = property[:pretty_name] %>
-                  <th>
-                    <%= pretty_name %>
+                  <% 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>
                   </th>
                   <% end %>
                 </tr>
@@ -24,33 +26,9 @@
                 <% @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="<%= url(:admin_edit, :model_name => @abstract_model.singular_name, :id => object.id) %>">
-                      <% case type %>
-                      <% when :boolean %>
-                      <% 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(name) %>
-                      <%= value.respond_to?(:strftime) ? value.strftime("%b. %d, %Y, %I:%M%p") : nil %>
-                      <% when :date %>
-                      <% value = object.send(name) %>
-                      <%= value.respond_to?(:strftime) ? value.strftime("%b. %d, %Y") : nil %>
-                      <% when :time %>
-                      <% value = object.send(name) %>
-                      <%= value.respond_to?(:strftime) ? value.strftime("%I:%M%p") : nil %>
-                      <% when :string %>
-                      <%= object.send(name).to_s.truncate(50) %>
-                      <% when :text %>
-                      <%= object.send(name).to_s.truncate(50) %>
-                      <% else %>
-                      <%= object.send(name) %>
-                      <% end %>
+                      <%= object_property(object, property) %>
                     </a>
                   </td>
                   <% end %>

data/lib/activerecord_support.rb

@@ -1,21 +1,24 @@
 module MerbAdmin
   class AbstractModel
     module ActiverecordSupport
-      def count(options = {})
-        model.count(options)
-      end
-
       def get(id)
         model.find(id).extend(InstanceMethods)
-      rescue
+      rescue ActiveRecord::RecordNotFound
         nil
       end
 
+      def count(options = {})
+        merge_order!(options)
+        model.count(options)
+      end
+
       def first(options = {})
+        merge_order!(options)
         model.first(options).extend(InstanceMethods)
       end
 
       def all(options = {})
+        merge_order!(options)
         model.all(options)
       end
 
@@ -93,7 +96,6 @@ module MerbAdmin
             :length => property.limit,
             :nullable? => property.null,
             :serial? => property.primary,
-            :key? => property.primary,
             :flag_map => property.type.respond_to?(:flag_map) ? property.type.flag_map : nil,
           }
         end
@@ -101,6 +103,12 @@ module MerbAdmin
 
       private
 
+      def merge_order!(options)
+        @sort ||= options.delete(:sort) || "id"
+        @sort_order ||= options.delete(:sort_reverse) ? "desc" : "asc"
+        options.merge!(:order => ["#{@sort} #{@sort_order}"])
+      end
+
       def association_parent_model_lookup(association)
         case association.macro
         when :belongs_to

data/lib/datamapper_support.rb

@@ -1,19 +1,22 @@
 module MerbAdmin
   class AbstractModel
     module DatamapperSupport
-      def count(options = {})
-        model.count(options)
-      end
-
       def get(id)
         model.get(id).extend(InstanceMethods)
       end
 
+      def count(options = {})
+        merge_order!(options)
+        model.count(options)
+      end
+
       def first(options = {})
+        merge_order!(options)
         model.first(options).extend(InstanceMethods)
       end
 
       def all(options = {})
+        merge_order!(options)
         model.all(options)
       end
 
@@ -70,7 +73,7 @@ module MerbAdmin
         model.relationships.to_a.map do |name, association|
           {
             :name => name,
-            :pretty_name => name.to_s.gsub('_', ' ').capitalize,
+            :pretty_name => name.to_s.gsub("_", " ").capitalize,
             :type => association_type_lookup(association),
             :parent_model => association.parent_model,
             :parent_key => association.parent_key.map{|r| r.name},
@@ -84,12 +87,11 @@ module MerbAdmin
         model.properties.map do |property|
           {
             :name => property.name,
-            :pretty_name => property.name.to_s.gsub('_', ' ').capitalize,
+            :pretty_name => property.name.to_s.gsub(/_id$/, "").gsub("_", " ").capitalize,
             :type => type_lookup(property),
             :length => property.length,
             :nullable? => property.nullable?,
             :serial? => property.serial?,
-            :key? => property.key?,
             :flag_map => property.type.respond_to?(:flag_map) ? property.type.flag_map : nil,
           }
         end
@@ -97,6 +99,12 @@ module MerbAdmin
 
       private
 
+      def merge_order!(options)
+        @sort ||= options.delete(:sort) || :id
+        @sort_order ||= options.delete(:sort_reverse) ? :desc : :asc
+        options.merge!(:order => [@sort.to_sym.send(@sort_order)])
+      end
+
       def association_type_lookup(association)
         if self.model == association.parent_model
           association.options[:max] > 1 ? :has_many : :has_one

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

data/spec/requests/main_spec.rb

@@ -89,6 +89,38 @@ describe "MerbAdmin" do
     end
   end
 
+  describe "list with sort" do
+    before(:each) do
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 42, :name => "Jackie Robinson", :sex => :male, :position => :second)
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 32, :name => "Sandy Koufax", :sex => :male, :position => :pitcher)
+      @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 sorted correctly" do
+      @response.body.should contain(/Jackie Robinson.*Sandy Koufax/m)
+    end
+  end
+
+  describe "list with reverse sort" do
+    before(:each) do
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 42, :name => "Jackie Robinson", :sex => :male, :position => :second)
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 32, :name => "Sandy Koufax", :sex => :male, :position => :pitcher)
+      @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 sorted correctly" do
+      @response.body.should contain(/Sandy Koufax.*Jackie Robinson/m)
+    end
+  end
+
   describe "list with 2 objects", :given => "two players exist" do
     before(:each) do
       MerbAdmin[:paginate] = true

metadata

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