sunstone 5.2.1 → 6.0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f235687b97d48caa7ecf7a231928452bbaf807b8d2e6e6508a7f9159372dc600
-  data.tar.gz: 94eec63ac1c23762404058fe37b1558a62ec7ad564e262977e1534721949c149
+  metadata.gz: 5ecbeb6967817d2f58c9602526839eeee2b9aa161dc00adf1f962549874c49af
+  data.tar.gz: 7759fa8e537ae1dd04009dca78ae7ffad19cbb6166629e99778f2b22aa982837
 SHA512:
-  metadata.gz: c16d5374f32074dcd7a9e96ecf7f01dc6c77848df299454a5209913f25cdb23b333f4cc6b9a93e6f58d25b6681a11f54b8124f8352427702b22301e81a98a6a7
-  data.tar.gz: fb6512b92823f37cac2477010df776a703f12a3f13f455a6d7388c8edffe4a59192fa3aa2114b4f62e244aa4b9a771f32e01718e5c5f2a0ddf2ed382fe49390a
+  metadata.gz: c72e778804a92ea85dadd3f7adbae2f5171ca63c47da09b065dcb9c14202a8d78e9ecd95ad15f7b2f0bfe7384a858497a1758b056112f703cc87fb8dd91607dd
+  data.tar.gz: 26d94406a0f9b50ad8429c0dd5d49d3da1fd182e1b8b12d87d6e0f0604f343f0920a10b6f0597b4830e3d6856cf62e36b65382e081381f6d5e9b196e94f28c72

data/.travis.yml

@@ -1,3 +1,4 @@
+dist: xenial
 language: ruby
 sudo: false
 
@@ -7,17 +8,18 @@ cache:
     - /home/travis/.rvm/gems
 
 rvm:
-  - 2.4.4
-  - 2.5.1
+  - 2.6
 
 env:
   matrix:
-    - RAILS_VERSION=v5.2.0 GEM=ar:mysql2
-    - RAILS_VERSION=v5.2.0 GEM=ar:sqlite3
-    - RAILS_VERSION=v5.2.0 GEM=ar:postgresql
+    - RAILS_VERSION=v6.0.0.rc1 GEM=activerecord:mysql2
+    - RAILS_VERSION=v6.0.0.rc1 GEM=activerecord:sqlite3
+    - RAILS_VERSION=v6.0.0.rc1 GEM=activerecord:postgresql
 
+services:
+  - mysql
 addons:
-  postgresql: "9.4"
+  postgresql: "10"
 
 before_install:
   - unset BUNDLE_GEMFILE

data/ext/active_record/attribute_methods.rb

@@ -46,11 +46,7 @@ module ActiveRecord
           record.destroy
         elsif autosave != false
           if record.new_record? || (autosave && record.changed_for_autosave?)
-            if record.new_record?
-              attrs["#{reflection.name}_attributes"] = record.send(:attributes_with_values_for_create, record.attribute_names)              
-            else
-              attrs["#{reflection.name}_attributes"] = record.send(:attributes_with_values_for_update, record.attribute_names)
-            end
+            attrs["#{reflection.name}_attributes"] = record.send(:attributes_with_values, record.new_record? ? (record.attribute_names - ['id']) : record.attribute_names)
           end
         end
       end
@@ -79,11 +75,7 @@ module ActiveRecord
               record[reflection.foreign_key] = key
             end
 
-            if record.new_record?
-              attrs["#{reflection.name}_attributes"] = record.send(:attributes_with_values_for_create, record.attribute_names)
-            else
-              attrs["#{reflection.name}_attributes"] = record.send(:attributes_with_values_for_update, record.attribute_names)
-            end
+            attrs["#{reflection.name}_attributes"] = record.send(:attributes_with_values, record.new_record? ? (record.attribute_names - ['id']): record.attribute_names)
           end
         end
       end
@@ -105,11 +97,7 @@ module ActiveRecord
             []
           else
             association.target.select { |r| !r.destroyed? }.map do |record|
-              if record.new_record?
-                record.send(:attributes_with_values_for_create, record.send(:keys_for_partial_write) + [record.class.primary_key])
-              else
-                record.send(:attributes_with_values_for_update, record.send(:keys_for_partial_write) + [record.class.primary_key])
-              end
+              record.send(:attributes_with_values, record.send(:attribute_names_for_partial_writes) + (record.new_record? ? [] : [record.class.primary_key]))
             end
           end
         

data/ext/active_record/finder_methods.rb

@@ -1,6 +1,6 @@
 module Arel
   module Visitors
-    class ToSql < Arel::Visitors::Reduce
+    class ToSql < Arel::Visitors::Visitor
       
       def visit_Arel_Attributes_Relation o, collector
         visit(o.relation, collector)
@@ -19,7 +19,7 @@ module ActiveRecord
       attributes.flat_map do |key, value|
         if value.is_a?(Hash) && !table.has_column?(key)
           ka = associated_predicate_builder(key).expand_from_hash(value)
-          if self.table.instance_variable_get(:@klass).connection.is_a?(ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter)
+          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)
                 k.left = Arel::Attributes::Relation.new(k.left, key)
@@ -49,16 +49,21 @@ module ActiveRecord
           queries.reduce(&:or)
         elsif table.aggregated_with?(key)
           mapping = table.reflect_on_aggregation(key).mapping
-          queries = Array.wrap(value).map do |object|
-            mapping.map do |field_attr, aggregate_attr|
-              if mapping.size == 1 && !object.respond_to?(aggregate_attr)
-                build(table.arel_attribute(field_attr), object)
-              else
-                build(table.arel_attribute(field_attr), object.send(aggregate_attr))
-              end
-            end.reduce(&:and)
+          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
+            build(table.arel_attribute(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)
+            end
+            queries.reduce(&:or)
           end
-          queries.reduce(&:or)
         else
           build(table.arel_attribute(key), value)
         end
@@ -197,7 +202,7 @@ module ActiveRecord
         relation = except(:includes, :eager_load, :preload)
         relation.arel.eager_load = Arel::Nodes::EagerLoad.new(eager_load_values)
       else
-        join_dependency = construct_join_dependency
+        join_dependency = construct_join_dependency(eager_load_values + includes_values)
         relation = except(:includes, :eager_load, :preload).joins!(join_dependency)
       end
 

data/ext/active_record/persistence.rb

@@ -2,6 +2,22 @@ module ActiveRecord
   # = Active Record \Persistence
   module Persistence
     
+    module ClassMethods
+      def rpc(name)
+        define_method("#{name}!") do
+          req = Net::HTTP::Post.new("/#{self.class.table_name}/#{CGI.escape(id.to_s)}/#{CGI.escape(name.to_s)}")
+          self.class.connection.instance_variable_get(:@connection).send_request(req) do |response|
+            JSON.parse(response.body).each do |k,v|
+              if self.class.column_names.include?(k)
+                @attributes.write_from_database(k, v)
+              end
+            end
+          end
+          true
+        end
+      end
+    end
+    
     def update!(attributes)
       @no_save_transaction = true
       with_transaction_returning_status do
@@ -14,14 +30,14 @@ module ActiveRecord
     
     private
 
-    def create_or_update(*args, &block)
+    def create_or_update(**, &block)
       _raise_readonly_record_error if readonly?
       return false if destroyed?
       
       @updating = new_record? ? :creating : :updating
       Thread.current[:sunstone_updating_model] = self
 
-      result = new_record? ? _create_record(&block) : _update_record(*args, &block)
+      result = new_record? ? _create_record(&block) : _update_record(&block)
 
       if self.class.connection.is_a?(ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter) && result != 0
         row_hash = result.rows.first
@@ -64,7 +80,7 @@ module ActiveRecord
     # and returns its id.
     def _create_record(attribute_names = self.attribute_names)
       attribute_names &= self.class.column_names
-      attributes_values = attributes_with_values_for_create(attribute_names)
+      attributes_values = attributes_with_values(attribute_names)
 
       new_id = self.class._insert_record(attributes_values)
 
@@ -79,14 +95,13 @@ module ActiveRecord
     end
     
     def _update_record(attribute_names = self.attribute_names)
-      attribute_names &= self.class.column_names
-      attributes_values = attributes_with_values_for_update(attribute_names)
+      attribute_values = attributes_with_values(attribute_names)
 
-      if attributes_values.empty?
+      if attribute_values.empty?
         affected_rows = 0
         @_trigger_update_callback = true
       else
-        affected_rows = self.class._update_record( attributes_values, self.class.primary_key => id_in_database )
+        affected_rows = self.class._update_record( attribute_values, self.class.primary_key => id_in_database )
         @_trigger_update_callback = affected_rows == 1
       end
 
@@ -94,7 +109,7 @@ module ActiveRecord
 
       affected_rows
     end
-    
+
     #!!!! TODO: I am duplicated from finder_methods.....
     def construct(parent, relations, seen, model_cache)
       relations.each do |key, attributes|

data/ext/active_record/relation/calculations.rb

@@ -13,11 +13,9 @@ module ActiveRecord
         load
         return records.pluck(*column_names.map{|n| n.sub(/^#{klass.table_name}\./, "")})
       else
-        enforce_raw_sql_whitelist(column_names)
+        klass.disallow_raw_sql!(column_names)
         relation = spawn
-        relation.select_values = column_names.map { |cn|
-          @klass.has_attribute?(cn) || @klass.attribute_alias?(cn) ? arel_attribute(cn) : cn
-        }
+        relation.select_values = column_names
         result = skip_query_cache_if_necessary { klass.connection.select_all(relation.arel, nil) }
         result.cast_values(klass.attribute_types)
       end

data/ext/active_record/statement_cache.rb

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

data/ext/active_record/transactions.rb

@@ -41,7 +41,14 @@ module ActiveRecord
         status
       else
         self.class.transaction do
-          add_to_transaction
+          if has_transactional_callbacks?
+            add_to_transaction
+          else
+            sync_with_transaction_state if @transaction_state&.finalized?
+            @transaction_state = self.class.connection.transaction_state
+          end
+          remember_transaction_record_state
+
           status = yield
           raise ActiveRecord::Rollback unless status
         end

data/ext/arel/nodes/select_statement.rb

@@ -1,6 +1,6 @@
 module Arel
   module Nodes
-    class SelectStatement < Arel::Nodes::Node
+    class SelectStatement < Arel::Nodes::NodeExpression
 
       attr_accessor :eager_load
 

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

@@ -3,10 +3,10 @@ module ActiveRecord
     module Sunstone
       module Type
         class Array < ActiveRecord::Type::Value
-          include ActiveRecord::Type::Helpers::Mutable
+          include ActiveModel::Type::Helpers::Mutable
           
           attr_reader :subtype
-          delegate :type, :user_input_in_time_zone, :limit, to: :subtype
+          delegate :type, :user_input_in_time_zone, :limit, :precision, :scale, to: :subtype
           
           def initialize(subtype)
             @subtype = subtype
@@ -47,13 +47,14 @@ module ActiveRecord
           def map(value, &block)
             value.map(&block)
           end
+
+          def changed_in_place?(raw_old_value, new_value)
+            deserialize(raw_old_value) != new_value
+          end
           
-          # def cast_value(string)
-          #   return string unless string.is_a?(::String)
-          #   return if string.empty?
-          #
-          #   JSON.parse(string)
-          # end
+          def force_equality?(value)
+            value.is_a?(::Array)
+          end
           
           private
           

data/lib/arel/visitors/sunstone.rb

@@ -8,7 +8,7 @@ end
 
 module Arel
   module Visitors
-    class Sunstone < Arel::Visitors::Reduce
+    class Sunstone < Arel::Visitors::Visitor
       
       def compile node, &block
         accept(node, Arel::Collectors::SQLString.new, &block).value
@@ -66,11 +66,29 @@ module Arel
 
         collector
       end
-      
+
       def visit_Arel_Nodes_Overlaps o, collector
-        { visit(o.left, collector) => {overlaps: o.left.type_cast_for_database(o.right) }}
+        key = visit(o.left, collector)
+        value = { overlaps: visit(o.right, collector) }
+        if key.is_a?(Hash)
+          add_to_bottom_of_hash_or_array(key, value)
+          key
+        else
+          {key => value}
+        end
       end
-      
+
+      def visit_Arel_Nodes_NotOverlaps o, collector
+        key = visit(o.left, collector)
+        value = { not_overlaps: visit(o.right, collector) }
+        if key.is_a?(Hash)
+          add_to_bottom_of_hash_or_array(key, value)
+          key
+        else
+          {key => value}
+        end
+      end
+
       def visit_Arel_Nodes_InsertStatement o, collector
         collector.request_type  = Net::HTTP::Post
         collector.table         = o.relation.name
@@ -80,14 +98,12 @@ module Arel
           if o.values.is_a?(Arel::Nodes::SqlLiteral) && o.values == 'DEFAULT VALUES'
             collector.updates = {}
           else
-            keys = o.values.right.map { |x| visit(x, collector) }
-            values = o.values.left
             collector.updates = {}
-          
-
-            keys.each_with_index do |k, i|
+            
+            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, values[i])
+                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|
@@ -103,7 +119,7 @@ module Arel
                   end
                 }
               else
-                collector.updates[k] = visit(values[i], collector)
+                collector.updates[k] = visit(value, collector)
               end
             end
           end
@@ -867,7 +883,41 @@ module Arel
           { key => value }
         end
       end
-      
+
+      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)
+            okey = okey.values.first
+          end
+          nkey = okey.keys.first
+          nvalue = okey.values.first
+          okey[nkey] = { nvalue => value }
+        else
+          { key => value }
+        end
+      end
+
+      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)
+            okey = okey.values.first
+          end
+          nkey = okey.keys.first
+          nvalue = okey.values.first
+          okey[nkey] = { nvalue => value }
+        else
+          { key => value }
+        end
+      end
+
       def visit_Arel_Nodes_NotEqual o, collector
         {
           visit(o.left, collector) => { :not => visit(o.right, collector) }

data/lib/sunstone/connection.rb

@@ -32,6 +32,12 @@ module Sunstone
       end
 
       @connection = Net::HTTP.new(host, port)
+      @connection.max_retries         = 0
+      @connection.open_timeout        = 5
+      @connection.read_timeout        = 30
+      @connection.write_timeout       = 5
+      @connection.ssl_timeout         = 5
+      @connection.keep_alive_timeout  = 30
       @connection.use_ssl = use_ssl
       if use_ssl && config[:ca_cert]
         @connection.cert_store = OpenSSL::X509::Store.new
@@ -166,7 +172,6 @@ module Sunstone
       end
 
       return_value = nil
-      retry_count = 0
       begin
         close_connection = false
         @connection.request(request) do |response|
@@ -195,9 +200,6 @@ module Sunstone
           end
         end
         @connection.finish if close_connection
-      rescue ActiveRecord::ConnectionNotEstablished
-        retry_count += 1
-        retry_count == 1 ? retry : raise
       end
 
       return_value
@@ -396,7 +398,7 @@ module Sunstone
         when 301
           raise Sunstone::Exception::MovedPermanently, response.body
         when 502
-          raise ActiveRecord::ConnectionNotEstablished, response.body
+          raise Sunstone::Exception::BadGateway, response.body
         when 500..599
           raise Sunstone::ServerError, response.body
         else

data/lib/sunstone/exception.rb

@@ -29,6 +29,9 @@ module Sunstone
 
     class MovedPermanently < Sunstone::Exception
     end
+    
+    class BadGateway < Sunstone::Exception
+    end
 
     class ApiVersionUnsupported < Sunstone::Exception
     end

data/lib/sunstone/version.rb

@@ -1,3 +1,3 @@
 module Sunstone
-  VERSION = '5.2.1'
+  VERSION = '6.0.0.4'
 end

data/sunstone.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+  s.required_ruby_version = '>= 2.6'
 
   # Developoment 
   s.add_development_dependency 'rake'
@@ -29,10 +30,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rgeo'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'byebug'
-  s.add_development_dependency 'activesupport', '~> 5.2.1'
+  s.add_development_dependency 'activesupport', '>= 6.0.0.rc1'
   
   # Runtime
   s.add_runtime_dependency 'msgpack'
   s.add_runtime_dependency 'cookie_store'
-  s.add_runtime_dependency 'activerecord', '~> 5.2.1'
+  s.add_runtime_dependency 'activerecord', '>= 6.0.0.rc1'
 end

data/test/active_record/eager_loading_test.rb

@@ -42,19 +42,21 @@ class ActiveRecord::EagerLoadingTest < ActiveSupport::TestCase
       id: 1, ships: [{id: 1, fleet_id: 1}]
     }].to_json)
     
-    fleets = Fleet.eager_load(:ships => :sailors)
+    fleets = Fleet.eager_load(ships: :sailors)
     assert_equal [1], fleets.map(&:id)
     assert_equal [1], fleets.first.ships.map(&:id)
   end
   
 
   test '#eager_loads' do
-    webmock(:get, "/fleets", include: [{:ships => :sailors}]).to_return(body: [{
-      id: 1, ships: [{id: 1, fleet_id: 1}]
-    }].to_json)
-    
-    fleets = Fleet.eager_load(:ships, :sailors).limit(2).to_sql
-    assert_equal '', fleets
+    skip
+    assert_equal <<-SQL, Fleet.eager_load(ships: :sailors).limit(2).to_sql
+      SELECT DISTINCT "fleets"."id"
+      FROM "fleets"
+      LEFT OUTER JOIN "ships" ON "ships"."fleet_id" = "fleets"."id"
+      LEFT OUTER JOIN "sailors" ON "sailors"."ship_id" = "ships"."id"
+      LIMIT 2
+    SQL
   end
-  
+
 end

data/test/active_record/rpc_test.rb

@@ -0,0 +1,30 @@
+require 'test_helper'
+
+class ActiveRecord::RPCTest < ActiveSupport::TestCase
+
+  schema do
+    create_table "ships", limit: 100 do |t|
+      t.string   "name",                    limit: 255
+    end
+  end
+
+  class Ship < ActiveRecord::Base
+    rpc :self_destruct
+  end
+  
+  test '::rpc calls custom controller function' do
+    webmock(:get, "/ships", { limit: 1, order: [{id: :asc}] }).to_return({
+      body: [{id: 3, name: 'Sivar'}].to_json
+    })
+
+    webmock(:post, '/ships/3/self_destruct').to_return({
+      body: {name: 'DESTROYED'}.to_json
+    })
+
+    ship = Ship.first
+    assert ship.self_destruct!
+    assert_equal 'DESTROYED', ship.name
+    assert ship.changes.empty?
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunstone
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 6.0.0.4
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-08 00:00:00.000000000 Z
+date: 2019-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -182,16 +182,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 6.0.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 6.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -224,16 +224,16 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 6.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 6.0.0.rc1
 description: A library for interacting with REST APIs. Similar to ActiveResource
 email:
 - jonbracy@gmail.com
@@ -299,6 +299,7 @@ files:
 - test/active_record/query/order_test.rb
 - test/active_record/query/where_test.rb
 - test/active_record/query_test.rb
+- test/active_record/rpc_test.rb
 - test/schema_mock.rb
 - test/sunstone/connection/configuration_test.rb
 - test/sunstone/connection/cookie_store_test.rb
@@ -317,15 +318,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A library for interacting with REST APIs
@@ -344,6 +344,7 @@ test_files:
 - test/active_record/query/order_test.rb
 - test/active_record/query/where_test.rb
 - test/active_record/query_test.rb
+- test/active_record/rpc_test.rb
 - test/schema_mock.rb
 - test/sunstone/connection/configuration_test.rb
 - test/sunstone/connection/cookie_store_test.rb