arel_extensions 2.3.3 → 2.5.0

data/lib/arel_extensions/nodes/char_length.rb

@@ -0,0 +1,11 @@
+module ArelExtensions
+  module Nodes
+    class CharLength < Function
+      RETURN_TYPE = :integer
+
+      def initialize(node)
+        super([node])
+      end
+    end
+  end
+end

data/lib/arel_extensions/nodes/coalesce.rb

@@ -9,7 +9,7 @@ module ArelExtensions
         @left_node_type || self.class.const_get(:RETURN_TYPE)
       end
 
-      def initialize expr
+      def initialize(expr)
         tab = expr.map { |arg|
           convert_to_node(arg)
         }

data/lib/arel_extensions/nodes/collate.rb

@@ -5,7 +5,7 @@ module ArelExtensions
 
       attr_accessor :ai, :ci, :option
 
-      def initialize left, option = nil, ai = false, ci = false
+      def initialize(left, option = nil, ai = false, ci = false)
         @ai = ai
         @ci = ci
         @option = option

data/lib/arel_extensions/nodes/concat.rb

@@ -2,7 +2,7 @@ module ArelExtensions::Nodes
   class Concat < Function
     RETURN_TYPE = :string
 
-    def initialize expr
+    def initialize(expr)
       tab = expr.map { |arg|
         # flatten nested concats.
         node = convert_to_node(arg)
@@ -25,8 +25,8 @@ module ArelExtensions::Nodes
       super(tab)
     end
 
-    def self.new expr
-      o = super(expr)
+    def self.new(expr)
+      o = super
       if o.expressions.length == 1
         o.expressions[0]
       else
@@ -35,7 +35,7 @@ module ArelExtensions::Nodes
     end
 
     def concat(other)
-      Concat.new(self.expressions + [other])
+      Concat.new(expressions + [other])
     end
   end
 
@@ -44,9 +44,9 @@ module ArelExtensions::Nodes
 
     attr_accessor :separator
 
-    def initialize node, separator = ', ', **opts
+    def initialize(node, separator = ', ', **opts)
       @separator = convert_to_node(separator)
-      super node, **opts
+      super(node, **opts)
     end
   end
 end

data/lib/arel_extensions/nodes/date_diff.rb

@@ -3,8 +3,7 @@ require 'date'
 module ArelExtensions
   module Nodes
     class DateDiff < Function # difference entre colonne date et date string/date
-      attr_accessor :left_node_type
-      attr_accessor :right_node_type
+      attr_accessor :left_node_type, :right_node_type
 
       RETURN_TYPE = :integer # by default...
 
@@ -29,7 +28,7 @@ module ArelExtensions
           @right_node_type = :ruby_time
         end
         res << (%i[date ruby_date].include?(@left_node_type) ? convert_to_date_node(expr[1]) : convert_to_datetime_node(expr[1]))
-        super res
+        super(res)
       end
     end
 
@@ -37,7 +36,7 @@ module ArelExtensions
       RETURN_TYPE = :date
       attr_accessor :date_type
 
-      def initialize expr
+      def initialize(expr)
         col = expr.first
         @date_type = type_of_attribute(col)
         tab = expr.map do |arg|
@@ -47,8 +46,8 @@ module ArelExtensions
       end
 
       def sqlite_value
-        v = self.expressions.last
-        if defined?(ActiveSupport::Duration) && ActiveSupport::Duration === v
+        v = expressions.last
+        if defined?(ActiveSupport::Duration) && v.is_a?(ActiveSupport::Duration)
           if @date_type == :date
             Arel.quoted((v.value >= 0 ? '+' : '-') + v.inspect)
           elsif @date_type == :datetime
@@ -60,60 +59,54 @@ module ArelExtensions
       end
 
       def mysql_value(v = nil)
-        v ||= self.expressions.last
-        if defined?(ActiveSupport::Duration) && ActiveSupport::Duration === v
+        v ||= expressions.last
+        if defined?(ActiveSupport::Duration) && v.is_a?(ActiveSupport::Duration)
           if @date_type == :date || @date_type == :datetime
             Arel.sql('INTERVAL %s' % v.inspect.sub(/s\Z/, ''))
           end
+        elsif v.is_a?(ArelExtensions::Nodes::Duration)
+          v.with_interval = true
+          v
         else
-          if ArelExtensions::Nodes::Duration === v
-            v.with_interval = true
-            v
-          else
-            v
-          end
+          v
         end
       end
 
       def postgresql_value(v = nil)
-        v ||= self.expressions.last
-        if defined?(ActiveSupport::Duration) && ActiveSupport::Duration === v
+        v ||= expressions.last
+        if defined?(ActiveSupport::Duration) && v.is_a?(ActiveSupport::Duration)
           if @date_type == :date
             Arel.sql("INTERVAL '%s'" % v.inspect.sub(/s\Z/, '').upcase)
           elsif @date_type == :datetime
             Arel.sql("INTERVAL '%s'" % v.inspect.sub(/s\Z/, '').upcase)
           end
+        elsif v.is_a?(ArelExtensions::Nodes::Duration)
+          v.with_interval = true
+          v
         else
-          if ArelExtensions::Nodes::Duration === v
-            v.with_interval = true
-            v
-          else
-            v
-          end
+          v
         end
       end
 
       def oracle_value(v = nil)
-        v ||= self.expressions.last
-        if defined?(ActiveSupport::Duration) && ActiveSupport::Duration === v
+        v ||= expressions.last
+        if defined?(ActiveSupport::Duration) && v.is_a?(ActiveSupport::Duration)
           if @date_type == :ruby_date
             Arel.sql("(INTERVAL '1' DAY) * %s" % v.inspect.to_i)
           else
             Arel.sql("(INTERVAL '1' SECOND) * %s" % v.to_i)
           end
+        elsif v.is_a?(ArelExtensions::Nodes::Duration)
+          v.with_interval = true
+          v
         else
-          if ArelExtensions::Nodes::Duration === v
-            v.with_interval = true
-            v
-          else
-            v
-          end
+          v
         end
       end
 
       def mssql_value(v = nil)
-        v ||= self.expressions.last
-        if defined?(ActiveSupport::Duration) && ActiveSupport::Duration === v
+        v ||= expressions.last
+        if defined?(ActiveSupport::Duration) && v.is_a?(ActiveSupport::Duration)
           if @date_type == :date
             v.to_i / (24 * 3600)
           elsif @date_type == :datetime
@@ -134,8 +127,8 @@ module ArelExtensions
       end
 
       def mssql_datepart(v = nil)
-        v ||= self.expressions.last
-        if defined?(ActiveSupport::Duration) && ActiveSupport::Duration === v
+        v ||= expressions.last
+        if defined?(ActiveSupport::Duration) && v.is_a?(ActiveSupport::Duration)
           if @date_type == :date
             Arel.sql('day')
           elsif @date_type == :datetime
@@ -151,19 +144,17 @@ module ArelExtensions
                   end
             Arel.sql(res)
           end
-        else
-          if ArelExtensions::Nodes::Duration === v
-            v.with_interval = true
-            case v.left
-            when 'd', 'm', 'y'
-              Arel.sql('day')
-            when 'h', 'mn', 's'
-              Arel.sql('second')
-            when /i\z/
-              Arel.sql(ArelExtensions::Visitors::MSSQL::LOADED_VISITOR::DATE_MAPPING[v.left[0..-2]])
-            else
-              Arel.sql(ArelExtensions::Visitors::MSSQL::LOADED_VISITOR::DATE_MAPPING[v.left])
-            end
+        elsif v.is_a?(ArelExtensions::Nodes::Duration)
+          v.with_interval = true
+          case v.left
+          when 'd', 'm', 'y'
+            Arel.sql('day')
+          when 'h', 'mn', 's'
+            Arel.sql('second')
+          when /i\z/
+            Arel.sql(ArelExtensions::Visitors::MSSQL::LOADED_VISITOR::DATE_MAPPING[v.left[0..-2]])
+          else
+            Arel.sql(ArelExtensions::Visitors::MSSQL::LOADED_VISITOR::DATE_MAPPING[v.left])
           end
         end
       end
@@ -190,7 +181,7 @@ module ArelExtensions
       RETURN_TYPE = :integer
 
       def initialize(expr)
-        super [expr.first, convert_number(expr[1])]
+        super([expr.first, convert_number(expr[1])])
       end
 
       def convert_number(object)
@@ -200,7 +191,7 @@ module ArelExtensions
         when String
           object.to_i
         else
-          if defined?(ActiveSupport::Duration) && ActiveSupport::Duration === object
+          if defined?(ActiveSupport::Duration) && object.is_a?(ActiveSupport::Duration)
             object.to_i
           else
             raise(ArgumentError, "#{object.class} cannot be converted to Number")

data/lib/arel_extensions/nodes/duration.rb

@@ -5,8 +5,8 @@ module ArelExtensions
 
       attr_accessor :with_interval
 
-      def initialize left, right, aliaz = nil
-        tab = Array.new
+      def initialize(left, right, aliaz = nil)
+        tab = []
         tab << left
         tab << right
         @with_interval = left.end_with?('i')

data/lib/arel_extensions/nodes/format.rb

@@ -7,12 +7,12 @@ module ArelExtensions
 
       attr_accessor :col_type, :iso_format, :time_zone
 
-      def initialize expr
+      def initialize(expr)
         col = expr[0]
         @iso_format = convert_format(expr[1])
         @time_zone  = expr[2]
         @col_type = type_of_attribute(col)
-        super [col, convert_to_string_node(@iso_format)]
+        super([col, convert_to_string_node(@iso_format)])
       end
 
       private

data/lib/arel_extensions/nodes/formatted_date.rb

@@ -7,12 +7,12 @@ module ArelExtensions
 
       attr_accessor :col_type, :iso_format, :time_zone
 
-      def initialize expr
+      def initialize(expr)
         col = expr[0]
         @iso_format = convert_format(expr[1])
         @time_zone  = expr[2]
         @col_type = type_of_attribute(col)
-        super [col, convert_to_string_node(@iso_format)]
+        super([col, convert_to_string_node(@iso_format)])
       end
 
       private

data/lib/arel_extensions/nodes/formatted_number.rb

@@ -5,7 +5,7 @@ module ArelExtensions
 
       attr_accessor :locale, :prefix, :suffix, :flags, :scientific_notation, :width, :precision, :type, :original_string
 
-      def initialize expr
+      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]
@@ -17,7 +17,7 @@ module ArelExtensions
         @flags = expr[1][:flags]
         @scientific_notation = /[eE]/.match(expr[1][:type]) || false
         @original_string = expr[1][:original_string]
-        super [col]
+        super([col])
       end
     end
   end

data/lib/arel_extensions/nodes/function.rb

@@ -26,11 +26,9 @@ module ArelExtensions
         self.class.const_get(:RETURN_TYPE)
       end
 
-      def as other
-        res = Arel::Nodes::As.new(self.clone, Arel.sql(other))
-        if Gem::Version.new(Arel::VERSION) >= Gem::Version.new('9.0.0')
-          self.alias = Arel.sql(other)
-        end
+      def as(other)
+        res = Arel::Nodes::As.new(clone, Arel.sql(other))
+        self.alias = Arel.sql(other)
         res
       end
 
@@ -75,6 +73,8 @@ module ArelExtensions
           Arel.quoted(object.strftime('%H:%M:%S'), self)
         when MBSTRING, String, Symbol
           Arel.quoted(object.to_s)
+        when TrueClass, FalseClass
+          Arel.quoted(object)
         when Date
           Arel.quoted(object.to_s, self)
         when NilClass
@@ -82,7 +82,7 @@ module ArelExtensions
         when ActiveSupport::Duration
           Arel.sql(object.to_i)
         when Array
-          Arel.grouping(object.map{|e| convert_to_node(e)})
+          Arel.grouping(object.map { |e| convert_to_node(e) })
         else
           raise(ArgumentError, "#{object.class} cannot be converted to CONCAT arg")
         end
@@ -95,7 +95,7 @@ module ArelExtensions
         when Integer
           Arel.quoted(object.to_s)
         when Arel::Attributes::Attribute
-          case self.type_of_attribute(object)
+          case type_of_attribute(object)
           when :date
             ArelExtensions::Nodes::Format.new [object, 'yyyy-mm-dd']
           when :time

data/lib/arel_extensions/nodes/is_null.rb

@@ -4,11 +4,13 @@ module ArelExtensions
   module Nodes
     class IsNull < Arel::Nodes::Unary
       include ArelExtensions::BooleanFunctions
+
       RETURN_TYPE = :boolean
     end
 
     class IsNotNull < Arel::Nodes::Unary
       include ArelExtensions::BooleanFunctions
+
       RETURN_TYPE = :boolean
     end
   end

data/lib/arel_extensions/nodes/json.rb

@@ -5,20 +5,20 @@ 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
+      def get(key)
         JsonGet.new(self, key)
       end
 
-      def set key, value
+      def set(key, value)
         JsonSet.new(self, key, value)
       end
 
-      def group as_array = true, orders = nil, distinct: false
+      def group(as_array = true, orders = nil, distinct: false)
         if distinct
           JsonGroup.new(Arel::Nodes::NamedFunction.new('DISTINCT', [self]), as_array, orders)
         else
@@ -35,12 +35,12 @@ module ArelExtensions
         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)
+          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])
+          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
@@ -58,9 +58,21 @@ module ArelExtensions
         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)
-          self.type_of_attribute(v)
+          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?
@@ -72,12 +84,12 @@ module ArelExtensions
     end
 
     class Json < JsonNode
-      def initialize *expr
+      def initialize(*expr)
         @dict =
           if expr.length == 1
             convert_to_json_node(expr.first)
           else
-            expr.map{|e| convert_to_json_node(e) }
+            expr.map { |e| convert_to_json_node(e) }
           end
         super
       end
@@ -89,7 +101,7 @@ 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
@@ -101,7 +113,7 @@ module ArelExtensions
     class JsonGet < JsonNode
       attr_accessor :key
 
-      def initialize json, key
+      def initialize(json, key)
         @dict = json
         @key = convert_to_node(key)
       end
@@ -110,7 +122,7 @@ module ArelExtensions
     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)

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.quoted(expr[1])])
       end
     end
   end

data/lib/arel_extensions/nodes/locate.rb

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

data/lib/arel_extensions/nodes/matches.rb

@@ -1,11 +1,11 @@
 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 < V7
 
       def initialize(left, right, escape = nil)
         r = Arel.quoted(right)
-        if Arel::VERSION.to_i < 7 # managed by default in version 7+ (rails 5), so useful for rails 3 & 4
+        if AREL_VERSION < V7 # managed by default in version 7+ (rails 5), so useful for rails 3 & 4
           super(left, r, escape)
           @case_sensitive = false
         else

data/lib/arel_extensions/nodes/power.rb

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

data/lib/arel_extensions/nodes/rand.rb

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

data/lib/arel_extensions/nodes/repeat.rb

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

data/lib/arel_extensions/nodes/replace.rb

@@ -4,7 +4,7 @@ module ArelExtensions
       RETURN_TYPE = :string
       attr_accessor :left, :pattern, :substitute
 
-      def initialize left, pattern, substitute
+      def initialize(left, pattern, substitute)
         @left = convert_to_node(left)
         @pattern = convert_to_node(pattern)
         @substitute = convert_to_node(substitute)
@@ -16,9 +16,9 @@ module ArelExtensions
       RETURN_TYPE = :string
       attr_accessor :left, :pattern, :substitute
 
-      def initialize left, pattern, substitute
+      def initialize(left, pattern, substitute)
         @left = convert_to_node(left)
-        @pattern = (pattern.is_a?(Regexp) ? pattern : %r[#{pattern}])
+        @pattern = (pattern.is_a?(Regexp) ? pattern : /#{pattern}/)
         @substitute = convert_to_node(substitute)
         super([@left, @pattern, @substitute])
       end

data/lib/arel_extensions/nodes/rollup.rb

@@ -3,7 +3,7 @@
 
 begin
   Arel::Nodes.const_get('RollUp')
-rescue NameError => _
+rescue NameError => _e
   module Arel
     module Nodes
       class RollUp < Arel::Nodes::Unary
@@ -18,16 +18,16 @@ rescue NameError => _
         # handle grouping aggregation semantics
         def grouping_array_or_grouping_element(o, collector)
           if o.expr.is_a? Array
-            collector << "( "
+            collector << '( '
             visit o.expr, collector
-            collector << " )"
+            collector << ' )'
           else
             visit o.expr, collector
           end
         end
 
         def visit_Arel_Nodes_RollUp(o, collector)
-          collector << "ROLLUP"
+          collector << 'ROLLUP'
           grouping_array_or_grouping_element o, collector
         end
       end

data/lib/arel_extensions/nodes/round.rb

@@ -3,11 +3,11 @@ module ArelExtensions
     class Round < Function
       RETURN_TYPE = :number
 
-      def initialize expr
+      def initialize(expr)
         if expr && expr.length == 1
-          super [convert_to_node(expr.first)]
+          super([convert_to_node(expr.first)])
         else
-          super [convert_to_node(expr.first), convert_to_number(expr[1])]
+          super([convert_to_node(expr.first), convert_to_number(expr[1])])
         end
       end
     end

data/lib/arel_extensions/nodes/select.rb

@@ -3,7 +3,7 @@ module Arel
     class SelectCore
       # havings did not exist in rails < 5.2
       if !method_defined?(:havings)
-        alias :havings :having
+        alias havings having
       end
     end
   end

data/lib/arel_extensions/nodes/std.rb

@@ -4,9 +4,9 @@ module ArelExtensions
       RETURN_TYPE = :number
       attr_accessor :unbiased_estimator
 
-      def initialize node, **opts
+      def initialize(node, **opts)
         @unbiased_estimator = opts[:unbiased] ? true : false
-        super node, **opts
+        super
       end
     end
 
@@ -14,9 +14,9 @@ module ArelExtensions
       RETURN_TYPE = :number
       attr_accessor :unbiased_estimator
 
-      def initialize node, **opts
+      def initialize(node, **opts)
         @unbiased_estimator = opts[:unbiased] ? true : false
-        super node, **opts
+        super
       end
     end
   end