sferik-merb-admin 0.2.4 → 0.2.5

data/README.markdown

@@ -14,7 +14,7 @@ At the command prompt, type:
 
 In your app, add the following dependency to `config/dependencies.rb`:
 
-    dependency "sferik-merb-admin", "0.2.4", :require_as => "merb-admin"
+    dependency "sferik-merb-admin", "0.2.5", :require_as => "merb-admin"
 
 Add the following route to `config/router.rb`:
 
@@ -30,6 +30,7 @@ You can configuring the merb-admin slice in a before_app_loads block:
 
     Merb::BootLoader.before_app_loads do
       Merb::Slices::config[:merb_admin][:app_name] = "My App"
+      Merb::Slices::config[:merb_admin][:paginate] = true
     end
 
 ## Run it

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.2.4"
+GEM_VERSION = "0.2.5"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = "merb"
@@ -26,8 +26,8 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency("merb-slices", Merb::VERSION)
-  s.add_dependency("merb_datamapper", Merb::VERSION)
+  s.add_dependency("merb-slices", ">= 1.0.12")
+  s.add_dependency("merb_datamapper", ">= 1.0.12")
   s.add_dependency("dm-core", ">= 0.9.11")
   s.add_dependency("dm-is-paginated", ">= 0.0.1")
   s.require_path = "lib"

data/app/controllers/forms.rb

@@ -13,33 +13,32 @@ class MerbAdmin::Forms < MerbAdmin::Application
     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))
+        options.merge!(key.to_sym => (value == "true"))
       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]
+    if params[:query]
+      condition_statement = []
+      conditions = []
+      @properties.each do |property|
+        next unless property.type.to_s == "String"
+        condition_statement << "#{property.field} LIKE ?"
+        conditions << "%#{params[:query]}%"
+      end
+      conditions.unshift(condition_statement.join(" OR "))
+      options.merge!(:conditions => conditions) unless conditions == [""]
+    end
+    if params[:sort]
+      order = "[:#{params[:sort]}.#{params[:sort_reverse] ? 'desc' : 'asc'}]"
+      options.merge!(:order => eval(order))
+    end
+    if !MerbAdmin[:paginate] || params[:all]
       options = {
         :limit => 200,
       }.merge(options)
       @instances = @model.all(options).reverse
     else
-      if params[:query]
-        condition_statement = []
-        conditions = []
-        @properties.each do |property|
-          next unless property.primitive.to_s == "String"
-          condition_statement << "#{property.field} LIKE ?"
-          conditions << "%#{params[:query]}%"
-        end
-        conditions.unshift(condition_statement.join(" OR "))
-        options.merge!(:conditions => conditions) unless conditions == [""]
-      end
-      if params[:sort]
-        order = "[:#{params[:sort]}.#{params[:sort_reverse] ? 'desc' : 'asc'}]"
-        options.merge!(:order => eval(order))
-      end
-
       # monkey patch pagination
       @model.class_eval("is_paginated") unless @model.respond_to?(:paginated)
       @current_page = (params[:page] || 1).to_i

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.2.4"
+    self.version = "0.2.5"
     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.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -18,7 +18,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 1.0.12
     version: 
@@ -28,7 +28,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 1.0.12
     version: