arel_extensions 2.0.10 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1c901d7b1d85f0ae44bab91682891629784947bae91f7ad968c85d1e48c9948
-  data.tar.gz: 4b35308d0833bdc9539886dfb2575326e46551a24b03f5b98a4217000ffbb9a3
+  metadata.gz: b1ecd7512b41f7db6706dd6affb2e57327cf7331233e39027906743f824f82a8
+  data.tar.gz: 1c7baed7dedb0fb616116fd9888dff8e3a9b0c15ff9b2ae107b982adb522e67c
 SHA512:
-  metadata.gz: a84ef9d6cdb99b63efb35500976f10152d36cd4500307c76ffa4bc5c478502d0b517516b299b613b56a560fff96f4e23a5225944587af0cee2ae81e09b0714b5
-  data.tar.gz: e1c8043cb10571b353ac3a1ba14ac5ad75aa92c25fdca5d2610b8ef3413c0b0f861bd576ee6b51896ee005445af941441bfdf8c9ab698b9339e7b297f29712e2
+  metadata.gz: a81f1010f6cf3d992830b1596eb5b8eaf61fd725cbe97f4cea23aea8172d2f6f6377b58684cf00b16da947ab9a1b65f23efe6f9335db274764931772cb7a219e
+  data.tar.gz: d5140b1fcbff6e4a9549d0d0418ed95215405f8f78ae8e82d6a7a86792130f4e31272cfcd6733c511cc2828599f466a2d66c0b8ffcc461a6d2c7ffe81307c369

data/lib/arel_extensions/nodes/json.rb

@@ -33,36 +33,51 @@ module ArelExtensions
       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
 
+      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 JsonMerge < JsonNode

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "2.0.10".freeze
+  VERSION = "2.0.11".freeze
 end

data/lib/arel_extensions/visitors/to_sql.rb

@@ -585,6 +585,26 @@ module ArelExtensions
         collector
       end
 
+      def json_value(o,v)
+        case o.type_of_node(v)
+        when :string
+          Arel.when(v.is_null).then(Arel::Nodes.build_quoted("null")).else(Arel::Nodes.build_quoted('"') + v.replace('\\','\\\\').replace('"','\"') + '"')
+        when :date
+          s = v.format('%Y-%m-%d')
+          Arel.when(s.is_null).then(Arel::Nodes.build_quoted("null")).else(Arel::Nodes.build_quoted('"') + s + '"')
+        when :datetime
+          s = v.format('%Y-%m-%dT%H:%M:%S')
+          Arel.when(s.is_null).then(Arel::Nodes.build_quoted("null")).else(Arel::Nodes.build_quoted('"') + s + '"')
+        when :time
+          s = v.format('%H:%M:%S')
+          Arel.when(s.is_null).then(Arel::Nodes.build_quoted("null")).else(Arel::Nodes.build_quoted('"') + s + '"')
+        when :nil
+          Arel::Nodes.build_quoted("null")
+        else
+          ArelExtensions::Nodes::Cast.new([v, :string]).coalesce("null")
+        end
+      end
+
       def visit_ArelExtensions_Nodes_Json o,collector
         case o.dict
         when Array
@@ -593,11 +613,7 @@ module ArelExtensions
             if i != 0
               res += ', '
             end
-            if (v.is_a?(Arel::Attributes::Attribute) && o.type_of_attribute(v) == :string) || (v.return_type == :string)
-              res = res + '"' + v + '"'
-            else
-              res += v
-            end
+            res += json_value(o,v)
           end
           res += ']'
           collector = visit res, collector
@@ -607,12 +623,8 @@ module ArelExtensions
             if i != 0
               res += ', '
             end
-            res += Arel::Nodes.build_quoted('"')+k + '": '
-            if (v.is_a?(Arel::Attributes::Attribute) && o.type_of_attribute(v) == :string) || (v.respond_to?(:return_type) && v.return_type == :string)
-              res = res + '"' + v + '"'
-            else
-              res += v
-            end
+            res += Arel::Nodes.build_quoted('"') + ArelExtensions::Nodes::Cast.new([k, :string]).coalesce("").replace('\\','\\\\').replace('"','\"') + '": '
+            res += json_value(o,v)
           end
           res += '}'
           collector = visit res, collector
@@ -633,12 +645,8 @@ module ArelExtensions
             if i != 0
               res = res + ', '
             end
-            kv = Arel::Nodes.build_quoted('"')+k + '": '
-            if (v.is_a?(Arel::Attributes::Attribute) && o.type_of_attribute(v) == :string) || (v.respond_to?(:return_type) && v.return_type == :string)
-              kv = kv + '"' + v + '"'
-            else
-              kv += v
-            end
+            kv = Arel::Nodes.build_quoted('"') + ArelExtensions::Nodes::Cast.new([k, :string]).coalesce("").replace('\\','\\\\').replace('"','\"') + '": '
+            kv += json_value(o,v)
             res = res + kv.group_concat(', ', order: Array(orders)).coalesce('')
           end
           res = res + '}'

data/version_v1.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.2.14".freeze
+  VERSION = "1.2.15".freeze
 end

data/version_v2.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "2.0.10".freeze
+  VERSION = "2.0.11".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.0.11
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2020-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord