sunstone 8.0.0 → 8.1.0

data/lib/active_record/connection_adapters/sunstone/schema_statements.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module ConnectionAdapters
     module Sunstone
@@ -59,16 +61,16 @@ module ActiveRecord
         end
 
         def new_column(name, options)
-          sql_type_metadata = fetch_type_metadata(options)
-          SunstoneColumn.new(name, sql_type_metadata, options)
+          cast_type = lookup_cast_type(options)
+          sql_type_metadata = fetch_type_metadata(cast_type, options)
+          SunstoneColumn.new(name, cast_type, sql_type_metadata, options)
         end
 
         def lookup_cast_type(options)
           @type_map.lookup(options['type'], options.symbolize_keys)
         end
 
-        def fetch_type_metadata(options)
-          cast_type = lookup_cast_type(options)
+        def fetch_type_metadata(cast_type, options)
           simple_type = SqlTypeMetadata.new(
             sql_type: options['type'],
             type: cast_type.type,

data/lib/active_record/connection_adapters/sunstone/type/array.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module ConnectionAdapters
     module Sunstone

data/lib/active_record/connection_adapters/sunstone/type/binary.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'base64'
 
 module ActiveRecord

data/lib/active_record/connection_adapters/sunstone/type/date_time.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module ConnectionAdapters
     module Sunstone

data/lib/active_record/connection_adapters/sunstone/type/ewkb.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rgeo'
 
 module ActiveRecord

data/lib/active_record/connection_adapters/sunstone/type/json.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module ConnectionAdapters
     module Sunstone

data/lib/active_record/connection_adapters/sunstone/type/uuid.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module ConnectionAdapters
     module Sunstone

data/lib/active_record/connection_adapters/sunstone/type_metadata.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module ConnectionAdapters
     class SunstoneSQLTypeMetadata < DelegateClass(SqlTypeMetadata)

data/lib/active_record/connection_adapters/sunstone_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record/connection_adapters/abstract_adapter'
 
 require 'arel/nodes/relation'

data/lib/arel/collectors/sunstone.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module Collectors
     class Sunstone < Arel::Collectors::Bind
@@ -136,16 +138,24 @@ module Arel
         
         case operation
         when :count
-          path += "/#{operation}"
+          path << "/#{operation}"
         when :calculate
-          path += "/calculate"
+          path << "/calculate"
           params[:select] = columns
         when :update, :delete
-          path += "/#{params[:where]['id']}"
-          params.delete(:where)
+          if params[:where].is_a?(Array)
+            path << "/#{params[:where][0]['id']}"
+            params[:where][0].delete('id')
+            params[:where].shift if params[:where][0].empty?
+          else
+            path << "/#{params[:where]['id']}"
+            params[:where].delete('id')
+            params.delete(:where) if params[:where].empty?
+          end
+          params[:where] = params[:where].first if params[:where]&.one?
         end
 
-        if params.size > 0 && request_type == Net::HTTP::Get
+        if params.size > 0
           newpath = path + "?#{CGI.escape(MessagePack.pack(params))}"
           if newpath.length > MAX_URI_LENGTH
             request_type_override = Net::HTTP::Post

data/lib/arel/visitors/sunstone.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'arel/visitors/visitor'
 
 module Arel
@@ -160,7 +162,6 @@ module Arel
         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
@@ -171,8 +172,6 @@ module Arel
           raise 'Upsupported'
         end
 
-        collector.where = collector.where.first
-
         if o.values
           collector.updates = {}
 

data/lib/sunstone/connection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # _Sunstone_ is a low-level API. It provides basic HTTP #get, #post, #put, and
 # #delete calls to the Sunstone Server. It can also provides basic error
 # checking of responses.

data/lib/sunstone/exception.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Sunstone
   
   class ServerError < ::RuntimeError

data/lib/sunstone/gis.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'active_record/connection_adapters/sunstone/type/ewkb'

data/lib/sunstone/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Sunstone
-  VERSION = '8.0.0'
+  VERSION = '8.1.0'
 end

data/lib/sunstone.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 require 'net/http'
 require 'net/https'
@@ -7,6 +9,7 @@ require 'msgpack'
 require 'cookie_store' # optional
 
 require "active_record"
+require "active_record/locking/optimistic"
 
 # Adapter
 require File.expand_path(File.join(__FILE__, '../sunstone/version'))
@@ -20,16 +23,21 @@ require File.expand_path(File.join(__FILE__, '../arel/visitors/sunstone'))
 require File.expand_path(File.join(__FILE__, '../arel/collectors/sunstone'))
 
 # ActiveRecord Extensions
+require File.expand_path(File.join(__FILE__, '../../ext/active_record/base'))
 require File.expand_path(File.join(__FILE__, '../../ext/active_record/statement_cache'))
 require File.expand_path(File.join(__FILE__, '../../ext/active_record/associations'))
 require File.expand_path(File.join(__FILE__, '../../ext/active_record/relation'))
 require File.expand_path(File.join(__FILE__, '../../ext/active_record/relation/calculations'))
 require File.expand_path(File.join(__FILE__, '../../ext/active_record/relation/query_methods'))
+require File.expand_path(File.join(__FILE__, '../../ext/active_record/relation/predicate_builder'))
+require File.expand_path(File.join(__FILE__, '../../ext/active_record/relation/finder_methods'))
 require File.expand_path(File.join(__FILE__, '../../ext/active_record/persistence'))
 require File.expand_path(File.join(__FILE__, '../../ext/active_record/callbacks'))
 require File.expand_path(File.join(__FILE__, '../../ext/active_record/attribute_methods'))
 require File.expand_path(File.join(__FILE__, '../../ext/active_record/transactions'))
 require File.expand_path(File.join(__FILE__, '../../ext/active_record/associations/collection_association'))
+require File.expand_path(File.join(__FILE__, '../../ext/active_record/associations/has_many_through_association'))
+require File.expand_path(File.join(__FILE__, '../../ext/active_record/locking/optimistic'))
 
 require File.expand_path(File.join(__FILE__, '../../ext/active_support/core_ext/object/to_query'))
 
@@ -37,7 +45,7 @@ require File.expand_path(File.join(__FILE__, '../../ext/arel/select_manager'))
 require File.expand_path(File.join(__FILE__, '../../ext/arel/nodes/eager_load'))
 require File.expand_path(File.join(__FILE__, '../../ext/arel/attributes/empty_relation'))
 require File.expand_path(File.join(__FILE__, '../../ext/arel/nodes/select_statement'))
-require File.expand_path(File.join(__FILE__, '../../ext/active_record/finder_methods'))
+
 
 
 ActiveRecord::ConnectionAdapters.register("sunstone", "ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter", "active_record/connection_adapters/sunstone_adapter")

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sunstone
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.1.0
 platform: ruby
 authors:
 - Jon Bracy
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -184,14 +183,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: '8.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -240,28 +239,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.1
+        version: 9.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.1
+        version: 9.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 9.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 9.0.0
 description: A library for interacting with REST APIs. Similar to ActiveResource
 email:
 - jonbracy@gmail.com
@@ -269,15 +268,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - LICENSE
+- README.md
 - ext/active_record/associations.rb
 - ext/active_record/associations/collection_association.rb
+- ext/active_record/associations/has_many_through_association.rb
 - ext/active_record/attribute_methods.rb
+- ext/active_record/base.rb
 - ext/active_record/callbacks.rb
-- ext/active_record/finder_methods.rb
+- ext/active_record/locking/optimistic.rb
 - ext/active_record/persistence.rb
 - ext/active_record/relation.rb
 - ext/active_record/relation/calculations.rb
+- ext/active_record/relation/finder_methods.rb
+- ext/active_record/relation/predicate_builder.rb
 - ext/active_record/relation/query_methods.rb
 - ext/active_record/statement_cache.rb
 - ext/active_record/transactions.rb
@@ -307,9 +312,12 @@ files:
 - lib/sunstone/gis.rb
 - lib/sunstone/version.rb
 homepage: http://sunstonerb.com
-licenses: []
-metadata: {}
-post_install_message:
+licenses:
+- MIT
+metadata:
+  source_code_uri: https://github.com/malomalo/sunstone
+  changelog_uri: https://github.com/malomalo/sunstone/blob/master/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -317,15 +325,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.21
-signing_key:
+rubygems_version: 4.0.11
 specification_version: 4
 summary: A library for interacting with REST APIs
 test_files: []

data/ext/active_record/finder_methods.rb

@@ -1,246 +0,0 @@
-# The last ref that this code was synced with Rails
-# ref: 9269f634d471ad6ca46752421eabd3e1c26220b5
-
-module ActiveRecord
-  class PredicateBuilder # :nodoc:
-
-    def expand_from_hash(attributes, &block)
-      return ["1=0"] if attributes.empty?
-
-      attributes.flat_map do |key, value|
-        if key.is_a?(Array) && key.size == 1
-          key = key.first
-          value = value.flatten
-        end
-        
-        if key.is_a?(Array)
-          queries = Array(value).map do |ids_set|
-            raise ArgumentError, "Expected corresponding value for #{key} to be an Array" unless ids_set.is_a?(Array)
-            expand_from_hash(key.zip(ids_set).to_h)
-          end
-          grouping_queries(queries)
-        elsif value.is_a?(Hash) && !table.has_column?(key)
-          ka = table.associated_table(key, &block)
-            .predicate_builder.expand_from_hash(value.stringify_keys)
-
-          if self.table.instance_variable_get(:@klass).connection.is_a?(ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter)
-            ka.each { |k|
-              if k.left.is_a?(Arel::Attributes::Attribute) || k.left.is_a?(Arel::Attributes::Relation)
-                k.left = Arel::Attributes::Relation.new(k.left, key)
-              end
-            }
-          end
-          ka
-        elsif table.associated_with?(key)
-          # Find the foreign key when using queries such as:
-          # Post.where(author: author)
-          #
-          # For polymorphic relationships, find the foreign key and type:
-          # PriceEstimate.where(estimate_of: treasure)
-          associated_table = table.associated_table(key)
-          if associated_table.polymorphic_association?
-            value = [value] unless value.is_a?(Array)
-            klass = PolymorphicArrayValue
-          elsif associated_table.through_association?
-            next associated_table.predicate_builder.expand_from_hash(
-              associated_table.primary_key => value
-            )
-          end
-
-          klass ||= AssociationQueryValue
-          queries = klass.new(associated_table, value).queries.map! do |query|
-            # If the query produced is identical to attributes don't go any deeper.
-            # Prevents stack level too deep errors when association and foreign_key are identical.
-            query == attributes ? self[key, value] : expand_from_hash(query)
-          end
-
-          grouping_queries(queries)
-        elsif table.aggregated_with?(key)
-          mapping = table.reflect_on_aggregation(key).mapping
-          values = value.nil? ? [nil] : Array.wrap(value)
-          if mapping.length == 1 || values.empty?
-            column_name, aggr_attr = mapping.first
-            values = values.map do |object|
-              object.respond_to?(aggr_attr) ? object.public_send(aggr_attr) : object
-            end
-            self[column_name, values]
-          else
-            queries = values.map do |object|
-              mapping.map do |field_attr, aggregate_attr|
-                self[field_attr, object.try!(aggregate_attr)]
-              end
-            end
-
-            grouping_queries(queries)
-          end
-        else
-          self[key, value]
-        end
-      end
-    end
-
-  end
-end
-
-module ActiveRecord
-  module FinderMethods
-
-    class SunstoneJoinDependency
-      def initialize(klass)
-        @klass = klass
-      end
-      
-      def reflections
-        []
-      end
-      
-      def apply_column_aliases(relation)
-        relation
-      end
-      
-      def instantiate(result_set, strict_loading_value, &block)
-        seen = Hash.new { |i, object_id|
-          i[object_id] = Hash.new { |j, child_class|
-            j[child_class] = {}
-          }
-        }
-
-        model_cache = Hash.new { |h, klass| h[klass] = {} }
-        parents = model_cache[@klass]
-
-        message_bus = ActiveSupport::Notifications.instrumenter
-
-        payload = {
-          record_count: result_set.length,
-          class_name: @klass.name
-        }
-
-        message_bus.instrument("instantiation.active_record", payload) do
-          result_set.each { |row_hash|
-            parent_key = @klass.primary_key ? row_hash[@klass.primary_key] : row_hash
-            parent = parents[parent_key] ||= @klass.instantiate(row_hash.select{|k,v| @klass.column_names.include?(k.to_s) }, &block)
-            construct(parent, row_hash.select{|k,v| !@klass.column_names.include?(k.to_s) }, seen, model_cache, strict_loading_value)
-          }
-        end
-
-        parents.values
-      end
-
-      def construct(parent, relations, seen, model_cache, strict_loading_value)
-        relations.each do |key, attributes|
-          reflection = parent.class.reflect_on_association(key)
-          next unless reflection
-
-          if reflection.collection?
-            other = parent.association(reflection.name)
-            other.loaded!
-          else
-            if parent.association_cached?(reflection.name)
-              model = parent.association(reflection.name).target
-              construct(model, attributes.select{|k,v| !model.class.column_names.include?(k.to_s) }, seen, model_cache, strict_loading_value)
-            end
-          end
-
-          if !reflection.collection?
-            construct_association(parent, reflection, attributes, seen, model_cache, strict_loading_value)
-          else
-            attributes.each do |row|
-              construct_association(parent, reflection, row, seen, model_cache, strict_loading_value)
-            end
-          end
-
-        end
-      end
-
-      def construct_association(parent, reflection, attributes, seen, model_cache, strict_loading_value)
-        return if attributes.nil?
-
-        klass = if reflection.polymorphic?
-          parent.send(reflection.foreign_type).constantize.base_class
-        else
-          reflection.klass
-        end
-        id = attributes[klass.primary_key]
-        model = seen[parent.object_id][klass][id]
-
-        if model
-          construct(model, attributes.select{|k,v| !klass.column_names.include?(k.to_s) }, seen, model_cache, strict_loading_value)
-
-          other = parent.association(reflection.name)
-
-          if reflection.collection?
-            other.target.push(model)
-          else
-            other.target = model
-          end
-
-          other.set_inverse_instance(model)
-        else
-          model = construct_model(parent, reflection, id, attributes.select{|k,v| klass.column_names.include?(k.to_s) }, seen, model_cache, strict_loading_value)
-          seen[parent.object_id][model.class.base_class][id] = model
-          construct(model, attributes.select{|k,v| !klass.column_names.include?(k.to_s) }, seen, model_cache, strict_loading_value)
-        end
-      end
-
-
-      def construct_model(record, reflection, id, attributes, seen, model_cache, strict_loading_value)
-        klass = if reflection.polymorphic?
-          record.send(reflection.foreign_type).constantize
-        else
-          reflection.klass
-        end
-
-        model = model_cache[klass][id] ||= klass.instantiate(attributes)
-        other = record.association(reflection.name)
-
-        if reflection.collection?
-          other.target.push(model)
-        else
-          other.target = model
-        end
-
-        other.set_inverse_instance(model)
-        model
-      end
-  
-    end
-
-    def apply_join_dependency(eager_loading: group_values.empty?)
-      if connection.is_a?(ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter)
-        join_dependency = SunstoneJoinDependency.new(base_class)
-        relation = except(:includes, :eager_load, :preload)
-        relation.arel.eager_load = Arel::Nodes::EagerLoad.new(eager_load_values)
-      else
-        join_dependency = construct_join_dependency(
-          eager_load_values | includes_values, Arel::Nodes::OuterJoin
-        )
-        relation = except(:includes, :eager_load, :preload).joins!(join_dependency)
-      end
-
-      if eager_loading && has_limit_or_offset? && !(
-          using_limitable_reflections?(join_dependency.reflections) &&
-          using_limitable_reflections?(
-            construct_join_dependency(
-              select_association_list(joins_values).concat(
-                select_association_list(left_outer_joins_values)
-              ), nil
-            ).reflections
-          )
-        )
-        if !connection.is_a?(ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter)
-          relation = skip_query_cache_if_necessary do
-            klass.connection.distinct_relation_for_primary_key(relation)
-          end
-        end
-      end
-
-      if block_given?
-        yield relation, join_dependency
-      else
-        relation
-      end
-    end
-    
-  end
-
-end