arel_extensions 1.1.8 → 1.1.9

data/lib/arel_extensions/math_functions.rb

@@ -11,6 +11,26 @@ require 'arel_extensions/nodes/std'
 module ArelExtensions
   module MathFunctions
 
+    # Arel does not handle Decimal literal properly
+    def * other
+      case other
+      when Float, BigDecimal
+        super(Arel::Nodes.build_quoted(other))
+      else
+        super(other)
+      end
+    end
+
+    # Arel does not handle Decimal literal properly
+    def / other
+      case other
+      when Float, BigDecimal
+        super(Arel::Nodes.build_quoted(other))
+      else
+        super(other)
+      end
+    end
+
     # Abs function returns the absolute value of a number passed as argument #
     def abs
         ArelExtensions::Nodes::Abs.new [self]
@@ -25,32 +45,31 @@ module ArelExtensions
     def floor
         ArelExtensions::Nodes::Floor.new [self]
     end
-    
-     # function gives the base 10 log 
+
+     # function gives the base 10 log
     def log10
         ArelExtensions::Nodes::Log10.new [self]
     end
-    
+
     # function gives the power of a number
     def pow exposant = 0
         ArelExtensions::Nodes::Power.new [self,exposant]
     end
-    
+
     # function gives the power of a number
     def power exposant = 0
         ArelExtensions::Nodes::Power.new [self,exposant]
     end
-    
-    # Aggregate Functions 
+
+    # Aggregate Functions
     def std unbiased = true
-		ArelExtensions::Nodes::Std.new [self,unbiased]
+      ArelExtensions::Nodes::Std.new [self,unbiased]
     end
-    
+
     def variance unbiased = true
-		ArelExtensions::Nodes::Variance.new [self,unbiased]
+      ArelExtensions::Nodes::Variance.new [self,unbiased]
     end
 
-
     #function that can be invoked to produce random numbers between 0 and 1
 #    def rand seed = nil
 #        ArelExtensions::Nodes::Rand.new [seed]
@@ -65,28 +84,28 @@ module ArelExtensions
             ArelExtensions::Nodes::Round.new [self]
         end
     end
-    
+
     # function returning a number at a specific format
-	def format_number format_string, locale=nil
-		begin
-			sprintf(format_string,0) # this line is to get the right error message if the format_string is not correct			
-			m = /^(.*)%([ #+\-0]*)([1-9][0-9]+|[1-9]?)[.]?([0-9]*)([a-zA-Z])(.*)$/.match(format_string)		
-			opts = {
-				:prefix     => m[1],
-				:flags      => m[2].split(//).uniq.join,
-				:width      => m[3].to_i,
-				:precision  => m[4] != '' ? m[4].to_i : 6,
-				:type       => m[5],
-				:suffix     => m[6],
-				:locale		=> locale,
-				:original_string => format_string
-			}
-			# opts = {:locale => 'fr_FR', :type => "e"/"f"/"d", :prefix => "$ ", :suffix => " %", :flags => " +-#0", :width => 5, :precision => 6}
-			ArelExtensions::Nodes::FormattedNumber.new [self,opts]
-		rescue Exception
-			Arel::Nodes.build_quoted('Wrong Format')
-		end
-	end	
+    def format_number format_string, locale=nil
+      begin
+        sprintf(format_string,0) # this line is to get the right error message if the format_string is not correct
+        m = /^(.*)%([ #+\-0]*)([1-9][0-9]+|[1-9]?)[.]?([0-9]*)([a-zA-Z])(.*)$/.match(format_string)
+        opts = {
+          :prefix     => m[1],
+          :flags      => m[2].split(//).uniq.join,
+          :width      => m[3].to_i,
+          :precision  => m[4] != '' ? m[4].to_i : 6,
+          :type       => m[5],
+          :suffix     => m[6],
+          :locale    => locale,
+          :original_string => format_string
+        }
+        # opts = {:locale => 'fr_FR', :type => "e"/"f"/"d", :prefix => "$ ", :suffix => " %", :flags => " +-#0", :width => 5, :precision => 6}
+        ArelExtensions::Nodes::FormattedNumber.new [self,opts]
+      rescue Exception
+        Arel::Nodes.build_quoted('Wrong Format')
+      end
+    end
 
   end
 end

data/lib/arel_extensions/nodes/function.rb

@@ -2,27 +2,26 @@ require 'arel_extensions/predications'
 
 module ArelExtensions
   module Nodes
-    class Function < Arel::Nodes::Function    
+    class Function < Arel::Nodes::Function
       include Arel::Math
-      include Arel::Expressions      
+      include Arel::Expressions
       include Arel::OrderPredications
-	  include ArelExtensions::Predications	
-	  
-	  RETURN_TYPE = :string # by default...
+      include ArelExtensions::Predications
+
+      RETURN_TYPE = :string # by default...
+
+      # overrides as to make new Node like AliasPredication
+
+      def return_type
+        self.class.const_get(:RETURN_TYPE)
+      end
 
-    	# overrides as to make new Node like AliasPredication
-    
-	  def return_type 
-		self.class.const_get(:RETURN_TYPE)
-	  end
-    	
-    	
       def as other
         ArelExtensions::Nodes::As.new(self, Arel.sql(other))
       end
 
       def expr
-       	@expressions.first
+         @expressions.first
       end
 
       def left
@@ -33,14 +32,14 @@ module ArelExtensions
         @expressions[1]
       end
 
-      def type_of_attribute(att)				
+      def type_of_attribute(att)
         case att
         when Arel::Attributes::Attribute
-			begin  
-				Arel::Table.engine.connection.schema_cache.columns_hash(att.relation.table_name)[att.name.to_s].type
-			rescue
-				att
-			end
+          begin
+            Arel::Table.engine.connection.schema_cache.columns_hash(att.relation.table_name)[att.name.to_s].type
+          rescue
+            att
+          end
         when ArelExtensions::Nodes::Function
           att.return_type
 #        else
@@ -53,17 +52,17 @@ module ArelExtensions
         when Arel::Attributes::Attribute, Arel::Nodes::Node, Integer
           object
         when DateTime
-		  Arel::Nodes.build_quoted(object, self)
+          Arel::Nodes.build_quoted(object, self)
         when Time
           Arel::Nodes.build_quoted(object.strftime('%H:%M:%S'), self)
-        when String
-          Arel::Nodes.build_quoted(object)
+        when String, Symbol
+          Arel::Nodes.build_quoted(object.to_s)
         when Date
           Arel::Nodes.build_quoted(object.to_s, self)
         when NilClass
           Arel.sql('NULL')
         when ActiveSupport::Duration
-          object.to_i
+          Arel.sql(object.to_i)
         else
           raise(ArgumentError, "#{object.class} can not be converted to CONCAT arg")
         end
@@ -85,7 +84,7 @@ module ArelExtensions
             object
           end
         when DateTime
-		  Arel::Nodes.build_quoted(object, self)
+          Arel::Nodes.build_quoted(object, self)
         when Time
           Arel::Nodes.build_quoted(object.strftime('%H:%M:%S'), self)
         when String
@@ -93,7 +92,7 @@ module ArelExtensions
         when Date
           Arel::Nodes.build_quoted(object, self)
         when NilClass
-          Arel.sql('NULL')
+          Arel.sql(nil)
         when ActiveSupport::Duration
           Arel::Nodes.build_quoted(object.to_i.to_s)
         else
@@ -145,7 +144,7 @@ module ArelExtensions
           raise(ArgumentError, "#{object.class} can not be converted to NUMBER arg")
         end
       end
-      
+
     end
   end
 end

data/lib/arel_extensions/nodes/json.rb

@@ -0,0 +1,81 @@
+module ArelExtensions
+  module Nodes
+    class JsonNode < Function
+      RETURN_TYPE = :json
+
+      attr_accessor :hash
+
+      def merge *expr
+        args = [self] + expr.map{|e| Json.new(e)}
+        JsonMerge.new(args)
+      end
+
+      def get key
+        JsonGet.new(self,key)
+      end
+
+      def set key, value
+        JsonSet.new(self,key,value)
+      end
+    end
+    
+    class Json < JsonNode
+
+      def initialize *expr
+        if expr.length == 1
+          case expr.first
+          when JsonNode
+            @hash = expr.first.hash
+          when Array
+            @hash = expr.first.map{|e|
+              (e.is_a?(Array) || e.is_a?(Hash)) ? Json.new(e) : convert_to_node(e)
+            }
+          when Hash
+            @hash = 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
+            @hash = convert_to_node(expr.first)
+          when NilClass
+            @hash = 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)
+              @hash = convert_to_node(expr.first)
+            else
+              @hash = [convert_to_node(expr.first)]
+            end
+          end
+        else
+          @hash = expr.map{|e| (e.is_a?(Array) || e.is_a?(Hash)) ? Json.new(e) : convert_to_node(e) }
+        end
+      end
+
+    end
+
+    class JsonMerge < JsonNode
+    end
+
+    class JsonGet < JsonNode
+      attr_accessor :key
+
+      def initialize json, key
+        @hash = json
+        @key = convert_to_node(key)
+      end
+
+    end
+
+    class JsonSet < JsonNode
+      attr_accessor :key, :value
+
+      def initialize json, key, value
+        @hash = json
+        @key = convert_to_node(key)
+        @value = Json.new(value)
+      end
+
+    end
+
+  end
+end

data/lib/arel_extensions/predications.rb

@@ -1,101 +1,99 @@
 module ArelExtensions
-	module Predications
-		def when right, expression=nil
-			ArelExtensions::Nodes::Case.new(self).when(right,expression)
-		end
+  module Predications
+    def when right, expression=nil
+      ArelExtensions::Nodes::Case.new(self).when(right,expression)
+    end
 
-		def matches(other, escape=nil,case_sensitive= nil)
-			if Arel::VERSION.to_i < 7
-				Arel::Nodes::Matches.new(self, Arel::Nodes.build_quoted(other), escape)
-			else
-				Arel::Nodes::Matches.new(self, Arel::Nodes.build_quoted(other), escape, case_sensitive)
-			end
-		end
-		
-		def imatches(other, escape=nil)
-			ArelExtensions::Nodes::IMatches.new(self, other, escape)
-		end			
-		
-		def cast right	
-		  ArelExtensions::Nodes::Cast.new([self,right])
-		end
+    def matches(other, escape=nil,case_sensitive= nil)
+      if Arel::VERSION.to_i < 7
+        Arel::Nodes::Matches.new(self, Arel::Nodes.build_quoted(other), escape)
+      else
+        Arel::Nodes::Matches.new(self, Arel::Nodes.build_quoted(other), escape, case_sensitive)
+      end
+    end
 
-		def in(other) #In should handle nil element in the Array
-			res = nil
-			case other
-			when Enumerable
-				if other.include?(nil)
-					other.delete(nil)
-					case other.length
-					when 0
-						res = self.is_null
-					when 1
-						res = self.is_null.or(self==other[0])
-					else
-						res = self.is_null.or(Arel::Nodes::In.new(self,quoted_array(other)))
-					end
-				else
-					res = Arel::Nodes::In.new(self,quoted_array(other))
-				end
-			when nil
-				res = self.is_null
-			when Arel::SelectManager
-				res = Arel::Nodes::In.new(self, other.ast)
-			when Range
-				res = self.between(other)
-			else
-				res = Arel::Nodes::In.new(self,quoted_node(other))
-			end
-			res			 
-		end
-		
-		def not_in(other) #In should handle nil element in the Array
-			res = nil
-			case other
-			when Enumerable
-				if other.include?(nil)
-					other.delete(nil)
-					case other.length
-					when 0
-						res = self.is_not_null
-					when 1
-						res = self.is_not_null.and(self!=other[0])
-					else
-						res = self.is_not_null.and(Arel::Nodes::NotIn.new(self,quoted_array(other)))
-					end
-				else
-					res = Arel::Nodes::NotIn.new(self,quoted_array(other))
-				end
-			when nil
-				res = self.is_not_null
-			when Arel::SelectManager
-				res = Arel::Nodes::NotIn.new(self, other.ast)
-			else
-				res = Arel::Nodes::NotIn.new(self,quoted_node(other))
-			end
-			res
-		end
-		
-		def convert_to_node(object)
-			case object
-			when Arel::Attributes::Attribute, Arel::Nodes::Node, Integer
-			  object
-			when DateTime
-			  Arel::Nodes.build_quoted(object, self)
-			when Time
-			  Arel::Nodes.build_quoted(object.strftime('%H:%M:%S'), self)
-			when String
-			  Arel::Nodes.build_quoted(object)
-			when Date
-			  Arel::Nodes.build_quoted(object.to_s, self)
-			when NilClass
-			  Arel.sql('NULL')
-			when ActiveSupport::Duration
-			  object.to_i
-			else
-			  raise(ArgumentError, "#{object.class} can not be converted to CONCAT arg")
-			end
-		end
-		
-	end
+    def imatches(other, escape=nil)
+      ArelExtensions::Nodes::IMatches.new(self, other, escape)
+    end
+
+    def cast right
+      ArelExtensions::Nodes::Cast.new([self,right])
+    end
+
+    def in(other) #In should handle nil element in the Array
+      case other
+      when Range
+        self.between(other)
+      when Enumerable
+        if other.include?(nil)
+          other.delete(nil)
+          case other.length
+          when 0
+            self.is_null
+          when 1
+            self.is_null.or(self==other[0])
+          else
+            self.is_null.or(Arel::Nodes::In.new(self,quoted_array(other)))
+          end
+        else
+          Arel::Nodes::In.new(self,quoted_array(other))
+        end
+      when nil
+        self.is_null
+      when Arel::SelectManager
+        Arel::Nodes::In.new(self, other.ast)
+      else
+        Arel::Nodes::In.new(self,quoted_node(other))
+      end
+    end
+
+    def not_in(other) #In should handle nil element in the Array
+      case other
+      when Range
+        Arel::Nodes::Not.new(self.between(other))
+      when Enumerable
+        if other.include?(nil)
+          other.delete(nil)
+          case other.length
+          when 0
+            self.is_not_null
+          when 1
+            self.is_not_null.and(self!=other[0])
+          else
+            self.is_not_null.and(Arel::Nodes::NotIn.new(self,quoted_array(other)))
+          end
+        else
+          Arel::Nodes::NotIn.new(self,quoted_array(other))
+        end
+      when nil
+        self.is_not_null
+      when Arel::SelectManager
+        Arel::Nodes::NotIn.new(self, other.ast)
+      else
+        Arel::Nodes::NotIn.new(self,quoted_node(other))
+      end
+    end
+
+    def convert_to_node(object)
+      case object
+      when Arel::Attributes::Attribute, Arel::Nodes::Node, Integer
+        object
+      when DateTime
+        Arel::Nodes.build_quoted(object, self)
+      when Time
+        Arel::Nodes.build_quoted(object.strftime('%H:%M:%S'), self)
+      when String
+        Arel::Nodes.build_quoted(object)
+      when Date
+        Arel::Nodes.build_quoted(object.to_s, self)
+      when NilClass
+        Arel.sql('NULL')
+      when ActiveSupport::Duration
+        object.to_i
+      else
+        raise(ArgumentError, "#{object.class} can not be converted to CONCAT arg")
+      end
+    end
+
+  end
 end

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.1.8".freeze
+  VERSION = "1.1.9".freeze
 end