merb-admin 0.7.0 → 0.7.1

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.7.0"
+  dependency "merb-admin", "0.7.1"
 Add the following route to <tt>config/router.rb</tt>:
   add_slice(:merb_admin, :path_prefix => "admin")
 Then, run the following rake task:

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/lib/activerecord_support.rb

@@ -10,8 +10,7 @@ module MerbAdmin
       end
 
       def count(options = {})
-        merge_order!(options)
-        model.count(options)
+        model.count(options.reject{|key, value| [:sort, :sort_reverse].include?(key)})
       end
 
       def first(options = {})

data/lib/datamapper_support.rb

@@ -10,8 +10,7 @@ module MerbAdmin
       end
 
       def count(options = {})
-        merge_order!(options)
-        model.count(options)
+        model.count(options.reject{|key, value| [:sort, :sort_reverse].include?(key)})
       end
 
       def first(options = {})

data/lib/merb-admin.rb

@@ -24,7 +24,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.7.0"
+    self.version = "0.7.1"
     self.author = "Erik Michaels-Ober"
 
     # Stub classes loaded hook - runs before LoadClasses BootLoader

data/merb-admin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{merb-admin}
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Erik Michaels-Ober"]
-  s.date = %q{2009-11-28}
+  s.date = %q{2009-12-01}
   s.description = %q{MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data.}
   s.email = %q{sferik@gmail.com}
   s.extra_rdoc_files = [

metadata

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