arel_extensions 1.2.23 → 2.0.0.rc3

data/lib/arel_extensions/attributes.rb

@@ -23,5 +23,6 @@ module ArelExtensions
     def !=(other)
       Arel::Nodes::NotEqual.new self, Arel::Nodes.build_quoted(other, self)
     end
+
   end
 end

data/lib/arel_extensions/boolean_functions.rb

@@ -1,15 +1,14 @@
-# coding: utf-8
-
 require 'arel_extensions/nodes/then'
 
 module ArelExtensions
   module BooleanFunctions
+
     def ⋀(other)
       self.and(other)
     end
 
     def and *others
-      Arel::Nodes::And.new self, others
+      Arel::Nodes::And.new([self]+ others.flatten)
     end
 
     def ⋁(other)
@@ -17,7 +16,12 @@ module ArelExtensions
     end
 
     def or *others
-      Arel::Nodes::Or.new self, others
+      args = others.flatten
+      if args.length == 1
+        Arel::Nodes::Or.new(self, args.first)
+      else
+        ArelExtensions::Nodes::Or.new([self]+ args)
+      end
     end
 
     def then(t, f = nil)
@@ -26,61 +30,16 @@ module ArelExtensions
   end
 end
 
-class Arel::Nodes::And
+Arel::Nodes::And.class_eval do
   include ArelExtensions::BooleanFunctions
-
-  def self.new *children
-    children =
-      children.flatten.map { |c|
-      c.is_a?(self) ? c.children : c
-      }.flatten
-    super(children)
-  end
 end
 
-# For some reason, Arel's And is properly defined as variadic (it
-# stores @children, and hashes it all).  However Arel's Or is defined
-# as binary, with only @left and @right, and hashing only @left and @right.
-#
-# So reimplement its ctor and accessors.
-
-class Arel::Nodes::Or
+Arel::Nodes::Or.class_eval do
   include ArelExtensions::BooleanFunctions
+end
 
-  attr_reader :children
-
-  def self.new *children
-    children =
-      children.flatten.map { |c|
-      c.is_a?(self) ? c.children : c
-      }.flatten
-    super(*children)
-  end
-
-  def initialize *children
-    @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
+ArelExtensions::Nodes.const_set('Or',Class.new(Arel::Nodes::And)).class_eval do
+  include ArelExtensions::BooleanFunctions
+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,5 +1,6 @@
 module ArelExtensions
   class CommonSqlFunctions
+
     def initialize(cnx)
       @cnx = cnx
       if cnx && cnx.adapter_name =~ /sqlite/i && !$load_extension_disabled
@@ -11,7 +12,7 @@ module ArelExtensions
           db.enable_load_extension(0)
         rescue => e
           $load_extension_disabled = true
-          puts "cannot load extensions #{e.inspect}"
+          puts "can not load extensions #{e.inspect}"
         end
       end
     end
@@ -38,12 +39,11 @@ module ArelExtensions
 
     def add_sql_functions(env_db = nil)
       env_db ||= @cnx.adapter_name
-      env_db = 'mysql' if env_db =~ /mysql/i
       if env_db =~ /sqlite/i
         begin
           add_sqlite_functions
         rescue => e
-          puts "cannot add sqlite functions #{e.inspect}"
+          puts "can not add sqlite functions #{e.inspect}"
         end
       end
       if File.exist?("init/#{env_db}.sql")
@@ -52,14 +52,15 @@ module ArelExtensions
           sql.split(/^GO\s*$/).each {|str|
             @cnx.execute(str.strip) unless str.blank?
           }
-        elsif env_db =='mysql'
-          sql.split("$$")[1..-2].each { |str|
-            @cnx.execute(str.strip) unless str.strip.blank?
-          }
+        elsif env_db == 'mysql' 
+			sql.split("$$")[1..-2].each { |str|
+				@cnx.execute(str.strip) unless str.strip.blank?
+			}
         else
           @cnx.execute(sql) unless sql.blank?
         end
       end
     end
+
   end
 end

data/lib/arel_extensions/comparators.rb

@@ -1,5 +1,6 @@
 module ArelExtensions
   module Comparators
+
     def >(other)
       Arel::Nodes::GreaterThan.new self, Arel::Nodes.build_quoted(other, self)
     end
@@ -16,34 +17,33 @@ 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.
+    #Function use for not_regexp
     def convert_regexp(other)
       case other
       when String
-        # Do nothing.
+        #Do nothing
       when Regexp
         other = other.source.gsub('\A','^')
-        other.gsub!('\z','$')
         other.gsub!('\Z','$')
         other.gsub!('\d','[0-9]')
         other.gsub!('\D','[^0-9]')
@@ -54,5 +54,6 @@ 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,5 +43,6 @@ module ArelExtensions
     def format(tpl)
       ArelExtensions::Nodes::Format.new [self, tpl]
     end
+
   end
 end

data/lib/arel_extensions/insert_manager.rb

@@ -2,33 +2,32 @@ 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
+      case cols.first
+        when String, Symbol
+          cols.each { |c|
+            @ast.columns << @ast.relation[c]
+          }
+        when Array
+          if String === cols.first.first
+            @ast.columns = cols.map {|c| [@ast.relation[c.first]] }
+          elsif Arel::Attributes::Attribute == cols.first.first
+            @ast.columns = cols
+          end
+        when NilClass
+          @ast.columns = @ast.relation.columns
       end
-    when NilClass
-      res_columns = @ast.relation.columns
-    end
-    self.values = BulkValues.new(res_columns, data)
-    @ast.columns = res_columns
+      self.values = BulkValues.new(@ast.columns, data)
     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
@@ -24,7 +24,7 @@ module ArelExtensions
           else
             return Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
           end
-        when ArelExtensions::Nodes::Function,ArelExtensions::Nodes::Case
+        when  ArelExtensions::Nodes::Function,ArelExtensions::Nodes::Case
           return case self.return_type
         when :string, :text
           self.concat(other)
@@ -35,7 +35,7 @@ module ArelExtensions
         else
           self.concat(other)
         end
-      when Arel::Nodes::Function
+      when  Arel::Nodes::Function
         Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
       else
         begin
@@ -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
@@ -115,7 +115,7 @@ module ArelExtensions
               end
             when Arel::Nodes::Node, DateTime, Time, String, Date
               ArelExtensions::Nodes::DateDiff.new [self, other]
-            when ArelExtensions::Nodes::Duration, Integer
+            when  ArelExtensions::Nodes::Duration, Integer
               ArelExtensions::Nodes::DateSub.new [self, other]
             else # ActiveSupport::Duration
               ArelExtensions::Nodes::DateAdd.new [self, -other]
@@ -133,5 +133,6 @@ module ArelExtensions
         end
       end
     end
+
   end
 end

data/lib/arel_extensions/math_functions.rb

@@ -7,10 +7,10 @@ require 'arel_extensions/nodes/formatted_number'
 require 'arel_extensions/nodes/log10'
 require 'arel_extensions/nodes/power'
 require 'arel_extensions/nodes/std'
-require 'arel_extensions/nodes/sum'
 
 module ArelExtensions
   module MathFunctions
+
     # Arel does not handle Decimal literal properly
     def * other
       case other
@@ -46,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
@@ -62,29 +62,21 @@ module ArelExtensions
     end
 
     # Aggregate Functions
-    def std opts = {unbiased: true}
-      ArelExtensions::Nodes::Std.new self, **opts
-    end
-
-    def variance opts = {unbiased: true}
-      ArelExtensions::Nodes::Variance.new self, **opts
+    def std unbiased = true
+      ArelExtensions::Nodes::Std.new [self,unbiased]
     end
 
-    def sum opts = {unbiased: true}
-      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
+    def variance unbiased = true
+      ArelExtensions::Nodes::Variance.new [self,unbiased]
     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) rescue nil
+    #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 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]
@@ -94,19 +86,19 @@ module ArelExtensions
     end
 
     # function returning a number at a specific format
-    def format_number format_string, locale = nil
+    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,
-          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]
@@ -114,5 +106,6 @@ module ArelExtensions
         Arel::Nodes.build_quoted('Wrong Format')
       end
     end
+
   end
 end