lib/active_house/orderable.rb in active_house-0.1.5 vs lib/active_house/orderable.rb in active_house-0.2.0
- old
+ new
@@ -1,5 +1,7 @@
+require 'active_support/core_ext/object/try'
+
module ActiveHouse
module Orderable
extend ActiveSupport::Concern
included do
@@ -23,10 +25,10 @@
elsif clause.is_a?(Symbol)
clause.to_s
elsif clause.is_a?(Hash)
if clause.keys.one?
direction = clause.values.first
- raise ArgumentError, 'direction must be asc or desc' if [:asc, :desc].exclude?(direction.try!(:to_sym))
+ raise ArgumentError, 'direction must be asc or desc' unless [:asc, :desc].include?(direction.try!(:to_sym))
"#{clause.keys.first} #{direction.to_s.upcase}"
else
clause.assert_valid_keys(:field, :direction, :collate)
[
clause.fetch(:field),