arel_extensions 1.2.14 → 1.2.19

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
@@ -47,8 +46,7 @@ module ArelExtensions::Nodes
 
     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

@@ -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

data/lib/arel_extensions/nodes/formatted_number.rb

@@ -19,7 +19,6 @@ module ArelExtensions
         @original_string = expr[1][:original_string]
         super [col]
       end
-
     end
   end
 end

data/lib/arel_extensions/nodes/function.rb

@@ -10,6 +10,10 @@ module ArelExtensions
 
       RETURN_TYPE = :string # by default...
 
+      # Support multibyte string if they are available.
+      MBSTRING =
+        defined?(ActiveSupport::Multibyte::Chars) ? ActiveSupport::Multibyte::Chars : String
+
       # overrides as to make new Node like AliasPredication
 
       def return_type
@@ -50,8 +54,8 @@ module ArelExtensions
           end
         when ArelExtensions::Nodes::Function
           att.return_type
-#        else
-#          nil
+          #        else
+          #          nil
         end
       end
 
@@ -63,7 +67,7 @@ module ArelExtensions
           Arel::Nodes.build_quoted(object, self)
         when Time
           Arel::Nodes.build_quoted(object.strftime('%H:%M:%S'), self)
-        when String, Symbol
+        when MBSTRING, String, Symbol
           Arel::Nodes.build_quoted(object.to_s)
         when Date
           Arel::Nodes.build_quoted(object.to_s, self)
@@ -74,7 +78,7 @@ module ArelExtensions
         when Array
           Arel::Nodes::Grouping.new(object.map{|r| convert_to_node(e)})
         else
-          raise(ArgumentError, "#{object.class} can not be converted to CONCAT arg")
+          raise(ArgumentError, "#{object.class} cannot be converted to CONCAT arg")
         end
       end
 
@@ -97,8 +101,8 @@ module ArelExtensions
           Arel::Nodes.build_quoted(object, self)
         when Time
           Arel::Nodes.build_quoted(object.strftime('%H:%M:%S'), self)
-        when String
-          Arel::Nodes.build_quoted(object)
+        when MBSTRING, String
+          Arel::Nodes.build_quoted(object.to_s)
         when Date
           Arel::Nodes.build_quoted(object, self)
         when NilClass
@@ -106,7 +110,7 @@ module ArelExtensions
         when ActiveSupport::Duration
           Arel::Nodes.build_quoted(object.to_i.to_s)
         else
-          raise(ArgumentError, "#{object.class} can not be converted to CONCAT arg")
+          raise(ArgumentError, "#{object.class} cannot be converted to CONCAT arg")
         end
       end
 
@@ -116,12 +120,12 @@ module ArelExtensions
           object
         when DateTime, Time
           Arel::Nodes.build_quoted(Date.new(object.year, object.month, object.day), self)
-        when String
-          Arel::Nodes.build_quoted(Date.parse(object), self)
+        when MBSTRING, String
+          Arel::Nodes.build_quoted(Date.parse(object.to_s), self)
         when Date
           Arel::Nodes.build_quoted(object, self)
         else
-          raise(ArgumentError, "#{object.class} can not be converted to Date")
+          raise(ArgumentError, "#{object.class} cannot be converted to Date")
         end
       end
 
@@ -131,12 +135,12 @@ module ArelExtensions
           object
         when DateTime, Time
           Arel::Nodes.build_quoted(object, self)
-        when String
-          Arel::Nodes.build_quoted(Time.parse(object), self)
+        when MBSTRING, String
+          Arel::Nodes.build_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)
         else
-          raise(ArgumentError, "#{object.class} can not be converted to Datetime")
+          raise(ArgumentError, "#{object.class} cannot be converted to Datetime")
         end
       end
 
@@ -154,10 +158,9 @@ module ArelExtensions
         when NilClass
           0
         else
-          raise(ArgumentError, "#{object.class} can not be converted to NUMBER arg")
+          raise(ArgumentError, "#{object.class} cannot be converted to NUMBER arg")
         end
       end
-
     end
   end
 end

data/lib/arel_extensions/nodes/json.rb

@@ -26,43 +26,55 @@ module ArelExtensions
         [@dict].hash
       end
 
+      def convert_to_json_node(n)
+        case n
+        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)
+          }
+        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])
+            acc
+          }
+        when String, Numeric, TrueClass, FalseClass
+          convert_to_node(n)
+        when Date
+          convert_to_node(n.strftime("%Y-%m-%d"))
+        when DateTime, Time
+          convert_to_node(n.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
+        when NilClass
+          Arel.sql('null')
+        else
+          convert_to_node(n)
+        end
+      end
+
+      def type_of_node(v)
+        if v.is_a?(Arel::Attributes::Attribute)
+          self.type_of_attribute(v)
+        elsif v.respond_to?(:return_type)
+          v.return_type
+        elsif v.nil?
+          :nil
+        else
+          :string
+        end
+      end
     end
 
     class Json < JsonNode
-
       def initialize *expr
         @dict =
           if expr.length == 1
-            case exp = expr.first
-            when JsonNode
-              exp.dict
-            when Array
-              exp.map{|e|
-                (e.is_a?(Array) || e.is_a?(Hash)) ? Json.new(e) : convert_to_node(e)
-              }
-            when Hash
-              exp.reduce({}){|acc,v|
-                acc[convert_to_node(v[0])] = (v[1].is_a?(Array) || v[1].is_a?(Hash)) ? Json.new(v[1]) : convert_to_node(v[1])
-                acc
-              }
-            when String, Numeric, TrueClass, FalseClass
-              convert_to_node(exp)
-            when NilClass
-              Arel.sql('null')
-            else
-              if (exp.is_a?(Arel::Attributes::Attribute) && type_of_attribute(exp) == :string) \
-                 || (exp.return_type == :string)
-                convert_to_node(exp)
-              else
-                [convert_to_node(exp)]
-              end
-            end
+            convert_to_json_node(expr.first)
           else
-            expr.map{|e| (e.is_a?(Array) || e.is_a?(Hash)) ? Json.new(e) : convert_to_node(e) }
+            expr.map{|e| convert_to_json_node(e) }
           end
         super
       end
-
     end
 
     class JsonMerge < JsonNode
@@ -87,7 +99,6 @@ module ArelExtensions
         @dict = json
         @key = convert_to_node(key)
       end
-
     end
 
     class JsonSet < JsonNode
@@ -98,8 +109,6 @@ module ArelExtensions
         @key = convert_to_node(key)
         @value = Json.new(value)
       end
-
     end
-
   end
 end

data/lib/arel_extensions/nodes/length.rb

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