ar_pg_array 0.9.5 → 0.9.6

data/VERSION

@@ -1 +1 @@
-0.9.5
+0.9.6

data/lib/ar_pg_array/querying_arel.rb

@@ -1,80 +1,169 @@
-module Arel
-  module Predicates
-    class ArrayAny < Binary
-      def eval(row)
-        !(operand1.eval(row) & operand2.eval(row)).empty?
+if Arel::VERSION >= '2.0'
+  module Arel
+    module Nodes
+      class ArrayAny < Arel::Nodes::Binary
       end
-    
-      def predicate_sql
-        "&&"
+
+      class ArrayAll < Arel::Nodes::Binary
+      end
+
+      class ArrayIncluded < Arel::Nodes::Binary
       end
     end
-    
-    class ArrayAll < Binary
-      def eval(row)
-        (operand2.eval(row) - operand1.eval(row)).empty?
+
+    module Predications
+      def ar_any other
+        Nodes::ArrayAny.new self, other
       end
-      
-      def predicate_sql
-        "@>"
+
+      def ar_all other
+        Nodes::ArrayAll.new self, other
       end
-    end
-    
-    class ArrayIncluded < Binary
-      def eval(row)
-        (operand1.eval(row) - operand2.eval(row)).empty?
+
+      def ar_included other
+        Nodes::ArrayIncluded.new self, other
       end
-      
-      def predicate_sql
-        "<@"
+    end
+
+    module Visitors
+      class PostgreSQL
+        def visit_Arel_Nodes_ArrayAny o
+          "#{visit o.left} && #{visit o.right}"
+        end
+
+        def visit_Arel_Nodes_ArrayAll o
+          "#{visit o.left} @> #{visit o.right}"
+        end
+
+        def visit_Arel_Nodes_ArrayIncluded o
+          "#{visit o.left} <@ #{visit o.right}"
+        end
+
+        def visit_PGArrays_PgArray o
+          @connection.quote_array_for_arel_by_base_type(o, o.base_type)
+        end
+
+        alias :visit_PGArrays_PgAny :visit_PGArrays_PgArray
+        alias :visit_PGArrays_PgAll :visit_PGArrays_PgArray
+        alias :visit_PGArrays_PgIncluded :visit_PGArrays_PgArray
       end
     end
   end
-  
-  class Attribute
-    methods = lambda do
-      def ar_any(other)
-        Predicates::ArrayAny.new(self, other)
-      end
+else
+  module Arel
+    module Predicates
+      class ArrayAny < Binary
+        def eval(row)
+          !(operand1.eval(row) & operand2.eval(row)).empty?
+        end
       
-      def ar_all(other)
-        Predicates::ArrayAll.new(self, other)
+        def predicate_sql
+          "&&"
+        end
       end
       
-      def ar_included(other)
-        Predicates::ArrayIncluded.new(self, other)
+      class ArrayAll < Binary
+        def eval(row)
+          (operand2.eval(row) - operand1.eval(row)).empty?
+        end
+        
+        def predicate_sql
+          "@>"
+        end
       end
       
-      def in(other)
-        case other
-        when ::PGArrays::PgAny
-          ar_any(other)
-        when ::PGArrays::PgAll
-          ar_all(other)
-        when ::PGArrays::PgIncludes
-          ar_included(other)
-        else
-          Predicates::In.new(self, other)
+      class ArrayIncluded < Binary
+        def eval(row)
+          (operand1.eval(row) - operand2.eval(row)).empty?
+        end
+        
+        def predicate_sql
+          "<@"
         end
       end
     end
-    if defined? PREDICATES
-      PREDICATES.concat [:ar_any, :ar_all, :ar_included]
-      class_exec &methods
-    else
-      Predications.class_exec &methods
+    
+    class Attribute
+      methods = lambda do
+        def ar_any(other)
+          Predicates::ArrayAny.new(self, other)
+        end
+        
+        def ar_all(other)
+          Predicates::ArrayAll.new(self, other)
+        end
+        
+        def ar_included(other)
+          Predicates::ArrayIncluded.new(self, other)
+        end
+      end
+      if defined? PREDICATES
+        PREDICATES.concat [:ar_any, :ar_all, :ar_included]
+        class_exec &methods
+      else
+        Predications.class_exec &methods
+      end
     end
   end
-end
 
-module PGArrays
-  class PgArray
-    def to_sql( formatter = nil )
-      formatter.engine.connection.quote_array_for_arel_by_base_type(self, base_type)
+  module PGArrays
+    class PgArray
+      def to_sql( formatter = nil )
+        formatter.engine.connection.quote_array_for_arel_by_base_type(self, base_type)
+      end
+      
+      def to_a
+        self
+      end
     end
-    
-    def to_a
-      self
+  end
+end
+
+module ActiveRecord
+  class PredicateBuilder
+    def build_from_hash(attributes, default_table)
+      predicates = attributes.map do |column, value|
+        table = default_table
+
+        if value.is_a?(Hash)
+          table = Arel::Table.new(column, :engine => @engine)
+          build_from_hash(value, table)
+        else
+          column = column.to_s
+
+          if column.include?('.')
+            table_name, column = column.split('.', 2)
+            table = Arel::Table.new(table_name, :engine => @engine)
+          end
+
+          attribute = table[column] || Arel::Attribute.new(table, column)
+
+          case value
+          when PGArrays::PgAny
+            attribute.ar_any(value)
+          when PGArrays::PgAll
+            attribute.ar_all(value)
+          when PGArrays::PgIncludes
+            attribute.ar_included(value)
+          when Array, ActiveRecord::Associations::AssociationCollection, ActiveRecord::Relation
+            values = value.to_a.map { |x|
+              x.is_a?(ActiveRecord::Base) ? x.id : x
+            }
+            attribute.in(values)
+          when Range, Arel::Relation
+            attribute.in(value)
+          when ActiveRecord::Base
+            attribute.eq(value.id)
+          when Class
+            # FIXME: I think we need to deprecate this behavior
+            attribute.eq(value.name)
+          else
+            attribute.eq(value)
+          end
+        end
+      end
+
+      predicates.flatten
     end
   end
 end

data/lib/ar_pg_array/schema_arel.rb

@@ -65,26 +65,41 @@ module Arel
     end
   end
 
-  module Sql
+  if Arel::VERSION < '2.0'
+    module Sql
+      module Attributes
+        class << self
+          def for_with_postgresql_arrays(column)
+            if column.type.to_s =~ /^(.+)_array$/
+              ('Arel::Sql::Attributes::' + for_without_postgresql_arrays(column.base_column).name.split('::').last + 'Array').constantize
+            else
+              for_without_postgresql_arrays(column)
+            end
+          end
+          alias_method_chain :for, :postgresql_arrays
+        end
+        
+        %w{Integer Float Decimal Boolean String Time}.each do |basetype|
+          module_eval <<-"END"
+            class #{basetype}Array < Arel::Attributes::#{basetype}Array
+              include Attributes
+            end
+          END
+        end
+      end
+    end
+  else
     module Attributes
       class << self
         def for_with_postgresql_arrays(column)
           if column.type.to_s =~ /^(.+)_array$/
-            ('Arel::Sql::Attributes::' + for_without_postgresql_arrays(column.base_column).name.split('::').last + 'Array').constantize
+            ('Arel::Attributes::' + for_without_postgresql_arrays(column.base_column).name.split('::').last + 'Array').constantize
           else
             for_without_postgresql_arrays(column)
           end
         end
         alias_method_chain :for, :postgresql_arrays
       end
-      
-      %w{Integer Float Decimal Boolean String Time}.each do |basetype|
-        module_eval <<-"END"
-          class #{basetype}Array < Arel::Attributes::#{basetype}Array
-            include Attributes
-          end
-        END
-      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar_pg_array
 version: !ruby/object:Gem::Version 
-  hash: 49
-  prerelease: false
+  hash: 55
+  prerelease: 
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Sokolov Yura aka funny_falcon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-20 00:00:00 +03:00
+date: 2011-04-13 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ar-pg-array
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Use power of PostgreSQL Arrays in ActiveRecord