arel_extensions 1.2.13 → 1.2.18

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

data/lib/arel_extensions/nodes/locate.rb

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

data/lib/arel_extensions/nodes/log10.rb

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

data/lib/arel_extensions/nodes/matches.rb

@@ -1,7 +1,6 @@
 module ArelExtensions
   module Nodes
     class IMatches < Arel::Nodes::Matches
-
       attr_accessor :case_sensitive if Arel::VERSION.to_i < 7
 
       def initialize(left, right, escape = nil)
@@ -26,6 +25,5 @@ module ArelExtensions
 
     class SMatches < IMatches
     end
-
   end
 end

data/lib/arel_extensions/nodes/md5.rb

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

data/lib/arel_extensions/nodes/power.rb

@@ -6,7 +6,6 @@ module ArelExtensions
       def initialize expr
         super [convert_to_node(expr.first), convert_to_number(expr[1])]
       end
-
     end
   end
 end

data/lib/arel_extensions/nodes/rand.rb

@@ -10,7 +10,6 @@ module ArelExtensions
           super []
         end
       end
-
     end
   end
 end

data/lib/arel_extensions/nodes/repeat.rb

@@ -13,8 +13,6 @@ module ArelExtensions
       def +(other)
         return ArelExtensions::Nodes::Concat.new(self.expressions + [other])
       end
-
     end
-
   end
 end

data/lib/arel_extensions/nodes/replace.rb

@@ -14,7 +14,6 @@ module ArelExtensions
       def +(other)
         return ArelExtensions::Nodes::Concat.new(self.expressions + [other])
       end
-
     end
 
     class RegexpReplace < Function
@@ -32,6 +31,5 @@ module ArelExtensions
         return ArelExtensions::Nodes::Concat.new(self.expressions + [other])
       end
     end
-
   end
 end

data/lib/arel_extensions/nodes/round.rb

@@ -10,7 +10,6 @@ module ArelExtensions
           super [convert_to_node(expr.first), convert_to_number(expr[1])]
         end
       end
-
     end
   end
 end

data/lib/arel_extensions/nodes/soundex.rb

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

data/lib/arel_extensions/nodes/std.rb

@@ -19,6 +19,5 @@ module ArelExtensions
         super node, opts
       end
     end
-
   end
 end

data/lib/arel_extensions/nodes/substring.rb

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

data/lib/arel_extensions/nodes/trim.rb

@@ -13,7 +13,6 @@ module ArelExtensions
       def +(other)
         return ArelExtensions::Nodes::Concat.new(self.expressions + [other])
       end
-
     end
 
     class Ltrim < Trim
@@ -23,6 +22,5 @@ module ArelExtensions
     class Rtrim < Trim
       RETURN_TYPE = :string
     end
-
   end
 end

data/lib/arel_extensions/nodes/union.rb

@@ -1,7 +1,6 @@
 module ArelExtensions
   module Nodes
     class Union < Arel::Nodes::Union
-
       def initialize left,right
         return super(left,right)
       end
@@ -18,6 +17,5 @@ module ArelExtensions
         Arel::Nodes::TableAlias.new Arel::Nodes::Grouping.new(self), Arel::Nodes::SqlLiteral.new(other.to_s)
       end
     end
-
   end
 end

data/lib/arel_extensions/nodes/union_all.rb

@@ -1,7 +1,6 @@
 module ArelExtensions
   module Nodes
     class UnionAll < Arel::Nodes::UnionAll
-
       def initialize left,right
         return super(left,right)
       end
@@ -14,6 +13,5 @@ module ArelExtensions
         Arel::Nodes::TableAlias.new Arel::Nodes::Grouping.new(self), Arel::Nodes::SqlLiteral.new(other.to_s)
       end
     end
-
   end
 end

data/lib/arel_extensions/nodes/wday.rb

@@ -1,19 +1,15 @@
 module ArelExtensions
   module Nodes
     class Wday < Function
-
-
       def initialize other, aliaz = nil
         tab = Array.new
         tab << other
         super(tab, aliaz)
       end
 
-
       def date
         @expressions.first
       end
-
     end
   end
 end

data/lib/arel_extensions/null_functions.rb

@@ -3,23 +3,21 @@ require 'arel_extensions/nodes/is_null'
 
 module ArelExtensions
   module NullFunctions
-
-    #ISNULL function lets you return an alternative value when an expression is NULL.
+    # ISNULL function lets you return an alternative value when an expression is NULL.
     def is_null
       ArelExtensions::Nodes::IsNull.new [self]
     end
 
-    #ISNOTNULL function lets you return an alternative value when an expression is NOT NULL.
+    # ISNOTNULL function lets you return an alternative value when an expression is NOT NULL.
     def is_not_null
       ArelExtensions::Nodes::IsNotNull.new [self]
     end
 
     # returns the first non-null expr in the expression list. You must specify at least two expressions.
-    #If all occurrences of expr evaluate to null, then the function returns null.
+    # If all occurrences of expr evaluate to null, then the function returns null.
     def coalesce *args
       args.unshift(self)
       ArelExtensions::Nodes::Coalesce.new args
     end
-
   end
 end

data/lib/arel_extensions/predications.rb

@@ -1,6 +1,5 @@
 module ArelExtensions
   module Predications
-
     def when right, expression = nil
       ArelExtensions::Nodes::Case.new(self).when(right,expression)
     end
@@ -21,12 +20,12 @@ module ArelExtensions
       ArelExtensions::Nodes::Cast.new([self,right])
     end
 
-    def in(*other) #In should handle nil element in the Array
+    def in(*other) # In should handle nil element in the Array
       other = other.first if other.length <= 1
       case other
       when Range
         self.between(other)
-      when Arel::Nodes::Grouping
+      when Arel::Nodes::Grouping, ArelExtensions::Nodes::Union, ArelExtensions::Nodes::UnionAll
         Arel::Nodes::In.new(self, quoted_node(other))
       when Enumerable
         nils, values   = other.partition{ |v| v.nil? }
@@ -49,12 +48,12 @@ module ArelExtensions
       end
     end
 
-    def not_in(*other) #In should handle nil element in the Array
+    def not_in(*other) # In should handle nil element in the Array
       other = other.first if other.length <= 1
       case other
       when Range
         Arel::Nodes::Not.new(self.between(other))
-      when Arel::Nodes::Grouping
+      when Arel::Nodes::Grouping, ArelExtensions::Nodes::Union, ArelExtensions::Nodes::UnionAll
         Arel::Nodes::NotIn.new(self, quoted_node(other))
       when Enumerable
         nils, values   = other.partition{ |v| v.nil? }
@@ -94,7 +93,7 @@ module ArelExtensions
       when ActiveSupport::Duration
         object.to_i
       else
-        raise(ArgumentError, "#{object.class} can not be converted to CONCAT arg")
+        raise(ArgumentError, "#{object.class} cannot be converted to CONCAT arg")
       end
     end
   end