restful_query 0.3.5 → 0.3.6

data/lib/restful_query/can_query.rb

@@ -18,7 +18,7 @@ module RestfulQuery
           scope_meth = self.respond_to?(:where) ? :scope : :named_scope
 
           send(scope_meth, :restful_query, lambda {|query_hash|
-            return {} if query_hash.blank? || query_hash.empty?
+            query_hash = {} if query_hash.blank? || query_hash.empty?
             parser = self.restful_query_parser(query_hash)
             query_hash = {}
             query_hash[:conditions] = parser.to_conditions_array if parser.has_conditions?

data/lib/restful_query/parser.rb

@@ -9,7 +9,7 @@ module RestfulQuery
       @map_columns     = options[:map_columns] || {}
       @single_sort     = options[:single_sort] || true
       @default_sort_options = options[:sort_options] || {}
-      @query           = (query || {}).dup
+      @query           = (!query || query.empty? || query.to_s =~ /^\s*$/ ? {} : query).dup
       @default_sort    = options[:default_sort] ? [make_sort(options[:default_sort])] : []
       @default_join    = @query.delete(:join) || :and
       extract_sorts_from_conditions

data/lib/restful_query.rb

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

data/restful_query.gemspec

@@ -4,13 +4,13 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{restful_query}
-  s.version = "0.3.5"
+  s.name = "restful_query"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Quint"]
-  s.date = %q{2011-08-15}
-  s.description = %q{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.}
+  s.date = "2012-08-14"
+  s.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."
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -38,9 +38,9 @@ Gem::Specification.new do |s|
     "test/test_restful_query_sort.rb"
   ]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{quirkey}
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Simple ActiveRecord and Sequel queries from a RESTful and safe interface}
+  s.rubyforge_project = "quirkey"
+  s.rubygems_version = "1.8.24"
+  s.summary = "Simple ActiveRecord and Sequel queries from a RESTful and safe interface"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/test_restful_query_parser.rb

@@ -23,6 +23,20 @@ class RestfulQueryParserTest < Test::Unit::TestCase
         end
       end
 
+      context "without query but options" do
+        setup do
+          @parser = RestfulQuery::Parser.new(' ', :default_sort => 'created_at ASC')
+        end
+
+        should "return Parser object" do
+          assert @parser.is_a?(RestfulQuery::Parser)
+        end
+
+        should "have include options" do
+          assert_equal({'_sort' => ['created_at-asc']}, @parser.to_query_hash)
+        end
+      end
+
       context "with a hash of columns and operations" do
         setup do
           new_parser_from_hash

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restful_query
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-15 00:00:00.000000000 -04:00
-default_executable: 
+date: 2012-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2151840860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,15 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151840860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &2151839320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +37,15 @@ dependencies:
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2151839320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: Shoulda
-  requirement: &2151837540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +53,12 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *2151837540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 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.
@@ -75,7 +89,6 @@ files:
 - test/test_restful_query_condition.rb
 - test/test_restful_query_parser.rb
 - test/test_restful_query_sort.rb
-has_rdoc: true
 homepage: 
 licenses: []
 post_install_message: 
@@ -96,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: quirkey
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simple ActiveRecord and Sequel queries from a RESTful and safe interface