sunstone 5.1.0.4 → 5.2.1

data/lib/arel/collectors/sunstone.rb

@@ -1,7 +1,7 @@
 module Arel
   module Collectors
     class Sunstone < Arel::Collectors::Bind
-
+      
       MAX_URI_LENGTH = 2083
 
       attr_accessor :request_type, :table, :where, :limit, :offset, :order, :operation, :columns, :updates, :eager_loads, :id, :distinct, :distinct_on
@@ -9,24 +9,23 @@ module Arel
       # This is used to removed an bind values. It is not used in the request
       attr_accessor :join_source
       
+      attr_reader :binds
+      
       def initialize
         @join_source = []
-        super
+        @binds = []
       end
-
-      def cast_attribute(v)
-        if (v.is_a?(ActiveRecord::Attribute))
-          v.value_for_database
-        else
-          v
-        end
+      
+      def add_bind(bind)
+        @binds << bind.value_for_database
+        bind
       end
 
       def substitute_binds hash, bvs
         if hash.is_a?(Array)
           hash.map do |v|
             if v.is_a?(Arel::Nodes::BindParam)
-              cast_attribute(bvs.last.is_a?(Array) ? bvs.shift.last : bvs.shift)
+              bvs.shift#.value_for_database
             elsif v.is_a?(Hash) || v.is_a?(Array)
               substitute_binds(v, bvs)
             else
@@ -37,7 +36,7 @@ module Arel
           newhash = {}
           hash.each do |k, v|
             if v.is_a?(Arel::Nodes::BindParam)
-              newhash[k] = cast_attribute(bvs.last.is_a?(Array) ? bvs.shift.last : bvs.shift)
+              newhash[k] = bvs.shift || v.value.value_for_database
             elsif v.is_a?(Hash)
               newhash[k] = substitute_binds(v, bvs)
             elsif v.is_a?(Array)
@@ -48,16 +47,12 @@ module Arel
           end
           newhash
         elsif hash.is_a?(Arel::Nodes::BindParam)
-          cast_attribute(bvs.last.is_a?(Array) ? bvs.shift.last : bvs.shift)
+          bvs.shift || hash.value.value_for_database
         else
-          cast_attribute(bvs.last.is_a?(Array) ? bvs.shift.last : bvs.shift)
+          bvs.shift || hash.value.value_for_database
         end
       end
 
-      def value
-        flatten_nested(where).flatten
-      end
-
       def flatten_nested(obj)
         if obj.is_a?(Array)
           obj.map { |w| flatten_nested(w) }
@@ -68,6 +63,13 @@ module Arel
         end
       end
 
+      def value
+        self
+      end
+      
+      def sql_for(bvs, conn = nil)
+        compile(bvs, conn)
+      end
       def compile bvs, conn = nil
         path = "/#{table}"
         headers = {}
@@ -110,7 +112,7 @@ module Arel
         elsif offset
           params[:offset] = offset
         end
-
+        
         case operation
         when :count
           path += "/#{operation}"
@@ -121,7 +123,7 @@ module Arel
           path += "/#{params[:where]['id']}"
           params.delete(:where)
         end
-        
+
         if params.size > 0 && request_type == Net::HTTP::Get
           newpath = path + "?#{CGI.escape(MessagePack.pack(params))}"
           if newpath.length > MAX_URI_LENGTH

data/lib/arel/visitors/sunstone.rb

@@ -10,10 +10,6 @@ module Arel
   module Visitors
     class Sunstone < Arel::Visitors::Reduce
       
-      def initialize
-        @dispatch = get_dispatch_cache
-      end
-      
       def compile node, &block
         accept(node, Arel::Collectors::SQLString.new, &block).value
       end
@@ -81,7 +77,6 @@ module Arel
         collector.operation     = :insert
         
         if o.values
-          
           if o.values.is_a?(Arel::Nodes::SqlLiteral) && o.values == 'DEFAULT VALUES'
             collector.updates = {}
           else
@@ -108,7 +103,7 @@ module Arel
                   end
                 }
               else
-                collector.updates[k] = values[i]
+                collector.updates[k] = visit(values[i], collector)
               end
             end
           end
@@ -818,7 +813,7 @@ module Arel
       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'
@@ -948,7 +943,8 @@ module Arel
       alias :visit_Arel_Attributes_Boolean :visit_Arel_Attributes_Attribute
 
       def visit_Arel_Nodes_BindParam o, collector
-        o
+        a = collector.add_bind(o.value)
+        o.is_a?(Arel::Nodes::BindParam) ? o : a
       end
 
       def literal(o, collector)

data/lib/sunstone.rb

@@ -24,11 +24,11 @@ require File.expand_path(File.join(__FILE__, '../../ext/active_record/statement_
 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/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/association'))
 require File.expand_path(File.join(__FILE__, '../../ext/active_record/associations/collection_association'))
 
 require File.expand_path(File.join(__FILE__, '../../ext/active_support/core_ext/object/to_query'))
@@ -38,5 +38,4 @@ require File.expand_path(File.join(__FILE__, '../../ext/arel/nodes/eager_load'))
 require File.expand_path(File.join(__FILE__, '../../ext/arel/attributes/relation'))
 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'))
-require File.expand_path(File.join(__FILE__, '../../ext/active_record/batches'))
+require File.expand_path(File.join(__FILE__, '../../ext/active_record/finder_methods'))

data/lib/sunstone/connection.rb

@@ -397,8 +397,8 @@ module Sunstone
           raise Sunstone::Exception::MovedPermanently, response.body
         when 502
           raise ActiveRecord::ConnectionNotEstablished, response.body
-        when 300..599
-          raise Sunstone::Exception, response.body
+        when 500..599
+          raise Sunstone::ServerError, response.body
         else
           raise Sunstone::Exception, response.body
         end

data/lib/sunstone/exception.rb

@@ -1,6 +1,13 @@
 module Sunstone
   
-  class Exception < ::Exception
+  class ServerError < ::RuntimeError
+  end
+
+  # RuntimeErrors don't get translated by Rails into
+  # ActiveRecord::StatementInvalid which StandardError do. Would rather
+  # use StandardError, but it's usefull with Sunstone to know when something
+  # raises a Sunstone::Exception::NotFound or Forbidden
+  class Exception < ::RuntimeError
     
     class UnexpectedResponse < Sunstone::Exception
     end

data/lib/sunstone/version.rb

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

data/sunstone.gemspec

@@ -23,16 +23,16 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'minitest-reporters'
   s.add_development_dependency 'mocha'
   s.add_development_dependency 'faker'
-  s.add_development_dependency 'factory_girl'
+  s.add_development_dependency 'factory_bot'
   s.add_development_dependency 'webmock'
   #s.add_development_dependency 'sdoc-templates-42floors'
   s.add_development_dependency 'rgeo'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'byebug'
-  s.add_development_dependency 'activesupport', '~> 5.1.0'
+  s.add_development_dependency 'activesupport', '~> 5.2.1'
   
   # Runtime
   s.add_runtime_dependency 'msgpack'
   s.add_runtime_dependency 'cookie_store'
-  s.add_runtime_dependency 'activerecord', '~> 5.1.0'
+  s.add_runtime_dependency 'activerecord', '~> 5.2.1'
 end

data/test/active_record/associations/has_many_test.rb

@@ -116,7 +116,6 @@ class ActiveRecord::Associations::HasManyTest < ActiveSupport::TestCase
       }.to_json
     )
 
-    # fleet.ships = [ship]
     fleet = Fleet.eager_load(:ships).find(1)
     assert fleet.update(ships: [Ship.new(name: 'Voyager')])
     assert_equal 1, fleet.id
@@ -150,7 +149,6 @@ class ActiveRecord::Associations::HasManyTest < ActiveSupport::TestCase
       }.to_json
     )
 
-    # fleet.ships = [ship]
     fleet = Fleet.eager_load(:ships).find(1)
     fleet.ships.first.name = 'Voyager'
     fleet.save
@@ -187,6 +185,36 @@ class ActiveRecord::Associations::HasManyTest < ActiveSupport::TestCase
     assert_requested req_stub
   end
   
+  test '#update persisted record doesnt include any unchanged associations' do
+    webmock(:get, '/fleets', where: {id: 1}, limit: 1, include: [:ships]).to_return({
+      body: [{
+        id: 1,
+        name: 'Armada Trio',
+        ships: [
+          {id: 2, fleet_id: 1, name: 'Definant'}, {id: 3, fleet_id: 1, name: 'Enterprise'}
+        ]
+      }].to_json
+    })
+    
+    req_stub = webmock(:patch, '/fleets/1').with(
+      body: { fleet: { name: 'New NAME!!' } }.to_json
+    ).to_return(
+      body: {
+        id: 1,
+        name: 'New NAME!!'
+      }.to_json
+    )
+
+    # fleet.ships = [ship]
+    fleet = Fleet.eager_load(:ships).find(1)
+    assert fleet.ships.loaded?
+    #[{id: 2, fleet_id: 1, name: 'Definant'}, {id: 3, fleet_id: 1, name: 'Enterprise'}]
+    fleet.update(name: 'New NAME!!', ships: fleet.ships)
+    fleet.save
+
+    assert_requested req_stub
+  end
+  
   # Clearing the relationship =================================================
 
   test '#update clears has_many relationship' do

data/test/active_record/eager_loading_test.rb

@@ -47,4 +47,14 @@ class ActiveRecord::EagerLoadingTest < ActiveSupport::TestCase
     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
+  end
+  
 end

data/test/active_record/persistance_test.rb

@@ -45,7 +45,7 @@ class ActiveRecord::PersistanceTest < ActiveSupport::TestCase
       TestModelA.create
     end
   end
-  
+
   test '#create with errors' do
     req_stub = webmock(:post, "/fleets").with(
       body: { fleet: {} }.to_json
@@ -78,7 +78,7 @@ class ActiveRecord::PersistanceTest < ActiveSupport::TestCase
 
     fleet = Fleet.find(1)
     fleet.save
-    
+
     assert fleet.save
     assert_equal 1, fleet.id
     assert_equal 'Armada Duo', fleet.name
@@ -108,9 +108,9 @@ class ActiveRecord::PersistanceTest < ActiveSupport::TestCase
       TestModelB.create
     end
   end
-  
-  
-  
+
+
+
   test '#update clears belongs_to relationship' do
     webmock(:get, "/ships", where: {id: 1}, limit: 1).to_return(
       body: [{id: 1, fleet_id: 1, name: 'Armada Uno'}].to_json
@@ -125,7 +125,7 @@ class ActiveRecord::PersistanceTest < ActiveSupport::TestCase
     assert ship.update(fleet: nil)
     assert_requested req_stub
   end
-  
+
   test '#update' do
     webmock(:get, "/ships", where: {id: 1}, limit: 1).to_return(
       body: [{id: 1, fleet_id: nil, name: 'Armada Uno'}].to_json
@@ -140,7 +140,7 @@ class ActiveRecord::PersistanceTest < ActiveSupport::TestCase
 
     assert_requested req_stub
   end
-  
+
   test '#update!' do
     webmock(:get, "/ships", where: {id: 1}, limit: 1).to_return(
       body: [{id: 1, fleet_id: nil, name: 'Armada Uno'}].to_json

data/test/active_record/query/count_test.rb

@@ -8,7 +8,12 @@ class ActiveRecord::QueryCountTest < ActiveSupport::TestCase
     end
   end
   
+  class Fleet < ActiveRecord::Base
+    has_many :ships
+  end
+
   class Ship < ActiveRecord::Base
+    belongs_to :fleet
   end
 
   test '::count' do
@@ -27,6 +32,14 @@ class ActiveRecord::QueryCountTest < ActiveSupport::TestCase
     assert_equal 10, Ship.count(:id)
   end
 
+  test '::count with eager_load' do
+    webmock(:get, "/ships/calculate", select: [{count: "id"}], limit: 100, offset: 0).to_return({
+      body: [10].to_json
+    })
+
+    assert_equal 10, Ship.eager_load(:fleet).count
+  end
+
   test '::sum(:column)' do
     webmock(:get, "/ships/calculate", select: [{sum: "weight"}], limit: 100, offset: 0).to_return({
       body: [10].to_json

data/test/active_record/query_test.rb

@@ -28,7 +28,7 @@ class ActiveRecord::QueryTest < ActiveSupport::TestCase
 
     assert_nil Ship.first
   end
-  
+
   test '::first!' do
     webmock(:get, "/ships", { limit: 1, order: [{id: :asc}] }).to_return({
       body: [].to_json
@@ -46,23 +46,23 @@ class ActiveRecord::QueryTest < ActiveSupport::TestCase
 
     assert_nil Ship.last
   end
-  
+
   test '::where on the same column multiple times with symbols and strings' do
     webmock(:get, "/ships", { where: [{ id: {gt: 10} }, 'AND', {id: {gt: 11}}], limit: 100, offset: 0 }).to_return(body: [].to_json)
 
     arel_table = Ship.arel_table
     assert_equal [], Ship.where(arel_table[:id].gt(10)).where(arel_table['id'].gt(11)).to_a
   end
-  
+
   test '::where(AND CONDITION)' do
     webmock(:get, "/ships", { where: {id: 10, name: 'name'}, limit: 1, order: [{id: :asc}] }).to_return({
       body: [{id: 42}].to_json
     })
-    
+
     arel_table = Ship.arel_table
     assert_equal 42, Ship.where(arel_table[:id].eq(10).and(arel_table[:name].eq('name'))).first.id
   end
-  
+
   test '::where(OR CONDITION)' do
     webmock(:get, "/ships", { where: [{id: 10}, 'OR', {name: 'name'}], limit: 1, order: [{id: :asc}] }).to_return({
       body: [{id: 42}].to_json
@@ -90,7 +90,7 @@ class ActiveRecord::QueryTest < ActiveSupport::TestCase
 
     assert_equal 42, Ship.where(name: name)[0].id
   end
-  
+
   test '::where with JOIN' do
     webmock(:get, "/ships", {where: { ownerships: {id: {eq: 1}} }, limit: 100, offset: 0 }).to_return({
       body: [{id: 42}].to_json

data/test/sunstone/connection/send_request_test.rb

@@ -89,7 +89,7 @@ class Sunstone::Connection::SendRequestTest < ActiveSupport::TestCase
     assert_raises(Sunstone::Exception::ApiVersionUnsupported) { connection.send_request(Net::HTTP::Get.new('/422')) }
     assert_raises(Sunstone::Exception)               { connection.send_request(Net::HTTP::Get.new('/450')) }
     assert_raises(Sunstone::Exception::ServiceUnavailable)    { connection.send_request(Net::HTTP::Get.new('/503')) }
-    assert_raises(Sunstone::Exception)               { connection.send_request(Net::HTTP::Get.new('/550')) }
+    assert_raises(Sunstone::ServerError)               { connection.send_request(Net::HTTP::Get.new('/550')) }
   end
 
   test '#send_request(#<Net::HTTPRequest>, &block) returns value returned from &block' do

data/test/test_helper.rb

@@ -14,7 +14,7 @@ require "minitest/autorun"
 require 'minitest/unit'
 require 'minitest/reporters'
 require 'webmock/minitest'
-require 'mocha/mini_test'
+require 'mocha/minitest'
 
 require 'sunstone'
 require File.expand_path('../schema_mock.rb', __FILE__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunstone
 version: !ruby/object:Gem::Version
-  version: 5.1.0.4
+  version: 5.2.1
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-08 00:00:00.000000000 Z
+date: 2018-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.1
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.1
 description: A library for interacting with REST APIs. Similar to ActiveResource
 email:
 - jonbracy@gmail.com
@@ -250,15 +250,14 @@ files:
 - Rakefile
 - TODO.md
 - ext/active_record/associations.rb
-- ext/active_record/associations/association.rb
 - ext/active_record/associations/collection_association.rb
 - ext/active_record/attribute_methods.rb
-- ext/active_record/batches.rb
 - ext/active_record/callbacks.rb
 - ext/active_record/finder_methods.rb
 - ext/active_record/persistence.rb
 - ext/active_record/relation.rb
 - ext/active_record/relation/calculations.rb
+- ext/active_record/relation/query_methods.rb
 - ext/active_record/statement_cache.rb
 - ext/active_record/transactions.rb
 - ext/active_support/core_ext/object/to_query.rb
@@ -326,7 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: A library for interacting with REST APIs