merb-admin 0.4.5 → 0.4.6

data/README.markdown

@@ -16,7 +16,7 @@ At the command prompt, type:
 
 In your app, add the following dependency to `config/dependencies.rb`:
 
-    dependency "merb-admin", "0.4.5"
+    dependency "merb-admin", "0.4.6"
 
 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.5"
+GEM_VERSION = "0.4.6"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = "merb"

data/app/controllers/main.rb

@@ -14,6 +14,7 @@ class MerbAdmin::Main < MerbAdmin::Application
   def list
     options = {}
     merge_query!(options)
+    merge_filter!(options)
     merge_sort!(options)
     merge_sort_reverse!(options)
 
@@ -128,15 +129,36 @@ class MerbAdmin::Main < MerbAdmin::Application
 
   def merge_query!(options)
     return unless params[:query]
-    condition_statement = []
-    conditions = []
+    statements = []
+    values = []
+    conditions = options[:conditions] || [""]
     @properties.each do |property|
       next unless property[:type] == :string
-      condition_statement << "#{property[:name]} LIKE ?"
-      conditions << "%#{params[:query]}%"
+      statements << "#{property[:name]} LIKE ?"
+      values << "%#{params[:query]}%"
     end
-    conditions.unshift(condition_statement.join(' OR '))
-    options.merge!(:conditions => conditions) unless conditions == ['']
+    conditions[0] += statements.join(" OR ")
+    conditions += values
+    options.merge!(:conditions => conditions) unless conditions == [""]
+  end
+
+  def merge_filter!(options)
+    return unless params[:filter]
+    statements = []
+    values = []
+    conditions = options[:conditions] || [""]
+    params[:filter].each_pair do |key, value|
+      @properties.each do |property|
+        next unless property[:name] == key.to_sym
+        next unless property[:type] == :boolean
+        statements << "#{key} = ?"
+        values << (value == "true")
+      end
+    end
+    conditions[0] += statements.join(" AND ")
+    conditions += values
+    options.merge!(:conditions => conditions) unless conditions == [""]
+    puts options.inspect
   end
 
   def merge_sort!(options)

data/app/helpers/main_helper.rb

@@ -22,7 +22,7 @@ module Merb
           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")
+            Builder::XmlMarkup.new.img(:src => image_path("icon-no.gif"), :alt => "False")
           end
         when :date_time
           value = object.send(property_name)

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

@@ -1,18 +1,12 @@
 <%
-  flag_map = property[:flag_map]
   property_name = property[:name]
+  length = property[:length]
   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(property_name, :collection => collection, :label => label) %>
-                  <% else %>
-                    <% length = property[:length] %>
                   <%= text_field(property_name, :maxlength => length, :label => label) %>
                   <p class="help">
                     <%= required ? "Required." : "Optional." %>
                   </p>
-                  <% end %>
                 </div>

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

@@ -1,6 +1,7 @@
 <%
   params = request.params.except(:action, :controller, :model_name)
   query = params[:query]
+  filter = params[:filter]
   sort = params[:sort]
   sort_reverse = params[:sort_reverse]
 %>
@@ -10,20 +11,47 @@
               <%= link_to("Add #{@abstract_model.pretty_name.downcase}", url(:admin_new, :model_name => @abstract_model.singular_name), :class => "addlink") %>
             </li>
           </ul>
-          <div class="module" id="changelist">
+          <div class="module filtered" id="changelist">
             <div id="toolbar">
               <form id="changelist-search" action="" method="get">
               <div>
                 <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 query %>
+                <% if query || filter %>
                 <span class="small quiet"><%= @record_count %> <%= @record_count == 1 ? "result" : "results" %> (<a href="?"><%= @abstract_model.count %> total</a>)</span>
                 <% end %>
+                <% if filter %>
+                <% filter.each do |name, value| %>
+                <input type="hidden" name="filter[<%= name %>]" value="<%= value %>"/>
+                <% end %>
+                <% end %>
               </div>
               </form>
             </div>
             <script type="text/javascript">document.getElementById("searchbar").focus();</script>
+            <div id="changelist-filter">
+              <h2>Filter</h2>
+              <% @properties.each do |property| %>
+              <% property_type = property[:type] %>
+              <% property_name = property[:name] %>
+              <% property_pretty_name = property[:pretty_name] %>
+              <% if property_type == :boolean %>
+              <h3>By <%= property_pretty_name %></h3>
+              <ul>
+                <li class="<%= filter.nil? || filter[property_name].blank? ? "selected" : nil %>">
+                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (filter || {}).reject{|key, value| key.to_sym == property_name})) %>">All</a>
+                </li>
+                <li class="<%= filter && filter[property_name] == "true" ? "selected" : nil %>">
+                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (filter || {}).merge({property_name => "true"}))) %>">Yes</a>
+                </li>
+                <li class="<%= filter && filter[property_name] == "false" ? "selected" : nil %>">
+                  <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:filter => (filter || {}).merge({property_name => "false"}))) %>">No</a>
+                </li>
+              </ul>
+              <% end %>
+              <% end %>
+            </div>
             <table cellspacing="0">
               <thead>
                 <tr>

data/lib/activerecord_support.rb

@@ -96,7 +96,6 @@ module MerbAdmin
             :length => property.limit,
             :nullable? => property.null,
             :serial? => property.primary,
-            :flag_map => property.type.respond_to?(:flag_map) ? property.type.flag_map : nil,
           }
         end
       end

data/lib/datamapper_support.rb

@@ -92,7 +92,6 @@ module MerbAdmin
             :length => property.length,
             :nullable? => property.nullable?,
             :serial? => property.serial?,
-            :flag_map => property.type.respond_to?(:flag_map) ? property.type.flag_map : nil,
           }
         end
       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.4.5"
+    self.version = "0.4.6"
     self.author = "Erik Michaels-Ober"
 
     # Stub classes loaded hook - runs before LoadClasses BootLoader

data/schema/migrations/004_create_players_migration.rb

@@ -4,11 +4,11 @@ class CreatePlayersMigration < ActiveRecord::Migration
       t.timestamps
       t.datetime :deleted_at
       t.integer :team_id
-      t.string :name, :limit => 50, :null => false
+      t.string :name, :limit => 100, :null => false
+      t.string :position, :limit => 50
       t.integer :number
-      t.integer :position
-      t.integer :sex
       t.float :batting_average, :default => 0.0
+      t.boolean :all_star, :default => false
       t.boolean :injured, :default => false
       t.date :born_on
       t.timestamp :wake_at

data/schema/migrations/005_create_teams_migration.rb

@@ -5,7 +5,6 @@ class CreateTeamsMigration < ActiveRecord::Migration
       t.integer :league_id
       t.integer :division_id
       t.string :name, :limit => 50, :null => false
-      t.integer :colors
     end
     add_index :teams, :division_id
     add_index :teams, :league_id

data/spec/models/datamapper/player.rb

@@ -7,10 +7,10 @@ class Player
   property :deleted_at, ParanoidDateTime
   property :team_id, Integer, :nullable => false, :index => true
   property :name, String, :length => 100, :nullable => false
+  property :position, String
   property :number, Integer, :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 :all_star, Boolean, :default => false
   property :injured, Boolean, :default => false
   property :born_on, Date
   property :wake_at, Time

data/spec/models/datamapper/team.rb

@@ -7,7 +7,6 @@ class Team
   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

data/spec/requests/main_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
 
 given "a player exists" do
-  @player = MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => rand(99), :name => "Player 1", :sex => :male, :position => :pitcher)
+  @player = MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => rand(99), :name => "Player 1")
 end
 
 given "a draft exists" do
@@ -11,7 +11,7 @@ end
 given "two players exist" do
   @players = []
   2.times do |i|
-    @players << MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => rand(99), :name => "Player #{i}", :sex => :male, :position => :pitcher)
+    @players << MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => rand(99), :name => "Player #{i}")
   end
 end
 
@@ -23,12 +23,12 @@ given "three teams exist" do
 end
 
 given "a player exists and a draft exists" do
-  @player = MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => rand(99), :name => "Player 1", :sex => :male, :position => :pitcher)
+  @player = MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => rand(99), :name => "Player 1")
   @draft = MerbAdmin::AbstractModel.new("Draft").create(:player_id => rand(99999), :team_id => rand(99999), :date => Date.today, :round => rand(50), :pick => rand(30), :overall => rand(1500))
 end
 
 given "a player exists and three teams exist" do
-  @player = MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => rand(99), :name => "Player 1", :sex => :male, :position => :pitcher)
+  @player = MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => rand(99), :name => "Player 1")
   @teams = []
   3.times do |i|
     @teams << MerbAdmin::AbstractModel.new("Team").create(:league_id => rand(99999), :division_id => rand(99999), :name => "Team #{i}")
@@ -46,7 +46,7 @@ end
 given "twenty players exist" do
   @players = []
   20.times do |i|
-    @players << MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => rand(99), :name => "Player #{i}", :sex => :male, :position => :pitcher)
+    @players << MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => rand(99), :name => "Player #{i}")
   end
 end
 
@@ -91,8 +91,8 @@ describe "MerbAdmin" do
 
   describe "list with query" 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)
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 42, :name => "Jackie Robinson", :position => "second")
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 32, :name => "Sandy Koufax", :position => "pitcher")
       @response = request(url(:admin_list, :model_name => "player"), :params => {:query => "Jackie Robinson"})
     end
 
@@ -111,8 +111,8 @@ describe "MerbAdmin" do
 
   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)
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 42, :name => "Jackie Robinson", :position => "second")
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 32, :name => "Sandy Koufax", :position => "pitcher")
       @response = request(url(:admin_list, :model_name => "player"), :params => {:sort => "name"})
     end
 
@@ -127,8 +127,8 @@ describe "MerbAdmin" do
 
   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)
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 42, :name => "Jackie Robinson", :position => "second")
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 32, :name => "Sandy Koufax", :position => "pitcher")
       @response = request(url(:admin_list, :model_name => "player"), :params => {:sort => "name", :sort_reverse => "true"})
     end
 
@@ -141,6 +141,26 @@ describe "MerbAdmin" do
     end
   end
 
+  describe "list with boolean filter" do
+    before(:each) do
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 18, :name => "Moises Alou", :position => "left", :injured => true)
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 5, :name => "David Wright", :position => "third", :injured => false)
+      @response = request(url(:admin_list, :model_name => "player"), :params => {:filter => {:injured => true}})
+    end
+
+    it "should respond sucessfully" do
+      @response.should be_successful
+    end
+
+    it "should contain a correct result" do
+      @response.body.should contain("Moises Alou")
+    end
+
+    it "should not contain an incorrect result" do
+      @response.body.should_not contain("David Wright")
+    end
+  end
+
   describe "list with 2 objects", :given => "two players exist" do
     before(:each) do
       MerbAdmin[:paginate] = true
@@ -298,7 +318,7 @@ describe "MerbAdmin" do
 
   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, :position => :second, :sex => :male}})
+      @response = request(url(:admin_create, :model_name => "player"), :method => "post", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :position => "second"}})
     end
 
     it "should redirect to list" do
@@ -312,7 +332,7 @@ describe "MerbAdmin" do
 
   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, :position => :second, :sex => :male}, :_continue => true})
+      @response = request(url(:admin_create, :model_name => "player"), :method => "post", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :position => "second"}, :_continue => true})
     end
 
     it "should redirect to edit" do
@@ -326,7 +346,7 @@ describe "MerbAdmin" do
 
   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, :position => :second, :sex => :male}, :_add_another => true})
+      @response = request(url(:admin_create, :model_name => "player"), :method => "post", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :position => "second"}, :_add_another => true})
     end
 
     it "should redirect to new" do
@@ -340,7 +360,7 @@ describe "MerbAdmin" do
 
   describe "create with has-one association", :given => "a draft exists" do
     before(:each) do
-      @response = request(url(:admin_create, :model_name => "player"), :method => "post", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :position => :second, :sex => :male}, :associations => {:draft => @draft.id}})
+      @response = request(url(:admin_create, :model_name => "player"), :method => "post", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :position => "second"}, :associations => {:draft => @draft.id}})
     end
 
     it "should create a new object" do
@@ -383,7 +403,7 @@ describe "MerbAdmin" do
 
   describe "update", :given => "a player 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}})
+      @response = request(url(:admin_update, :model_name => "player", :id => @player.id), :method => "put", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1}})
     end
 
     it "should redirect to list" do
@@ -397,7 +417,7 @@ describe "MerbAdmin" do
 
   describe "update and edit", :given => "a player 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})
+      @response = request(url(:admin_update, :model_name => "player", :id => @player.id), :method => "put", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1}, :_continue => true})
     end
 
     it "should redirect to edit" do
@@ -411,7 +431,7 @@ describe "MerbAdmin" do
 
   describe "update and add another", :given => "a player 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})
+      @response = request(url(:admin_update, :model_name => "player", :id => @player.id), :method => "put", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1}, :_add_another => true})
     end
 
     it "should redirect to new" do
@@ -425,7 +445,7 @@ describe "MerbAdmin" do
 
   describe "update with has-one association", :given => "a player exists and a draft 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, :position => :second, :sex => :male}, :associations => {:draft => @draft.id}})
+      @response = request(url(:admin_update, :model_name => "player", :id => @player.id), :method => "put", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :position => "second"}, :associations => {:draft => @draft.id}})
     end
 
     it "should update an object that already exists" do
@@ -458,7 +478,7 @@ describe "MerbAdmin" do
 
   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}})
+      @response = request(url(:admin_update, :model_name => "player", :id => 1), :method => "put", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1}})
     end
 
     it "should raise NotFound" do

metadata

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