sferik-merb-admin 0.1.9 → 0.2.0

data/README.markdown

@@ -14,7 +14,7 @@ At the command prompt, type:
 
 In your app, add the following dependency to `config/dependencies.rb`:
 
-    dependency "sferik-merb-admin", "0.1.9", :require_as => "merb-admin"
+    dependency "sferik-merb-admin", "0.2.0", :require_as => "merb-admin"
 
 Add the following route to `config/router.rb`:
 

data/Rakefile

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

data/app/controllers/forms.rb

@@ -35,6 +35,11 @@ class MerbAdmin::Forms < MerbAdmin::Application
         conditions.unshift(condition_statement.join(" OR "))
         options.merge!(:conditions => conditions) unless conditions == [""]
       end
+      if params[:sort]
+        order = "[:#{params[:sort]}.#{params[:sort_reverse] ? 'desc' : 'asc'}]"
+        options.merge!(:order => eval(order))
+      end
+
       # monkey patch pagination
       @model.class_eval("is_paginated") unless @model.respond_to?(:paginated)
       @current_page = (params[:page] || 1).to_i

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

@@ -30,24 +30,24 @@
               <% if property.primitive.to_s == "TrueClass" %>
               <h3>By <%= property.field.gsub('_', ' ') %></h3>
               <ul>
-                <li<%= params[:filter].nil? || params[:filter][property.name].blank? ? ' class="selected"' : nil %>>
+                <li class="<%= params[:filter].nil? || params[:filter][property.name].blank? ? "selected" : nil %>">
                   <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (params[:filter] || {}).reject{|key, value| key.to_sym == property.name})) %>">All</a>
                 </li>
-                <li<%= params[:filter] && params[:filter][property.name] == "true" ? ' class="selected"' : nil %>>
-                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (params[:filter] || {}).merge({property.name => true}))) %>">Yes</a>
+                <li class="<%= params[:filter] && params[:filter][property.name] == "true" ? "selected" : nil %>">
+                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (params[:filter] || {}).merge({property.name => "true"}))) %>">Yes</a>
                 </li>
-                <li<%= params[:filter] && params[:filter][property.name] == "false" ? ' class="selected"' : nil %>>
-                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (params[:filter] || {}).merge({property.name => false}))) %>">No</a>
+                <li class="<%= params[:filter] && params[:filter][property.name] == "false" ? "selected" : nil %>">
+                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (params[:filter] || {}).merge({property.name => "false"}))) %>">No</a>
                 </li>
               </ul>
               <% elsif property.primitive.to_s == "Integer" && property.type.respond_to?(:flag_map) %>
               <h3>By <%= property.field.gsub('_', ' ') %></h3>
               <ul>
-                <li<%= params[:filter].nil? || params[:filter][property.name].blank? ? ' class="selected"' : nil %>>
+                <li class="<%= params[:filter].nil? || params[:filter][property.name].blank? ? "selected" : nil %>">
                   <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (params[:filter] || {}).reject{|key, value| key.to_sym == property.name})) %>">All</a>
                 </li>
                 <% property.type.flag_map.each do |value, name| %>
-                <li<%= params[:filter] && params[:filter][property.name] == name.to_s ? ' class="selected"' : nil %>>
+                <li class="<%= params[:filter] && params[:filter][property.name] == name.to_s ? "selected" : nil %>">
                   <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (params[:filter] || {}).merge({property.name => name}))) %>"><%= name.to_s.capitalize.gsub('_', ' ')%></a>
                 </li>
                 <% end %>
@@ -59,8 +59,8 @@
               <thead>
                 <tr>
                   <% @properties.each do |property| %>
-                  <th>
-                    <%= property.field.capitalize.gsub('_', ' ') %>
+                  <th class="<%= params[:sort] == property.field ? params[:sort_reverse] ? 'sorted descending' : 'sorted ascending' : nil %>">
+                    <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:sort => property.field).reject{|key, value| key.to_sym == :sort_reverse}.merge(params[:sort] == property.field && params[:sort_reverse] != "true" ? {:sort_reverse => "true"} : {})) %>"><%= property.field.capitalize.gsub('_', ' ') %></a>
                   </th>
                   <% end %>
                 </tr>

data/lib/merb-admin.rb

@@ -22,7 +22,7 @@ if defined?(Merb::Plugins)
     
     # 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.1.9"
+    self.version = "0.2.0"
     self.author = "Erik Michaels-Ober"
     
     # Stub classes loaded hook - runs before LoadClasses BootLoader

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sferik-merb-admin
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors: 
 - Erik Michaels-Ober