arel_extensions 1.7.0 → 2.0.0.rc3

data/lib/arel_extensions/nodes/json.rb

@@ -5,94 +5,62 @@ module ArelExtensions
 
       attr_accessor :dict
 
-      def merge(*expr)
-        args = [self] + expr.map { |e| Json.new(e) }
+      def merge *expr
+        args = [self] + expr.map{|e| Json.new(e)}
         JsonMerge.new(args)
       end
 
-      def get(key)
-        JsonGet.new(self, key)
+      def get key
+        JsonGet.new(self,key)
       end
 
-      def set(key, value)
-        JsonSet.new(self, key, value)
+      def set key, value
+        JsonSet.new(self,key,value)
       end
 
-      def group(as_array = true, orders = nil, distinct: false)
-        if distinct
-          JsonGroup.new(Arel::Nodes::NamedFunction.new('DISTINCT', [self]), as_array, orders)
-        else
-          JsonGroup.new(self, as_array, orders)
-        end
+      def group as_array = true, orders= nil
+        JsonGroup.new(self,as_array, orders)
       end
 
       def hash
         [@dict].hash
       end
 
-      def convert_to_json_node(n)
-        case n
-        when JsonNode
-          n.dict
-        when Array
-          n.map { |e|
-            e.is_a?(Array) || e.is_a?(Hash) ? Json.new(e) : convert_to_json_node(e)
-          }
-        when Hash
-          n.reduce({}) { |acc, v|
-            acc[convert_to_json_node(v[0])] = v[1].is_a?(Array) || v[1].is_a?(Hash) ? Json.new(v[1]) : convert_to_json_node(v[1])
-            acc
-          }
-        when String, Numeric, TrueClass, FalseClass
-          convert_to_node(n)
-        when Date
-          convert_to_node(n.strftime('%Y-%m-%d'))
-        when DateTime, Time
-          convert_to_node(n.strftime('%Y-%m-%dT%H:%M:%S.%L%:z'))
-        when NilClass
-          Arel.null
-        when Arel::SelectManager
-          Arel.grouping(n)
-        else
-          convert_to_node(n)
-        end
-      end
-
-      # A boolean literal, either bare (TrueClass/FalseClass) or wrapped in a Quoted node
-      # (which is how `convert_to_node` represents one after construction).
-      def boolean_literal?(v)
-        v.is_a?(TrueClass) \
-          || v.is_a?(FalseClass) \
-          || (v.is_a?(Arel::Nodes::Quoted) && [true, false].include?(v.expr))
-      end
-
-      def type_of_node(v)
-        if v.is_a?(Arel::Attributes::Attribute)
-          type_of_attribute(v)
-        elsif v.is_a?(Numeric)
-          :numeric
-        elsif boolean_literal?(v)
-          :boolean
-        elsif v.respond_to?(:return_type)
-          v.return_type
-        elsif v.nil?
-          :nil
-        else
-          :string
-        end
-      end
     end
 
     class Json < JsonNode
-      def initialize(*expr)
-        @dict =
-          if expr.length == 1
-            convert_to_json_node(expr.first)
+
+      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
-            expr.map { |e| convert_to_json_node(e) }
+            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)
+            else
+              @dict = [convert_to_node(expr.first)]
+            end
           end
+        else
+          @dict = expr.map{|e| (e.is_a?(Array) || e.is_a?(Hash)) ? Json.new(e) : convert_to_node(e) }
+        end
         super
       end
+
     end
 
     class JsonMerge < JsonNode
@@ -101,11 +69,15 @@ module ArelExtensions
     class JsonGroup < JsonNode
       attr_accessor :as_array, :orders
 
-      def initialize(json, as_array = true, orders = nil)
+      def initialize json, as_array = true, orders = nil
         @dict = as_array ? json : json.dict
         @as_array = as_array
         if orders
-          @orders = Array(orders)
+          if orders.is_a?(Array)
+            @orders = orders
+          else
+            @orders = [orders]
+          end
         end
       end
     end
@@ -113,20 +85,23 @@ module ArelExtensions
     class JsonGet < JsonNode
       attr_accessor :key
 
-      def initialize(json, key)
+      def initialize json, key
         @dict = json
         @key = convert_to_node(key)
       end
+
     end
 
     class JsonSet < JsonNode
       attr_accessor :key, :value
 
-      def initialize(json, key, value)
+      def initialize json, key, value
         @dict = json
         @key = convert_to_node(key)
         @value = Json.new(value)
       end
+
     end
+
   end
 end

data/lib/arel_extensions/nodes/length.rb

@@ -2,12 +2,7 @@ module ArelExtensions
   module Nodes
     class Length < Function
       RETURN_TYPE = :integer
-      attr_accessor :bytewise
 
-      def initialize(node, bytewise = true)
-        @bytewise = bytewise
-        super([node])
-      end
     end
   end
 end

data/lib/arel_extensions/nodes/levenshtein_distance.rb

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

data/lib/arel_extensions/nodes/locate.rb

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

data/lib/arel_extensions/nodes/log10.rb

@@ -1,7 +1,8 @@
 module ArelExtensions
   module Nodes
     class Log10 < Function
-      RETURN_TYPE = :number
+    	RETURN_TYPE = :number
+
     end
   end
 end

data/lib/arel_extensions/nodes/matches.rb

@@ -1,11 +1,12 @@
 module ArelExtensions
   module Nodes
     class IMatches < Arel::Nodes::Matches
-      attr_accessor :case_sensitive if AREL_VERSION < V7
 
+      attr_accessor :case_sensitive if Arel::VERSION.to_i < 7
+      
       def initialize(left, right, escape = nil)
-        r = Arel.quoted(right)
-        if AREL_VERSION < V7 # managed by default in version 7+ (rails 5), so useful for rails 3 & 4
+        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
           super(left, r, escape)
           @case_sensitive = false
         else
@@ -16,14 +17,15 @@ module ArelExtensions
 
     class IDoesNotMatch < IMatches
     end
-
+    
     class AiMatches < IMatches
     end
-
+    
     class AiIMatches < IMatches
     end
-
+    
     class SMatches < IMatches
     end
+
   end
 end

data/lib/arel_extensions/nodes/md5.rb

@@ -2,6 +2,7 @@ module ArelExtensions
   module Nodes
     class MD5 < Function
       RETURN_TYPE = :string
+
     end
   end
 end

data/lib/arel_extensions/nodes/power.rb

@@ -1,11 +1,11 @@
 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/rand.rb

@@ -5,11 +5,12 @@ module ArelExtensions
 
       def initialize(seed = nil)
         if seed && seed.length == 1
-          super
+          super seed
         else
-          super([])
+          super []
         end
       end
+
     end
   end
 end

data/lib/arel_extensions/nodes/repeat.rb

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

data/lib/arel_extensions/nodes/replace.rb

@@ -2,26 +2,18 @@ module ArelExtensions
   module Nodes
     class Replace < Function
       RETURN_TYPE = :string
-      attr_accessor :left, :pattern, :substitute
 
-      def initialize(left, pattern, substitute)
-        @left = convert_to_node(left)
-        @pattern = convert_to_node(pattern)
-        @substitute = convert_to_node(substitute)
-        super([@left, @pattern, @substitute])
+      def initialize expr
+        tab = expr.map { |arg|
+          convert_to_node(arg)
+        }
+        return super(tab)
       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 : /#{pattern}/)
-        @substitute = convert_to_node(substitute)
-        super([@left, @pattern, @substitute])
+      def +(other)
+        return ArelExtensions::Nodes::Concat.new(self.expressions + [other]) 
       end
+
     end
   end
 end

data/lib/arel_extensions/nodes/round.rb

@@ -3,13 +3,14 @@ module ArelExtensions
     class Round < Function
       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
+      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
       end
+
     end
   end
 end

data/lib/arel_extensions/nodes/soundex.rb

@@ -1,18 +1,18 @@
 module ArelExtensions
-  module Nodes
-    class Soundex < Function
-      include Arel::Expressions
-      include ArelExtensions::Comparators
+	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
 
-      RETURN_TYPE = :string
-
-      def ==(other)
-        Arel::Nodes::Equality.new self, Arel.quoted(other, self)
-      end
-
-      def !=(other)
-        Arel::Nodes::NotEqual.new self, Arel.quoted(other, self)
-      end
-    end
-  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,23 +1,26 @@
 module ArelExtensions
   module Nodes
-    class Std < AggregateFunction
-      RETURN_TYPE = :number
-      attr_accessor :unbiased_estimator
-
-      def initialize(node, **opts)
-        @unbiased_estimator = opts[:unbiased] ? true : false
-        super
-      end
-    end
-
-    class Variance < AggregateFunction
-      RETURN_TYPE = :number
-      attr_accessor :unbiased_estimator
-
-      def initialize(node, **opts)
-        @unbiased_estimator = opts[:unbiased] ? true : false
-        super
-      end
+    class Std < Function
+    	RETURN_TYPE = :number
+    	
+		attr_accessor :unbiased_estimator
+    	def initialize expr
+	        col = expr.first
+            @unbiased_estimator = expr[1]
+        	super [col]
+    	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    
+    
   end
 end

data/lib/arel_extensions/nodes/substring.rb

@@ -1,65 +1,23 @@
 module ArelExtensions
   module Nodes
     class Substring < Function
-      RETURN_TYPE = :string
+    	RETURN_TYPE = :string
+
+		def initialize expr
+			tab = [convert_to_node(expr[0]), convert_to_node(expr[1])]
+			if expr[2]
+				tab << convert_to_node(expr[2])
+#			else
+#				tab << expr[0].length
+			end
+			return super(tab)
+		end
+
+#		def +(other)
+#			puts "[Substring] : #{other.inspect} (#{self.expressions.inspect})"
+#	        return ArelExtensions::Nodes::Concat.new(self.expressions + [other]) 
+#		end
 
-      def initialize(expr)
-        start = expr[1]
-        if start.is_a?(Range) && expr[2]
-          raise ArgumentError, 'cannot pass a length together with a Range start; the Range already determines the extracted length'
-        end
-
-        tab = [convert_to_node(expr[0]), start.is_a?(Range) ? start : convert_to_node(start)]
-        if expr[2]
-          tab << convert_to_node(expr[2])
-        end
-        super(tab)
-      end
-
-      def range?
-        expressions[1].is_a?(Range)
-      end
-
-      # Builds the vendor-agnostic Arel node tree reproducing Ruby's
-      # `String#[Range]` semantics: endless/beginless ranges, negative
-      # "from the end" indices, `exclude_end?`, and Ruby's `nil`-vs-`""`
-      # distinction (out of range vs valid-but-empty).
-      #
-      # Only meaningful when `#range?` is true; visitors need to check
-      # that first, then `visit` the node this returns.
-      def range_substring_node
-        col = expressions[0]
-        range = expressions[1]
-        b = range.begin
-        e = range.end
-        n = col.char_length
-
-        b_idx =
-          if b.nil?
-            0
-          elsif b.negative?
-            n + b
-          else
-            b
-          end
-
-        e_idx =
-          if e.nil?
-            n
-          else
-            raw = e.negative? ? n + e : e
-            range.exclude_end? ? raw : raw + 1
-          end
-
-        e_idx_clamped = Arel.when(n < e_idx).then(n).else(e_idx)
-
-        cases = Arel.when(col.is_null).then(Arel.quoted(nil))
-        cases = cases.when(n < b_idx).then(Arel.quoted(nil))
-        cases = cases.when(b_idx < 0).then(Arel.quoted(nil)) if b.is_a?(Integer) && b.negative?
-        cases
-          .when(e_idx_clamped <= b_idx).then(Arel.quoted(''))
-          .else(Substring.new([col, b_idx + 1, e_idx_clamped - b_idx]))
-      end
     end
   end
 end

data/lib/arel_extensions/nodes/then.rb

@@ -1,11 +1,11 @@
 module ArelExtensions
   module Nodes
     class Then < Function
-      def initialize(expr)
+      def initialize expr
         tab = expr.map { |arg|
           convert_to_node(arg)
         }
-        super(tab)
+        return super(tab)
       end
     end
   end

data/lib/arel_extensions/nodes/trim.rb

@@ -2,25 +2,27 @@ module ArelExtensions
   module Nodes
     class Trim < Function
       RETURN_TYPE = :string
-
-      def initialize(expr)
+      
+      def initialize expr
         tab = expr.map { |arg|
           convert_to_node(arg)
         }
-        super(tab)
+        return super(tab)
       end
 
       def +(other)
-        ArelExtensions::Nodes::Concat.new(expressions + [other])
+        return ArelExtensions::Nodes::Concat.new(self.expressions + [other]) 
       end
+
     end
 
     class Ltrim < Trim
-      RETURN_TYPE = :string
+	  RETURN_TYPE = :string
     end
 
     class Rtrim < Trim
       RETURN_TYPE = :string
     end
+
   end
 end

data/lib/arel_extensions/nodes/union.rb

@@ -1,21 +1,24 @@
 module ArelExtensions
   module Nodes
     class Union < Arel::Nodes::Union
-      def initialize(left, right)
-        super
+
+      def initialize left,right
+        return super(left,right)
       end
 
       def +(other)
-        ArelExtensions::Nodes::Union.new(self, other)
+        return ArelExtensions::Nodes::Union.new(self,other) 
       end
 
       def union(other)
-        ArelExtensions::Nodes::UnionAll.new(self, other)
+        return ArelExtensions::Nodes::UnionAll.new(self,other) 
       end
 
-      def as(other)
-        Arel::Nodes::TableAlias.new Arel.grouping(self), Arel::Nodes::SqlLiteral.new(other.to_s)
+      def as other
+        Arel::Nodes::TableAlias.new Arel::Nodes::Grouping.new(self), Arel::Nodes::SqlLiteral.new(other.to_s)
       end
     end
+
   end
 end
+

data/lib/arel_extensions/nodes/union_all.rb

@@ -1,17 +1,20 @@
 module ArelExtensions
   module Nodes
     class UnionAll < Arel::Nodes::UnionAll
-      def initialize(left, right)
-        super
+
+      def initialize left,right
+        return super(left,right)
       end
 
       def union_all(other)
-        ArelExtensions::Nodes::UnionAll.new(self, other)
+        return ArelExtensions::Nodes::UnionAll.new(self,other)
       end
 
-      def as(other)
-        Arel::Nodes::TableAlias.new Arel.grouping(self), Arel::Nodes::SqlLiteral.new(other.to_s)
+      def as other
+        Arel::Nodes::TableAlias.new Arel::Nodes::Grouping.new(self), Arel::Nodes::SqlLiteral.new(other.to_s)
       end
     end
+
   end
 end
+

data/lib/arel_extensions/nodes/wday.rb

@@ -1,15 +1,19 @@
 module ArelExtensions
   module Nodes
     class Wday < Function
-      def initialize(other, aliaz = nil)
-        tab = []
+
+
+      def initialize other, aliaz = nil
+        tab = Array.new
         tab << other
         super(tab, aliaz)
       end
 
+
       def date
         @expressions.first
       end
+
     end
   end
 end

data/lib/arel_extensions/nodes.rb

@@ -1,2 +1,2 @@
 require 'arel_extensions/nodes/function'
-require 'arel_extensions/nodes/aggregate_function'
+