merb-admin 0.6.3 → 0.6.4

data/README.rdoc

@@ -11,7 +11,7 @@ http://github.com/sferik/merb-admin/raw/master/screenshots/edit.png
 == Installation
   $ gem install merb-admin -s http://gemcutter.org
 In your app, add the following dependency to <tt>config/dependencies.rb</tt>:
-  dependency "merb-admin", "0.6.3"
+  dependency "merb-admin", "0.6.4"
 Add the following route to <tt>config/router.rb</tt>:
   add_slice(:merb_admin, :path_prefix => "admin")
 Then, run the following rake task:

data/Rakefile

@@ -9,7 +9,7 @@ AUTHOR = "Erik Michaels-Ober"
 EMAIL = "sferik@gmail.com"
 HOMEPAGE = "http://github.com/sferik/merb-admin"
 SUMMARY = "MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data."
-GEM_VERSION = "0.6.3"
+GEM_VERSION = "0.6.4"
 MERB_GEM_VERSION = "1.0.15"
 
 spec = Gem::Specification.new do |s|

data/app/controllers/main.rb

@@ -14,12 +14,10 @@ class MerbAdmin::Main < MerbAdmin::Application
 
   def list
     options = {}
-    options.merge!(sort)
-    options.merge!(sort_reverse)
-    options.merge!(query(options))
-    options.merge!(filter(options))
-    # merge_query!(options)
-    # merge_filter!(options)
+    options.merge!(get_sort_hash)
+    options.merge!(get_sort_reverse_hash)
+    options.merge!(get_query_hash(options))
+    options.merge!(get_filter_hash(options))
     per_page = MerbAdmin[:per_page]
     if params[:all]
       options.merge!(:limit => per_page * 2)
@@ -96,17 +94,17 @@ class MerbAdmin::Main < MerbAdmin::Application
     raise NotFound unless @object
   end
 
-  def sort
+  def get_sort_hash
     sort = params[:sort]
     sort ? {:sort => sort} : {}
   end
 
-  def sort_reverse
+  def get_sort_reverse_hash
     sort_reverse = params[:sort_reverse]
     sort_reverse ? {:sort_reverse => sort_reverse == "true"} : {}
   end
 
-  def query(options)
+  def get_query_hash(options)
     query = params[:query]
     return {} unless query
     statements = []
@@ -114,7 +112,7 @@ class MerbAdmin::Main < MerbAdmin::Application
     conditions = options[:conditions] || [""]
 
     @properties.select{|property| property[:type] == :string}.each do |property|
-      statements << "#{property[:name]} LIKE ?"
+      statements << "(#{property[:name]} LIKE ?)"
       values << "%#{query}%"
     end
 
@@ -124,7 +122,7 @@ class MerbAdmin::Main < MerbAdmin::Application
     conditions != [""] ? {:conditions => conditions} : {}
   end
 
-  def filter(options)
+  def get_filter_hash(options)
     filter = params[:filter]
     return {} unless filter
     statements = []
@@ -133,7 +131,7 @@ class MerbAdmin::Main < MerbAdmin::Application
 
     filter.each_pair do |key, value|
       @properties.select{|property| property[:type] == :boolean && property[:name] == key.to_sym}.each do |property|
-        statements << "#{key} = ?"
+        statements << "(#{key} = ?)"
         values << (value == "true")
       end
     end

data/lib/abstract_model.rb

@@ -5,7 +5,7 @@ module MerbAdmin
     # Returns all models for a given Merb app
     def self.all
       return @models if @models
-      @models ||= []
+      @models = []
       orm = Merb.orm
       case orm
       when :activerecord, :sequel
@@ -16,7 +16,6 @@ module MerbAdmin
           end
         end
       when :datamapper
-        @models = []
         DataMapper::Model.descendants.each do |model_name|
           # Remove DataMapperSessionStore because it's included by default
           next if m == Merb::DataMapperSessionStore if Merb.const_defined?(:DataMapperSessionStore)

data/lib/merb-admin/spectasks.rb

@@ -1,3 +1,5 @@
+require 'spec/rake/spectask'
+
 namespace :slices do
   namespace :"merb-admin" do
 

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-admin
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-05 00:00:00 -08:00
+date: 2009-11-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency