arel_extensions 1.2.15 → 1.2.23

data/generate_gems.sh

@@ -1,14 +1,15 @@
 
-gem uninstall arel_extensions
+#gem uninstall arel_extensions
 
 # VERSION ~> 1
 cp ./version_v1.rb lib/arel_extensions/version.rb
+cp ./gemspecs/arel_extensions-v1.gemspec ./arel_extensions.gemspec
 gem build ./arel_extensions.gemspec
 
 # VERSION ~> 2
 cp ./version_v2.rb lib/arel_extensions/version.rb
 mv ./arel_extensions.gemspec ./arel_extensions.gemspec.bck
-cp ./gemspec_v2/arel_extensions-v2.gemspec ./arel_extensions.gemspec
+cp ./gemspecs/arel_extensions-v2.gemspec ./arel_extensions.gemspec
 gem build ./arel_extensions.gemspec
 cp ./version_v1.rb lib/arel_extensions/version.rb
-cp ./arel_extensions.gemspec.bck ./arel_extensions.gemspec
+cp ./gemspecs/arel_extensions-v1.gemspec ./arel_extensions.gemspec

data/lib/arel_extensions.rb

@@ -16,8 +16,10 @@ class Arel::Nodes::Casted
   include Arel::AliasPredication
 
   # They forget to define hash.
-  def hash
-    [self.class, self.val, self.attribute].hash
+  if Gem::Version.new(Arel::VERSION) < Gem::Version.new("10.0.0")
+    def hash
+      [self.class, self.val, self.attribute].hash
+    end
   end
 end
 
@@ -124,9 +126,13 @@ class Arel::Nodes::Function
   include ArelExtensions::NullFunctions
   include ArelExtensions::Predications
 
-  alias_method :old_as, :as
+  alias_method(:old_as, :as) rescue nil
   def as other
-    Arel::Nodes::As.new(self, Arel.sql(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
+    res
   end
 end
 
@@ -178,7 +184,7 @@ class Arel::Nodes::As
 end
 
 class Arel::Table
-  alias_method :old_alias, :alias
+  alias_method(:old_alias, :alias) rescue nil
   def alias(name = "#{self.name}_2")
     name.blank? ? self : Arel::Nodes::TableAlias.new(self,name)
   end

data/lib/arel_extensions/boolean_functions.rb

@@ -1,9 +1,9 @@
 # coding: utf-8
+
 require 'arel_extensions/nodes/then'
 
 module ArelExtensions
   module BooleanFunctions
-
     def ⋀(other)
       self.and(other)
     end
@@ -23,7 +23,6 @@ module ArelExtensions
     def then(t, f = nil)
       ArelExtensions::Nodes::Then.new [self, t, f]
     end
-
   end
 end
 
@@ -34,10 +33,9 @@ class Arel::Nodes::And
     children =
       children.flatten.map { |c|
       c.is_a?(self) ? c.children : c
-    }.flatten
+      }.flatten
     super(children)
   end
-
 end
 
 # For some reason, Arel's And is properly defined as variadic (it
@@ -55,7 +53,7 @@ class Arel::Nodes::Or
     children =
       children.flatten.map { |c|
       c.is_a?(self) ? c.children : c
-    }.flatten
+      }.flatten
     super(*children)
   end
 
@@ -63,8 +61,26 @@ class Arel::Nodes::Or
     @children = children
   end
 
+  def initialize_copy(other)
+    super
+    @children = other.children.copy if other.children
+  end
+
+  def left
+    children.first
+  end
+
+  def right
+    children[1]
+  end
+
   def hash
     children.hash
   end
 
+  def eql?(other)
+    self.class == other.class &&
+      children == other.children
+  end
+  alias :== :eql?
 end

data/lib/arel_extensions/common_sql_functions.rb

@@ -1,6 +1,5 @@
 module ArelExtensions
   class CommonSqlFunctions
-
     def initialize(cnx)
       @cnx = cnx
       if cnx && cnx.adapter_name =~ /sqlite/i && !$load_extension_disabled
@@ -12,7 +11,7 @@ module ArelExtensions
           db.enable_load_extension(0)
         rescue => e
           $load_extension_disabled = true
-          puts "can not load extensions #{e.inspect}"
+          puts "cannot load extensions #{e.inspect}"
         end
       end
     end
@@ -44,7 +43,7 @@ module ArelExtensions
         begin
           add_sqlite_functions
         rescue => e
-          puts "can not add sqlite functions #{e.inspect}"
+          puts "cannot add sqlite functions #{e.inspect}"
         end
       end
       if File.exist?("init/#{env_db}.sql")
@@ -62,6 +61,5 @@ module ArelExtensions
         end
       end
     end
-
   end
 end

data/lib/arel_extensions/comparators.rb

@@ -1,7 +1,5 @@
 module ArelExtensions
   module Comparators
-
-
     def >(other)
       Arel::Nodes::GreaterThan.new self, Arel::Nodes.build_quoted(other, self)
     end
@@ -18,26 +16,26 @@ module ArelExtensions
       Arel::Nodes::LessThanOrEqual.new self, Arel::Nodes.build_quoted(other, self)
     end
 
-
-    #REGEXP function
-    #Pattern matching using regular expressions
+    # REGEXP function
+    # Pattern matching using regular expressions
     def =~(other)
-#      arg = self.relation.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s].type
-#      if arg == :string || arg == :text
+        #      arg = self.relation.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s].type
+        #      if arg == :string || arg == :text
         Arel::Nodes::Regexp.new self, convert_regexp(other)
-#      end
+      #      end
     end
 
-    #NOT_REGEXP function
-    #Negation of Regexp
+    # NOT_REGEXP function
+    # Negation of Regexp
     def !~(other)
-#      arg = self.relation.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s].type
-#      if arg == :string || arg == :text
+        #      arg = self.relation.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s].type
+        #      if arg == :string || arg == :text
         Arel::Nodes::NotRegexp.new self, convert_regexp(other)
-#      end
+      #      end
     end
 
     private
+
     # Function used for not_regexp.
     def convert_regexp(other)
       case other
@@ -56,6 +54,5 @@ module ArelExtensions
       end
       Arel::Nodes.build_quoted(other, self)
     end
-
   end
 end

data/lib/arel_extensions/date_duration.rb

@@ -4,22 +4,22 @@ require 'arel_extensions/nodes/wday'
 
 module ArelExtensions
   module DateDuration
-    #function returns the year (as a number) given a date value.
+    # function returns the year (as a number) given a date value.
     def year
       ArelExtensions::Nodes::Duration.new "y", self
     end
 
-  #function returns the month (as a number) given a date value.
+    # function returns the month (as a number) given a date value.
     def month
       ArelExtensions::Nodes::Duration.new "m", self
     end
 
-    #function returns the  week (as a number) given a date value.
+    # function returns the  week (as a number) given a date value.
     def week
       ArelExtensions::Nodes::Duration.new "w", self
     end
 
-    #function returns the month (as a number) given a date value.
+    # function returns the month (as a number) given a date value.
     def day
       ArelExtensions::Nodes::Duration.new "d", self
     end
@@ -43,6 +43,5 @@ module ArelExtensions
     def format(tpl)
       ArelExtensions::Nodes::Format.new [self, tpl]
     end
-
   end
 end

data/lib/arel_extensions/insert_manager.rb

@@ -2,34 +2,33 @@ require 'arel'
 
 module ArelExtensions
   module InsertManager
-
     def bulk_insert(cols, data)
     res_columns = []
-      case cols.first
-      when String, Symbol
-        cols.each { |c|
-          res_columns << @ast.relation[c]
-        }
-      when Array
-        if String === cols.first.first
-          res_columns = cols.map {|c| [@ast.relation[c.first]] }
-        elsif Arel::Attributes::Attribute == cols.first.first
-          res_columns = cols
-        end
-      when NilClass
-        res_columns = @ast.relation.columns
+    case cols.first
+    when String, Symbol
+      cols.each { |c|
+        res_columns << @ast.relation[c]
+      }
+    when Array
+      if String === cols.first.first
+        res_columns = cols.map {|c| [@ast.relation[c.first]] }
+      elsif Arel::Attributes::Attribute == cols.first.first
+        res_columns = cols
       end
-      self.values = BulkValues.new(res_columns, data)
-      @ast.columns = res_columns
+    when NilClass
+      res_columns = @ast.relation.columns
+    end
+    self.values = BulkValues.new(res_columns, data)
+    @ast.columns = res_columns
     end
 
     class BulkValues < Arel::Nodes::Node
       attr_accessor :left, :cols
+
       def initialize(cols, values)
         @left = values
         @cols = cols
       end
     end
-
   end
 end

data/lib/arel_extensions/math.rb

@@ -11,9 +11,9 @@ require 'arel_extensions/nodes/union_all'
 
 module ArelExtensions
   module Math
-    #function + between
-    #String and others (convert in string)  allows you to concatenate 2 or more strings together.
-    #Date and integer adds or subtracts a specified time interval from a date.
+    # function + between
+    # String and others (convert in string)  allows you to concatenate 2 or more strings together.
+    # Date and integer adds or subtracts a specified time interval from a date.
     def +(other)
       case self
         when Arel::Nodes::Quoted
@@ -43,7 +43,7 @@ module ArelExtensions
         rescue Exception
           col = nil
         end
-        if (!col) #if the column doesn't exist in the database
+        if (!col) # if the column doesn't exist in the database
           Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new(self, other))
         else
           arg = col.type
@@ -62,8 +62,8 @@ module ArelExtensions
       end
     end
 
-    #function returns the time between two dates
-    #function returns the substraction between two ints
+    # function returns the time between two dates
+    # function returns the substraction between two ints
     def -(other)
       case self
       when Arel::Nodes::Grouping
@@ -91,7 +91,7 @@ module ArelExtensions
         rescue Exception
           col = nil
         end
-        if (!col) #if the column doesn't exist in the database
+        if (!col) # if the column doesn't exist in the database
           Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
         else
           arg = col.type
@@ -103,7 +103,7 @@ module ArelExtensions
               rescue Exception
                 col2 = nil
               end
-              if (!col2) #if the column doesn't exist in the database
+              if (!col2) # if the column doesn't exist in the database
                 ArelExtensions::Nodes::DateSub.new [self, other]
               else
                 arg2 = col2.type
@@ -133,6 +133,5 @@ module ArelExtensions
         end
       end
     end
-
   end
 end

data/lib/arel_extensions/math_functions.rb

@@ -11,7 +11,6 @@ require 'arel_extensions/nodes/sum'
 
 module ArelExtensions
   module MathFunctions
-
     # Arel does not handle Decimal literal properly
     def * other
       case other
@@ -47,7 +46,7 @@ module ArelExtensions
         ArelExtensions::Nodes::Floor.new [self]
     end
 
-     # function gives the base 10 log
+    # function gives the base 10 log
     def log10
         ArelExtensions::Nodes::Log10.new [self]
     end
@@ -64,24 +63,28 @@ module ArelExtensions
 
     # Aggregate Functions
     def std opts = {unbiased: true}
-      ArelExtensions::Nodes::Std.new self, opts
+      ArelExtensions::Nodes::Std.new self, **opts
     end
 
     def variance opts = {unbiased: true}
-      ArelExtensions::Nodes::Variance.new self, opts
+      ArelExtensions::Nodes::Variance.new self, **opts
     end
 
     def sum opts = {unbiased: true}
-      ArelExtensions::Nodes::Sum.new self, opts
+      if Gem::Version.new(Arel::VERSION) >= Gem::Version.new("9.0.0")
+        Arel::Nodes::Sum.new [self]
+      else
+        ArelExtensions::Nodes::Sum.new self, **opts
+      end
     end
 
-    #function that can be invoked to produce random numbers between 0 and 1
-#    def rand seed = nil
-#        ArelExtensions::Nodes::Rand.new [seed]
-#    end
-    alias_method :random, :rand
+    # function that can be invoked to produce random numbers between 0 and 1
+    #    def rand seed = nil
+    #        ArelExtensions::Nodes::Rand.new [seed]
+    #    end
+    alias_method(:random, :rand) rescue nil
 
-    #function is used to round a numeric field to the number of decimals specified
+    # function is used to round a numeric field to the number of decimals specified
     def round precision = nil
         if precision
             ArelExtensions::Nodes::Round.new [self, precision]
@@ -96,14 +99,14 @@ module ArelExtensions
         sprintf(format_string,0) # this line is to get the right error message if the format_string is not correct
         m = /^(.*)%([ #+\-0]*)([1-9][0-9]+|[1-9]?)[.]?([0-9]*)([a-zA-Z])(.*)$/.match(format_string)
         opts = {
-          :prefix     => m[1],
-          :flags      => m[2].split(//).uniq.join,
-          :width      => m[3].to_i,
-          :precision  => m[4] != '' ? m[4].to_i : 6,
-          :type       => m[5],
-          :suffix     => m[6],
-          :locale    => locale,
-          :original_string => format_string
+          prefix: m[1],
+          flags: m[2].split(//).uniq.join,
+          width: m[3].to_i,
+          precision: m[4] != '' ? m[4].to_i : 6,
+          type: m[5],
+          suffix: m[6],
+          locale: locale,
+          original_string: format_string
         }
         # opts = {:locale => 'fr_FR', :type => "e"/"f"/"d", :prefix => "$ ", :suffix => " %", :flags => " +-#0", :width => 5, :precision => 6}
         ArelExtensions::Nodes::FormattedNumber.new [self,opts]
@@ -111,6 +114,5 @@ module ArelExtensions
         Arel::Nodes.build_quoted('Wrong Format')
       end
     end
-
   end
 end

data/lib/arel_extensions/nodes/abs.rb

@@ -2,7 +2,6 @@ module ArelExtensions
   module Nodes
     class Abs < Function
       RETURN_TYPE = :number
-
     end
   end
 end