arel_extensions 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b227ca895990c123d78d688d01f00a27a563b70
-  data.tar.gz: 21bc450f1776d263294b6d56523adb59843825bb
+  metadata.gz: 8aa9a662954d3fc3157f1275991e4bf04e13ea63
+  data.tar.gz: ff96c79a38ce3a7f9f675ac3af7596caf689f7f0
 SHA512:
-  metadata.gz: 42e41791d3c25cb5c3a5900b992ee7e22e813bdb278406b3dc3eeaa02ec2477d76696c4abb50a93956f1b9bf55be5ef8234e96720bbcfc47de53afb8b5fb3ab3
-  data.tar.gz: 07fd67e1b8fe666bdff49c2baeae98d828cacfc0ae6a6b049e98850df6db4c0b24c370350feb973fb0b9f04e633955fb4375f33e020910a0b896f9629bfde300
+  metadata.gz: 741e88fb943d9482ff4e7966747f56bf94d0aed909ed6f838e084eef53f89b74a55a90ad22daeaed1a53ee7d05192b52a7c03ca3c9988d32e2e511052821411e
+  data.tar.gz: 75dcbf19327872a9d6b7eab78c334f9875e56ba3ef5f6c2d571c10c6acc2d2eb91254cd757ef97590ea4770689db59e9a9775869f6d7345e8a4eb00572c388d0

data/.travis.yml

@@ -54,6 +54,7 @@ rvm:
 - 2.2.5
 - 2.3.1
 - 2.4.0
+- 2.5.0
 - rbx-2
 - jruby-9.0.5.0
 - jruby-head
@@ -77,6 +78,8 @@ matrix:
     jdk: openjdk7
   - rvm: 2.4.0
     jdk: openjdk7
+  - rvm: 2.5.0
+    jdk: openjdk7
   - rvm: ruby-head
     jdk: openjdk7  
   - rvm: rbx-2
@@ -91,6 +94,8 @@ matrix:
     jdk: oraclejdk8
   - rvm: 2.4.0
     jdk: oraclejdk8
+  - rvm: 2.5.0
+    jdk: oraclejdk8
   - rvm: ruby-head
     jdk: oraclejdk8    
   - rvm: jruby-head

data/README.md

@@ -138,10 +138,19 @@ t[:birthdate].format('%Y-%m-%d').to_sql
 Arel-extensions allows to use functions on case clause
 
 ```ruby
-(t[:name].when("smith").then(1).when("doe").then(2).else(0).sum.to_sql
+t[:name].when("smith").then(1).when("doe").then(2).else(0).sum.to_sql
 # => SUM(CASE "my_table"."name" WHEN 'smith' THEN 1 WHEN 'doe' THEN 2 ELSE 0 END) 
 ```
 
+## Cast Function
+
+Arel-extensions allows to cast type on constants and attributes
+
+```ruby
+t[:id].cast('char').to_sql
+# => CAST("my_table"."id" AS char)
+```
+
 
 ## Stored Procedures and User-defined functions
 

data/gemfiles/rails5_1_4.gemfile

@@ -1,12 +1,12 @@
 source "https://rubygems.org"
 
-gem 'rails', '~> 5.1.4'
+gem 'rails', '5.1.4'
 gem 'arel', '~> 8'
 
 group :development, :test do
-	gem 'activesupport', '~> 5.1.4'
-	gem 'activemodel', '~> 5.1.4'
-	gem 'activerecord', '~> 5.1.4'
+	gem 'activesupport', '5.1.4'
+	gem 'activemodel', '5.1.4'
+	gem 'activerecord', '5.1.4'
 
 	gem "sqlite3", :platforms => [:mri, :mswin, :mingw]
 	gem "mysql2", :platforms => [:mri, :mswin, :mingw]

data/lib/arel_extensions.rb

@@ -57,6 +57,8 @@ require 'arel_extensions/nodes/union'
 require 'arel_extensions/nodes/union_all'
 require 'arel_extensions/nodes/as'
 require 'arel_extensions/nodes/case'
+require 'arel_extensions/nodes/soundex'
+require 'arel_extensions/nodes/cast'
 require 'arel_extensions/predications'
 
 
@@ -116,18 +118,15 @@ Arel::SelectManager.class_eval do
   include ArelExtensions::Nodes
 end
 
-Arel::Nodes::Union.class_eval do	
-  include ArelExtensions::SetFunctions
+Arel::Nodes::As.class_eval do	
   include ArelExtensions::Nodes
 end
 
-Arel::Nodes::UnionAll.class_eval do	
-  include ArelExtensions::SetFunctions
-  include ArelExtensions::Nodes
-end
 
-Arel::Nodes::As.class_eval do	
-  include ArelExtensions::Nodes
+if Arel::VERSION.to_i >= 7 
+	Arel::Nodes::Case.class_eval do
+	  include ArelExtensions::Predications
+	end
 end
 
 

data/lib/arel_extensions/math.rb

@@ -1,5 +1,6 @@
 require 'arel_extensions/nodes'
 require 'arel_extensions/nodes/concat'
+require 'arel_extensions/nodes/cast'
 
 require 'arel_extensions/nodes/date_diff'
 require 'arel_extensions/nodes/duration'
@@ -14,6 +15,7 @@ module ArelExtensions
     #Date and integer adds or subtracts a specified time interval from a date.
     def +(other)
 	  return ArelExtensions::Nodes::Concat.new [self, other] if self.is_a?(Arel::Nodes::Quoted)
+	  
 	  if self.is_a?(Arel::Nodes::Grouping)
 		if self.expr.left.is_a?(String) || self.expr.right.is_a?(String)
 		  return ArelExtensions::Nodes::Concat.new [self, other]
@@ -21,6 +23,7 @@ module ArelExtensions
 		  return Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
 		end
 	  end
+	  
 	  return case self.class.return_type
 	  when :string, :text
 		ArelExtensions::Nodes::Concat.new [self, other]

data/lib/arel_extensions/math_functions.rb

@@ -3,6 +3,9 @@ require 'arel_extensions/nodes/ceil'
 require 'arel_extensions/nodes/floor'
 require 'arel_extensions/nodes/round'
 require 'arel_extensions/nodes/rand'
+require 'arel_extensions/nodes/formatted_number'
+require 'arel_extensions/nodes/log10'
+require 'arel_extensions/nodes/power'
 
 module ArelExtensions
   module MathFunctions
@@ -21,6 +24,22 @@ module ArelExtensions
     def floor
         ArelExtensions::Nodes::Floor.new [self]
     end
+    
+     # 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
+
 
     #function that can be invoked to produce random numbers between 0 and 1
 #    def rand seed = nil
@@ -36,6 +55,27 @@ 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
+			}
+			# opts = {:locale => 'fr_FR', :type => "e"/"f"/"d", :prefix => "$ ", :suffix => " %", :flags => " +-#0", :width => 5, :precision => 6}
+			ArelExtensions::Nodes::FormattedNumber.new [self,opts]
+		rescue
+			Arel::Nodes.build_quoted('Wrong Format')
+		end
+	end	
 
   end
 end

data/lib/arel_extensions/nodes/case.rb

@@ -2,8 +2,9 @@ module ArelExtensions
 	module Nodes    
 		if Arel::VERSION.to_i < 7 
 			class Case < Arel::Nodes::Node
-				include ArelExtensions::Predications	
 				include Arel::Expressions
+				include ArelExtensions::Comparators
+				include ArelExtensions::Predications
 
 				attr_accessor :case, :conditions, :default
 
@@ -56,11 +57,15 @@ module ArelExtensions
 			end
 
 			class Else < Arel::Nodes::Unary # :nodoc:
-			end	
+			end		
 			
 		else
 		
-			class Case < Arel::Nodes::Case		
+			class Case < Arel::Nodes::Case	
+				include Arel::Expressions
+				include ArelExtensions::Comparators
+				include ArelExtensions::Predications
+				
 			end
 			
 		end		

data/lib/arel_extensions/nodes/cast.rb

@@ -0,0 +1,52 @@
+module ArelExtensions
+  module Nodes
+    class Cast < Function  
+	  @@return_type= :string
+
+      def initialize expr 
+		as_attr = expr[1]
+		case expr[1]
+		when 'bigint', 'int', 'smallint', 'tinyint', 'bit', 'decimal', 'numeric', 'money', 'smallmoney', 'float', 'real'
+			@@return_type= :number
+		when 'datetime', 'smalldatetime'		
+			@@return_type= :ruby_time
+		when 'char', 'varchar', 'text', 'nchar', 'nvarchar', 'ntext'
+			@@return_type= :string
+		when 'binary', 'varbinary', 'image'
+			@@return_type= :binary			
+		when :number 
+			@@return_type= :number
+			as_attr = 'int'
+		when :datetime 
+			@@return_type= :ruby_time
+			as_attr = 'datetime'
+		when :string 
+			@@return_type= :string
+			as_attr = 'char'
+		when :binary
+			@@return_type= :binary			
+			as_attr = 'binary'
+		else
+			@@return_type= :string
+			as_attr =  'char'
+		end
+        tab = [convert_to_node(expr.first), Arel::Nodes::SqlLiteral.new(as_attr)]
+		return super(tab)
+	  end
+	  
+		def +(other)
+		  case @@return_type
+		  when :string
+			return ArelExtensions::Nodes::Concat.new [self, other]
+		  when :ruby_time
+			ArelExtensions::Nodes::DateAdd.new [self, other]
+		  else
+			Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
+		  end
+		end
+	    
+	
+	  
+    end
+  end
+end

data/lib/arel_extensions/nodes/coalesce.rb

@@ -2,9 +2,10 @@ module ArelExtensions
   module Nodes
     class Coalesce < Function
       include ArelExtensions::Math
+      include ArelExtensions::Comparators
+      
       attr_accessor :left_node_type
 
-
       def initialize expr
         tab = expr.map { |arg|
           convert_to_node(arg)
@@ -15,7 +16,7 @@ module ArelExtensions
         when Integer, Float
           @left_node_type = :number
         when ArelExtensions::Nodes::Coalesce, ArelExtensions::Nodes::Function
-          @left_node_type = expr.first.try(:left_node_type)
+          @left_node_type = expr.first.respond_to?(:left_node_type) ? expr.first.left_node_type : nil
         when Arel::Nodes::Node, Arel::Attributes::Attribute 
           @left_node_type = type_of_attribute(expr.first)
         when Date
@@ -25,7 +26,7 @@ module ArelExtensions
         end
         return super(tab)
       end
-      
+
     end
   end
 end

data/lib/arel_extensions/nodes/concat.rb

@@ -13,6 +13,10 @@ module ArelExtensions
       def +(other)
         return ArelExtensions::Nodes::Concat.new(self.expressions + [other]) 
       end
+      
+      def concat(other)
+        return ArelExtensions::Nodes::Concat.new(self.expressions + [other]) 
+      end
 
     end
 

data/lib/arel_extensions/nodes/format.rb

@@ -6,7 +6,7 @@ module ArelExtensions
     	attr_accessor :col_type, :iso_format
     	def initialize expr
 	        col = expr.first
-          @iso_format = expr[1]
+            @iso_format = expr[1]
 	        @col_type = type_of_attribute(col)
         	super [col, convert_to_string_node(@iso_format)]
     	end

data/lib/arel_extensions/nodes/formatted_number.rb

@@ -0,0 +1,56 @@
+module ArelExtensions
+	module Nodes
+		class FormattedNumber < Function		
+			@@return_type = :string
+			
+			attr_accessor :locale, :prefix, :suffix, :flags, :scientific_notation, :width,:precision, :type
+			
+			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
+				super [col]
+			end
+			
+			def locale 
+				@locale
+			end
+					
+			def prefix
+				@prefix
+			end
+			
+			def suffix
+				@suffix
+			end
+			
+			def width
+				@width
+			end
+			
+			def precision
+				@precision	
+			end
+			
+			def type
+				@type
+			end
+			
+			def flags
+				@flags
+			end
+			
+			def scientific_notation
+				@scientific_notation
+			end
+    	end
+				
+	end
+end

data/lib/arel_extensions/nodes/function.rb

@@ -1,8 +1,11 @@
+require 'arel_extensions/predications'
+
 module ArelExtensions
   module Nodes
     class Function < Arel::Nodes::Function
       include Arel::Math
       include Arel::Expressions
+	  include ArelExtensions::Predications	
 
       cattr_accessor :return_type
 
@@ -25,10 +28,14 @@ module ArelExtensions
         @expressions[1]
       end
 
-      def type_of_attribute(att)
+      def type_of_attribute(att)				
         case att
         when Arel::Attributes::Attribute
-          Arel::Table.engine.connection.schema_cache.columns_hash(att.relation.table_name)[att.name.to_s].type
+			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.class.return_type
 #        else

data/lib/arel_extensions/nodes/log10.rb

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

data/lib/arel_extensions/nodes/matches.rb

@@ -12,7 +12,6 @@ module ArelExtensions
           super(left, r, escape, false)
         end
       end
-
     end
 
     class IDoesNotMatch < IMatches

data/lib/arel_extensions/nodes/power.rb

@@ -0,0 +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
+    end
+  end
+end

data/lib/arel_extensions/nodes/repeat.rb

@@ -0,0 +1,20 @@
+module ArelExtensions
+  module Nodes
+    class Repeat < Function
+      @@return_type = :string
+      
+      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]) 
+      end
+
+    end
+
+  end
+end

data/lib/arel_extensions/nodes/soundex.rb

@@ -1,7 +1,18 @@
 module ArelExtensions
-  module Nodes
-    class Soundex < Function	
-    	@@return_type = :string
-    end
-  end
+	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
+
+			def !=(other)
+				Arel::Nodes::NotEqual.new self, Arel::Nodes.build_quoted(other, self)
+			end
+		end
+	end
 end

data/lib/arel_extensions/predications.rb

@@ -5,5 +5,23 @@ module ArelExtensions
 				ArelExtensions::Nodes::Case.new(self).when(right)
 			end
 		end
+		
+		def matches(other, escape=nil)
+			Arel::Nodes::Matches.new(self, Arel::Nodes.build_quoted(other), escape)
+		end
+		
+		def imatches(other, escape=nil)
+			ArelExtensions::Nodes::IMatches.new(self, other, escape)
+		end			
+			
+		def cast_as_char
+		  ArelExtensions::Nodes::Cast.new([self,'char'])
+		end
+		
+		def cast right	
+		  ArelExtensions::Nodes::Cast.new([self,right])
+		end
+
+		
 	end
 end

data/lib/arel_extensions/set_functions.rb

@@ -16,6 +16,9 @@ module ArelExtensions
 			ArelExtensions::Nodes::UnionAll.new(self,other)
 		end
 
+		def uniq
+			self
+		end
 
 	end
 end

data/lib/arel_extensions/string_functions.rb

@@ -10,6 +10,9 @@ require 'arel_extensions/nodes/trim'
 require 'arel_extensions/nodes/change_case'
 require 'arel_extensions/nodes/blank'
 require 'arel_extensions/nodes/format'
+require 'arel_extensions/nodes/repeat'
+require 'arel_extensions/nodes/cast'
+      
 
 module ArelExtensions
   module StringFunctions
@@ -110,6 +113,10 @@ module ArelExtensions
     def not_blank
       ArelExtensions::Nodes::NotBlank.new [self]
     end
+    
+    def repeat other = 1 
+	  ArelExtensions::Nodes::Repeat.new [self, other]
+    end
 
   end
 end

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.0.2".freeze
+  VERSION = "1.0.3".freeze
 end

data/lib/arel_extensions/visitors/mssql.rb

@@ -28,6 +28,26 @@ module ArelExtensions
         collector << ")"
         collector
       end
+      
+	  def visit_ArelExtensions_Nodes_Log10 o, collector
+        collector << "LOG10("
+        o.expressions.each_with_index { |arg, i|
+          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector = visit arg, collector
+        }
+        collector << ")"
+        collector
+      end
+      
+      def visit_ArelExtensions_Nodes_Power o, collector
+        collector << "POWER("
+        o.expressions.each_with_index { |arg, i|
+          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector = visit arg, collector
+        }
+        collector << ")"
+        collector
+      end
 
       def visit_ArelExtensions_Nodes_IsNull o, collector
         collector << "("
@@ -69,6 +89,17 @@ module ArelExtensions
         collector << ")"
         collector
       end
+       
+      def visit_ArelExtensions_Nodes_Repeat o, collector
+        collector << "REPLICATE("
+        o.expressions.each_with_index { |arg, i|
+          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector = visit arg, collector
+        }
+        collector << ")"
+        collector
+      end
+
 
       def visit_ArelExtensions_Nodes_DateDiff o, collector
         collector << if o.left_node_type == :ruby_time || o.left_node_type == :datetime || o.left_node_type == :time

data/lib/arel_extensions/visitors/mysql.rb

@@ -9,6 +9,28 @@ module ArelExtensions
         '%M' => '%i', '%S' => '%S', '%L' =>   '', '%N' => '%f', '%z' => ''
       }
 
+
+	  #Math functions
+	  def visit_ArelExtensions_Nodes_Log10 o, collector
+        collector << "LOG10("
+        o.expressions.each_with_index { |arg, i|
+          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector = visit arg, collector
+        }
+        collector << ")"
+        collector
+      end
+	  
+	  def visit_ArelExtensions_Nodes_Power o, collector
+        collector << "POW("
+        o.expressions.each_with_index { |arg, i|
+          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector = visit arg, collector
+        }
+        collector << ")"
+        collector
+      end
+
       #String functions
       def visit_ArelExtensions_Nodes_IMatches o, collector # insensitive on ASCII
         collector = visit o.left, collector
@@ -38,7 +60,13 @@ module ArelExtensions
         collector << "CONCAT("
         o.expressions.each_with_index { |arg, i|
           collector << Arel::Visitors::MySQL::COMMA unless i == 0
-          collector = visit arg, collector
+          if (arg.is_a?(Numeric)) || (arg.is_a?(Arel::Attributes::Attribute))
+			collector << "CAST("
+			collector = visit arg, collector
+			collector << " AS char)"
+		  else
+			collector = visit arg, collector
+	   	  end
         }
         collector << ")"
         collector
@@ -81,6 +109,16 @@ module ArelExtensions
         collector << ")"
         collector
       end
+      
+      def visit_ArelExtensions_Nodes_Repeat o, collector
+        collector << "REPEAT("
+        o.expressions.each_with_index { |arg, i|
+          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector = visit arg, collector
+        }
+        collector << ")"
+        collector
+      end
 
       def visit_ArelExtensions_Nodes_Format o, collector
         case o.col_type
@@ -95,6 +133,8 @@ module ArelExtensions
         when :integer, :float, :decimal
           collector << "FORMAT("
           collector = visit o.left, collector
+          collector << Arel::Visitors::ToSql::COMMA          
+          collector << '2'
           collector << Arel::Visitors::ToSql::COMMA
           collector = visit o.right, collector
           collector << ")"

data/lib/arel_extensions/visitors/oracle.rb

@@ -9,6 +9,28 @@ module ArelExtensions
         '%H' => 'HH24', '%k' => '', '%I' => 'HH', '%l' => '', '%P' => 'am', '%p' => 'AM',                   # hours
         '%M' => 'MI', '%S' => 'SS', '%L' => 'MS', '%N' => 'US', '%z' => 'tz'                                # seconds, subseconds
       }
+      
+	  def visit_ArelExtensions_Nodes_Log10 o, collector
+        collector << "LOG("
+        o.expressions.each_with_index { |arg, i|
+          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector = visit arg, collector
+        }
+        collector << ",10)"
+        collector
+      end
+	  
+	  def visit_ArelExtensions_Nodes_Power o, collector
+        collector << "POWER("
+        o.expressions.each_with_index { |arg, i|
+          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector = visit arg, collector
+        }
+        collector << ")"
+        collector
+      end      
+      
+      
 
       def visit_ArelExtensions_Nodes_Concat o, collector
         collector << '('
@@ -265,6 +287,15 @@ module ArelExtensions
         collector << ")"
         collector
       end
+      
+      def visit_ArelExtensions_Nodes_Repeat o, collector
+        collector << "LPAD('',"        
+	    collector = visit o.expressions[1], collector
+	    collector << Arel::Visitors::ToSql::COMMA
+	    collector = visit o.expressions[0], collector
+        collector << ")"
+        collector
+      end  
 
       # add primary_key if not present, avoid zip
     if Arel::VERSION.to_i < 7

data/lib/arel_extensions/visitors/postgresql.rb

@@ -19,6 +19,27 @@ module ArelExtensions
         collector << ")"
         collector
       end
+      
+      def visit_ArelExtensions_Nodes_Power o, collector
+        collector << "POWER("
+        o.expressions.each_with_index { |arg, i|
+          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector = visit arg, collector
+        }
+        collector << ")"
+        collector
+      end
+      
+      def visit_ArelExtensions_Nodes_Log10 o, collector
+        collector << "LOG("
+        o.expressions.each_with_index { |arg, i|
+          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector = visit arg, collector
+        }
+        collector << ")"
+        collector
+      end
+	  
 
       remove_method(:visit_Arel_Nodes_Regexp) rescue nil
       def visit_Arel_Nodes_Regexp o, collector
@@ -100,6 +121,16 @@ module ArelExtensions
         collector << ")"
         collector
       end
+      
+      def visit_ArelExtensions_Nodes_Repeat o, collector
+        collector << "REPEAT("
+        o.expressions.each_with_index { |arg, i|
+          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector = visit arg, collector
+        }
+        collector << ")"
+        collector
+      end      
 
       def visit_ArelExtensions_Nodes_DateAdd o, collector
         collector = visit o.left, collector

data/lib/arel_extensions/visitors/to_sql.rb

@@ -1,6 +1,7 @@
 module ArelExtensions
   module Visitors
-  	Arel::Visitors::ToSql.class_eval do
+  	Arel::Visitors::ToSql.class_eval do  
+
 
       # Math Functions
       def visit_ArelExtensions_Nodes_Abs o, collector
@@ -52,6 +53,23 @@ module ArelExtensions
         collector << ")"
         collector
       end
+      
+      def visit_ArelExtensions_Nodes_Log10 o, collector
+        collector << "LOG10("
+        collector = visit o.left, collector
+        collector << ")"
+        collector
+      end
+      
+      def visit_ArelExtensions_Nodes_Power o, collector
+        collector << "POW("
+        o.expressions.each_with_index { |arg, i|
+          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector = visit arg, collector
+        }
+        collector << ")"
+        collector
+      end
 
       # String functions
       def visit_ArelExtensions_Nodes_Concat o, collector
@@ -110,6 +128,16 @@ module ArelExtensions
         collector << ")"
         collector
       end
+      
+      def visit_ArelExtensions_Nodes_Repeat o, collector
+        collector << "REPEAT("
+        o.expressions.each_with_index { |arg, i|
+          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector = visit arg, collector
+        }
+        collector << ")"
+        collector
+      end
 
       def visit_ArelExtensions_Nodes_FindInSet o, collector
         collector << "FIND_IN_SET("
@@ -223,6 +251,15 @@ module ArelExtensions
 
   	  #comparators
 
+      def visit_ArelExtensions_Nodes_Cast o, collector
+        collector << "CAST("
+        collector = visit o.left, collector
+        collector << " AS "
+        collector = visit o.right, collector
+        collector << ")"
+        collector
+      end
+      
       def visit_ArelExtensions_Nodes_Coalesce o, collector
         collector << "COALESCE("
         o.expressions.each_with_index { |arg, i|
@@ -434,7 +471,56 @@ module ArelExtensions
         collector << "ELSE "
         visit o.expr, collector
     end
-	
+    
+    
+    
+	 def visit_ArelExtensions_Nodes_FormattedNumber o, collector		
+		col = o.left
+		params = o.locale ? [o.precision,Arel::Nodes.build_quoted(o.locale)] : [o.precision]
+		sign = ArelExtensions::Nodes::Case.new.when(col<0).
+							then('-').
+							else(o.flags.include?('+') ? '+' : (o.flags.include?(' ') ? ' ' : ''))
+		sign_length = ArelExtensions::Nodes::Length.new([sign])
+		
+		if o.scientific_notation 
+			number = ArelExtensions::Nodes::Concat.new([
+							Arel::Nodes::NamedFunction.new('FORMAT',[
+								col.abs/Arel::Nodes.build_quoted(10).pow(col.abs.log10.floor)
+							]+params),
+							o.type, 
+							Arel::Nodes::NamedFunction.new('FORMAT',[
+								col.abs.log10.floor,
+								0
+							])
+						])			
+		else
+			number = Arel::Nodes::NamedFunction.new('FORMAT',[col.abs]+params)
+		end
+		
+		repeated_char = (o.width == 0) ? Arel::Nodes.build_quoted('') : ArelExtensions::Nodes::Case.new().
+			when(Arel::Nodes.build_quoted(o.width).abs-(number.length+sign_length)>0).
+			then(Arel::Nodes.build_quoted(
+					o.flags.include?('-') ? ' ' : (o.flags.include?('0') ? '0' : ' ')
+				).repeat(Arel::Nodes.build_quoted(o.width).abs-(number.length+sign_length))
+			).
+			else('')
+		before = (!o.flags.include?('0'))&&(!o.flags.include?('-')) ? repeated_char : ''
+		middle = (o.flags.include?('0'))&&(!o.flags.include?('-'))  ? repeated_char : ''
+		after  = o.flags.include?('-') ? repeated_char : ''
+		full_number =  col.when(0).then(0).else(
+			ArelExtensions::Nodes::Concat.new([
+				before,
+				sign,
+				middle,
+				number,
+				after
+			])
+		)				
+		collector = visit ArelExtensions::Nodes::Concat.new([Arel::Nodes.build_quoted(o.prefix),full_number,Arel::Nodes.build_quoted(o.suffix)]), collector
+		
+		collector		
+	  end
+		
   	end
   end
 end

data/test/visitors/test_to_sql.rb

@@ -43,6 +43,9 @@ module ArelExtensions
         compile(@price.abs + 42).must_be_like %{(ABS("products"."price") + 42)}
         compile(@price.ceil + 42).must_be_like %{(CEIL("products"."price") + 42)}
         compile(@price.floor + 42).must_be_like %{(FLOOR("products"."price") + 42)}
+        compile(@price.log10 + 42).must_be_like %{(LOG10("products"."price") + 42)}
+        compile(@price.power(42) + 42).must_be_like %{(POW("products"."price", 42) + 42)}
+        compile(@price.pow(42) + 42).must_be_like %{(POW("products"."price", 42) + 42)}
         compile(@price.ceil + @price.floor).must_be_like %{(CEIL("products"."price") + FLOOR("products"."price"))}
         compile((@price.ceil + @price.floor).abs).must_be_like %{ABS((CEIL("products"."price") + FLOOR("products"."price")))}
         compile(@price.round + 42).must_be_like %{(ROUND("products"."price") + 42)}
@@ -110,11 +113,6 @@ module ArelExtensions
         compile(c.idoes_not_match('%test%')).must_be_like %{"users"."name" NOT ILIKE '%test%'}
       end
 
-	  it "should accept comparators on functions" do
-		  c = @table[:name]
-		  #compile(c.soundex == 'test').must_be_like %{SOUNDEX("users"."name") = 'test'}
-	  end
-
       # Maths
       # DateDiff
       it "should diff date col and date" do
@@ -219,9 +217,6 @@ module ArelExtensions
 			
 	 end
 	 
-	 
-	 puts "AREL VERSION : " + Arel::VERSION.to_s
-	 
 	 # Case
      it "should accept case clause" do		
 		@table[:name].when("smith").then("cool").when("doe").then("fine").else("uncool").to_sql
@@ -233,9 +228,71 @@ module ArelExtensions
 		ArelExtensions::Nodes::Case.new(@table[:name]).when("smith").then(1).when("doe").then(2).else(0).to_sql
 			.must_be_like %{CASE "users"."name" WHEN 'smith' THEN 1 WHEN 'doe' THEN 2 ELSE 0 END}  
 		@table[:name].when("smith").then(1).when("doe").then(2).else(0).sum.to_sql
-			.must_be_like %{SUM(CASE "users"."name" WHEN 'smith' THEN 1 WHEN 'doe' THEN 2 ELSE 0 END)}  			
+			.must_be_like %{SUM(CASE "users"."name" WHEN 'smith' THEN 1 WHEN 'doe' THEN 2 ELSE 0 END)} 
+        @table[:name].when("smith").then("cool").else("uncool").matches('value',false).to_sql
+            .must_be_like %{CASE "users"."name" WHEN 'smith' THEN 'cool' ELSE 'uncool' END LIKE 'value'}  			     									
+        @table[:name].when("smith").then("cool").else("uncool").imatches('value',false).to_sql
+            .must_be_like %{CASE "users"."name" WHEN 'smith' THEN 'cool' ELSE 'uncool' END ILIKE 'value'}  			     									
      end
-	 
+     
+     
+	  it "should accept comparators on functions" do
+		  c = @table[:name]
+		  compile(c.soundex == 'test').must_be_like %{SOUNDEX("users"."name") = 'test'}
+	  end
+	  
+	  
+	  it "should accept in on select statement" do
+		c = @table[:name]
+		compile(c.in(@table.project(@table[:name])))
+			.must_be_like %{"users"."name" IN (SELECT "users"."name" FROM "users")}
+	  end	  
+	  
+	  it "should accept coalesce function properly even on none actual tables and attributes" do
+		fake_at = Arel::Table.new('fake_table')
+	    compile(fake_at['fake_attribute'].coalesce('other_value'))
+			.must_be_like %{COALESCE("fake_table"."fake_attribute", 'other_value')}			
+	    compile(fake_at['fake_attribute'].coalesce('other_value1','other_value2'))
+			.must_be_like %{COALESCE("fake_table"."fake_attribute", 'other_value1', 'other_value2')}
+        compile(fake_at['fake_attribute'].coalesce('other_value1').coalesce('other_value2'))
+			.must_be_like %{COALESCE(COALESCE("fake_table"."fake_attribute", 'other_value1'), 'other_value2')}	
+	    compile(fake_at['fake_attribute'].coalesce('other_value').matches('truc'))
+			.must_be_like %{COALESCE("fake_table"."fake_attribute", 'other_value') LIKE 'truc'}				
+		compile(fake_at['fake_attribute'].coalesce('other_value').imatches('truc'))
+			.must_be_like %{COALESCE("fake_table"."fake_attribute", 'other_value') ILIKE 'truc'}				
+	  end
+	  
+	  it "should be possible to cast nodes types" do
+	  		
+	    
+		compile(@table[:id].cast_as_char)
+			.must_be_like %{CAST("users"."id" AS char)}
+		
+		compile(@table[:id].cast('char'))
+			.must_be_like %{CAST("users"."id" AS char)}
+		
+		compile(@table[:id].coalesce(' ').cast('char'))
+			.must_be_like %{CAST(COALESCE("users"."id", ' ') AS char)}
+	
+		compile(@table[:id].coalesce(' ').cast(:string))
+			.must_be_like %{CAST(COALESCE("users"."id", ' ') AS char)}
+				
+		compile(@table[:id].cast('char') + ' ')
+			.must_be_like %{CONCAT(CAST("users"."id" AS char), ' ')}
+			
+		compile(@table[:id].cast('int') + 2)
+			.must_be_like %{(CAST("users"."id" AS int) + 2)}
+		
+	  end
+	  
+	  
+	  it "should be possible to specify a cool format on number" do	  
+		#puts @price.format_number("$$ %+030.2e €€","fr_FR").to_sql
+	#	compile(@price.format_number("$$ %+030.2e €€","fr_FR"))
+	#		.must_be_like %{CONCAT('$$ ', CASE \"products\".\"price\" WHEN 0 THEN 0 ELSE CONCAT('', CASE WHEN \"products\".\"price\" < 0 THEN '-' ELSE '+' END, CASE WHEN (ABS(30) - (LENGTH(CONCAT(FORMAT(ABS(\"products\".\"price\") / POW(10, FLOOR(LOG10(ABS(\"products\".\"price\")))), 2, 'fr_FR'), 'e', FORMAT(FLOOR(LOG10(ABS(\"products\".\"price\"))), 0))) + LENGTH(CASE WHEN \"products\".\"price\" < 0 THEN '-' ELSE '+' END))) > 0 THEN REPEAT('0', (ABS(30) - (LENGTH(CONCAT(FORMAT(ABS(\"products\".\"price\") / POW(10, FLOOR(LOG10(ABS(\"products\".\"price\")))), 2, 'fr_FR'), 'e', FORMAT(FLOOR(LOG10(ABS(\"products\".\"price\"))), 0))) + LENGTH(CASE WHEN \"products\".\"price\" < 0 THEN '-' ELSE '+' END)))) ELSE '' END, CONCAT(FORMAT(ABS(\"products\".\"price\") / POW(10, FLOOR(LOG10(ABS(\"products\".\"price\")))), 2, 'fr_FR'), 'e', FORMAT(FLOOR(LOG10(ABS(\"products\".\"price\"))), 0)), '') END, ' €€')}
+	  end
+	  
+	  puts "AREL VERSION : " + Arel::VERSION.to_s
     end
   end
 end 

data/test/with_ar/all_agnostic_test.rb

@@ -249,6 +249,7 @@ module ArelExtensions
         skip "PostgreSql version can't load extension for soundex" if @env_db == 'postgresql'
         assert_equal "C540", t(@camille, @name.soundex)
         assert_equal 8, User.where(@name.soundex.eq(@name.soundex)).count
+        assert_equal 8, User.where(@name.soundex == @name.soundex).count
       end
 
       def test_change_case
@@ -458,6 +459,25 @@ module ArelExtensions
 	  def test_case
 	    assert_equal 4, User.find_by_sql(@ut.project(@score.when(20.16).then(1).else(0).as('score_bin')).to_sql).sum(&:score_bin)
 	  end
+	  
+	  def test_format_numbers
+		#score of Arthur = 65.62
+		if @env_db == 'mysql'
+			assert_equal "AZERTY65,62" , t(@arthur, @score.format_number("AZERTY%.2f","fr_FR"))
+			assert_equal "65,62AZERTY" , t(@arthur, @score.format_number("%.2fAZERTY","fr_FR"))
+			assert_equal "$ 65.62 €" , t(@arthur, @score.format_number("$ %.2f €","en_EN"))		
+			assert_equal "$ 0065,62 €" , t(@arthur, @score.format_number("$ %07.2f €","fr_FR"))
+			assert_equal "$ 65,62   €" , t(@arthur, @score.format_number("$ %-07.2f €","fr_FR"))
+			assert_equal "$ 65,62   €" , t(@arthur, @score.format_number("$ %-7.2f €","fr_FR"))
+			assert_equal "$   65,62 €" , t(@arthur, @score.format_number("$ % 7.2f €","fr_FR"))
+			assert_equal "$  +65,62 €" , t(@arthur, @score.format_number("$ % +7.2f €","fr_FR"))		
+			assert_equal "$ +065,62 €" , t(@arthur, @score.format_number("$ %0+7.2f €","fr_FR"))	
+			assert_equal "$ 6,56e1 €" , t(@arthur, @score.format_number("$ %.2e €","fr_FR"))			
+			assert_equal "$ 6,56E1 €" , t(@arthur, @score.format_number("$ %.2E €","fr_FR"))	
+			assert_equal "Wrong Format" , t(@arthur, @score.format_number("$ %...234.6F €","fr_FR"))
+		end
+	  end
+	  
 
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -123,6 +123,7 @@ files:
 - lib/arel_extensions/nodes/as.rb
 - lib/arel_extensions/nodes/blank.rb
 - lib/arel_extensions/nodes/case.rb
+- lib/arel_extensions/nodes/cast.rb
 - lib/arel_extensions/nodes/ceil.rb
 - lib/arel_extensions/nodes/change_case.rb
 - lib/arel_extensions/nodes/coalesce.rb
@@ -132,12 +133,16 @@ files:
 - lib/arel_extensions/nodes/find_in_set.rb
 - lib/arel_extensions/nodes/floor.rb
 - lib/arel_extensions/nodes/format.rb
+- lib/arel_extensions/nodes/formatted_number.rb
 - lib/arel_extensions/nodes/function.rb
 - lib/arel_extensions/nodes/is_null.rb
 - lib/arel_extensions/nodes/length.rb
 - lib/arel_extensions/nodes/locate.rb
+- lib/arel_extensions/nodes/log10.rb
 - lib/arel_extensions/nodes/matches.rb
+- lib/arel_extensions/nodes/power.rb
 - lib/arel_extensions/nodes/rand.rb
+- lib/arel_extensions/nodes/repeat.rb
 - lib/arel_extensions/nodes/replace.rb
 - lib/arel_extensions/nodes/round.rb
 - lib/arel_extensions/nodes/soundex.rb