merb-admin 0.4.6 → 0.4.7

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.6"
+    dependency "merb-admin", "0.4.7"
 
 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.6"
+GEM_VERSION = "0.4.7"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = "merb"

data/app/controllers/main.rb

@@ -137,6 +137,7 @@ class MerbAdmin::Main < MerbAdmin::Application
       statements << "#{property[:name]} LIKE ?"
       values << "%#{params[:query]}%"
     end
+    conditions[0] += " AND " unless conditions == [""]
     conditions[0] += statements.join(" OR ")
     conditions += values
     options.merge!(:conditions => conditions) unless conditions == [""]
@@ -155,10 +156,10 @@ class MerbAdmin::Main < MerbAdmin::Application
         values << (value == "true")
       end
     end
+    conditions[0] += " AND " unless conditions == [""]
     conditions[0] += statements.join(" AND ")
     conditions += values
     options.merge!(:conditions => conditions) unless conditions == [""]
-    puts options.inspect
   end
 
   def merge_sort!(options)

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

@@ -16,7 +16,7 @@
               <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="text" size="40" name="query" value="<%= query %>" id="searchbar" />
                 <input type="submit" value="Search" />
                 <% if query || filter %>
                 <span class="small quiet"><%= @record_count %> <%= @record_count == 1 ? "result" : "results" %> (<a href="?"><%= @abstract_model.count %> total</a>)</span>

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

data/schema/migrations/004_create_players_migration.rb

@@ -8,7 +8,7 @@ class CreatePlayersMigration < ActiveRecord::Migration
       t.string :position, :limit => 50
       t.integer :number
       t.float :batting_average, :default => 0.0
-      t.boolean :all_star, :default => false
+      t.boolean :retired, :default => false
       t.boolean :injured, :default => false
       t.date :born_on
       t.timestamp :wake_at

data/spec/models/datamapper/player.rb

@@ -10,7 +10,7 @@ class Player
   property :position, String
   property :number, Integer, :nullable => false
   property :batting_average, Float, :default => 0.0, :precision => 4, :scale => 3
-  property :all_star, Boolean, :default => false
+  property :retired, Boolean, :default => false
   property :injured, Boolean, :default => false
   property :born_on, Date
   property :wake_at, Time

data/spec/requests/main_spec.rb

@@ -89,10 +89,42 @@ describe "MerbAdmin" do
     end
   end
 
-  describe "list with query" do
+  describe "list with sort" do
     before(:each) do
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 32, :name => "Sandy Koufax", :position => "pitcher")
       MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 42, :name => "Jackie Robinson", :position => "second")
+      @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 => 32, :name => "Sandy Koufax", :position => "pitcher")
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 42, :name => "Jackie Robinson", :position => "second")
+      @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 query" do
+    before(:each) do
       MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 32, :name => "Sandy Koufax", :position => "pitcher")
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 42, :name => "Jackie Robinson", :position => "second")
       @response = request(url(:admin_list, :model_name => "player"), :params => {:query => "Jackie Robinson"})
     end
 
@@ -109,43 +141,58 @@ describe "MerbAdmin" do
     end
   end
 
-  describe "list with sort" do
+  describe "list with query and boolean filter" do
     before(:each) do
-      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"})
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 32, :name => "Sandy Koufax", :position => "pitcher", :retired => true, :injured => true)
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 42, :name => "Jackie Robinson", :position => "second", :retired => true, :injured => false)
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 18, :name => "Moises Alou", :position => "left", :retired => false, :injured => true)
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 5, :name => "David Wright", :position => "third", :retired => false, :injured => false)
+      @response = request(url(:admin_list, :model_name => "player"), :params => {:query => "Sandy Koufax", :filter => {:injured => "true"}})
     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)
+    it "should contain a correct result" do
+      @response.body.should contain("Sandy Koufax")
+    end
+
+    it "should not contain an incorrect result" do
+      @response.body.should_not contain("Jackie Robinson")
+      @response.body.should_not contain("Moises Alou")
+      @response.body.should_not contain("David Wright")
     end
   end
 
-  describe "list with reverse sort" do
+
+  describe "list with boolean filter" do
     before(:each) do
-      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"})
+      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 be sorted correctly" do
-      @response.body.should contain(/Sandy Koufax.*Jackie Robinson/m)
+    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 boolean filter" do
+  describe "list with boolean filters" 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}})
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 32, :name => "Sandy Koufax", :position => "pitcher", :retired => true, :injured => true)
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 42, :name => "Jackie Robinson", :position => "second", :retired => true, :injured => false)
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 18, :name => "Moises Alou", :position => "left", :retired => false, :injured => true)
+      MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 5, :name => "David Wright", :position => "third", :retired => false, :injured => false)
+      @response = request(url(:admin_list, :model_name => "player"), :params => {:filter => {:retired => "true", :injured => "true"}})
     end
 
     it "should respond sucessfully" do
@@ -153,10 +200,11 @@ describe "MerbAdmin" do
     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("Jackie Robinson")
+      @response.body.should_not contain("Moises Alou")
       @response.body.should_not contain("David Wright")
     end
   end

metadata

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