ardm 0.2.0 → 0.2.1

data/lib/ardm/active_record/associations.rb

@@ -39,8 +39,15 @@ module Ardm
           end
           [ar]
         else
-          block = if (conditions = ar.slice!(*keep)).any?
+          order = ar.delete(:order)
+          conditions = ar.slice!(*keep)
+          # sigh
+          block = if conditions.any? && order
+                    lambda { where(conditions).order(order) }
+                  elsif conditions.any?
                     lambda { where(conditions) }
+                  elsif order
+                    lambda { order(order) }
                   end
           [block, ar].compact
         end

data/lib/ardm/version.rb

@@ -1,3 +1,3 @@
 module Ardm
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ardm
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport