postgres_ext 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f41de74b7eea3b27f6770cb352ba70497d94513d
-  data.tar.gz: 3e9cf324c7a635ac338fd5af691909ed13f1f02e
+  metadata.gz: 81e5d99adec7bf0164b0e2fc17902e80ef62d264
+  data.tar.gz: ca7ab1ff4f77d91b31062130e17e87a055db719c
 SHA512:
-  metadata.gz: 5843378f753e2755c7c8459d89b580d10089d564b18ee390e349a3590efb0260bb12f6e9ef784bb02ef2514389351b303d867dbe7de4de859ac16ffdd88925ab
-  data.tar.gz: cf54fb746947851736f94fbf0e543eae772dfa7e85094c343853f12086c0c3c2c906ae2f15b4412de00fed0f1c749279a51a15a004fe8c5f07de9bdbadc05092
+  metadata.gz: 029878e575cb456781db615deb004839836a5bb46ccbd3a14c184b8e9b3b153c21c22b921e1938ed82378c9fc7f409799e882f623ff1913fb4dbd46e618685ca
+  data.tar.gz: 30a7dd666faf99922130a77cad0f25a148bc030b152ede31722475fe0c67addc29f08bf3f479a5e727ab3ff560667970ed96cf07f9ca2ad57d5039acdf8d78d7

data/lib/postgres_ext/active_record/relation/query_methods.rb

@@ -67,7 +67,7 @@ module ActiveRecord
       end
     end
 
-    [:with, :rank].each do |name|
+    [:with].each do |name|
       class_eval <<-CODE, __FILE__, __LINE__ + 1
        def #{name}_values                   # def select_values
          @values[:#{name}] || []            #   @values[:select] || []
@@ -80,6 +80,19 @@ module ActiveRecord
       CODE
     end
 
+    [:rank].each do |name|
+      class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{name}_value=(value)            # def readonly_value=(value)
+          raise ImmutableRelation if @loaded #   raise ImmutableRelation if @loaded
+          @values[:#{name}] = value          #   @values[:readonly] = value
+        end                                  # end
+
+        def #{name}_value                    # def readonly_value
+          @values[:#{name}]                  #   @values[:readonly]
+        end                                  # end
+      CODE
+    end
+
     def with(*args)
       check_if_method_has_arguments!('with', args)
       spawn.with!(*args.compact.flatten)
@@ -94,8 +107,8 @@ module ActiveRecord
       spawn.ranked! options
     end
 
-    def ranked!(*args)
-      self.rank_values += args
+    def ranked!(value)
+      self.rank_value = value
       self
     end
 
@@ -104,7 +117,7 @@ module ActiveRecord
 
       build_with(arel, with_values)
 
-      build_rank(arel, rank_values)
+      build_rank(arel, rank_value) if rank_value
 
       arel
     end
@@ -129,24 +142,27 @@ module ActiveRecord
       arel.with with_statements unless with_statements.empty?
     end
 
-    def build_rank(arel, ranks)
+    def build_rank(arel, rank_window_options)
       unless arel.projections.count == 1 && Arel::Nodes::Count === arel.projections.first
-        rank_orders = ranks.uniq.reject(&:blank?).flat_map do |value|
-          case value
+        rank_window = case rank_window_options
           when :order
             arel.orders
           when Symbol
-            table[value].asc
+            table[rank_window_options].asc
           when Hash
-            value.map { |field, dir| table[field].send(dir) }
+            rank_window_options.map { |field, dir| table[field].send(dir) }
           else
-            Arel::Nodes::SqlLiteral.new value
+            Arel::Nodes::SqlLiteral.new "(#{rank_window_options})"
           end
-        end
 
-        unless rank_orders.blank?
+        unless rank_window.blank?
           rank_node = Arel::Nodes::SqlLiteral.new 'rank()'
-          window = Arel::Nodes::Window.new.order(rank_orders)
+          window = Arel::Nodes::Window.new
+          if String === rank_window
+            window = window.frame rank_window
+          else
+            window = window.order(rank_window)
+          end
           over_node = Arel::Nodes::Over.new rank_node, window
 
           arel.project(over_node)

data/lib/postgres_ext/arel/visitors/to_sql.rb

@@ -3,9 +3,10 @@ require 'arel/visitors/to_sql'
 module Arel
   module Visitors
     class ToSql
-      def visit_Array o
-        if last_column.respond_to?(:array) && last_column.array
-          quoted o
+      def visit_Array o, a
+        column = a.relation.engine.columns.find { |col| col.name == a.name.to_s } if a
+        if column && column.respond_to?(:array) && column.array
+          quoted o, a
         else
           o.empty? ? 'NULL' : o.map { |x| visit x }.join(', ')
         end

data/lib/postgres_ext/arel/visitors/visitor.rb

@@ -4,33 +4,33 @@ module Arel
     class Visitor
       # We are adding our visitors to the main visitor for the time being until the right spot is found to monkey patch
       private
-      def visit_Arel_Nodes_ContainedWithin o
-        "#{visit o.left} << #{visit o.right}"
+      def visit_Arel_Nodes_ContainedWithin o, a = nil
+        "#{visit o.left, a} << #{visit o.right, o.left}"
       end
 
-      def visit_Arel_Nodes_ContainedWithinEquals o
-        "#{visit o.left} <<= #{visit o.right}"
+      def visit_Arel_Nodes_ContainedWithinEquals o, a = nil
+        "#{visit o.left, a} <<= #{visit o.right, o.left}"
       end
 
-      def visit_Arel_Nodes_Contains o
+      def visit_Arel_Nodes_Contains o, a = nil
         left_column = o.left.relation.engine.columns.find { |col| col.name == o.left.name.to_s }
 
         if left_column && left_column.respond_to?(:array) && left_column.array
-          "#{visit o.left} @> #{visit o.right}"
+          "#{visit o.left, a} @> #{visit o.right, o.left}"
         else
-          "#{visit o.left} >> #{visit o.right}"
+          "#{visit o.left, a} >> #{visit o.right, o.left}"
         end
       end
 
-      def visit_Arel_Nodes_ContainsEquals o
-        "#{visit o.left} >>= #{visit o.right}"
+      def visit_Arel_Nodes_ContainsEquals o, a = nil
+        "#{visit o.left, a} >>= #{visit o.right, o.left}"
       end
 
-      def visit_Arel_Nodes_Overlap o
-        "#{visit o.left} && #{visit o.right}"
+      def visit_Arel_Nodes_Overlap o, a = nil
+        "#{visit o.left, a} && #{visit o.right, o.left}"
       end
 
-      def visit_IPAddr value
+      def visit_IPAddr value, a = nil
         "'#{value.to_s}/#{value.instance_variable_get(:@mask_addr).to_s(2).count('1')}'"
       end
     end

data/lib/postgres_ext/version.rb

@@ -1,3 +1,3 @@
 module PostgresExt
-  VERSION = '2.1.2'
+  VERSION = '2.1.3'
 end

data/postgres_ext.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.version       = PostgresExt::VERSION
 
   gem.add_dependency 'activerecord', '~> 4.0.0'
-  gem.add_dependency 'arel', '~> 4.0.0'
+  gem.add_dependency 'arel', '~> 4.0.1'
   gem.add_dependency 'pg_array_parser', '~> 0.0.9'
 
   gem.add_development_dependency 'rails', '~> 4.0.0'

data/spec/queries/window_functions_spec.rb

@@ -23,8 +23,8 @@ describe 'Window functions' do
     end
 
     it 'uses the rank value when a string passed to it' do
-      query = Person.ranked('lucky_number desc')
-      query.to_sql.should eq 'SELECT "people".*, rank() OVER (ORDER BY lucky_number desc) FROM "people"'
+      query = Person.ranked('ORDER BY lucky_number DESC')
+      query.to_sql.should eq 'SELECT "people".*, rank() OVER (ORDER BY lucky_number DESC) FROM "people"'
     end
 
     it 'combines the order and rank' do
@@ -44,6 +44,11 @@ describe 'Window functions' do
     it 'does not apply the rank when performing a count' do
       query = Person.ranked(lucky_number: :desc).count
       query.should eq 0
+
+      Person.create!
+
+      query = Person.ranked(lucky_number: :desc).count
+      query.should eq 1
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postgres_ext
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Dan McClain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: pg_array_parser
   requirement: !ruby/object:Gem::Requirement
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.0
 signing_key: 
 specification_version: 4
 summary: Extends ActiveRecord to handle native PostgreSQL data types