restful_query 0.3.4 → 0.3.5

data/History.txt

@@ -1,3 +1,7 @@
+== 0.3.5 2011-08-15
+
+* Too quick to release the last one. Fixed now.
+
 == 0.3.4 2011-08-15
 
 * Added support for extra options to sort. Specifically this allows you to do NULLS FIRST/LAST

data/lib/restful_query.rb

@@ -9,7 +9,7 @@ rescue LoadError
 end
 
 module RestfulQuery
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 
   class Error < RuntimeError; end
 end

data/lib/restful_query/parser.rb

@@ -10,7 +10,7 @@ module RestfulQuery
       @single_sort     = options[:single_sort] || true
       @default_sort_options = options[:sort_options] || {}
       @query           = (query || {}).dup
-      @query['_sort'] ||= options[:default_sort] if options[:default_sort]
+      @default_sort    = options[:default_sort] ? [make_sort(options[:default_sort])] : []
       @default_join    = @query.delete(:join) || :and
       extract_sorts_from_conditions
       map_conditions
@@ -82,7 +82,7 @@ module RestfulQuery
           new_sort.direction = direction
         end
       else
-        new_sort = Sort.new(column, direction)
+        new_sort = make_sort(column, direction)
         self.sorts << new_sort
       end
       new_sort
@@ -147,13 +147,17 @@ module RestfulQuery
     def sorts_from_hash(sorts)
       sort_conditions = [sorts].flatten.compact
       sort_conditions.collect do |c|
-        s = Sort.parse(c)
-        s.column = map_column(s.column)
-        s.options = default_sort_options
-        s
+        make_sort(c)
       end
     end
 
+    def make_sort(*condition)
+      s = Sort.parse(condition.flatten.join(' '))
+      s.column = map_column(s.column)
+      s.options = default_sort_options
+      s
+    end
+
     def columns_from_options(column_type, options)
       option = "#{column_type}_columns".to_sym
       options[option] ? [options.delete(option)].flatten.collect {|c| c.to_s } : []

data/restful_query.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{restful_query}
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Quint"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restful_query
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152029040 !ruby/object:Gem::Requirement
+  requirement: &2151840860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152029040
+  version_requirements: *2151840860
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &2152028020 !ruby/object:Gem::Requirement
+  requirement: &2151839320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152028020
+  version_requirements: *2151839320
 - !ruby/object:Gem::Dependency
   name: Shoulda
-  requirement: &2152027080 !ruby/object:Gem::Requirement
+  requirement: &2151837540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *2152027080
+  version_requirements: *2151837540
 description: RestfulQuery provides a simple interface in front of a complex parser
   to parse specially formatted query hashes into complex SQL queries. It includes
   ActiveRecord and Sequel extensions.