arel_extensions 1.2.2 → 1.2.13

data/lib/arel_extensions/nodes/duration.rb

@@ -13,12 +13,10 @@ module ArelExtensions
         super(tab, aliaz)
       end
 
-
       def left
         @expressions.first
       end
 
-
       def right
         @expressions[1]
       end

data/lib/arel_extensions/nodes/format.rb

@@ -1,15 +1,15 @@
 module ArelExtensions
   module Nodes
-    class Format < Function      
+    class Format < Function
       RETURN_TYPE = :string
 
-    	attr_accessor :col_type, :iso_format
-    	def initialize expr
-	        col = expr.first
-            @iso_format = expr[1]
-	        @col_type = type_of_attribute(col)
-        	super [col, convert_to_string_node(@iso_format)]
-    	end
+      attr_accessor :col_type, :iso_format
+      def initialize expr
+        col = expr.first
+        @iso_format = expr[1]
+        @col_type = type_of_attribute(col)
+        super [col, convert_to_string_node(@iso_format)]
+      end
     end
   end
 end

data/lib/arel_extensions/nodes/formatted_number.rb

@@ -1,25 +1,25 @@
 module ArelExtensions
-	module Nodes
-		class FormattedNumber < Function		
-			RETURN_TYPE = :string
-			
-			attr_accessor :locale, :prefix, :suffix, :flags, :scientific_notation, :width,:precision, :type, :original_string
-			
-			def initialize expr
-				# expr[1] = {:locale => 'fr_FR', :type => "e"/"f"/"d", :prefix => "$ ", :suffix => " %", :flags => " +-#0", :width => 5, :precision => 6}
-				col = expr.first
-				@locale = expr[1][:locale]
-				@prefix = expr[1][:prefix]
-				@suffix = expr[1][:suffix] 
-				@width = expr[1][:width]
-				@precision = expr[1][:precision]
-				@type = expr[1][:type]
-				@flags = expr[1][:flags]
-				@scientific_notation = /[eE]/.match(expr[1][:type]) || false
-				@original_string = expr[1][:original_string]
-				super [col]
-			end
-			
-		end				
-	end
+  module Nodes
+    class FormattedNumber < Function
+      RETURN_TYPE = :string
+
+      attr_accessor :locale, :prefix, :suffix, :flags, :scientific_notation, :width,:precision, :type, :original_string
+
+      def initialize expr
+        # expr[1] = {:locale => 'fr_FR', :type => "e"/"f"/"d", :prefix => "$ ", :suffix => " %", :flags => " +-#0", :width => 5, :precision => 6}
+        col = expr.first
+        @locale = expr[1][:locale]
+        @prefix = expr[1][:prefix]
+        @suffix = expr[1][:suffix]
+        @width = expr[1][:width]
+        @precision = expr[1][:precision]
+        @type = expr[1][:type]
+        @flags = expr[1][:flags]
+        @scientific_notation = /[eE]/.match(expr[1][:type]) || false
+        @original_string = expr[1][:original_string]
+        super [col]
+      end
+
+    end
+  end
 end

data/lib/arel_extensions/nodes/function.rb

@@ -32,6 +32,14 @@ module ArelExtensions
         @expressions[1]
       end
 
+      def ==(other)
+        Arel::Nodes::Equality.new self, Arel::Nodes.build_quoted(other, self)
+      end
+
+      def !=(other)
+        Arel::Nodes::NotEqual.new self, Arel::Nodes.build_quoted(other, self)
+      end
+
       def type_of_attribute(att)
         case att
         when Arel::Attributes::Attribute
@@ -63,6 +71,8 @@ module ArelExtensions
           Arel.sql('NULL')
         when ActiveSupport::Duration
           Arel.sql(object.to_i)
+        when Array
+          Arel::Nodes::Grouping.new(object.map{|r| convert_to_node(e)})
         else
           raise(ArgumentError, "#{object.class} can not be converted to CONCAT arg")
         end

data/lib/arel_extensions/nodes/is_null.rb

@@ -1,13 +1,15 @@
+require 'arel_extensions/boolean_functions'
+
 module ArelExtensions
   module Nodes
-    class IsNull < Function
-    	RETURN_TYPE = :boolean
-    	
+    class IsNull < Arel::Nodes::Unary
+      include ArelExtensions::BooleanFunctions
+      RETURN_TYPE = :boolean
+    end
+
+    class IsNotNull < Arel::Nodes::Unary
+      include ArelExtensions::BooleanFunctions
+      RETURN_TYPE = :boolean
     end
-    
-    class IsNotNull < Function
-    	RETURN_TYPE = :boolean
-    	
-    end    
   end
 end

data/lib/arel_extensions/nodes/json.rb

@@ -18,7 +18,7 @@ module ArelExtensions
         JsonSet.new(self,key,value)
       end
 
-      def group as_array = true, orders= nil
+      def group as_array = true, orders = nil
         JsonGroup.new(self,as_array, orders)
       end
 
@@ -31,33 +31,35 @@ module ArelExtensions
     class Json < JsonNode
 
       def initialize *expr
-        if expr.length == 1
-          case expr.first
-          when JsonNode
-            @dict = expr.first.dict
-          when Array
-            @dict = expr.first.map{|e|
-              (e.is_a?(Array) || e.is_a?(Hash)) ? Json.new(e) : convert_to_node(e)
-            }
-          when Hash
-            @dict = expr.first.inject({}){|acc,v|
-              acc[convert_to_node(v[0])] =  (v[1].is_a?(Array) || v[1].is_a?(Hash)) ? Json.new(v[1]) :  convert_to_node(v[1])
-              acc
-            }
-          when String, Numeric, TrueClass, FalseClass
-            @dict = convert_to_node(expr.first)
-          when NilClass
-            @dict = Arel.sql('null')
-          else
-            if expr.first.is_a?(String) || (expr.first.is_a?(Arel::Attributes::Attribute) && type_of_attribute(expr.first) == :string) || (expr.first.return_type == :string)
-              @dict = convert_to_node(expr.first)
+        @dict =
+          if expr.length == 1
+            case exp = expr.first
+            when JsonNode
+              exp.dict
+            when Array
+              exp.map{|e|
+                (e.is_a?(Array) || e.is_a?(Hash)) ? Json.new(e) : convert_to_node(e)
+              }
+            when Hash
+              exp.reduce({}){|acc,v|
+                acc[convert_to_node(v[0])] = (v[1].is_a?(Array) || v[1].is_a?(Hash)) ? Json.new(v[1]) : convert_to_node(v[1])
+                acc
+              }
+            when String, Numeric, TrueClass, FalseClass
+              convert_to_node(exp)
+            when NilClass
+              Arel.sql('null')
             else
-              @dict = [convert_to_node(expr.first)]
+              if (exp.is_a?(Arel::Attributes::Attribute) && type_of_attribute(exp) == :string) \
+                 || (exp.return_type == :string)
+                convert_to_node(exp)
+              else
+                [convert_to_node(exp)]
+              end
             end
+          else
+            expr.map{|e| (e.is_a?(Array) || e.is_a?(Hash)) ? Json.new(e) : convert_to_node(e) }
           end
-        else
-          @dict = expr.map{|e| (e.is_a?(Array) || e.is_a?(Hash)) ? Json.new(e) : convert_to_node(e) }
-        end
         super
       end
 
@@ -73,11 +75,7 @@ module ArelExtensions
         @dict = as_array ? json : json.dict
         @as_array = as_array
         if orders
-          if orders.is_a?(Array)
-            @orders = orders
-          else
-            @orders = [orders]
-          end
+          @orders = Array(orders)
         end
       end
     end

data/lib/arel_extensions/nodes/levenshtein_distance.rb

@@ -1,11 +1,11 @@
 module ArelExtensions
   module Nodes
     class LevenshteinDistance < Function
-    	RETURN_TYPE = :number
-		
-		def initialize expr
-		  super [convert_to_node(expr.first), Arel::Nodes.build_quoted(expr[1])]		  
-		end
+      RETURN_TYPE = :number
+
+      def initialize expr
+        super [convert_to_node(expr.first), Arel::Nodes.build_quoted(expr[1])]
+      end
     end
   end
 end

data/lib/arel_extensions/nodes/locate.rb

@@ -1,14 +1,14 @@
 module ArelExtensions
   module Nodes
     class Locate < Function
-    	RETURN_TYPE = :integer
+      RETURN_TYPE = :integer
 
-		def initialize expr
-			tab = expr.map do |arg|
-			  convert_to_node(arg)
-			end
-			return super(tab)
-		end
+      def initialize expr
+        tab = expr.map do |arg|
+          convert_to_node(arg)
+        end
+        return super(tab)
+      end
 
     end
   end

data/lib/arel_extensions/nodes/matches.rb

@@ -3,7 +3,7 @@ module ArelExtensions
     class IMatches < Arel::Nodes::Matches
 
       attr_accessor :case_sensitive if Arel::VERSION.to_i < 7
-      
+
       def initialize(left, right, escape = nil)
         r = Arel::Nodes.build_quoted(right)
         if Arel::VERSION.to_i < 7 # managed by default in version 7+ (rails 5), so useful for rails 3 & 4
@@ -17,13 +17,13 @@ module ArelExtensions
 
     class IDoesNotMatch < IMatches
     end
-    
+
     class AiMatches < IMatches
     end
-    
+
     class AiIMatches < IMatches
     end
-    
+
     class SMatches < IMatches
     end
 

data/lib/arel_extensions/nodes/power.rb

@@ -1,11 +1,12 @@
 module ArelExtensions
   module Nodes
     class Power < Function
-    	RETURN_TYPE = :number
-		
-		def initialize expr
-		  super [convert_to_node(expr.first), convert_to_number(expr[1])]		  
-		end
+      RETURN_TYPE = :number
+
+      def initialize expr
+        super [convert_to_node(expr.first), convert_to_number(expr[1])]
+      end
+
     end
   end
 end

data/lib/arel_extensions/nodes/repeat.rb

@@ -2,7 +2,7 @@ module ArelExtensions
   module Nodes
     class Repeat < Function
       RETURN_TYPE = :string
-      
+
       def initialize expr
         tab = expr.map { |arg|
           convert_to_node(arg)
@@ -11,7 +11,7 @@ module ArelExtensions
       end
 
       def +(other)
-        return ArelExtensions::Nodes::Concat.new(self.expressions + [other]) 
+        return ArelExtensions::Nodes::Concat.new(self.expressions + [other])
       end
 
     end

data/lib/arel_extensions/nodes/replace.rb

@@ -2,18 +2,36 @@ module ArelExtensions
   module Nodes
     class Replace < Function
       RETURN_TYPE = :string
+      attr_accessor :left, :pattern, :substitute
 
-      def initialize expr
-        tab = expr.map { |arg|
-          convert_to_node(arg)
-        }
-        return super(tab)
+      def initialize left, pattern, substitute
+        @left = convert_to_node(left)
+        @pattern = convert_to_node(pattern)
+        @substitute = convert_to_node(substitute)
+        super([@left,@pattern,@substitute])
       end
 
       def +(other)
-        return ArelExtensions::Nodes::Concat.new(self.expressions + [other]) 
+        return ArelExtensions::Nodes::Concat.new(self.expressions + [other])
       end
 
     end
+
+    class RegexpReplace < Function
+      RETURN_TYPE = :string
+      attr_accessor :left, :pattern, :substitute
+
+      def initialize left, pattern, substitute
+        @left = convert_to_node(left)
+        @pattern = (pattern.is_a?(Regexp) ? pattern : %r[#{pattern}])
+        @substitute = convert_to_node(substitute)
+        super([@left,@pattern,@substitute])
+      end
+
+      def +(other)
+        return ArelExtensions::Nodes::Concat.new(self.expressions + [other])
+      end
+    end
+
   end
 end

data/lib/arel_extensions/nodes/round.rb

@@ -4,11 +4,11 @@ module ArelExtensions
       RETURN_TYPE = :number
 
       def initialize expr
-      	if expr && expr.length == 1
-      		super [convert_to_node(expr.first)]
-      	else
-      		super [convert_to_node(expr.first), convert_to_number(expr[1])]
-      	end
+        if expr && expr.length == 1
+          super [convert_to_node(expr.first)]
+        else
+          super [convert_to_node(expr.first), convert_to_number(expr[1])]
+        end
       end
 
     end

data/lib/arel_extensions/nodes/soundex.rb

@@ -1,18 +1,19 @@
 module ArelExtensions
-	module Nodes
-		class Soundex < Function	
-			include Arel::Expressions
-			include ArelExtensions::Comparators			
-							
-			RETURN_TYPE = :string
-				
-			def ==(other)
-				Arel::Nodes::Equality.new self, Arel::Nodes.build_quoted(other, self)
-			end
+  module Nodes
+    class Soundex < Function
+      include Arel::Expressions
+      include ArelExtensions::Comparators
 
-			def !=(other)
-				Arel::Nodes::NotEqual.new self, Arel::Nodes.build_quoted(other, self)
-			end
-		end
-	end
+      RETURN_TYPE = :string
+
+      def ==(other)
+        Arel::Nodes::Equality.new self, Arel::Nodes.build_quoted(other, self)
+      end
+
+      def !=(other)
+        Arel::Nodes::NotEqual.new self, Arel::Nodes.build_quoted(other, self)
+      end
+
+    end
+  end
 end

data/lib/arel_extensions/nodes/std.rb

@@ -1,26 +1,24 @@
 module ArelExtensions
   module Nodes
-    class Std < Function
-    	RETURN_TYPE = :number
-    	
-		attr_accessor :unbiased_estimator
-    	def initialize expr
-	        col = expr.first
-            @unbiased_estimator = expr[1]
-        	super [col]
-    	end    	
+    class Std < AggregateFunction
+      RETURN_TYPE = :number
+      attr_accessor :unbiased_estimator
+
+      def initialize node, opts = {}
+        @unbiased_estimator = opts[:unbiased] ? true : false
+        super node, opts
+      end
     end
-    
-    class Variance < Function
-    	RETURN_TYPE = :number
-    	
-		attr_accessor :unbiased_estimator
-    	def initialize expr
-	        col = expr.first
-            @unbiased_estimator = expr[1]
-        	super [col]
-    	end    	
-    end    
-    
+
+    class Variance < AggregateFunction
+      RETURN_TYPE = :number
+      attr_accessor :unbiased_estimator
+
+      def initialize node, opts = {}
+        @unbiased_estimator = opts[:unbiased] ? true : false
+        super node, opts
+      end
+    end
+
   end
 end