sunstone 6.0.0.8 → 6.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c4334de568780ae0f1bfff51878a34df6efc921931b3b8369d4c3dbf0212fc3
-  data.tar.gz: 16ffa50224484c100d4161a77cb9618ac206ab56b9c11dbf5f78e5d4863b693b
+  metadata.gz: afae21d218aa760e3a36c2db071a80f25f825fb618f56c9bc9cb25ddb628ee23
+  data.tar.gz: a1b4c27957ba0330a74bab059b5b352c56d74eeafd0d9e910845badae194a0e5
 SHA512:
-  metadata.gz: 1ae9e8e867434bdaa2df09eda49c69d80394b1a3f662a2d1fe7e01ea506379e03ad1092782ce87d9059ad64bc84cee590b7c5e0bd4000245c15a0a143279d1c1
-  data.tar.gz: ca3fc4d00c10174a3ec7d6255e04f957e69ecaa9f0d3e6d2c7019774b42922980cafa574f90afeace08f6b35cbd7b79e9e7b22cc64e6a5ea964ab2bd77bb0e61
+  metadata.gz: 2bf28e210e209846f11c287b7153669721211b86e1e27de9388b52bbdeb37abe1ea53c8370abfc11ab50132275804796912eeeb67c0c4e83cd840f54be44634b
+  data.tar.gz: b0eb0399c0a7ff542d06b9b3b83a1dbc699d4de11b75e24813186fd6f6c6de375713903ecc4886efb6b78395bc44f77841238d365ec389ada64bfeca95449626

data/.travis.yml

@@ -1,4 +1,4 @@
-dist: xenial
+dist: bionic
 language: ruby
 sudo: false
 
@@ -8,23 +8,42 @@ cache:
     - /home/travis/.rvm/gems
 
 rvm:
-  - 2.6
+  - 2.7
 
 env:
   matrix:
-    - RAILS_VERSION=v6.0.0 GEM=activerecord:mysql2
-    - RAILS_VERSION=v6.0.0 GEM=activerecord:sqlite3
-    - RAILS_VERSION=v6.0.0 GEM=activerecord:postgresql
+    - RAILS_VERSION=v6.1.0 TASK='db:mysql:rebuild mysql2:test'
+    - RAILS_VERSION=v6.1.0 TASK='db:mysql:rebuild mysql2:isolated_test'
+    - RAILS_VERSION=v6.1.0 TASK='db:postgresql:rebuild postgresql:test'
+    - RAILS_VERSION=v6.1.0 TASK='db:postgresql:rebuild postgresql:isolated_test'
+    - RAILS_VERSION=v6.1.0 TASK='sqlite3:test'
+    - RAILS_VERSION=v6.1.0 TASK='sqlite3:isolated_test'
+    - RAILS_VERSION=v6.1.0 TASK='sqlite3_mem:test'
 
 services:
   - mysql
 addons:
-  postgresql: "10"
+  postgresql: "13"
+  apt:
+    packages:
+    - postgresql-13
+    - postgresql-client-13
+
 
 before_install:
+  - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/13/main/postgresql.conf
+  - sudo cp /etc/postgresql/{9.3,13}/main/pg_hba.conf
+  - sudo pg_ctlcluster 13 main restart
   - unset BUNDLE_GEMFILE
   - gem update --system
   - gem update bundler
+  - gem install bundler --version 1.17.3
+  - mysql -e "create user rails@localhost;"
+  - mysql -e "grant all privileges on activerecord_unittest.* to rails@localhost;"
+  - mysql -e "grant all privileges on activerecord_unittest2.* to rails@localhost;"
+  - mysql -e "grant all privileges on inexistent_activerecord_unittest.* to rails@localhost;"
+  - mysql -e "create database activerecord_unittest default character set utf8mb4;"
+  - mysql -e "create database activerecord_unittest2 default character set utf8mb4;"
 
 install:
   - git clone --branch $RAILS_VERSION https://github.com/rails/rails.git ~/build/rails
@@ -46,4 +65,4 @@ before_script:
 
 script:
   - bundle exec rake test
-  - cd ~/build/rails && ci/travis.rb
+  - cd ~/build/rails/activerecord && bundle exec rake $TASK

data/ext/active_record/associations.rb

@@ -35,11 +35,11 @@ module ActiveRecord
         hm_options[:through] = middle_reflection.name
         hm_options[:source] = join_model.right_reflection.name
 
-        [:before_add, :after_add, :before_remove, :after_remove, :autosave, :validate, :join_table, :class_name, :extend].each do |k|
+        [:before_add, :after_add, :before_remove, :after_remove, :autosave, :validate, :join_table, :class_name, :extend, :strict_loading].each do |k|
           hm_options[k] = options[k] if options.key? k
         end
 
-        has_many name, scope, hm_options, &extension
+        has_many name, scope, **hm_options, &extension
         _reflections[name.to_s].parent_reflection = habtm_reflection
       end
     end

data/ext/active_record/attribute_methods.rb

@@ -6,8 +6,8 @@ module ActiveRecord
     # Returns a Hash of the Arel::Attributes and attribute values that have been
     # typecasted for use in an Arel insert/update method.
     def attributes_with_values(attribute_names)
-      attrs = attribute_names.each_with_object({}) do |name, attrs|
-        attrs[name] = _read_attribute(name)
+      attrs = attribute_names.index_with do |name|
+        _read_attribute(name)
       end
 
       if self.class.connection.is_a?(ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter)

data/ext/active_record/callbacks.rb

@@ -2,7 +2,7 @@ module ActiveRecord
   module Callbacks
     private
 
-      def create_or_update(*) #:nodoc:
+      def create_or_update(**) #:nodoc:
         if self.class.connection.is_a?(ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter)
           @_already_called ||= {}
           self.class.reflect_on_all_associations.each do |r|

data/ext/active_record/finder_methods.rb

@@ -1,12 +1,12 @@
 module ActiveRecord
   class PredicateBuilder # :nodoc:
 
-    def expand_from_hash(attributes)
+    def expand_from_hash(attributes, &block)
       return ["1=0"] if attributes.empty?
   
       attributes.flat_map do |key, value|
         if value.is_a?(Hash) && !table.has_column?(key)
-          ka = associated_predicate_builder(key).expand_from_hash(value)
+          ka = table.associated_table(key, &block).predicate_builder.expand_from_hash(value.stringify_keys)
           if self.send(: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)
@@ -28,13 +28,18 @@ module ActiveRecord
               value = [value] unless value.is_a?(Array)
               klass = PolymorphicArrayValue
             end
+          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|
-            expand_from_hash(query).reduce(&:and)
+          queries = klass.new(associated_table, value).queries.map! do |query|
+            expand_from_hash(query)
           end
-          queries.reduce(&:or)
+
+          grouping_queries(queries)
         elsif table.aggregated_with?(key)
           mapping = table.reflect_on_aggregation(key).mapping
           values = value.nil? ? [nil] : Array.wrap(value)
@@ -43,17 +48,18 @@ module ActiveRecord
             values = values.map do |object|
               object.respond_to?(aggr_attr) ? object.public_send(aggr_attr) : object
             end
-            build(table.arel_attribute(column_name), values)
+            self[column_name, values]
           else
             queries = values.map do |object|
               mapping.map do |field_attr, aggregate_attr|
-                build(table.arel_attribute(field_attr), object.try!(aggregate_attr))
-              end.reduce(&:and)
+                self[field_attr, object.try!(aggregate_attr)]
+              end
             end
-            queries.reduce(&:or)
+
+            grouping_queries(queries)
           end
         else
-          build(table.arel_attribute(key), value)
+          self[key, value]
         end
       end
     end
@@ -77,7 +83,7 @@ module ActiveRecord
         relation
       end
       
-      def instantiate(result_set, &block)
+      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] = {}
@@ -98,14 +104,14 @@ module ActiveRecord
           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)
+            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)
+      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
@@ -116,22 +122,22 @@ module ActiveRecord
           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)
+              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)
+            construct_association(parent, reflection, attributes, seen, model_cache, strict_loading_value)
           else
             attributes.each do |row|
-              construct_association(parent, reflection, row, seen, model_cache)
+              construct_association(parent, reflection, row, seen, model_cache, strict_loading_value)
             end
           end
 
         end
       end
 
-      def construct_association(parent, reflection, attributes, seen, model_cache)
+      def construct_association(parent, reflection, attributes, seen, model_cache, strict_loading_value)
         return if attributes.nil?
 
         klass = if reflection.polymorphic?
@@ -143,7 +149,7 @@ module ActiveRecord
         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)
+          construct(model, attributes.select{|k,v| !klass.column_names.include?(k.to_s) }, seen, model_cache, strict_loading_value)
 
           other = parent.association(reflection.name)
 
@@ -155,14 +161,14 @@ module ActiveRecord
 
           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)
+          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)
+          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)
+      def construct_model(record, reflection, id, attributes, seen, model_cache, strict_loading_value)
         klass = if reflection.polymorphic?
           record.send(reflection.foreign_type).constantize
         else
@@ -191,12 +197,21 @@ module ActiveRecord
         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
+          eager_load_values | includes_values, Arel::Nodes::OuterJoin
         )
         relation = except(:includes, :eager_load, :preload).joins!(join_dependency)
       end
 
-      if eager_loading && !using_limitable_reflections?(join_dependency.reflections)
+      if eager_loading && !(
+          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 has_limit_or_offset?
           limited_ids = limited_ids_for(relation)
           limited_ids.empty? ? relation.none! : relation.where!(primary_key => limited_ids)

data/ext/active_record/persistence.rb

@@ -105,6 +105,8 @@ module ActiveRecord
         @_trigger_update_callback = affected_rows == 1
       end
 
+      @previously_new_record = false
+
       yield(self) if block_given?
 
       affected_rows

data/ext/active_record/relation/calculations.rb

@@ -2,7 +2,7 @@ module ActiveRecord
   module Calculations
     
     def pluck(*column_names)
-      if loaded? && (column_names.map(&:to_s) - @klass.attribute_names - @klass.attribute_aliases.keys).empty?
+      if loaded? && all_attributes?(column_names)
         return records.pluck(*column_names)
       end
 
@@ -14,10 +14,18 @@ module ActiveRecord
         return records.pluck(*column_names.map{|n| n.sub(/^#{klass.table_name}\./, "")})
       else
         klass.disallow_raw_sql!(column_names)
+        columns = arel_columns(column_names)
         relation = spawn
-        relation.select_values = column_names
-        result = skip_query_cache_if_necessary { klass.connection.select_all(relation.arel, nil) }
-        result.cast_values(klass.attribute_types)
+        relation.select_values = columns
+        
+        result = skip_query_cache_if_necessary do
+          if where_clause.contradiction?
+            ActiveRecord::Result.new([], [])
+          else
+            klass.connection.select_all(relation.arel, nil)
+          end
+        end
+        type_cast_pluck_values(result, columns)
       end
     end
 

data/ext/active_record/statement_cache.rb

@@ -18,8 +18,13 @@ module ActiveRecord
           @values
         else
           val = @values.dup
-          casted_binds = binds.map(&:value_for_database)
-          @indexes.each { |i| val[i] = connection.quote(casted_binds.shift) }
+          @indexes.each do |i|
+            value = binds.shift
+            if ActiveModel::Attribute === value
+              value = value.value_for_database
+            end
+            val[i] = connection.quote(value)
+          end
           val.join
         end
       end

data/ext/active_record/transactions.rb

@@ -20,7 +20,7 @@ module ActiveRecord
     #   end
     # end
     #
-    def save!(*) #:nodoc:
+    def save!(**) #:nodoc:
       if instance_variable_defined?(:@no_save_transaction) && @no_save_transaction
         super
       else
@@ -35,29 +35,22 @@ module ActiveRecord
 
     def with_transaction_returning_status
       status = nil
+      connection = self.class.connection
       
-      if self.class.connection.is_a?(ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter) && instance_variable_defined?(:@updating) && @updating
+      if connection.is_a?(ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter) && instance_variable_defined?(:@updating) && @updating
         status = yield
-        status
       else
-        self.class.transaction do
-          if has_transactional_callbacks?
-            add_to_transaction
-          else
-            sync_with_transaction_state if @transaction_state&.finalized?
-            @transaction_state = self.class.connection.transaction_state
-          end
+        ensure_finalize = !connection.transaction_open?
+        connection.transaction do
+          add_to_transaction(ensure_finalize || has_transactional_callbacks?)
           remember_transaction_record_state
 
           status = yield
           raise ActiveRecord::Rollback unless status
         end
-        status
-      end
-    ensure
-      if @transaction_state && @transaction_state.committed?
-        clear_transaction_record_state
       end
+      
+      status
     end
 
 

data/ext/arel/attributes/empty_relation.rb

@@ -1,31 +1,31 @@
-module Arel
-  module Attributes
-    class EmptyRelation < Attribute
-
-      attr_accessor :collection, :for_write
-
-      def initialize(relation, name, collection = false, for_write=false)
-        self[:relation] = relation
-        self[:name] = name
-        @collection = collection
-        @for_write = for_write
-      end
-
-      def able_to_type_cast?
-        false
-      end
-
-      def table_name
-        nil
-      end
-
-      def eql? other
-        self.class == other.class &&
-          self.relation == other.relation &&
-          self.name == other.name &&
-          self.collection == other.collection
-      end
-
-    end
-  end
-end
+# module Arel
+#   module Attributes
+#     class EmptyRelation < Attribute
+#
+#       attr_accessor :collection, :for_write
+#
+#       def initialize(relation, name, collection = false, for_write=false)
+#         self[:relation] = relation
+#         self[:name] = name
+#         @collection = collection
+#         @for_write = for_write
+#       end
+#
+#       def able_to_type_cast?
+#         false
+#       end
+#
+#       def table_name
+#         nil
+#       end
+#
+#       def eql? other
+#         self.class == other.class &&
+#           self.relation == other.relation &&
+#           self.name == other.name &&
+#           self.collection == other.collection
+#       end
+#
+#     end
+#   end
+# end

data/ext/arel/nodes/select_statement.rb

@@ -4,7 +4,7 @@ module Arel
 
       attr_accessor :eager_load
 
-      def initialize cores = [SelectCore.new]
+      def initialize(cores = [SelectCore.new])
         super()
         @cores          = cores
         @orders         = []

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

@@ -2,8 +2,7 @@ module ActiveRecord
   module ConnectionAdapters
     # Sunstone-specific extensions to column definitions in a table.
     class SunstoneColumn < Column #:nodoc:
-      delegate :array, to: :sql_type_metadata
-      alias :array? :array
+      attr_reader :array
       
       def initialize(name, sql_type_metadata, options={})
         @name = name.freeze
@@ -14,6 +13,7 @@ module ActiveRecord
         @collation = nil
         @table_name = nil
         @primary_key = (options['primary_key'] == true)
+        @array = options['array']
       end
       
       def primary_key?

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

@@ -50,7 +50,9 @@ module ActiveRecord
         #  - format_type includes the column size constraint, e.g. varchar(50)
         #  - ::regclass is a function that gives the id for a table name
         def column_definitions(table_name) # :nodoc:
-          definition(table_name)['columns']
+          # First check for attributes and then for the deprecated columns field
+          # TODO: Remove after 0.3
+          definition(table_name)['attributes'] || definition(table_name)['columns']
         end
 
         # Returns the limit definition of the table (the maximum limit that can

data/lib/active_record/connection_adapters/sunstone_adapter.rb

@@ -17,7 +17,7 @@ require 'active_record/connection_adapters/sunstone/type/json'
 module ActiveRecord
   module ConnectionHandling # :nodoc:
 
-    VALID_SUNSTONE_CONN_PARAMS = [:url, :host, :port, :api_key, :use_ssl, :user_agent, :ca_cert]
+    VALID_SUNSTONE_CONN_PARAMS = [:endpoint, :host, :port, :api_key, :use_ssl, :user_agent, :ca_cert]
 
     # Establishes a connection to the database that's used by all Active Record
     # objects
@@ -25,8 +25,8 @@ module ActiveRecord
       conn_params = config.symbolize_keys
       conn_params.delete_if { |_, v| v.nil? }
 
-      if conn_params[:url]
-        uri = URI.parse(conn_params.delete(:url))
+      if conn_params[:endpoint]
+        uri = URI.parse(conn_params.delete(:endpoint))
         conn_params[:api_key] ||= (uri.user ? CGI.unescape(uri.user) : nil)
         conn_params[:host]    ||= uri.host
         conn_params[:port]    ||= uri.port
@@ -212,8 +212,8 @@ module ActiveRecord
         end
       end
 
-      def create_table_definition(name, temporary, options, as = nil) # :nodoc:
-        SunstoneAPI::TableDefinition.new native_database_types, name, temporary, options, as
+      def create_table_definition(name, **options)
+        SunstoneAPI::TableDefinition.new(self, name, **options)
       end
 
       ActiveRecord::Type.add_modifier({ array: true }, Sunstone::Type::Array, adapter: :sunstone)

data/lib/arel/visitors/sunstone.rb

@@ -1,10 +1,4 @@
 require 'arel/visitors/visitor'
-class Arel::Visitors::Dot
-  def visit_Arel_Nodes_Casted o
-    # collector << quoted(o.val, o.attribute).to_s
-    visit_String o.val
-  end
-end
 
 module Arel
   module Visitors
@@ -233,7 +227,7 @@ module Arel
       #
       def visit_Arel_Nodes_Casted o, collector
         # collector << quoted(o.val, o.attribute).to_s
-        o.val
+        o.value
       end
 
       def visit_Arel_Nodes_Quoted o, collector
@@ -953,9 +947,9 @@ module Arel
         end
       end
 
-      def visit_Arel_Attributes_EmptyRelation o, collector, top=true
-        o.for_write ? "#{o.name}_attributes" : o.name
-      end
+      # 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

data/lib/sunstone/connection.rb

@@ -10,7 +10,7 @@ module Sunstone
     #
     # Options:
     #
-    # * <tt>:url</tt> - An optional url used to set the protocol, host, port,
+    # * <tt>:endpoint</tt> - An optional endpoint used to set the protocol, host, port,
     #   and api_key
     # * <tt>:host</tt> - The default is to connect to 127.0.0.1.
     # * <tt>:port</tt> - Defaults to 80.
@@ -19,8 +19,8 @@ module Sunstone
     # * <tt>:user_agent</tt> - An optional string. Will be joined with other
     #                          User-Agent info.
     def initialize(config)
-      if config[:url]
-        uri = URI.parse(config.delete(:url))
+      if config[:endpoint]
+        uri = URI.parse(config.delete(:endpoint))
         config[:api_key] ||= (uri.user ? CGI.unescape(uri.user) : nil)
         config[:host]    ||= uri.host
         config[:port]    ||= uri.port
@@ -348,7 +348,7 @@ module Sunstone
       headers = Thread.current[:sunstone_headers]&.clone || {}
       headers['Accept'] = 'application/json'
       headers['User-Agent'] = user_agent
-      headers['Api-Version'] = '0.1.0'
+      headers['Api-Version'] = '0.2.0'
       headers['Connection'] = 'keep-alive'
       
       request_api_key = Thread.current[:sunstone_api_key] || api_key

data/lib/sunstone/version.rb

@@ -1,3 +1,3 @@
 module Sunstone
-  VERSION = '6.0.0.8'
+  VERSION = '6.1.0.rc1'
 end

data/sunstone.gemspec

@@ -35,6 +35,6 @@ Gem::Specification.new do |s|
   # Runtime
   s.add_runtime_dependency 'msgpack'
   s.add_runtime_dependency 'cookie_store'
-  s.add_runtime_dependency 'activerecord', '>= 6.0.0'
+  s.add_runtime_dependency 'activerecord', '>= 6.1.0'
   s.add_runtime_dependency 'arel-extensions', '>= 6.0.0.5'
 end

data/test/active_record/persistance_test.rb

@@ -14,6 +14,7 @@ class ActiveRecord::PersistanceTest < ActiveSupport::TestCase
 
     create_table "sailors" do |t|
       t.string   "name",                    limit: 255
+      t.text     "assignment"
     end
 
     create_table "sailors_ships", id: false do |t|
@@ -74,7 +75,7 @@ class ActiveRecord::PersistanceTest < ActiveSupport::TestCase
     assert_requested req_stub
   end
 
-  test '#save w/o changes' do
+  test '#save w/o changes does not trigger a request' do
     webmock(:get, '/fleets', where: {id: 1}, limit: 1).to_return(
       body: [{id: 1, name: 'Armada Duo'}].to_json
     )
@@ -85,6 +86,18 @@ class ActiveRecord::PersistanceTest < ActiveSupport::TestCase
     assert fleet.save
     assert_equal 1, fleet.id
     assert_equal 'Armada Duo', fleet.name
+    
+    
+    webmock(:get, '/sailors', where: {id: 1}, limit: 1).to_return(
+      body: [{id: 1, name: 'Nandor', assignment: 'stay alert'}].to_json
+    )
+
+    fleet = Sailor.find(1)
+    fleet.save
+
+    assert fleet.save
+    assert_equal 1, fleet.id
+    assert_equal 'stay alert', fleet.assignment
   end
 
   test '#save attempts another request while in transaction' do

data/test/active_record/query_test.rb

@@ -107,7 +107,7 @@ class ActiveRecord::QueryTest < ActiveSupport::TestCase
   end
 
   test '#to_sql binds correctly when joining' do
-    assert_equal 'SELECT ships.* FROM ships INNER JOIN ownerships ON ownerships.asset_id = ships.id AND ownerships.asset_type = \'ActiveRecord::QueryTest::Ship\' WHERE ownerships.id = 1', Ship.joins(:ownerships).where({ ownerships: { id: 1 } }).to_sql
+    assert_equal 'SELECT ships.* FROM ships INNER JOIN ownerships ON ownerships.asset_type = \'ActiveRecord::QueryTest::Ship\' AND ownerships.asset_id = ships.id WHERE ownerships.id = 1', Ship.joins(:ownerships).where({ ownerships: { id: 1 } }).to_sql
   end
 
   test '#to_sar' do

data/test/schema_mock.rb

@@ -34,6 +34,10 @@ class ActiveSupport::TestCase
       def string(name, options={})
         @columns[name] = Column.new(name, :string, options)
       end
+      
+      def text(name, options={})
+        @columns[name] = Column.new(name, :text, options)
+      end
 
       def datetime(name, options={})
         @columns[name] = Column.new(name, :datetime, options)
@@ -82,7 +86,7 @@ class ActiveSupport::TestCase
 
   set_callback(:setup, :before) do
     if !instance_variable_defined?(:@suite_setup_run) && self.class.class_variable_defined?(:@@schema)
-      ActiveRecord::Base.establish_connection(adapter: 'sunstone', url: 'http://example.com')
+      ActiveRecord::Base.establish_connection(adapter: 'sunstone', endpoint: 'http://example.com')
 
       req_stub = stub_request(:get, /^http:\/\/example.com/).with do |req|
         case req.uri.path

data/test/sunstone/connection/configuration_test.rb

@@ -2,40 +2,40 @@ require 'test_helper'
 
 class Sunstone::Connection::ConfigurationTest < ActiveSupport::TestCase
 
-  test "setting the url sets the api_key" do
-    connection = Sunstone::Connection.new(url: 'http://my_api_key@localhost')
+  test "setting the endpoint sets the api_key" do
+    connection = Sunstone::Connection.new(endpoint: 'http://my_api_key@localhost')
     assert_equal('my_api_key', connection.api_key)
   end
 
-  test "setting the url sets the host" do
-    connection = Sunstone::Connection.new(url: 'https://example.com')
+  test "setting the endpoint sets the host" do
+    connection = Sunstone::Connection.new(endpoint: 'https://example.com')
     assert_equal('example.com', connection.host)
   end
 
-  test "setting the url sets the port" do
-    connection = Sunstone::Connection.new(url: 'http://localhost')
+  test "setting the endpoint sets the port" do
+    connection = Sunstone::Connection.new(endpoint: 'http://localhost')
     assert_equal(80, connection.port)
 
-    connection = Sunstone::Connection.new(url: 'https://localhost')
+    connection = Sunstone::Connection.new(endpoint: 'https://localhost')
     assert_equal(443, connection.port)
     
-    connection = Sunstone::Connection.new(url: 'https://localhost:4321')
+    connection = Sunstone::Connection.new(endpoint: 'https://localhost:4321')
     assert_equal(4321, connection.port)
   end
 
-  test "setting the url sets the use_ssl option" do
-    connection = Sunstone::Connection.new(url: 'http://localhost')
+  test "setting the endpoint sets the use_ssl option" do
+    connection = Sunstone::Connection.new(endpoint: 'http://localhost')
     assert_equal(false, connection.use_ssl)
     
-    connection = Sunstone::Connection.new(url: 'https://localhost')
+    connection = Sunstone::Connection.new(endpoint: 'https://localhost')
     assert_equal(true, connection.use_ssl)
   end
   
   test "setting the user_agent appends it to the User-Agent" do
-    connection = Sunstone::Connection.new(url: 'http://localhost')
+    connection = Sunstone::Connection.new(endpoint: 'http://localhost')
     assert_equal("Sunstone/#{Sunstone::VERSION} Ruby/#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} #{RUBY_PLATFORM}", connection.user_agent)
     
-    connection = Sunstone::Connection.new(url: 'http://localhost', user_agent: "MyGem/3.14")
+    connection = Sunstone::Connection.new(endpoint: 'http://localhost', user_agent: "MyGem/3.14")
     assert_equal("MyGem/3.14 Sunstone/#{Sunstone::VERSION} Ruby/#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} #{RUBY_PLATFORM}", connection.user_agent)
   end
   

data/test/sunstone/connection/cookie_store_test.rb

@@ -4,7 +4,7 @@ class Sunstone::Connection::CookieStoreTest < ActiveSupport::TestCase
 
   test '#send_request(#<Net::HTTPRequest) adds cookies to the cookie store if present' do
     store = CookieStore::HashStore.new
-    connection = Sunstone::Connection.new(url: "http://testhost.com")
+    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
     stub_request(:get, "http://testhost.com/test").to_return(:body => 'get', :headers => {'Set-Cookie' => 'foo=bar; Max-Age=3600'})
 
     Sunstone::Connection.with_cookie_store(store) { connection.get('/test') }
@@ -17,7 +17,7 @@ class Sunstone::Connection::CookieStoreTest < ActiveSupport::TestCase
   
   test '#send_request(#<Net::HTTPRequest) sends cookie header if cookie store is present' do
     store = CookieStore::HashStore.new
-    connection = Sunstone::Connection.new(url: "http://testhost.com")
+    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
     stub_request(:get, "http://testhost.com/test").to_return(
       headers: {
         'Set-Cookie' => 'foo=bar; Path="/" Max-Age=3600'

data/test/sunstone/connection/request_helper_test.rb

@@ -5,28 +5,28 @@ class Sunstone::Connection::RequestHelpersTest < ActiveSupport::TestCase
   # Sunstone.get ==============================================================
 
   test '#get(path)' do
-    connection = Sunstone::Connection.new(url: "http://testhost.com")
+    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
     stub_request(:get, "http://testhost.com/test").to_return(:body => "get")
 
     assert_equal('get', connection.get('/test').body)
   end
 
   test '#get(path, params) with params as string' do
-    connection = Sunstone::Connection.new(url: "http://testhost.com")
+    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
     stub_request(:get, "http://testhost.com/test").with(:query => {'key' => 'value'}).to_return(:body => "get")
 
     assert_equal 'get', connection.get('/test', 'key=value').body
   end
 
   test '#get(path, params) with params as hash' do
-    connection = Sunstone::Connection.new(url: "http://testhost.com")
+    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
     stub_request(:get, "http://testhost.com/test").with(:query => {'key' => 'value'}).to_return(:body => "get")
 
     assert_equal 'get', connection.get('/test', {:key => 'value'}).body
   end
 
   test '#get(path, &block)' do
-    connection = Sunstone::Connection.new(url: "http://testhost.com")
+    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
     stub_request(:get, "http://testhost.com/test").to_return(:body => 'get')
 
     connection.get('/test') do |response|
@@ -37,21 +37,21 @@ class Sunstone::Connection::RequestHelpersTest < ActiveSupport::TestCase
   # Sunstone.post =============================================================
 
   test '#post(path)' do
-    connection = Sunstone::Connection.new(url: "http://testhost.com")
+    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
     stub_request(:post, "http://testhost.com/test").to_return(:body => "post")
 
     assert_equal('post', connection.post('/test').body)
   end
 
   test '#post(path, body)' do
-    connection = Sunstone::Connection.new(url: "http://testhost.com")
+    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
     stub_request(:post, "http://testhost.com/test").with(:body => 'body').to_return(:body => "post")
 
     assert_equal('post', connection.post('/test', 'body').body)
   end
 
   test '#post(path, &block)' do
-    connection = Sunstone::Connection.new(url: "http://testhost.com")
+    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
     stub_request(:post, "http://testhost.com/test").to_return(:body => 'post')
 
     connection.post('/test') do |response|
@@ -62,21 +62,21 @@ class Sunstone::Connection::RequestHelpersTest < ActiveSupport::TestCase
   # Sunstone.put ==============================================================
 
   test '#put(path)' do
-    connection = Sunstone::Connection.new(url: "http://testhost.com")
+    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
     stub_request(:put, "http://testhost.com/test").to_return(:body => "put")
 
     assert_equal('put', connection.put('/test').body)
   end
 
   test '#put(path, body)' do
-    connection = Sunstone::Connection.new(url: "http://testhost.com")
+    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
     stub_request(:put, "http://testhost.com/test").with(:body => 'body').to_return(:body => "put")
 
     assert_equal('put', connection.put('/test', 'body').body)
   end
 
   test '#put(path, &block)' do
-    connection = Sunstone::Connection.new(url: "http://testhost.com")
+    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
     stub_request(:put, "http://testhost.com/test").to_return(:body => 'put')
 
     connection.put('/test') do |response|
@@ -87,14 +87,14 @@ class Sunstone::Connection::RequestHelpersTest < ActiveSupport::TestCase
   # Sunstone.delete ===========================================================
 
   test '#delete' do
-    connection = Sunstone::Connection.new(url: "http://testhost.com")
+    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
     stub_request(:delete, "http://testhost.com/test").to_return(:body => "delete")
 
     assert_equal('delete', connection.delete('/test').body)
   end
 
   test '#delete(path, &block)' do
-    connection = Sunstone::Connection.new(url: "http://testhost.com")
+    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
     stub_request(:delete, "http://testhost.com/test").to_return(:body => 'delete')
 
     connection.delete('/test') do |response|

data/test/sunstone/connection/send_request_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class Sunstone::Connection::SendRequestTest < ActiveSupport::TestCase
 
   test '#send_request(#<Net::HTTPRequest>) includes the api-key header when present' do
-    connection = Sunstone::Connection.new(url: "http://my_api_key@example.com")
+    connection = Sunstone::Connection.new(endpoint: "http://my_api_key@example.com")
     
     test_stub = stub_request(:get, "http://example.com/verify").with { |req|
       req.headers['Api-Key'] == 'my_api_key'
@@ -13,7 +13,7 @@ class Sunstone::Connection::SendRequestTest < ActiveSupport::TestCase
   end
   
   test '#send_request(#<Net::HTTPRequest>) includes the user_agent' do
-    connection = Sunstone::Connection.new(url: "http://example.com")
+    connection = Sunstone::Connection.new(endpoint: "http://example.com")
     
     test_stub = stub_request(:get, "http://example.com/verify").with { |req|
       req.headers['User-Agent'] =~ /Sunstone\/\S+ Ruby\/\S+ \S+/
@@ -22,7 +22,7 @@ class Sunstone::Connection::SendRequestTest < ActiveSupport::TestCase
     assert_requested(test_stub)
     
     # Custom Agent
-    connection = Sunstone::Connection.new(url: "http://example.com", user_agent: "MyClient/2")
+    connection = Sunstone::Connection.new(endpoint: "http://example.com", user_agent: "MyClient/2")
     
     test_stub = stub_request(:get, "http://example.com/verify").with { |req|
       req.headers['User-Agent'] =~ /MyClient\/2 Sunstone\/\S+ Ruby\/\S+ \S+/
@@ -34,7 +34,7 @@ class Sunstone::Connection::SendRequestTest < ActiveSupport::TestCase
   test '#send_request(#<Net::HTTPRequest>)' do
     stub_request(:get, "http://testhost.com/test").to_return(body: 'get')
 
-    connection = Sunstone::Connection.new(url: "http://testhost.com")
+    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
     assert_equal('get', connection.send_request(Net::HTTP::Get.new('/test')).body)
   end
 
@@ -45,7 +45,7 @@ class Sunstone::Connection::SendRequestTest < ActiveSupport::TestCase
       body: "post"
     )
 
-    connection = Sunstone::Connection.new(url: "http://testhost.com")
+    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
     assert_equal('post', connection.send_request(Net::HTTP::Post.new('/test'), '{"key":"value"}').body)
   end
 
@@ -58,14 +58,14 @@ class Sunstone::Connection::SendRequestTest < ActiveSupport::TestCase
     wr.write('{"key":"value"}')
     wr.close
 
-    connection = Sunstone::Connection.new(url: "http://testhost.com")
+    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
     assert_equal('post', connection.send_request(Net::HTTP::Post.new('/test'), rd).body)
   end
 
   test '#send_request(#<Net::HTTPRequest>, body) with Ruby Object body' do
     stub_request(:post, "http://testhost.com/test").with(body: '{"key":"value"}').to_return(body: "post")
 
-    connection = Sunstone::Connection.new(url: "http://testhost.com")
+    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
     assert_equal('post', connection.send_request(Net::HTTP::Post.new('/test'), {:key => 'value'}).body)
   end
 
@@ -80,7 +80,7 @@ class Sunstone::Connection::SendRequestTest < ActiveSupport::TestCase
     stub_request(:get, "http://testhost.com/503").to_return(status: 503)
     stub_request(:get, "http://testhost.com/550").to_return(status: 550)
 
-    connection = Sunstone::Connection.new(url: "http://testhost.com")
+    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
     assert_raises(Sunstone::Exception::BadRequest)   { connection.send_request(Net::HTTP::Get.new('/400')) }
     assert_raises(Sunstone::Exception::Unauthorized) { connection.send_request(Net::HTTP::Get.new('/401')) }
     assert_raises(Sunstone::Exception::Forbidden) { connection.send_request(Net::HTTP::Get.new('/403')) }
@@ -95,7 +95,7 @@ class Sunstone::Connection::SendRequestTest < ActiveSupport::TestCase
   test '#send_request(#<Net::HTTPRequest>, &block) returns value returned from &block' do
     stub_request(:get, "http://testhost.com/test").to_return(body: 'get')
 
-    connection = Sunstone::Connection.new(url: "http://testhost.com")
+    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
     value = connection.send_request(Net::HTTP::Get.new('/test')) do |response|
       3215
     end
@@ -104,7 +104,7 @@ class Sunstone::Connection::SendRequestTest < ActiveSupport::TestCase
   end
 
   test '#send_request(#<Net::HTTPRequest>, &block)' do
-    connection = Sunstone::Connection.new(url: "http://testhost.com")
+    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
     stub_request(:get, "http://testhost.com/test").to_return(body: 'get')
 
     connection.send_request(Net::HTTP::Get.new('/test')) do |response|
@@ -122,7 +122,7 @@ class Sunstone::Connection::SendRequestTest < ActiveSupport::TestCase
   end
 
   test '#send_request(#<Net::HTTPRequest>, &block) with block reading chunks' do
-    connection = Sunstone::Connection.new(url: "http://testhost.com")
+    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
     
     rd, wr = IO.pipe
     rd = Net::BufferedIO.new(rd)
@@ -149,7 +149,7 @@ class Sunstone::Connection::SendRequestTest < ActiveSupport::TestCase
   
   # TODO: support multple depreaction-notice headers
   test 'deprecation warning printed when deprecation header returned' do
-    connection = Sunstone::Connection.new(url: "http://testhost.com")
+    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
     
     stub_request(:get, "http://testhost.com/test").to_return(
       body: 'get',

data/test/sunstone/connection_test.rb

@@ -5,7 +5,7 @@ class Sunstone::ConnectionTest < ActiveSupport::TestCase
   # #ping =====================================================================
 
   test '#ping' do
-    connection = Sunstone::Connection.new(url: "http://testhost.com")
+    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
     stub_request(:get, "http://testhost.com/ping").to_return(:body => 'pong')
 
     assert_equal( 'pong', connection.ping )
@@ -14,7 +14,7 @@ class Sunstone::ConnectionTest < ActiveSupport::TestCase
   # #server_config ===========================================================
 
   test '#config' do
-    connection = Sunstone::Connection.new(url: "http://testhost.com")
+    connection = Sunstone::Connection.new(endpoint: "http://testhost.com")
     stub_request(:get, "http://testhost.com/config").to_return(:body => '{"server": "configs"}')
 
     assert_equal( {:server => "configs"}, connection.server_config )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunstone
 version: !ruby/object:Gem::Version
-  version: 6.0.0.8
+  version: 6.1.0.rc1
 platform: ruby
 authors:
 - Jon Bracy
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2020-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: arel-extensions
   requirement: !ruby/object:Gem::Requirement
@@ -325,7 +325,7 @@ files:
 homepage: http://sunstonerb.com
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -336,12 +336,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A library for interacting with REST APIs
 test_files: