wherewolf 0.4.0 → 0.4.1

data/README.rdoc

@@ -61,7 +61,7 @@ For a real-life, running example, check out: http://wherewolf.herokuapp.com/
     player = Player.where_query('name ~= "Peter%"')
     # Returns all players who's name starts with Peter
 
-As you can see, where_query returns an ARel object, so you chain other statements to it. Please note, though: at the moment where_query needs to be the first in the chain. 
+As you can see, where_query returns an ARel object, so you chain other statements to it.
 
 == Order
 
@@ -79,6 +79,10 @@ You can also supply an order_query to handle ordering
     player = Player.order_query("name desc, position desc")
     # You can also have multiple order columns
 
+Of course you can nest them...
+
+    player = Player.where_query("first_cap != null").order_query('name desc')
+
 == Errors
 
 At the moment, error handling is very primitive. Just capture

data/Rakefile

@@ -22,7 +22,7 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{Wherewolf allows you to consume search terms as strings without worrying about database injections. It parses the query and converts it into ARel. It's great for creating filterable REST APIs.}
   gem.email = "myles@madpilot.com.au"
   gem.authors = ["Myles Eftos"]
-  gem.version = "0.4.0"
+  gem.version = "0.4.1"
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new

data/lib/wherewolf.rb

@@ -12,17 +12,10 @@ module Wherewolf
   
   module ClassMethods
     def has_query_parsing(options = {})
-      self.extend QueryMethods
-    end
-  end
-
-  module QueryMethods
-    def where_query(query)
-      Wherewolf::Where::Processor.parse(self, query)
-    end
-
-    def order_query(query)
-      Wherewolf::Order::Processor.parse(self, query)
+      self.class_eval do
+        scope :where_query, lambda { |query| Wherewolf::Where::Processor.parse(self, query) }
+        scope :order_query, lambda { |query| Wherewolf::Order::Processor.parse(self, query) }
+      end
     end
   end
 end

data/test/railtie_test.rb

@@ -2,6 +2,11 @@ require 'helper'
 
 class RailtieTest < Test::Unit::TestCase
   context 'Railtie' do
+    setup do
+      setup_database
+      setup_fixtures
+    end
+    
     should 'not enable where_query if has_query_parsing is not called' do
       assert_equal false, Team.respond_to?(:where_query)
     end
@@ -9,5 +14,20 @@ class RailtieTest < Test::Unit::TestCase
     should 'enable where_query if has_query_parsing is called' do
       assert_equal true, Player.respond_to?(:where_query)
     end
+  
+    should 'not enable order_query if has_query_parsing is not called' do
+      assert_equal false, Team.respond_to?(:order_query)
+    end
+    
+    should 'enable order_query if has_query_parsing is called' do
+      assert_equal true, Player.respond_to?(:order_query)
+    end
+
+    should 'allow where_query and order_query to be nestable' do
+      assert_nothing_raised do
+        players = Player.where_query('active = true').order_query('name desc')
+        assert_equal Player.where('active = ?', true).order('name desc').map(&:id), players.map(&:id)
+      end
+    end
   end
 end

data/wherewolf.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wherewolf"
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Myles Eftos"]
-  s.date = "2012-10-11"
+  s.date = "2012-10-12"
   s.description = "Wherewolf allows you to consume search terms as strings without worrying about database injections. It parses the query and converts it into ARel. It's great for creating filterable REST APIs."
   s.email = "myles@madpilot.com.au"
   s.extra_rdoc_files = [
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/madpilot/wherewolf"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.15"
   s.summary = "Makes filtering and searching to your REST API crazy easy."
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wherewolf
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-11 00:00:00.000000000 Z
+date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70304497147180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70304497147180
 - !ruby/object:Gem::Dependency
   name: parslet
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70304497162220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70304497162220
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70304497160940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70304497160940
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70304497159820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70304497159820
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70304497158780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70304497158780
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70304497157580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,15 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70304497157580
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70304497458900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -117,15 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70304497458900
 - !ruby/object:Gem::Dependency
   name: guard-test
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70304497457480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,15 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70304497457480
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70304497455240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -149,15 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70304497455240
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70304497453700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,15 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70304497453700
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70304497452400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -181,15 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70304497452400
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70304497451180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,12 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70304497451180
 description: Wherewolf allows you to consume search terms as strings without worrying
   about database injections. It parses the query and converts it into ARel. It's great
   for creating filterable REST APIs.
@@ -252,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3659032346363356481
+      hash: -548541850773955983
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -261,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Makes filtering and searching to your REST API crazy easy.