merb-admin 0.4.4 → 0.4.5

data/README.markdown

@@ -4,6 +4,8 @@
 
 It currently offers the features listed [here](http://sferik.tadalist.com/lists/1352791/public).
 
+The status of the current build can be seen [here](http://runcoderun.com/sferik/merb-admin).
+
 ## Get it
 
 At the command prompt, type:
@@ -14,7 +16,7 @@ At the command prompt, type:
 
 In your app, add the following dependency to `config/dependencies.rb`:
 
-    dependency "merb-admin", "0.4.4"
+    dependency "merb-admin", "0.4.5"
 
 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.4"
+GEM_VERSION = "0.4.5"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = "merb"

data/app/controllers/main.rb

@@ -13,6 +13,7 @@ class MerbAdmin::Main < MerbAdmin::Application
 
   def list
     options = {}
+    merge_query!(options)
     merge_sort!(options)
     merge_sort_reverse!(options)
 
@@ -125,6 +126,19 @@ class MerbAdmin::Main < MerbAdmin::Application
     raise NotFound unless @object
   end
 
+  def merge_query!(options)
+    return unless params[:query]
+    condition_statement = []
+    conditions = []
+    @properties.each do |property|
+      next unless property[:type] == :string
+      condition_statement << "#{property[:name]} LIKE ?"
+      conditions << "%#{params[:query]}%"
+    end
+    conditions.unshift(condition_statement.join(' OR '))
+    options.merge!(:conditions => conditions) unless conditions == ['']
+  end
+
   def merge_sort!(options)
     return unless params[:sort]
     sort = params[:sort] || "id"

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

@@ -1,5 +1,6 @@
 <%
   params = request.params.except(:action, :controller, :model_name)
+  query = params[:query]
   sort = params[:sort]
   sort_reverse = params[:sort_reverse]
 %>
@@ -10,6 +11,19 @@
             </li>
           </ul>
           <div class="module" 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 %>
+                <span class="small quiet"><%= @record_count %> <%= @record_count == 1 ? "result" : "results" %> (<a href="?"><%= @abstract_model.count %> total</a>)</span>
+                <% end %>
+              </div>
+              </form>
+            </div>
+            <script type="text/javascript">document.getElementById("searchbar").focus();</script>
             <table cellspacing="0">
               <thead>
                 <tr>

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

data/spec/requests/main_spec.rb

@@ -89,6 +89,26 @@ describe "MerbAdmin" do
     end
   end
 
+  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)
+      @response = request(url(:admin_list, :model_name => "player"), :params => {:query => "Jackie Robinson"})
+    end
+
+    it "should respond sucessfully" do
+      @response.should be_successful
+    end
+
+    it "should contain a correct result" do
+      @response.body.should contain("Jackie Robinson")
+    end
+
+    it "should not contain an incorrect result" do
+      @response.body.should_not contain("Sandy Koufax")
+    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)

metadata

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