restful_query 0.3.1 → 0.3.2

data/History.txt

@@ -1,3 +1,7 @@
+== 0.3.2 2011-04-23
+
+* Support for Rails 3 and Ruby 1.9.2
+
 == 0.3.1 2010-02-16
 
 * Parser takes a :map_columns option which maps aliases column names

data/init.rb

@@ -1 +1 @@
-require File.join(File.dirname(__FILE__), 'rails', 'init.rb')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'rails', 'init.rb')

data/lib/restful_query/can_query.rb

@@ -1,6 +1,6 @@
 module RestfulQuery
   module CanQuery
-   
+
     def self.included(klass)
       klass.extend MacroMethods
     end
@@ -14,8 +14,11 @@ module RestfulQuery
           def self.restful_query_parser(query_hash, options = {})
             RestfulQuery::Parser.new(query_hash, @query_options.merge(options))
           end
-          
-          named_scope :restful_query, lambda {|query_hash| 
+
+          scope_meth = self.respond_to?(:scope) ? :scope : :named_scope
+
+          send(scope_meth, :restful_query, lambda {|query_hash|
+            return {} 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?
@@ -23,14 +26,14 @@ module RestfulQuery
             query_hash[:order]      = parser.sort_sql if parser.has_sort?
             logger.info 'Rest query:' + query_hash.inspect
             query_hash
-          }
+          })
         end
       end
-      
+
       def can_query?
         @can_query
       end
     end
-    
+
   end
-end
+end

data/lib/restful_query.rb

@@ -1,22 +1,19 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
+require 'active_support'
 begin
   require 'chronic'
-  unless defined?(ActiveSupport)
-    require 'active_support'
-  end
 rescue LoadError
   warn 'In order to use the time parsing functionalities you must install the Chronic gem: sudo gem install chronic'
 end
 
 module RestfulQuery
-  VERSION = '0.3.1'
-  
+  VERSION = '0.3.2'
+
   class Error < RuntimeError; end
 end
 
-
 %w{condition sort parser can_query}.each do |lib|
   require File.join("restful_query","#{lib}.rb")
 end

data/rails/init.rb

@@ -1,3 +1,3 @@
-require File.join(File.dirname(__FILE__),'..','lib','restful_query.rb')
+require File.join(File.expand_path(File.dirname(__FILE__)),'..','lib','restful_query.rb')
 
-ActiveRecord::Base.send(:include, RestfulQuery::CanQuery)
+ActiveRecord::Base.send(:include, RestfulQuery::CanQuery)

data/restful_query.gemspec

@@ -1,60 +1,58 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{restful_query}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Quint"]
-  s.date = %q{2010-02-16}
+  s.date = %q{2011-04-23}
   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.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "History.txt",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "init.rb",
-     "lib/restful_query.rb",
-     "lib/restful_query/can_query.rb",
-     "lib/restful_query/condition.rb",
-     "lib/restful_query/parser.rb",
-     "lib/restful_query/sort.rb",
-     "lib/sequel/extensions/restful_query.rb",
-     "rails/init.rb",
-     "restful_query.gemspec",
-     "tasks/restful_query_tasks.rake",
-     "test/test_helper.rb",
-     "test/test_restful_query_can_query.rb",
-     "test/test_restful_query_condition.rb",
-     "test/test_restful_query_parser.rb",
-     "test/test_restful_query_sort.rb"
+    "History.txt",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "init.rb",
+    "lib/restful_query.rb",
+    "lib/restful_query/can_query.rb",
+    "lib/restful_query/condition.rb",
+    "lib/restful_query/parser.rb",
+    "lib/restful_query/sort.rb",
+    "lib/sequel/extensions/restful_query.rb",
+    "rails/init.rb",
+    "restful_query.gemspec",
+    "tasks/restful_query_tasks.rake",
+    "test/test_helper.rb",
+    "test/test_restful_query_can_query.rb",
+    "test/test_restful_query_condition.rb",
+    "test/test_restful_query_parser.rb",
+    "test/test_restful_query_sort.rb"
   ]
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{quirkey}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Simple ActiveRecord and Sequel queries from a RESTful and safe interface}
   s.test_files = [
     "test/test_helper.rb",
-     "test/test_restful_query_can_query.rb",
-     "test/test_restful_query_condition.rb",
-     "test/test_restful_query_parser.rb",
-     "test/test_restful_query_sort.rb"
+    "test/test_restful_query_can_query.rb",
+    "test/test_restful_query_condition.rb",
+    "test/test_restful_query_parser.rb",
+    "test/test_restful_query_sort.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.2.0"])
       s.add_runtime_dependency(%q<chronic>, [">= 0.2.3"])
       s.add_development_dependency(%q<Shoulda>, [">= 1.2.0"])

data/test/test_helper.rb

@@ -2,7 +2,8 @@ require 'test/unit'
 require 'rubygems'
 require 'shoulda'
 
-require File.join(File.dirname(__FILE__), '..', 'lib','restful_query.rb')
+$LOAD_PATH.unshift(File.join(File.expand_path(File.dirname(__FILE__)), '..'))
+require 'lib/restful_query'
 
 
 unless defined?(ActiveRecord)
@@ -14,12 +15,12 @@ unless defined?(ActiveRecord)
         def protected_attributes
           []
         end
-        
+
         def named_scope(name, options = {})
         end
       end
       self.pluralize_table_names = true
-      
+
       include RestfulQuery::CanQuery
     end
   end
@@ -30,5 +31,5 @@ class ClassWithQuery < ActiveRecord::Base
 end
 
 class ClassWithoutQuery < ActiveRecord::Base
-  
-end
+
+end

data/test/test_restful_query_condition.rb

@@ -56,77 +56,77 @@ class RestfulQueryConditionTest < Test::Unit::TestCase
         end
 
         should "parse value with chronic" do
-          assert_equal(1.week.ago.to_s, @condition.value.to_s)
+          assert_equal(Chronic.parse('1 week ago').to_s, @condition.value.to_s)
         end
       end
-      
+
       context "with a value of ':nil'" do
         setup do
           @condition = RestfulQuery::Condition.new('created_at', ':nil')
         end
-        
+
         should "convert value to true nil" do
           assert_equal(nil, @condition.value)
         end
       end
-      
+
       context "with a value of ':true'" do
         setup do
           @condition = RestfulQuery::Condition.new('created_at', ':true')
         end
-        
+
         should "convert value to true true" do
           assert_equal(true, @condition.value)
         end
       end
-      
+
       context "with a value of ':blank'" do
         setup do
           @condition = RestfulQuery::Condition.new('created_at', ':blank')
         end
-        
+
         should "convert value to true true" do
           assert_equal('', @condition.value)
         end
       end
-      
+
       context "with the IN operator" do
         setup do
           @condition = RestfulQuery::Condition.new('year', '1995,2005,2006', 'in')
         end
-        
+
         should "assign the operator" do
           assert_equal 'IN', @condition.operator
         end
-        
+
         should "split values by the delimiter option" do
           assert_equal ['1995', '2005', '2006'], @condition.value
         end
-        
+
         should "include parens in placeholder" do
           assert_equal ["year IN (?)", ['1995', '2005', '2006']], @condition.to_condition_array
         end
-        
+
         context "when the value is already an array" do
           setup do
             @condition = RestfulQuery::Condition.new('year', ['1995', '2005', '2006'], 'in')
           end
-          
+
           should "not resplit the value" do
             assert_equal ['1995', '2005', '2006'], @condition.value
           end
         end
       end
-      
+
       context "with the NOT IN operator" do
         setup do
           @condition = RestfulQuery::Condition.new('year', '1995|2005|2006', 'notin', :delimiter => '|')
         end
-        
+
         should "assign the operator" do
           assert_equal 'NOT IN', @condition.operator
         end
-        
+
         should "split values by delimiter option" do
           assert_equal ['1995', '2005', '2006'], @condition.value
         end
@@ -138,23 +138,23 @@ class RestfulQueryConditionTest < Test::Unit::TestCase
       setup do
         @condition = RestfulQuery::Condition.new('title', 'Bossman', 'lt')
       end
-      
+
       context "with operator = like to condition array" do
         setup do
           @condition = RestfulQuery::Condition.new('title', 'Bossman', 'like')
           @to_condition_array = @condition.to_condition_array
         end
-        
+
         should "wrap value with %" do
           assert_equal "%Bossman%", @to_condition_array[1]
         end
-        
+
         should "translate operator to LIKE" do
           assert_equal("title LIKE ?", @to_condition_array[0])
         end
-        
+
       end
-      
+
       context "to_condition_array" do
         setup do
           @to_condition = @condition.to_condition_array
@@ -172,7 +172,7 @@ class RestfulQueryConditionTest < Test::Unit::TestCase
           assert_equal @condition.value, @to_condition[1]
         end
       end
-    
+
       context "to_hash" do
         should "return hash like params" do
           assert_equal({'title' => {'lt' => 'Bossman'}}, @condition.to_hash)

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: restful_query
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Aaron Quint
@@ -9,39 +14,54 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-16 00:00:00 -05:00
+date: 2011-04-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 2
+        - 0
         version: 2.2.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: chronic
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 3
         version: 0.2.3
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: Shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 0
         version: 1.2.0
-    version: 
+  type: :development
+  version_requirements: *id003
 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.
 email: 
 executables: []
@@ -52,7 +72,6 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .gitignore
 - History.txt
 - LICENSE
 - README.rdoc
@@ -77,26 +96,30 @@ homepage:
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: quirkey
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simple ActiveRecord and Sequel queries from a RESTful and safe interface

data/.gitignore

@@ -1,5 +0,0 @@
-.DS_Store
-tmp*
-pkg*
-.specification
-_site*