sunstone 6.1.3 → 7.1.0.1

data/lib/arel/visitors/sunstone.rb

@@ -3,28 +3,24 @@ require 'arel/visitors/visitor'
 module Arel
   module Visitors
     class Sunstone < Arel::Visitors::Visitor
-      
+
       def compile(node, collector = Arel::Collectors::Sunstone.new)
         accept(node, collector).value
       end
-      
-      def preparable
-        false
-      end
-      
+
       private
-      
+
       def visit_Arel_Nodes_SelectStatement o, collector
         collector.table = o.cores.first.source.left.name
 
         collector = o.cores.inject(collector) { |c,x|
           visit_Arel_Nodes_SelectCore(x, c)
         }
-        
+
         if !o.orders.empty?
           collector.order = o.orders.map { |x| visit(x, collector) }
         end
-        
+
         collector = maybe_visit o.limit, collector
         collector = maybe_visit o.offset, collector
         collector = maybe_visit o.eager_load, collector
@@ -65,41 +61,36 @@ module Arel
         collector.request_type  = Net::HTTP::Post
         collector.table         = o.relation.name
         collector.operation     = :insert
-        
+
         if o.values
           if o.values.is_a?(Arel::Nodes::SqlLiteral) && o.values == 'DEFAULT VALUES'
             collector.updates = {}
           else
-            collector.updates = {}
-            
-            o.values.expr[0].each_with_index do |value, i|
-              k = value.value.name
-              if k.is_a?(Hash)
-                add_to_bottom_of_hash_or_array(k, value)
-                collector.updates.deep_merge!(k) { |key, v1, v2|
-                  if (v1.is_a?(Array) && v2.is_a?(Array))
-                    v2.each_with_index do |v, j|
-                      if v1[j].nil?
-                        v1[j] = v2[j]
-                      else
-                        v1[j].deep_merge!(v2[j]) unless v2[j].nil?
-                      end
-                    end
-                    v1
-                  else
-                    v2
-                  end
-                }
-              else
-                collector.updates[k] = visit(value, collector)
-              end
-            end
+            values = visit(o.values, collector)
+            collector.updates = o.columns.map(&:name).zip(values).to_h
           end
         end
-        
+
         collector
       end
-      
+
+      def visit_Arel_Nodes_ValuesList o, collector
+        o.rows[0].map do |v|
+          visit_subrelation v, collector
+        end
+      end
+
+      def visit_subrelation v, collector
+        case v
+        when Array
+          v.map { |v2| visit_subrelation v2, collector }
+        when Hash
+          v.transform_values { |v2| visit_subrelation v2, collector }
+        else
+          visit(v, collector)
+        end
+      end
+
       def find_bottom(hash)
         if hash.is_a?(Hash)
           if hash.values.first.is_a?(Array) || hash.values.first.is_a?(Hash)
@@ -116,10 +107,10 @@ module Arel
           end
         end
       end
-      
+
       def add_to_bottom_of_hash_or_array(hash, value)
         hash = find_bottom(hash)
-        
+
         if hash.is_a?(Hash)
           nkey = hash.keys.first
           nvalue = hash.values.first
@@ -165,26 +156,26 @@ module Arel
       #
       def visit_Arel_Nodes_UpdateStatement o, collector
         collector.request_type  = Net::HTTP::Patch
-        
+
         collector.table = o.relation.name
         collector.operation     = :update
-        
+
         # collector.id = o.wheres.first.children.first.right
         if !o.wheres.empty?
           collector.where = o.wheres.map { |x| visit(x, collector) }.inject([]) { |c, w|
             w.is_a?(Array) ? c += w : c << w
           }
         end
-        
+
         if collector.where.size != 1 && collector.where.first.size != 1 && !collector.where.first['id']
           raise 'Upsupported'
         end
-        
+
         collector.where = collector.where.first
-        
+
         if o.values
           collector.updates = {}
-          
+
           o.values.map { |x| visit(x, collector) }.each do |value|
             value.each do |key, v|
               if key.is_a?(Hash)
@@ -209,7 +200,7 @@ module Arel
             end
           end
         end
-        
+
         collector
       end
       #
@@ -444,7 +435,7 @@ module Arel
       def visit_Arel_Nodes_Descending o, collector
         { visit(o.expr, collector) => :desc }
       end
-      
+
       def visit_Arel_Nodes_RandomOrdering o, collector
         :random
       end
@@ -486,7 +477,7 @@ module Arel
       #
       def visit_Arel_Nodes_Count o, collector
         collector.operation = :calculate
-        
+
         collector.columns   ||= []
         collector.columns   << {:count => (o.expressions.first.is_a?(Arel::Attributes::Attribute) ? o.expressions.first.name : o.expressions.first) }
         # collector.columns   = visit o.expressions.first, collector
@@ -494,7 +485,7 @@ module Arel
 
       def visit_Arel_Nodes_Sum o, collector
         collector.operation = :calculate
-        
+
         collector.columns   ||= []
         collector.columns   << {:sum => (o.expressions.first.is_a?(Arel::Attributes::Attribute) ? o.expressions.first.name : o.expressions.first) }
         # collector.columns   = visit o.expressions.first, collector
@@ -502,7 +493,7 @@ module Arel
 
       def visit_Arel_Nodes_Max o, collector
         collector.operation = :calculate
-        
+
         collector.columns   ||= []
         if o.expressions.first.is_a?(Arel::Attributes::Attribute)
           relation = o.expressions.first.relation
@@ -704,11 +695,11 @@ module Arel
         end
       end
       alias_method :visit_Arel_Nodes_HomogeneousIn, :visit_Arel_Nodes_In
-      
+
       def visit_Arel_Nodes_NotIn o, collector
         key = visit(o.left, collector)
         value = {not_in: visit(o.right, collector)}
-        
+
         if hash.is_a?(Hash)
           add_to_bottom_of_hash_or_array(key, value)
           key
@@ -716,10 +707,10 @@ module Arel
           {key => value}
         end
       end
-      
+
       # You merge a into b if a keys do not colid with b keys
       def mergeable?(hash_a, hash_b)
-        
+
         hash_a.each do |key, value_a|
           #TODO: one day maybe just use symbols for all keys?
           if hash_b.has_key?(key.to_sym) || hash_b.has_key?(key.to_s)
@@ -733,7 +724,7 @@ module Arel
         end
         true
       end
-      
+
       def visit_Arel_Nodes_And o, collector
         ors = []
 
@@ -748,16 +739,16 @@ module Arel
             ors << value
           end
         end
-        
+
         result = []
         ors.each_with_index do |c, i|
           result << c
           result << 'AND' if ors.size != i + 1
         end
-        
+
         result.size == 1 ? result.first : result
       end
-      
+
       def visit_Arel_Nodes_Or o, collector
         [visit(o.left, collector), 'OR', visit(o.right, collector)]
       end
@@ -765,8 +756,15 @@ module Arel
       def visit_Arel_Nodes_Assignment o, collector
         case o.left
         when Arel::Nodes::UnqualifiedColumn
-          { visit(o.left.expr, collector) => visit(o.right, collector) }
-        when Arel::Attributes::Attribute, Arel::Nodes::BindParam
+          case o.right
+          when Array
+            { visit(o.left.expr, collector) => o.right.map { |i| i.transform_values { |v| visit(v, collector) } } }
+          when Hash
+            { visit(o.left.expr, collector) => o.right.transform_values { |v| visit(v, collector) } }
+          else
+            { visit(o.left.expr, collector) => visit(o.right, collector) }
+          end
+        when Arel::Attributes::Attribute, Arel::Nodes::BindParam, ActiveModel::Attribute
           { visit(o.left, collector) => visit(o.right, collector) }
         else
           collector = visit o.left, collector
@@ -783,7 +781,7 @@ module Arel
         okey.merge!(value)
         hash
       end
-      
+
       def add_to_bottom_of_hash(hash, value)
         okey = hash
         while okey.is_a?(Hash) && (okey.values.first.is_a?(Hash) || okey.values.first.is_a?(Array))
@@ -798,11 +796,11 @@ module Arel
         okey[nkey] = { nvalue => value }
         hash
       end
-      
+
       def visit_Arel_Nodes_Equality o, collector
         key = visit(o.left, collector)
         value = (o.right.nil? ? nil : visit(o.right, collector))
-        
+
         if key.is_a?(Hash)
           add_to_bottom_of_hash(key, {eq: value})
         elsif o.left.class.name == 'Arel::Attributes::Key'
@@ -811,7 +809,7 @@ module Arel
           { key => value }
         end
       end
-      
+
       def visit_Arel_Nodes_TSMatch(o, collector)
         key = visit(o.left, collector)
         value = { ts_match: (o.right.nil? ? nil : visit(o.right, collector)) }
@@ -827,11 +825,11 @@ module Arel
           hash
         end
       end
-      
+
       def visit_Arel_Nodes_TSVector(o, collector)
         visit(o.attribute, collector)
       end
-      
+
       def visit_Arel_Nodes_TSQuery(o, collector)
         if o.language
           [visit(o.expression, collector), visit(o.language, collector)]
@@ -839,11 +837,11 @@ module Arel
           visit(o.expression, collector)
         end
       end
-      
+
       def visit_Arel_Nodes_HasKey o, collector
         key = visit(o.left, collector)
         value = {has_key: (o.right.nil? ? nil : o.right.to_s)}
-        
+
         if key.is_a?(Hash)
           okey = key
           while okey.values.first.is_a?(Hash)
@@ -860,7 +858,7 @@ module Arel
       def visit_Arel_Nodes_HasKeys o, collector
         key = visit(o.left, collector)
         value = { has_keys: visit(o.right, collector) }
-        
+
         if key.is_a?(Hash)
           okey = key
           while okey.values.first.is_a?(Hash)
@@ -877,7 +875,7 @@ module Arel
       def visit_Arel_Nodes_HasAnyKey o, collector
         key = visit(o.left, collector)
         value = { has_any_key: visit(o.right, collector) }
-        
+
         if key.is_a?(Hash)
           okey = key
           while okey.values.first.is_a?(Hash)
@@ -907,11 +905,11 @@ module Arel
       def visit_Arel_Nodes_UnqualifiedColumn o, collector
         o.name
       end
-      
+
       def visit_Arel_Attributes_Cast(o, collector)
         visit(o.relation, collector) # No casting yet
       end
-      
+
       def visit_Arel_Attributes_Key o, collector
         "#{visit(o.relation, collector)}.#{o.name}"
       end
@@ -951,7 +949,7 @@ module Arel
       # def visit_Arel_Attributes_EmptyRelation o, collector, top=true
       #   o.for_write ? "#{o.name}_attributes" : o.name
       # end
-      
+
       def visit_Arel_Attributes_Attribute o, collector
         join_name = o.relation.table_alias || o.relation.name
 
@@ -968,6 +966,15 @@ module Arel
       alias :visit_Arel_Attributes_Time :visit_Arel_Attributes_Attribute
       alias :visit_Arel_Attributes_Boolean :visit_Arel_Attributes_Attribute
 
+      def visit_ActiveModel_Attribute(o, collector)
+        if o.value.is_a?(ActiveRecord::StatementCache::Substitute)
+          a = collector.add_bind(o)
+          o
+        else
+          o.value_for_database
+        end
+      end
+
       def visit_Arel_Nodes_BindParam o, collector
         a = collector.add_bind(o.value)
         o.is_a?(Arel::Nodes::BindParam) ? o : a
@@ -1064,12 +1071,11 @@ module Arel
           collector
         end
       end
-      
+
       def maybe_visit thing, collector
         return collector unless thing
-        collector << " "
         visit thing, collector
       end
     end
   end
-end
+end

data/lib/sunstone/connection.rb

@@ -4,7 +4,7 @@
 module Sunstone
   class Connection
 
-    attr_reader :api_key, :host, :port, :use_ssl
+    attr_reader :api_key, :host, :port, :use_ssl, :prefix
 
     # Initialize a connection a Sunstone API server.
     #
@@ -31,7 +31,7 @@ module Sunstone
         self.instance_variable_set(:"@#{key}", config[key])
       end
 
-      @connection = Net::HTTP.new(host, port)
+      @connection = Net::HTTP.new(host, port || (use_ssl ? 443 : 80))
       @connection.max_retries         = 0
       @connection.open_timeout        = 5
       @connection.read_timeout        = 30
@@ -132,25 +132,52 @@ module Sunstone
         if Thread.current[:sunstone_transaction_count] == 1 && !Thread.current[:sunstone_request_sent]
           Thread.current[:sunstone_request_sent] = request
         elsif Thread.current[:sunstone_request_sent]
-          log_mess = request.path.split('?', 2)
-          log_mess += Thread.current[:sunstone_request_sent].path.split('?', 2)
-          raise ActiveRecord::StatementInvalid, <<~MSG
+          message = <<~MSG
             Cannot send multiple request in a transaction.
-            
+        
             Trying to send:
-              #{request.method} #{log_mess[0]} #{(log_mess[1] && !log_mess[1].empty?) ? MessagePack.unpack(CGI.unescape(log_mess[1])) : '' }
-            
-            Already sent:
-              #{Thread.current[:sunstone_request_sent].method} #{log_mess[2]} #{(log_mess[3] && !log_mess[3].empty?) ? MessagePack.unpack(CGI.unescape(log_mess[3])) : '' }
           MSG
+          
+          path_and_query = request.path.split('?', 2)
+          message << "  #{request.method} #{path_and_query[0]}"
+          if path_and_query[1]
+            if request['Query-Encoding'] == 'application/msgpack'
+              message << " " << MessagePack.unpack(CGI.unescape(path_and_query[1])).inspect
+            else
+              message << " " << CGI.unescape(path_and_query[1])
+            end
+          end
+            
+          message << "\n\nAlready sent:\n"
+          path_and_query = Thread.current[:sunstone_request_sent].path.split('?', 2)
+          message << "  #{Thread.current[:sunstone_request_sent].method} #{path_and_query[0]}"
+          if path_and_query[1]
+            if request['Query-Encoding'] == 'application/msgpack'
+              message << " " << MessagePack.unpack(CGI.unescape(path_and_query[1]))
+            else
+              message << " " << CGI.unescape(path_and_query[1])
+            end
+          end
+
+          raise ActiveRecord::StatementInvalid, message
         else
           log_mess = request.path.split('?', 2)
-          raise ActiveRecord::StatementInvalid, <<~MSG
-            Cannot send multiple request in a transaction.
+          message = if request['Query-Encoding'] == 'application/msgpack'
+            <<~MSG
+              Cannot send multiple request in a transaction.
             
-            Trying to send:
-              #{request.method} #{log_mess[0]} #{(log_mess[1] && !log_mess[1].empty?) ? MessagePack.unpack(CGI.unescape(log_mess[1])) : '' }
-          MSG
+              Trying to send:
+                #{request.method} #{log_mess[0]} #{(log_mess[1] && !log_mess[1].empty?) ? MessagePack.unpack(CGI.unescape(log_mess[1])) : '' }
+            MSG
+          else
+              <<~MSG
+              Cannot send multiple request in a transaction.
+            
+              Trying to send:
+                #{request.method} #{log_mess[0]} #{(log_mess[1] && !log_mess[1].empty?) ? CGI.unescape(log_mess[1]) : '' }
+            MSG
+          end
+          raise ActiveRecord::StatementInvalid, message
         end
       end
       

data/lib/sunstone/version.rb

@@ -1,3 +1,3 @@
 module Sunstone
-  VERSION = '6.1.3'
+  VERSION = '7.1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunstone
 version: !ruby/object:Gem::Version
-  version: 6.1.3
+  version: 7.1.0.1
 platform: ruby
 authors:
 - Jon Bracy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-15 00:00:00.000000000 Z
+date: 2023-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -226,42 +226,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: arel-extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.0.1
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.0.0
 description: A library for interacting with REST APIs. Similar to ActiveResource
 email:
 - jonbracy@gmail.com
@@ -323,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: A library for interacting with REST APIs