arel_extensions 2.0.9 → 2.0.14

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
@@ -75,13 +74,13 @@ module ArelExtensions
       ArelExtensions::Nodes::Sum.new self, opts
     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 +95,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 +110,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

data/lib/arel_extensions/nodes/aggregate_function.rb

@@ -9,6 +9,5 @@ module ArelExtensions
         super [node]
       end
     end
-
   end
 end

data/lib/arel_extensions/nodes/blank.rb

@@ -19,6 +19,5 @@ module ArelExtensions
           super expr.first
       end
     end
-
   end
 end

data/lib/arel_extensions/nodes/case.rb

@@ -19,7 +19,6 @@ module ArelExtensions
 
         class Else < Arel::Nodes::Unary # :nodoc:
         end
-
       end
     else
       class Case < Arel::Nodes::Case
@@ -96,9 +95,9 @@ module ArelExtensions
 
       def eql? other
         self.class == other.class &&
-        self.case == other.case &&
-        self.conditions == other.conditions &&
-        self.default == other.default
+          self.case == other.case &&
+          self.conditions == other.conditions &&
+          self.default == other.default
       end
       alias :== :eql?
 

data/lib/arel_extensions/nodes/cast.rb

@@ -14,7 +14,10 @@ module ArelExtensions
           @return_type = :decimal
         when :number
           @return_type = :number
-        when 'char', 'varchar', 'text', 'nchar', 'nvarchar', 'ntext'
+        when 'char', 'varchar', 'nchar', 'nvarchar'
+          @return_type = :string
+        when 'text', :text, 'ntext', :ntext
+          @as_attr = expr[1].to_sym
           @return_type = :string
         when :datetime, 'datetime','smalldatetime'
           @return_type = :datetime
@@ -46,7 +49,6 @@ module ArelExtensions
       def return_type
         @return_type
       end
-
     end
   end
 end

data/lib/arel_extensions/nodes/ceil.rb

@@ -1,7 +1,7 @@
 module ArelExtensions
   module Nodes
     class Ceil < Function
-    	RETURN_TYPE = :number
+      RETURN_TYPE = :number
     end
   end
 end

data/lib/arel_extensions/nodes/coalesce.rb

@@ -29,7 +29,6 @@ module ArelExtensions
         end
         return super(tab)
       end
-
     end
   end
 end

data/lib/arel_extensions/nodes/collate.rb

@@ -12,7 +12,6 @@ module ArelExtensions
       tab = [convert_to_node(left)]
       return super(tab)
     end
-
     end
   end
 end

data/lib/arel_extensions/nodes/concat.rb

@@ -11,7 +11,7 @@ module ArelExtensions::Nodes
         else
           node
         end
-      }.flatten.reduce([]) { | res, b |
+      }.flatten.reduce([]) { |res, b|
         # concatenate successive literal strings.
         if b.is_a?(Arel::Nodes::Quoted) && b.expr == ""
           res
@@ -37,7 +37,6 @@ module ArelExtensions::Nodes
     def concat(other)
       Concat.new(self.expressions + [other])
     end
-
   end
 
   class GroupConcat < AggregateFunction
@@ -49,6 +48,5 @@ module ArelExtensions::Nodes
       @separator = convert_to_node(separator)
       super node, opts
     end
-
   end
 end

data/lib/arel_extensions/nodes/date_diff.rb

@@ -2,7 +2,7 @@ require 'date'
 
 module ArelExtensions
   module Nodes
-    class DateDiff < Function #difference entre colonne date et date string/date
+    class DateDiff < Function # difference entre colonne date et date string/date
       attr_accessor :left_node_type
       attr_accessor :right_node_type
 
@@ -97,7 +97,7 @@ module ArelExtensions
         v ||= self.expressions.last
         if defined?(ActiveSupport::Duration) && ActiveSupport::Duration === v
           if @date_type == :ruby_date
-            Arel.sql("(INTERVAL '1' DAY) * %s" % v.inspect.to_i )
+            Arel.sql("(INTERVAL '1' DAY) * %s" % v.inspect.to_i)
           else
             Arel.sql("(INTERVAL '1' SECOND) * %s" % v.to_i)
           end
@@ -150,6 +150,7 @@ module ArelExtensions
       end
 
       private
+
       def convert(object)
         case object
         when Arel::Attributes::Attribute, Arel::Nodes::Node, ActiveSupport::Duration
@@ -157,16 +158,16 @@ module ArelExtensions
         when Integer
           object.days
         when DateTime, Time, Date
-          raise(ArgumentError, "#{object.class} can not be converted to Integer")
+          raise(ArgumentError, "#{object.class} cannot be converted to Integer")
         when String
           Arel::Nodes.build_quoted(object)
         else
-          raise(ArgumentError, "#{object.class} can not be converted to Integer")
+          raise(ArgumentError, "#{object.class} cannot be converted to Integer")
         end
       end
     end
 
-    class DateSub < Function #difference entre colonne date et date string/date
+    class DateSub < Function # difference entre colonne date et date string/date
       RETURN_TYPE = :integer
 
       def initialize(expr)
@@ -183,12 +184,10 @@ module ArelExtensions
           if defined?(ActiveSupport::Duration) && ActiveSupport::Duration === object
             object.to_i
           else
-            raise(ArgumentError, "#{object.class} can not be converted to Number")
+            raise(ArgumentError, "#{object.class} cannot be converted to Number")
           end
         end
       end
-
     end
-
   end
 end

data/lib/arel_extensions/nodes/duration.rb

@@ -20,7 +20,6 @@ module ArelExtensions
       def right
         @expressions[1]
       end
-
     end
   end
 end

data/lib/arel_extensions/nodes/find_in_set.rb

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

data/lib/arel_extensions/nodes/floor.rb

@@ -1,7 +1,7 @@
 module ArelExtensions
   module Nodes
     class Floor < Function
-    	RETURN_TYPE = :number
+      RETURN_TYPE = :number
     end
   end
 end

data/lib/arel_extensions/nodes/format.rb

@@ -1,15 +1,41 @@
+require 'strscan'
+
 module ArelExtensions
   module Nodes
     class Format < Function
       RETURN_TYPE = :string
 
       attr_accessor :col_type, :iso_format
+
       def initialize expr
         col = expr.first
-        @iso_format = expr[1]
+        @iso_format = convert_format(expr[1])
         @col_type = type_of_attribute(col)
         super [col, convert_to_string_node(@iso_format)]
       end
+
+      private
+
+      # Address portability issues with some of the formats.
+      def convert_format(fmt)
+        s = StringScanner.new fmt
+        res = StringIO.new
+        while !s.eos?
+          res <<
+            case
+            when s.scan(/%D/)    then '%m/%d/%y'
+            when s.scan(/%F/)    then '%Y-%m-%d'
+            when s.scan(/%R/)    then '%H:%M'
+            when s.scan(/%r/)    then '%I:%M:%S %p'
+            when s.scan(/%T/)    then '%H:%M:%S'
+            when s.scan(/%v/)    then '%e-%b-%Y'
+
+            when s.scan(/[^%]+/) then s.matched
+            when s.scan(/./)     then s.matched
+            end
+        end
+        res.string
+      end
     end
   end
 end