sferik-merb-admin 0.1.7 → 0.1.8

data/README.markdown

@@ -8,15 +8,13 @@ It currently offers the features listed [here](http://sferik.tadalist.com/lists/
 
 At the command prompt, type:
 
-    git clone git://github.com/sferik/merb-admin.git
-    cd merb-admin
-    sudo rake install
+    sudo gem install sferik-merb-admin -s http://gems.github.com
 
 ## Install it
 
 In your app, add the following dependency to `config/dependencies.rb`:
 
-    dependency "merb-admin", "0.1.7"
+    dependency "sferik-merb-admin", "0.1.8", :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.7"
+GEM_VERSION = "0.1.8"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = "merb"

data/app/controllers/forms.rb

@@ -9,13 +9,29 @@ class MerbAdmin::Forms < MerbAdmin::Application
   end
 
   def list
+    options = {}
+    filters = params[:filter] || {}
+    filters.each_pair do |key, value|
+      if @model.properties[key].primitive.to_s == "TrueClass"
+        options.merge!(key.to_sym => (value == "true" ? true : false))
+      elsif @model.properties[key].primitive.to_s == "Integer" && @model.properties[key].type.respond_to?(:flag_map)
+        options.merge!(key.to_sym => value.to_sym)
+      end
+    end
     if params[:all]
-      @instances = @model.all(:limit => 200).reverse
+      options = {
+        :limit => 200,
+      }.merge(options)
+      @instances = @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
-      @page_count, @instances = @model.paginated(:page => @current_page, :per_page => 100)
+      options = {
+        :page => @current_page,
+        :per_page => 100,
+      }.merge(options)
+      @page_count, @instances = @model.paginated(options)
     end
     render(:layout => "list")
   end

data/app/helpers/application_helper.rb

@@ -59,8 +59,6 @@ module Merb
         ::MerbAdmin.slice_path_for(type, *segments)
       end
 
-
-
     end
   end
 end

data/app/helpers/forms_helper.rb

@@ -2,6 +2,7 @@ require 'builder'
 module Merb
   module MerbAdmin
     module FormsHelper
+
       # Given a page count and the current page, we generate a set of pagination
       # links.
       # 
@@ -107,6 +108,7 @@ module Merb
       def infinity
         1.0 / 0
       end
+
     end
   end
 end

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

@@ -1,7 +1,7 @@
         <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>
-            <a href="<%= slice_url(:admin_edit, :model_name => @model_name.snake_case, :id => @instance.id) %>"><%= @model_name %></a>
+            <%= link_to(@model_name, slice_url(:admin_edit, :model_name => @model_name.snake_case, :id => @instance.id))%>
           </li>
         </ul>
         <%= form_for(@instance, :action => slice_url(:admin_destroy, :model_name => @model_name.snake_case, :id => @instance.id), :method => :delete) do %>

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

@@ -1,6 +1,8 @@
         <div id="content-main">
         <ul class="object-tools">
-          <li><a href="<%= "/#{@model_name.snake_case}/#{@instance.id}" %>" target="_blank" class="viewsitelink">View on site</a></li>
+          <li>
+            <%= link_to("View on site", "/#{@model_name.snake_case}/#{@instance.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 %>
           <div>
@@ -13,7 +15,9 @@
             </fieldset>
             <div class="submit-row" >
               <%= submit "Save", :class => "default", :name => "_save" %>
-              <p class="deletelink-box"><a href="<%= slice_url(:admin_delete, :model_name => @model_name.snake_case, :id => @instance.id) %>" class="deletelink">Delete</a></p>
+              <p class="deletelink-box">
+                <%= link_to("Delete", slice_url(:admin_delete, :model_name => @model_name.snake_case, :id => @instance.id), :class => "deletelink") %>
+              </p>
               <%= submit "Save and add another", :name => "_add_another" %>
               <%= submit "Save and continue editing", :name => "_continue" %>
             </div>

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

@@ -1,12 +1,20 @@
         <div id="content-main">
           <div class="module">
             <table summary="Models available in the application.">
-              <caption><a href="<%= slice_url(:admin_dashboard) %>" class="section">Models</a></caption>
+              <caption>
+                <%= link_to("Models", slice_url(:admin_dashboard), :class => "section") %>
+              </caption>
               <% @models.map{|m| m.to_s}.each do |model_name| %>
               <tr>
-                <th scope="row"><a href="<%= slice_url(:admin_list, :model_name => model_name.snake_case) %>"><%=h model_name.pluralize %></a></th>
-                <td><a href="<%= slice_url(:admin_new, :model_name => model_name.snake_case) %>" class="addlink">Add</a></td>
-                <td><a href="<%= slice_url(:admin_list, :model_name => model_name.snake_case) %>" class="changelink">Edit</a></td>
+                <th scope="row">
+                  <%= link_to(model_name.pluralize, slice_url(:admin_list, :model_name => model_name.snake_case)) %>
+                </th>
+                <td>
+                  <%= link_to("Add", slice_url(:admin_new, :model_name => model_name.snake_case), :class => "addlink") %>
+                </td>
+                <td>
+                  <%= link_to("Edit", slice_url(:admin_list, :model_name => model_name.snake_case), :class => "changelink") %>
+                </td>
               </tr>
               <% end %>
             </table>

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

@@ -1,10 +1,42 @@
         <div id="content-main">
           <ul class="object-tools">
             <li>
-              <a href="<%= slice_url(:admin_new, :model_name => @model_name.snake_case) %>" class="addlink">Add <%=h @model_name.snake_case.gsub('_', ' ') %></a>
+              <%= link_to("Add #{@model_name.snake_case.gsub('_', ' ')}", slice_url(:admin_new, :model_name => @model_name.snake_case), :class => "addlink") %>
             </li>
           </ul>
           <div class="module filtered" id="changelist">
+            <div id="changelist-filter">
+              <h2>Filter</h2>
+              <% params = request.params.except(:action, :controller, :model_name) %>
+              <% @properties.each do |property| %>
+              <% 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 %>>
+                  <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>
+                <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>
+              </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 %>>
+                  <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 %>>
+                  <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 %>
+              </ul>
+              <% end %>
+              <% end %>
+            </div>
             <table cellspacing="0">
               <thead>
                 <tr>
@@ -55,9 +87,13 @@
               </tbody>
             </table>
             <p class="paginator">
-              <%= paginate(@current_page, @page_count, :url => slice_url(:admin_list, :model_name => @model_name.snake_case)) if @page_count.to_i > 1 %>
+            <% if @page_count.to_i > 1 %>
+              <%= paginate(@current_page, @page_count, :url => slice_url(:admin_list, :model_name => @model_name.snake_case)) %>
+            <% end %>
               <%= @model.count %> <%= @model.count == 1 ? @model_name.snake_case.gsub('_', ' ') : @model_name.snake_case.gsub('_', ' ').pluralize %>
-              <%= "<a href=\"#{slice_url(:admin_list, :model_name => @model_name.snake_case, :all => true)}\" class=\"showall\">Show all</a>" if @page_count.to_i == 2 %>
+            <% if @page_count.to_i == 2 %>
+              <%= link_to("Show all", slice_url(:admin_list, :model_name => @model_name.snake_case, :all => true), :class => "showall") %>
+            <% end %>
             </p>
           </div>
         </div>

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

@@ -21,7 +21,7 @@
           </h1>
         </div>
         <div id="user-tools">
-          Welcome, <strong><%= %></strong>. <a href="<%= %>">Log out</a>
+          <!-- Welcome, <strong></strong>. <a href="">Log out</a> -->
         </div>
       </div>
 <%= partial 'layout/message' -%>

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

@@ -30,12 +30,12 @@
           </h1>
         </div>
         <div id="user-tools">
-          Welcome, <strong><%= %></strong>. <a href="<%= %>">Log out</a>
+          <!-- Welcome, <strong></strong>. <a href="">Log out</a> -->
         </div>
       </div>
       <div class="breadcrumbs">
-        <a href="<%= url(:admin_dashboard) %>">Home</a> &rsaquo;
-        <a href="<%= url(:admin_list, :model_name => @model_name.snake_case) %>"><%=h @model_name.pluralize %></a> &rsaquo;
+        <%= link_to("Home", url(:admin_dashboard)) %> &rsaquo;
+        <%= link_to(@model_name.pluralize, url(:admin_list, :model_name => @model_name.snake_case)) %> &rsaquo;
         <%= page_name %>
       </div>
 <%= partial 'layout/message' -%>

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

@@ -25,11 +25,11 @@
           </h1>
         </div>
         <div id="user-tools">
-          Welcome, <strong><%= %></strong>. <a href="<%= %>">Log out</a>
+          <!-- Welcome, <strong></strong>. <a href="">Log out</a> -->
         </div>
       </div>
       <div class="breadcrumbs">
-        <a href="<%= url(:admin_dashboard) %>">Home</a> &rsaquo;
+        <%= link_to("Home", url(:admin_dashboard)) %> &rsaquo;
         <%=h @model_name.pluralize %>
       </div>
 <%= partial 'layout/message' -%>

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.7"
+    self.version = "0.1.8"
     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.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-06 00:00:00 -07:00
+date: 2009-08-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency