arel_extensions 1.2.5 → 1.2.8

data/lib/arel_extensions/nodes/formatted_number.rb

@@ -1,25 +1,25 @@
 module ArelExtensions
-	module Nodes
-		class FormattedNumber < Function
-			RETURN_TYPE = :string
+  module Nodes
+    class FormattedNumber < Function
+      RETURN_TYPE = :string
 
-			attr_accessor :locale, :prefix, :suffix, :flags, :scientific_notation, :width,:precision, :type, :original_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
+      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
+  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/power.rb

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

data/lib/arel_extensions/nodes/replace.rb

@@ -2,12 +2,13 @@ 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)
@@ -15,5 +16,22 @@ module ArelExtensions
       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
+  module Nodes
+    class Soundex < Function
+      include Arel::Expressions
+      include ArelExtensions::Comparators
 
-			RETURN_TYPE = :string
+      RETURN_TYPE = :string
 
-			def ==(other)
-				Arel::Nodes::Equality.new self, Arel::Nodes.build_quoted(other, self)
-			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
-		end
-	end
+      def !=(other)
+        Arel::Nodes::NotEqual.new self, Arel::Nodes.build_quoted(other, self)
+      end
+
+    end
+  end
 end

data/lib/arel_extensions/nodes/substring.rb

@@ -1,22 +1,15 @@
 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

data/lib/arel_extensions/nodes/trim.rb

@@ -17,7 +17,7 @@ module ArelExtensions
     end
 
     class Ltrim < Trim
-	  RETURN_TYPE = :string
+      RETURN_TYPE = :string
     end
 
     class Rtrim < Trim

data/lib/arel_extensions/nodes/union.rb

@@ -21,4 +21,3 @@ module ArelExtensions
 
   end
 end
-

data/lib/arel_extensions/nodes/union_all.rb

@@ -17,4 +17,3 @@ module ArelExtensions
 
   end
 end
-

data/lib/arel_extensions/predications.rb

@@ -1,10 +1,10 @@
 module ArelExtensions
   module Predications
-    def when right, expression=nil
+    def when right, expression = nil
       ArelExtensions::Nodes::Case.new(self).when(right,expression)
     end
 
-    def matches(other, escape=nil,case_sensitive= nil)
+    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
@@ -12,7 +12,7 @@ module ArelExtensions
       end
     end
 
-    def imatches(other, escape=nil)
+    def imatches(other, escape = nil)
       ArelExtensions::Nodes::IMatches.new(self, other, escape)
     end
 
@@ -25,25 +25,24 @@ module ArelExtensions
       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
+        nils, values   = other.partition{ |v| v.nil? }
+        ranges, values = values.partition{ |v| v.is_a?(Range) || v.is_a?(Arel::SelectManager)}
+
+        # In order of (imagined) decreasing efficiency: nil, values, and then more complex.
+        clauses =
+          nils.uniq.map { |r| self.in(r) } \
+          + (case values.uniq.size
+              when 0 then []
+              when 1 then [self == values[0]]
+              else [Arel::Nodes::In.new(self, quoted_array(values))] end) \
+          + ranges.uniq.map { |r| self.in(r) }
+        clauses.empty? ? self.is_null : clauses.reduce(&:or)
       when nil
         self.is_null
       when Arel::SelectManager
         Arel::Nodes::In.new(self, other.ast)
       else
-        Arel::Nodes::In.new(self,quoted_node(other))
+        Arel::Nodes::In.new(self, quoted_node(other))
       end
     end
 

data/lib/arel_extensions/string_functions.rb

@@ -100,13 +100,21 @@ module ArelExtensions
       ArelExtensions::Nodes::Collate.new(self,nil,false,true)
     end
 
-    def collate ai=false,ci=false, option=nil
+    def collate ai = false,ci = false, option = nil
       ArelExtensions::Nodes::Collate.new(self,option,ai,ci)
     end
 
     #REPLACE function replaces a sequence of characters in a string with another set of characters, not case-sensitive.
-    def replace left, right
-      ArelExtensions::Nodes::Replace.new [self, left, right]
+    def replace pattern, substitute
+      if pattern.is_a? Regexp
+        ArelExtensions::Nodes::RegexpReplace.new self, pattern, substitute
+      else
+        ArelExtensions::Nodes::Replace.new self, pattern, substitute
+      end
+    end
+
+    def regexp_replace pattern, substitute
+      ArelExtensions::Nodes::RegexpReplace.new self, pattern, substitute
     end
 
     def concat other
@@ -114,7 +122,7 @@ module ArelExtensions
     end
 
     #concat elements of a group, separated by sep and ordered by a list of Ascending or Descending
-    def group_concat(sep= nil, *orders, group: nil, order: nil)
+    def group_concat(sep = nil, *orders, group: nil, order: nil)
       if orders.present?
         warn("Warning : ArelExtensions: group_concat: you should now use the kwarg 'order' to specify an order in the group_concat.")
       end
@@ -123,8 +131,6 @@ module ArelExtensions
           o
         elsif o.respond_to?(:asc)
           o.asc
-        else
-          nil
         end
       }.compact
       ArelExtensions::Nodes::GroupConcat.new(self, sep, group: group, order: (order || order_tabs))

data/lib/arel_extensions/tasks.rb

@@ -1,12 +1,12 @@
 namespace :arel_extensions do
-	desc 'Install DB functions into current DB'
-	task :install_functions => :environment do
-		@env_db = if ENV['DB'] == 'oracle' && ((defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx") || (RUBY_PLATFORM == 'java')) # not supported
+  desc 'Install DB functions into current DB'
+  task :install_functions => :environment do
+    @env_db = if ENV['DB'] == 'oracle' && ((defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx") || (RUBY_PLATFORM == 'java')) # not supported
                 (RUBY_PLATFORM == 'java' ? "jdbc-sqlite" : 'sqlite')
               else
                 ENV['DB'] || ActiveRecord::Base.connection.adapter_name
               end
-    ActiveRecord::Base.establish_connection(Rails.env)
+    ActiveRecord::Base.establish_connection(Rails.env.to_sym)
     CommonSqlFunctions.new(ActiveRecord::Base.connection).add_sql_functions(@env_db)
-	end
+  end
 end

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.2.5".freeze
+  VERSION = "1.2.8".freeze
 end

data/lib/arel_extensions/visitors/mssql.rb

@@ -400,13 +400,14 @@ module ArelExtensions
         collector << "(STRING_AGG("
         collector = visit o.left, collector
         collector << Arel::Visitors::Oracle::COMMA
-        if o.separator  && o.selector != 'NULL'
-          collector = visit o.separator, collector
-        else
-          collector = visit Arel::Nodes.build_quoted(','), collector
-        end
+        collector =
+          if o.separator && o.separator != 'NULL'
+            visit o.separator, collector
+          else
+            visit Arel::Nodes.build_quoted(','), collector
+          end
         collector << ") WITHIN GROUP (ORDER BY "
-        if !o.order.blank?
+        if o.order.present?
           o.order.each_with_index do |order,i|
             collector << Arel::Visitors::Oracle::COMMA unless i == 0
             collector = visit order, collector
@@ -466,8 +467,9 @@ module ArelExtensions
               Arel::Nodes.build_quoted(1) :
               ArelExtensions::Nodes::Case.new.when(col<0).then(1).else(0)
 
-        if o.scientific_notation
-          number = ArelExtensions::Nodes::Concat.new([
+        number =
+          if o.scientific_notation
+            ArelExtensions::Nodes::Concat.new([
                   Arel::Nodes::NamedFunction.new('FORMAT',[
                     col.abs/Arel::Nodes.build_quoted(10).pow(col.abs.log10.floor),
                     param,
@@ -480,13 +482,13 @@ module ArelExtensions
                     locale
                   ])
                 ])
-        else
-          number = Arel::Nodes::NamedFunction.new('FORMAT',[
+          else
+            Arel::Nodes::NamedFunction.new('FORMAT',[
                 Arel::Nodes.build_quoted(col.abs),
                 param,
                 locale
               ])
-        end
+          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).
@@ -548,7 +550,6 @@ module ArelExtensions
         collector
       end
 
-
     end
   end
 end