arel_extensions 1.2.23 → 2.0.0.rc3

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
 
@@ -26,55 +26,41 @@ module ArelExtensions
         [@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.sql('null')
-        else
-          convert_to_node(n)
-        end
-      end
-
-      def type_of_node(v)
-        if v.is_a?(Arel::Attributes::Attribute)
-          self.type_of_attribute(v)
-        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)
+        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
@@ -87,7 +73,11 @@ module ArelExtensions
         @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
@@ -99,6 +89,7 @@ module ArelExtensions
         @dict = json
         @key = convert_to_node(key)
       end
+
     end
 
     class JsonSet < JsonNode
@@ -109,6 +100,8 @@ module ArelExtensions
         @key = convert_to_node(key)
         @value = Json.new(value)
       end
+
     end
+
   end
 end

data/lib/arel_extensions/nodes/length.rb

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

data/lib/arel_extensions/nodes/locate.rb

@@ -9,6 +9,7 @@ module ArelExtensions
         end
         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,8 +1,9 @@
 module ArelExtensions
   module Nodes
     class IMatches < Arel::Nodes::Matches
-      attr_accessor :case_sensitive if Arel::VERSION.to_i < 7
 
+      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
@@ -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

@@ -10,6 +10,7 @@ module ArelExtensions
           super []
         end
       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,8 +11,10 @@ module ArelExtensions
       end
 
       def +(other)
-        return ArelExtensions::Nodes::Concat.new(self.expressions + [other])
+        return ArelExtensions::Nodes::Concat.new(self.expressions + [other]) 
       end
+
     end
+
   end
 end

data/lib/arel_extensions/nodes/replace.rb

@@ -2,34 +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
 
       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,12 +4,13 @@ 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
   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::Nodes.build_quoted(other, self)
-      end
-
-      def !=(other)
-        Arel::Nodes::NotEqual.new self, Arel::Nodes.build_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 node, **opts
-      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
+    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,15 +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
-        tab = [convert_to_node(expr[0]), convert_to_node(expr[1])]
-        if expr[2]
-          tab << convert_to_node(expr[2])
-        end
-        return super(tab)
-      end
     end
   end
 end

data/lib/arel_extensions/nodes/trim.rb

@@ -2,7 +2,7 @@ module ArelExtensions
   module Nodes
     class Trim < Function
       RETURN_TYPE = :string
-
+      
       def initialize expr
         tab = expr.map { |arg|
           convert_to_node(arg)
@@ -11,16 +11,18 @@ module ArelExtensions
       end
 
       def +(other)
-        return ArelExtensions::Nodes::Concat.new(self.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