squeel 0.7.5 → 0.7.6

data/README.md

@@ -112,7 +112,7 @@ used in `WHERE` or `HAVING` clauses.
   <tr>
     <td>!=</td>
     <td>not_eq</td>
-    <td>!=</td>
+    <td>!= (1.9 only), ^ (1.8)</td>
     <td></td>
   </tr>
   <tr>
@@ -124,7 +124,7 @@ used in `WHERE` or `HAVING` clauses.
   <tr>
     <td>NOT LIKE</td>
     <td>does_not_match</td>
-    <td>!~</td>
+    <td>!~ (1.9 only)</td>
     <td>not_like</td>
   </tr>
   <tr>

data/lib/squeel/adapters/active_record/relation.rb

@@ -88,7 +88,9 @@ module Squeel
           arel.group(*attribute_viz.accept(@group_values.uniq.reject{|g| g.blank?})) unless @group_values.empty?
 
           order = @reorder_value ? @reorder_value : @order_values
-          arel.order(*attribute_viz.accept(order.uniq.reject{|o| o.blank?})) unless order.empty?
+          order = attribute_viz.accept(order.uniq.reject{|o| o.blank?})
+          order = reverse_sql_order(sqlify_order(order)) if @reverse_order_value
+          arel.order(*order) unless order.empty?
 
           build_select(arel, attribute_viz.accept(@select_values.uniq))
 
@@ -98,6 +100,14 @@ module Squeel
           arel
         end
 
+        # reverse_sql_order doesn't understand ARel ordering nodes, so we
+        # need to convert them to their corresponding SQL
+        def sqlify_order(order)
+          order.map do |o|
+            o.respond_to?(:to_sql) ? o.to_sql : o
+          end
+        end
+
         def build_join_dependency(manager, joins)
           buckets = joins.group_by do |join|
             case join

data/lib/squeel/version.rb

@@ -1,3 +1,3 @@
 module Squeel
-  VERSION = "0.7.5"
+  VERSION = "0.7.6"
 end

metadata

@@ -1,93 +1,92 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: squeel
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.7.6
   prerelease: 
-  version: 0.7.5
 platform: ruby
-authors: 
+authors:
 - Ernie Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-07 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-06-13 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156244960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2156244960
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &2156244220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2156244220
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2156242240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: machinist
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2156242240
+- !ruby/object:Gem::Dependency
+  name: machinist
+  requirement: &2156236780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.6
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: faker
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2156236780
+- !ruby/object:Gem::Dependency
+  name: faker
+  requirement: &2156197500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.9.5
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2156197500
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &2156196800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.3.3
   type: :development
-  version_requirements: *id006
-description: "\n      Squeel unlocks the power of ARel in your Rails 3 application with\n      a handy block-based syntax. You can write subqueries, access named\n      functions provided by your RDBMS, and more, all without writing\n      SQL strings.\n    "
-email: 
+  prerelease: false
+  version_requirements: *2156196800
+description: ! "\n      Squeel unlocks the power of ARel in your Rails 3 application
+  with\n      a handy block-based syntax. You can write subqueries, access named\n
+  \     functions provided by your RDBMS, and more, all without writing\n      SQL
+  strings.\n    "
+email:
 - ernie@metautonomo.us
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .yardopts
 - Gemfile
@@ -168,37 +167,42 @@ files:
 - squeel.gemspec
 homepage: http://metautonomo.us/projects/squeel
 licenses: []
+post_install_message: ! '
 
-post_install_message: "\n\
-  *** Thanks for installing Squeel! ***\n\
-  Be sure to check out http://metautonomo.us/projects/squeel/ for a\n\
-  walkthrough of Squeel's features, and click the donate link if\n\
-  you're feeling especially appreciative. It'd help me justify this\n\
-  \"open source\" stuff to my lovely wife. :)\n\n"
-rdoc_options: []
+  *** Thanks for installing Squeel! ***
+
+  Be sure to check out http://metautonomo.us/projects/squeel/ for a
 
-require_paths: 
+  walkthrough of Squeel''s features, and click the donate link if
+
+  you''re feeling especially appreciative. It''d help me justify this
+
+  "open source" stuff to my lovely wife. :)
+
+
+'
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: squeel
-rubygems_version: 1.7.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: ActiveRecord 3, improved.
-test_files: 
+test_files:
 - spec/blueprints/articles.rb
 - spec/blueprints/comments.rb
 - spec/blueprints/notes.rb