merb-admin 0.7.1 → 0.7.2

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.1"
+  dependency "merb-admin", "0.7.2"
 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.1
+0.7.2

data/lib/activerecord_support.rb

@@ -14,13 +14,11 @@ module MerbAdmin
       end
 
       def first(options = {})
-        merge_order!(options)
-        model.first(options).extend(InstanceMethods)
+        model.first(merge_order(options)).extend(InstanceMethods)
       end
 
       def all(options = {})
-        merge_order!(options)
-        model.all(options)
+        model.all(merge_order(options))
       end
 
       def paginated(options = {})
@@ -98,10 +96,10 @@ module MerbAdmin
 
       private
 
-      def merge_order!(options)
+      def merge_order(options)
         @sort ||= options.delete(:sort) || "id"
         @sort_order ||= options.delete(:sort_reverse) ? "desc" : "asc"
-        options.merge!(:order => ["#{@sort} #{@sort_order}"])
+        options.merge(:order => ["#{@sort} #{@sort_order}"])
       end
 
       def association_parent_model_lookup(association)

data/lib/datamapper_support.rb

@@ -14,13 +14,11 @@ module MerbAdmin
       end
 
       def first(options = {})
-        merge_order!(options)
-        model.first(options).extend(InstanceMethods)
+        model.first(merge_order(options)).extend(InstanceMethods)
       end
 
       def all(options = {})
-        merge_order!(options)
-        model.all(options)
+        model.all(merge_order(options))
       end
 
       def paginated(options = {})
@@ -96,10 +94,10 @@ module MerbAdmin
 
       private
 
-      def merge_order!(options)
+      def merge_order(options)
         @sort ||= options.delete(:sort) || :id
         @sort_order ||= options.delete(:sort_reverse) ? :desc : :asc
-        options.merge!(:order => [@sort.to_sym.send(@sort_order)])
+        options.merge(:order => [@sort.to_sym.send(@sort_order)])
       end
 
       def association_type_lookup(association)

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

data/merb-admin.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{merb-admin}
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Erik Michaels-Ober"]

metadata

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