arel_extensions 1.3.1 → 1.3.4

data/lib/arel_extensions/nodes/date_diff.rb

@@ -50,9 +50,9 @@ module ArelExtensions
         v = self.expressions.last
         if defined?(ActiveSupport::Duration) && ActiveSupport::Duration === v
           if @date_type == :date
-            return Arel::Nodes.build_quoted((v.value >= 0 ? '+' : '-') + v.inspect)
+            return Arel.quoted((v.value >= 0 ? '+' : '-') + v.inspect)
           elsif @date_type == :datetime
-            return Arel::Nodes.build_quoted((v.value >= 0 ? '+' : '-') + v.inspect)
+            return Arel.quoted((v.value >= 0 ? '+' : '-') + v.inspect)
           end
         else
           return v
@@ -115,7 +115,7 @@ module ArelExtensions
         v ||= self.expressions.last
         if defined?(ActiveSupport::Duration) && ActiveSupport::Duration === v
           if @date_type == :date
-            v.to_i / (24*3600)
+            v.to_i / (24 * 3600)
           elsif @date_type == :datetime
             if v.parts.size == 1
               #       first entry in the dict v.parts; one of [:years, :months, :weeks, :days, :hours, :minutes, :seconds]
@@ -155,9 +155,9 @@ module ArelExtensions
           if ArelExtensions::Nodes::Duration === v
             v.with_interval = true
             case v.left
-            when 'd','m','y'
+            when 'd', 'm', 'y'
               Arel.sql('day')
-            when 'h','mn','s'
+            when 'h', 'mn', 's'
               Arel.sql('second')
             when /i\z/
               Arel.sql(ArelExtensions::Visitors::MSSQL::LOADED_VISITOR::DATE_MAPPING[v.left[0..-2]])
@@ -179,7 +179,7 @@ module ArelExtensions
         when DateTime, Time, Date
           raise(ArgumentError, "#{object.class} cannot be converted to Integer")
         when String
-          Arel::Nodes.build_quoted(object)
+          Arel.quoted(object)
         else
           raise(ArgumentError, "#{object.class} cannot be converted to Integer")
         end

data/lib/arel_extensions/nodes/format.rb

@@ -10,7 +10,7 @@ module ArelExtensions
       def initialize expr
         col = expr[0]
         @iso_format = convert_format(expr[1])
-        @time_zone  = Arel::Nodes.build_quoted(expr[2]) if expr[2]
+        @time_zone  = expr[2]
         @col_type = type_of_attribute(col)
         super [col, convert_to_string_node(@iso_format)]
       end

data/lib/arel_extensions/nodes/formatted_number.rb

@@ -3,10 +3,10 @@ module ArelExtensions
     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}
+        # 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]

data/lib/arel_extensions/nodes/function.rb

@@ -22,14 +22,14 @@ module ArelExtensions
 
       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")
+        if Gem::Version.new(Arel::VERSION) >= Gem::Version.new('9.0.0')
           self.alias = Arel.sql(other)
         end
         res
       end
 
       def expr
-         @expressions.first
+        @expressions.first
       end
 
       def left
@@ -41,17 +41,17 @@ module ArelExtensions
       end
 
       def ==(other)
-        Arel::Nodes::Equality.new self, Arel::Nodes.build_quoted(other, self)
+        Arel::Nodes::Equality.new self, Arel.quoted(other, self)
       end
 
       def !=(other)
-        Arel::Nodes::NotEqual.new self, Arel::Nodes.build_quoted(other, self)
+        Arel::Nodes::NotEqual.new self, Arel.quoted(other, self)
       end
 
       def type_of_attribute(att)
         case att
         when Arel::Attributes::Attribute
-          ArelExtensions::column_of(att.relation.table_name, att.name.to_s)&.type || att
+          Arel.column_of(att.relation.table_name, att.name.to_s)&.type || att
         when ArelExtensions::Nodes::Function
           att.return_type
           #        else
@@ -64,13 +64,13 @@ module ArelExtensions
         when Arel::Attributes::Attribute, Arel::Nodes::Node, Integer
           object
         when DateTime
-          Arel::Nodes.build_quoted(object, self)
+          Arel.quoted(object, self)
         when Time
-          Arel::Nodes.build_quoted(object.strftime('%H:%M:%S'), self)
+          Arel.quoted(object.strftime('%H:%M:%S'), self)
         when MBSTRING, String, Symbol
-          Arel::Nodes.build_quoted(object.to_s)
+          Arel.quoted(object.to_s)
         when Date
-          Arel::Nodes.build_quoted(object.to_s, self)
+          Arel.quoted(object.to_s, self)
         when NilClass
           Arel.sql('NULL')
         when ActiveSupport::Duration
@@ -87,7 +87,7 @@ module ArelExtensions
         when Arel::Nodes::Node
           object
         when Integer
-          Arel::Nodes.build_quoted(object.to_s)
+          Arel.quoted(object.to_s)
         when Arel::Attributes::Attribute
           case self.type_of_attribute(object)
           when :date
@@ -98,17 +98,17 @@ module ArelExtensions
             object
           end
         when DateTime
-          Arel::Nodes.build_quoted(object, self)
+          Arel.quoted(object, self)
         when Time
-          Arel::Nodes.build_quoted(object.strftime('%H:%M:%S'), self)
+          Arel.quoted(object.strftime('%H:%M:%S'), self)
         when MBSTRING, String
-          Arel::Nodes.build_quoted(object.to_s)
+          Arel.quoted(object.to_s)
         when Date
-          Arel::Nodes.build_quoted(object, self)
+          Arel.quoted(object, self)
         when NilClass
           Arel.sql(nil)
         when ActiveSupport::Duration
-          Arel::Nodes.build_quoted(object.to_i.to_s)
+          Arel.quoted(object.to_i.to_s)
         else
           raise(ArgumentError, "#{object.class} cannot be converted to CONCAT arg")
         end
@@ -119,11 +119,11 @@ module ArelExtensions
         when Arel::Attributes::Attribute, Arel::Nodes::Node
           object
         when DateTime, Time
-          Arel::Nodes.build_quoted(Date.new(object.year, object.month, object.day), self)
+          Arel.quoted(Date.new(object.year, object.month, object.day), self)
         when MBSTRING, String
-          Arel::Nodes.build_quoted(Date.parse(object.to_s), self)
+          Arel.quoted(Date.parse(object.to_s), self)
         when Date
-          Arel::Nodes.build_quoted(object, self)
+          Arel.quoted(object, self)
         else
           raise(ArgumentError, "#{object.class} cannot be converted to Date")
         end
@@ -134,11 +134,11 @@ module ArelExtensions
         when Arel::Attributes::Attribute, Arel::Nodes::Node
           object
         when DateTime, Time
-          Arel::Nodes.build_quoted(object, self)
+          Arel.quoted(object, self)
         when MBSTRING, String
-          Arel::Nodes.build_quoted(Time.parse(object.to_s), self)
+          Arel.quoted(Time.parse(object.to_s), self)
         when Date
-          Arel::Nodes.build_quoted(Time.utc(object.year, object.month, object.day, 0, 0, 0), self)
+          Arel.quoted(Time.utc(object.year, object.month, object.day, 0, 0, 0), self)
         else
           raise(ArgumentError, "#{object.class} cannot be converted to Datetime")
         end

data/lib/arel_extensions/nodes/json.rb

@@ -11,15 +11,15 @@ module ArelExtensions
       end
 
       def get key
-        JsonGet.new(self,key)
+        JsonGet.new(self, key)
       end
 
       def set key, value
-        JsonSet.new(self,key,value)
+        JsonSet.new(self, key, value)
       end
 
       def group as_array = true, orders = nil
-        JsonGroup.new(self,as_array, orders)
+        JsonGroup.new(self, as_array, orders)
       end
 
       def hash
@@ -32,19 +32,19 @@ module ArelExtensions
           n.dict
         when Array
           n.map{|e|
-             (e.is_a?(Array) || e.is_a?(Hash)) ? Json.new(e) : convert_to_json_node(e)
+            (e.is_a?(Array) || e.is_a?(Hash)) ? Json.new(e) : convert_to_json_node(e)
           }
         when Hash
-          n.reduce({}){|acc,v|
+          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"))
+          convert_to_node(n.strftime('%Y-%m-%d'))
         when DateTime, Time
-          convert_to_node(n.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
+          convert_to_node(n.strftime('%Y-%m-%dT%H:%M:%S.%L%:z'))
         when NilClass
           Arel.null
         when Arel::SelectManager

data/lib/arel_extensions/nodes/levenshtein_distance.rb

@@ -4,7 +4,7 @@ module ArelExtensions
       RETURN_TYPE = :number
 
       def initialize expr
-        super [convert_to_node(expr.first), Arel::Nodes.build_quoted(expr[1])]
+        super [convert_to_node(expr.first), Arel.quoted(expr[1])]
       end
     end
   end

data/lib/arel_extensions/nodes/matches.rb

@@ -4,7 +4,7 @@ module ArelExtensions
       attr_accessor :case_sensitive if Arel::VERSION.to_i < 7
 
       def initialize(left, right, escape = nil)
-        r = Arel::Nodes.build_quoted(right)
+        r = Arel.quoted(right)
         if Arel::VERSION.to_i < 7 # managed by default in version 7+ (rails 5), so useful for rails 3 & 4
           super(left, r, escape)
           @case_sensitive = false

data/lib/arel_extensions/nodes/replace.rb

@@ -8,7 +8,7 @@ module ArelExtensions
         @left = convert_to_node(left)
         @pattern = convert_to_node(pattern)
         @substitute = convert_to_node(substitute)
-        super([@left,@pattern,@substitute])
+        super([@left, @pattern, @substitute])
       end
     end
 
@@ -20,7 +20,7 @@ module ArelExtensions
         @left = convert_to_node(left)
         @pattern = (pattern.is_a?(Regexp) ? pattern : %r[#{pattern}])
         @substitute = convert_to_node(substitute)
-        super([@left,@pattern,@substitute])
+        super([@left, @pattern, @substitute])
       end
     end
   end

data/lib/arel_extensions/nodes/soundex.rb

@@ -7,11 +7,11 @@ module ArelExtensions
       RETURN_TYPE = :string
 
       def ==(other)
-        Arel::Nodes::Equality.new self, Arel::Nodes.build_quoted(other, self)
+        Arel::Nodes::Equality.new self, Arel.quoted(other, self)
       end
 
       def !=(other)
-        Arel::Nodes::NotEqual.new self, Arel::Nodes.build_quoted(other, self)
+        Arel::Nodes::NotEqual.new self, Arel.quoted(other, self)
       end
     end
   end

data/lib/arel_extensions/nodes/union.rb

@@ -1,16 +1,16 @@
 module ArelExtensions
   module Nodes
     class Union < Arel::Nodes::Union
-      def initialize left,right
-        return super(left,right)
+      def initialize left, right
+        return super(left, right)
       end
 
       def +(other)
-        return ArelExtensions::Nodes::Union.new(self,other)
+        return ArelExtensions::Nodes::Union.new(self, other)
       end
 
       def union(other)
-        return ArelExtensions::Nodes::UnionAll.new(self,other)
+        return ArelExtensions::Nodes::UnionAll.new(self, other)
       end
 
       def as other

data/lib/arel_extensions/nodes/union_all.rb

@@ -1,12 +1,12 @@
 module ArelExtensions
   module Nodes
     class UnionAll < Arel::Nodes::UnionAll
-      def initialize left,right
-        return super(left,right)
+      def initialize left, right
+        return super(left, right)
       end
 
       def union_all(other)
-        return ArelExtensions::Nodes::UnionAll.new(self,other)
+        return ArelExtensions::Nodes::UnionAll.new(self, other)
       end
 
       def as other

data/lib/arel_extensions/predications.rb

@@ -1,14 +1,14 @@
 module ArelExtensions
   module Predications
     def when right, expression = nil
-      ArelExtensions::Nodes::Case.new(self).when(right,expression)
+      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)
+        Arel::Nodes::Matches.new(self, Arel.quoted(other), escape)
       else
-        Arel::Nodes::Matches.new(self, Arel::Nodes.build_quoted(other), escape, case_sensitive)
+        Arel::Nodes::Matches.new(self, Arel.quoted(other), escape, case_sensitive)
       end
     end
 
@@ -17,7 +17,7 @@ module ArelExtensions
     end
 
     def cast right
-      ArelExtensions::Nodes::Cast.new([self,right])
+      ArelExtensions::Nodes::Cast.new([self, right])
     end
 
     def in(*other) # In should handle nil element in the Array
@@ -72,7 +72,7 @@ module ArelExtensions
       when Arel::SelectManager
         Arel::Nodes::NotIn.new(self, other.ast)
       else
-        Arel::Nodes::NotIn.new(self,quoted_node(other))
+        Arel::Nodes::NotIn.new(self, quoted_node(other))
       end
     end
 
@@ -81,13 +81,13 @@ module ArelExtensions
       when Arel::Attributes::Attribute, Arel::Nodes::Node, Integer
         object
       when DateTime
-        Arel::Nodes.build_quoted(object, self)
+        Arel.quoted(object, self)
       when Time
-        Arel::Nodes.build_quoted(object.strftime('%H:%M:%S'), self)
+        Arel.quoted(object.strftime('%H:%M:%S'), self)
       when String
-        Arel::Nodes.build_quoted(object)
+        Arel.quoted(object)
       when Date
-        Arel::Nodes.build_quoted(object.to_s, self)
+        Arel.quoted(object.to_s, self)
       when NilClass
         Arel.sql('NULL')
       when ActiveSupport::Duration

data/lib/arel_extensions/railtie.rb

@@ -3,7 +3,7 @@ require 'rails'
 module ArelExtensions
   class Railtie < Rails::Railtie
     rake_tasks do
-        load 'arel_extensions/tasks.rb'
+      load 'arel_extensions/tasks.rb'
     end
   end
 end

data/lib/arel_extensions/set_functions.rb

@@ -4,15 +4,15 @@ require 'arel_extensions/nodes/union_all'
 module ArelExtensions
   module SetFunctions
     def +(other)
-      ArelExtensions::Nodes::Union.new(self,other)
+      ArelExtensions::Nodes::Union.new(self, other)
     end
 
     def union(other)
-      ArelExtensions::Nodes::Union.new(self,other)
+      ArelExtensions::Nodes::Union.new(self, other)
     end
 
     def union_all(other)
-      ArelExtensions::Nodes::UnionAll.new(self,other)
+      ArelExtensions::Nodes::UnionAll.new(self, other)
     end
 
     def uniq

data/lib/arel_extensions/string_functions.rb

@@ -101,27 +101,27 @@ module ArelExtensions
     end
 
     def ai_matches other # accent insensitive & case sensitive
-      ArelExtensions::Nodes::AiMatches.new(self,other)
+      ArelExtensions::Nodes::AiMatches.new(self, other)
     end
 
     def ai_imatches other # accent insensitive & case insensitive
-      ArelExtensions::Nodes::AiIMatches.new(self,other)
+      ArelExtensions::Nodes::AiIMatches.new(self, other)
     end
 
     def smatches other # accent sensitive & case sensitive
-      ArelExtensions::Nodes::SMatches.new(self,other)
+      ArelExtensions::Nodes::SMatches.new(self, other)
     end
 
     def ai_collate
-      ArelExtensions::Nodes::Collate.new(self,nil,true,false)
+      ArelExtensions::Nodes::Collate.new(self, nil, true, false)
     end
 
     def ci_collate
-      ArelExtensions::Nodes::Collate.new(self,nil,false,true)
+      ArelExtensions::Nodes::Collate.new(self, nil, false, true)
     end
 
-    def collate ai = false,ci = false, option = nil
-      ArelExtensions::Nodes::Collate.new(self,option,ai,ci)
+    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.
@@ -144,7 +144,7 @@ module ArelExtensions
     # 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)
       if orders.present?
-        warn("Warning : ArelExtensions: group_concat: you should now use the kwarg 'order' to specify an order in the group_concat.")
+        warn("Warning: ArelExtensions: group_concat: you should now use the kwarg 'order' to specify an order in the group_concat.")
       end
       order_tabs = [orders].flatten.map{ |o|
         if o.is_a?(Arel::Nodes::Ascending) || o.is_a?(Arel::Nodes::Descending)

data/lib/arel_extensions/tasks.rb

@@ -1,8 +1,8 @@
 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
-                (RUBY_PLATFORM == 'java' ? "jdbc-sqlite" : 'sqlite')
+    @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

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.3.1".freeze
+  VERSION = '1.3.4'.freeze
 end

data/lib/arel_extensions/visitors/ibm_db.rb

@@ -2,45 +2,45 @@ module ArelExtensions
   module Visitors
     class Arel::Visitors::IBM_DB
       def visit_ArelExtensions_Nodes_Ceil o, collector
-        collector << "CEILING("
+        collector << 'CEILING('
         collector = visit o.expr, collector
-        collector << ")"
+        collector << ')'
         collector
       end
 
       def visit_ArelExtensions_Nodes_Trim o, collector
-        collector << "LTRIM(RTRIM("
+        collector << 'LTRIM(RTRIM('
         o.expressions.each_with_index { |arg, i|
           collector << COMMA if i != 0
           collector = visit arg, collector
         }
-        collector << "))"
+        collector << '))'
         collector
       end
 
       def visit_ArelExtensions_Nodes_DateDiff o, collector
-        collector << "DAY("
+        collector << 'DAY('
         collector = visit o.left, collector
-        collector << ","
+        collector << ','
         if o.right.is_a?(Arel::Attributes::Attribute)
           collector = visit o.right, collector
         else
           collector << "'#{o.right}'"
         end
-        collector << ")"
+        collector << ')'
         collector
       end
 
       def visit_ArelExtensions_Nodes_Duration o, collector
         # visit left for period
-        if o.left == "d"
-          collector << "DAY("
-        elsif o.left == "m"
-          collector << "MONTH("
-        elsif o.left == "w"
-          collector << "WEEK"
-        elsif o.left == "y"
-          collector << "YEAR("
+        if o.left == 'd'
+          collector << 'DAY('
+        elsif o.left == 'm'
+          collector << 'MONTH('
+        elsif o.left == 'w'
+          collector << 'WEEK'
+        elsif o.left == 'y'
+          collector << 'YEAR('
         end
         # visit right
         if o.right.is_a?(Arel::Attributes::Attribute)
@@ -48,20 +48,20 @@ module ArelExtensions
         else
           collector << "'#{o.right}'"
         end
-        collector << ")"
+        collector << ')'
         collector
       end
 
       def visit_ArelExtensions_Nodes_IsNull o, collector
-        collector << "COALESCE("
+        collector << 'COALESCE('
         collector = visit o.left, collector
-        collector << ","
+        collector << ','
         if (o.right.is_a?(Arel::Attributes::Attribute))
           collector = visit o.right, collector
         else
           collector << "'#{o.right}'"
         end
-        collector << ")"
+        collector << ')'
         collector
       end
     end