sunstone 5.0.0.beta3 → 5.0.0.1

data/lib/sunstone.rb

@@ -1,33 +1,40 @@
+require 'uri'
+require 'net/http'
+require 'net/https'
+
+require 'json'
 require 'msgpack'
-require 'wankel'
-require 'cookie_store'
-require 'active_record'
+require 'cookie_store' # optional
+
+require "active_record"
 
+# Adapter
 require File.expand_path(File.join(__FILE__, '../sunstone/version'))
-require File.expand_path(File.join(__FILE__, '../sunstone/connection'))
 require File.expand_path(File.join(__FILE__, '../sunstone/exception'))
+require File.expand_path(File.join(__FILE__, '../sunstone/connection'))
+require File.expand_path(File.join(__FILE__, '../active_record/connection_adapters/sunstone_adapter'))
+require File.expand_path(File.join(__FILE__, '../active_record/connection_adapters/sunstone/type_metadata'))
 
+# Arel Adapters
 require File.expand_path(File.join(__FILE__, '../arel/visitors/sunstone'))
 require File.expand_path(File.join(__FILE__, '../arel/collectors/sunstone'))
 
-require File.expand_path(File.join(__FILE__, '../active_record/connection_adapters/sunstone_adapter'))
-require File.expand_path(File.join(__FILE__, '../active_record/connection_adapters/sunstone/type_metadata'))
-
+# ActiveRecord Extensions
 require File.expand_path(File.join(__FILE__, '../../ext/active_record/statement_cache'))
 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/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/relation/predicate_builder'))
-# require File.expand_path(File.join(__FILE__, '../../ext/active_record/calculations'))
-require File.expand_path(File.join(__FILE__, '../../ext/active_record/query_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/builder/has_and_belongs_to_many'))
 
 require File.expand_path(File.join(__FILE__, '../../ext/active_support/core_ext/object/to_query'))
 
 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/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'))

data/lib/sunstone/connection.rb

@@ -1,29 +1,26 @@
-require 'uri'
-require 'net/http'
-require 'net/https'
-
 # _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.
 module Sunstone
   class Connection
 
-    # Set the User-Agent of the client. Will be joined with other User-Agent info
     attr_reader :api_key, :host, :port, :use_ssl
 
     # Initialize a connection a Sunstone API server.
     #
     # Options:
     #
-    # * <tt>:site</tt> - An optional url used to set the protocol, host, port,
+    # * <tt>:url</tt> - An optional url 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.
     # * <tt>:use_ssl</tt> - Defaults to false.
     # * <tt>:api_key</tt> - An optional token to send in the `Api-Key` header
+    # * <tt>:user_agent</tt> - An optional string. Will be joined with other
+    #                          User-Agent info.
     def initialize(config)
-      if config[:site]
-        uri = URI.parse(config.delete(:site))
+      if config[:url]
+        uri = URI.parse(config.delete(:url))
         config[:api_key] ||= (uri.user ? CGI.unescape(uri.user) : nil)
         config[:host]    ||= uri.host
         config[:port]    ||= uri.port
@@ -66,6 +63,10 @@ module Sunstone
         RUBY_PLATFORM
       ].compact.join(' ')
     end
+    
+    def url(path=nil)
+      "http#{use_ssl ? 's' : ''}://#{host}#{port != 80 ? (port == 443 && use_ssl ? '' : ":#{port}") : ''}#{path}"
+    end
 
     # Sends a Net::HTTPRequest to the server. The headers returned from
     # Sunestone#headers are automatically added to the request. The appropriate
@@ -103,7 +104,33 @@ module Sunstone
     #    end
     #  end
     def send_request(request, body=nil, &block)
-      request_uri = "http#{use_ssl ? 's' : ''}://#{host}#{port != 80 ? (port == 443 && use_ssl ? '' : ":#{port}") : ''}#{request.path}"
+      if request.method != 'GET' && Thread.current[:sunstone_transaction_count]
+        if Thread.current[:sunstone_transaction_count] == 1 && !Thread.current[:sunstone_request_sent]
+          Thread.current[:sunstone_request_sent] = request
+        elsif Thread.current[:sunstone_request_sent]
+          log_mess = request.path.split('?', 2)
+          log_mess += Thread.current[:sunstone_request_sent].path.split('?', 2)
+          raise <<~MSG
+            Cannot send multiple request in a transaction.
+            
+            Trying to send:
+              #{request.method} #{log_mess[0]} #{(log_mess[1] && !log_mess[1].empty?) ? MessagePack.unpack(CGI.unescape(log_mess[1])) : '' }
+            
+            Already sent:
+              #{Thread.current[:sunstone_request_sent].method} #{log_mess[2]} #{(log_mess[3] && !log_mess[3].empty?) ? MessagePack.unpack(CGI.unescape(log_mess[3])) : '' }
+          MSG
+        else
+          log_mess = request.path.split('?', 2)
+          raise <<~MSG
+            Cannot send multiple request in a transaction.
+            
+            Trying to send:
+              #{request.method} #{log_mess[0]} #{(log_mess[1] && !log_mess[1].empty?) ? MessagePack.unpack(CGI.unescape(log_mess[1])) : '' }
+          MSG
+        end
+      end
+      
+      request_uri = url(request.path)
       request_headers.each { |k, v| request[k] = v }
       request['Content-Type'] ||= 'application/json'
       
@@ -117,15 +144,15 @@ module Sunstone
       elsif body.is_a?(String)
         request.body = body
       elsif body
-        request.body = Wankel.encode(body)
+        request.body = JSON.generate(body)
       end
 
       return_value = nil
       retry_count = 0
       begin
         @connection.request(request) do |response|
-          if response['API-Version-Deprecated']
-            logger.warn("DEPRECATION WARNING: API v#{API_VERSION} is being phased out")
+          if response['Deprecation-Notice']
+            ActiveSupport::Deprecation.warn(response['Deprecation-Notice'])
           end
 
           validate_response_code(response)
@@ -285,7 +312,7 @@ module Sunstone
     end
 
     def server_config
-      @server_config ||= Wankel.parse(get('/config').body, :symbolize_keys => true)
+      @server_config ||= JSON.parse(get('/config').body, symbolize_names: true)
     end
 
     private
@@ -329,26 +356,39 @@ module Sunstone
         when 400
           raise Sunstone::Exception::BadRequest, response.body
         when 401
-          raise Sunstone::Exception::Unauthorized, response
+          raise Sunstone::Exception::Unauthorized, response.body
+        when 403
+          raise Sunstone::Exception::Forbidden, response.body
         when 404
-          raise Sunstone::Exception::NotFound, response
+          raise Sunstone::Exception::NotFound, response.body
         when 410
-          raise Sunstone::Exception::Gone, response
+          raise Sunstone::Exception::Gone, response.body
         when 422
-          raise Sunstone::Exception::ApiVersionUnsupported, response
+          raise Sunstone::Exception::ApiVersionUnsupported, response.body
         when 503
-          raise Sunstone::Exception::ServiceUnavailable, response
+          raise Sunstone::Exception::ServiceUnavailable, response.body
         when 301
-          raise Sunstone::Exception::MovedPermanently, response
+          raise Sunstone::Exception::MovedPermanently, response.body
         when 502
-          raise ActiveRecord::ConnectionNotEstablished, response
+          raise ActiveRecord::ConnectionNotEstablished, response.body
         when 300..599
-          raise Sunstone::Exception, response
+          raise Sunstone::Exception, response.body
         else
-          raise Sunstone::Exception, response
+          raise Sunstone::Exception, response.body
         end
       end
     end
+    
+    def self.use_cookie_store(store)
+      Thread.current[:sunstone_cookie_store] = store
+    end
+  
+    def self.with_cookie_store(store)
+      Thread.current[:sunstone_cookie_store] = store
+      yield
+    ensure
+      Thread.current[:sunstone_cookie_store] = nil
+    end
 
   end
 end

data/lib/sunstone/exception.rb

@@ -11,6 +11,9 @@ module Sunstone
     class Unauthorized < Sunstone::Exception
     end
 
+    class Forbidden < Sunstone::Exception
+    end
+
     class NotFound < Sunstone::Exception
     end
 

data/lib/sunstone/gis.rb

@@ -0,0 +1 @@
+require 'active_record/connection_adapters/sunstone/type/ewkb'

data/lib/sunstone/version.rb

@@ -1,3 +1,3 @@
 module Sunstone
-  VERSION = '5.0.0.beta3'
-end
+  VERSION = '5.0.0.1'
+end

data/sunstone.gemspec

@@ -26,13 +26,12 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'factory_girl'
   s.add_development_dependency 'webmock'
   s.add_development_dependency 'sdoc-templates-42floors'
+  s.add_development_dependency 'rgeo'
+  s.add_development_dependency 'simplecov'
 
   # Runtime
   s.add_runtime_dependency 'msgpack'
-  s.add_runtime_dependency 'wankel'
   s.add_runtime_dependency 'cookie_store'
   s.add_runtime_dependency 'arel', '~> 7.0'
-  s.add_runtime_dependency 'activesupport', '>= 5.0.0.beta3'
-  s.add_runtime_dependency 'activemodel', '>= 5.0.0.beta3'
-  s.add_runtime_dependency 'activerecord', '>= 5.0.0.beta3'
-end
+  s.add_runtime_dependency 'activerecord', '5.0.0.1'
+end

data/test/active_record/associations/has_and_belongs_to_many_test.rb

@@ -0,0 +1,12 @@
+require 'test_helper'
+
+class ActiveRecord::Associations::HasAndBelongsToManyTest < Minitest::Test
+
+  test '#relation_ids' do
+    webmock(:get, "/ships", where: {id: 42}, limit: 1).to_return(body: [{id: 42, name: "The Niña"}].to_json)
+    webmock(:get, "/sailors", where: {sailors_ships: {ship_id: {eq: 42}}}).to_return(body: [{id: 43, name: "Chris"}].to_json)
+
+    assert_equal [43], Ship.find(42).sailor_ids
+  end
+
+end

data/test/active_record/associations/has_many_test.rb

@@ -0,0 +1,72 @@
+require 'test_helper'
+
+class ActiveRecord::Associations::HasManyTest < Minitest::Test
+
+  test '#create with has_many_ids=' do
+    webmock(:get, "/ships", where: {id: 2}).to_return(body: [{id: 2, fleet_id: nil, name: 'Duo'}].to_json)
+    webmock(:post, "/fleets").with(
+      body: {
+        fleet: {
+          name: 'Spanish Armada',
+          ships_attributes: [{id: 2, name: 'Duo'}]
+        }
+      }
+    ).to_return(body: {id: 42, name: "Spanish Armada"}.to_json)
+
+    Fleet.create(name: 'Spanish Armada', ship_ids: [2])
+  end
+
+
+  test '#update with has_many_ids=' do
+    webmock(:get, "/fleets", where: {id: 42}, limit: 1).to_return(body: [{id: 42, name: "Spanish Armada"}].to_json)
+    webmock(:get, "/ships", where: {fleet_id: 42}).to_return(body: [].to_json)
+    webmock(:get, "/ships", where: {id: 2}).to_return(body: [{id: 2, fleet_id: nil, name: 'Duo'}].to_json)
+
+    webmock(:patch, "/fleets/42").with(
+      body: {
+        fleet: {
+          ships_attributes: [{id: 2, name: 'Duo'}]
+        }
+    }).to_return(body: {id: 42, name: "Spanish Armada"}.to_json)
+
+    Fleet.find(42).update(ship_ids: ["2"])
+  end
+
+  test '#save includes modified has_many 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'}
+        ]
+      }].to_json
+    })
+
+    req_stub = webmock(:patch, '/fleets/1').with(
+      body: {
+        fleet: {
+          ships_attributes: [{ name: 'Voyager' }]
+        }
+      }.to_json
+    ).to_return(
+      body: {
+        id: 1,
+        name: 'Armada Trio',
+        ships: [{ id: 3, fleet_id: 1, name: 'Voyager' }]
+      }.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
+    assert_equal [3], fleet.ships.map(&:id)
+    # assert_equal 3, ship.fleet.id
+    # assert_equal 'Definant 001', ship.name
+    # assert_equal 'Armada 2', ship.fleet.name
+
+    assert_requested req_stub
+  end
+
+end

data/test/active_record/eager_loading_test.rb

@@ -0,0 +1,15 @@
+require 'test_helper'
+
+class ActiveRecord::EagerLoadingTest < Minitest::Test
+
+  test '#eager_load' 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)
+    assert_equal [1], fleets.map(&:id)
+    assert_equal [1], fleets.first.ships.map(&:id)
+  end
+  
+end

data/test/active_record/persistance_test.rb

@@ -0,0 +1,190 @@
+require 'test_helper'
+
+class ActiveRecord::PersistanceTest < Minitest::Test
+  
+  class TestModelA < ExampleRecord
+  end
+  class TestModelB < ExampleRecord
+    before_save do
+      TestModelA.create
+    end
+  end
+  
+  test '#create with errors' do
+    req_stub = webmock(:post, "/fleets").with(
+      body: { fleet: {} }.to_json
+    ).to_return(
+      status: 400,
+      body: {name: 'Armada Uno', errors: {name: 'is required'}}.to_json
+    )
+
+    fleet = Fleet.create()
+    assert_equal ["is required"], fleet.errors[:name]
+    assert_requested req_stub
+  end
+
+  test '#create' do
+    req_stub = webmock(:post, "/fleets").with(
+      body: { fleet: {name: 'Armada Uno'} }.to_json
+    ).to_return(
+      body: {id: 1, name: 'Armada Uno'}.to_json
+    )
+
+    Fleet.create(name: 'Armada Uno')
+
+    assert_requested req_stub
+  end
+
+  test '#save w/o changes' do
+    webmock(:get, '/fleets', where: {id: 1}, limit: 1).to_return(
+      body: [{id: 1, name: 'Armada Duo'}].to_json
+    )
+
+    fleet = Fleet.find(1)
+    fleet.save
+    
+    assert fleet.save
+    assert_equal 1, fleet.id
+    assert_equal 'Armada Duo', fleet.name
+  end
+
+  
+  test '#save attempts another request while in transaction' do
+    webmock(:get, '/test_model_bs/schema').to_return(
+      body: {
+        id: {type: 'integer', primary_key: true, null: false, array: false},
+        name: {type: 'string', primary_key: false, null: true, array: false}
+      }.to_json
+    )
+    webmock(:get, '/test_model_as/schema').to_return(
+      body: {
+        id: {type: 'integer', primary_key: true, null: false, array: false},
+        name: {type: 'string', primary_key: false, null: true, array: false}
+      }.to_json
+    )
+
+    assert_raises ActiveRecord::StatementInvalid do
+      TestModelB.create
+    end
+  end
+  
+  test '#save includes modified belongs_to associations' do
+    ship = Ship.new(name: 'Definant', fleet: Fleet.new(name: 'Armada Duo'))
+    
+    req_stub = webmock(:post, '/ships', {include: :fleet}).with(
+      body: {
+        ship: {
+          name: 'Definant', fleet_attributes: { name: 'Armada Duo' }
+        }
+      }.to_json
+    ).to_return(
+      body: {
+        id: 2,
+        fleet_id: 3,
+        name: 'Definant 001',
+        fleet: { id: 3, name: 'Armada 2' }
+      }.to_json
+    )
+    
+    assert ship.save
+    assert_equal 2, ship.id
+    assert_equal 3, ship.fleet_id
+    assert_equal 3, ship.fleet.id
+    assert_equal 'Definant 001', ship.name
+    assert_equal 'Armada 2', ship.fleet.name
+    
+    assert_requested req_stub
+  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
+    )
+    req_stub = webmock(:patch, '/ships/1').with(
+      body: {ship: {fleet_id: nil}}.to_json
+    ).to_return(
+      body: {id: 1, name: 'Armada Uno'}.to_json
+    )
+
+    ship = Ship.find(1)
+    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
+    )
+    req_stub = webmock(:patch, "/ships").with(
+      body: { ship: { name: 'Armada Trio' } }.to_json
+    ).to_return(
+      body: {id: 1, name: 'Armada Trio'}.to_json
+    )
+
+    Ship.find(1).update(name: 'Armada Trio')
+
+    assert_requested req_stub
+  end
+
+  test '#update habtm relationships' do
+    webmock(:get, "/ships", where: {id: 1}, limit: 1).to_return(
+      body: [{id: 1, fleet_id: nil, name: 'Armada Uno'}].to_json
+    )
+    webmock(:get, "/sailors", where: {id: 1}, limit: 1).to_return(
+      body: [{id: 1, name: 'Captain'}].to_json
+    )
+    webmock(:get, "/sailors", where: {sailors_ships: {ship_id: {eq: 1}}}).to_return(
+      body: [].to_json
+    )
+    req_stub = webmock(:patch, '/ships/1').with(
+      body: {ship: {sailors_attributes: [{id: 1, name: "Captain"}]}}.to_json
+    ).to_return(
+      body: {id: 1, name: 'Armada Uno'}.to_json
+    )
+
+    ship = Ship.find(1)
+    assert ship.update(sailors: [Sailor.find(1)])
+    assert_requested req_stub
+  end
+  
+  test '#update clears habtm relationship' do
+    webmock(:get, "/ships", where: {id: 1}, limit: 1).to_return(
+      body: [{id: 1, fleet_id: nil, name: 'Armada Uno'}].to_json
+    )
+    webmock(:get, "/sailors", where: {id: 1}, limit: 1).to_return(
+      body: [{id: 1, name: 'Captain'}].to_json
+    )
+    webmock(:get, "/sailors", where: {sailors_ships: {ship_id: {eq: 1}}}).to_return(
+      body: [{id: 1, name: 'Captain'}].to_json
+    )
+    req_stub = webmock(:patch, '/ships/1').with(
+      body: {ship: {sailors_attributes: []}}.to_json
+    ).to_return(
+      body: {id: 1, name: 'Armada Uno'}.to_json
+    )
+
+    ship = Ship.find(1)
+    assert ship.update(sailors: [])
+    assert_requested req_stub
+  end
+
+  test '#update clears has_many relationship' do
+    webmock(:get, "/fleets", where: {id: 1}, limit: 1).to_return(
+      body: [{id: 1, name: 'Armada Uno'}].to_json
+    )
+    webmock(:get, "/ships", where: {fleet_id: 1}).to_return(
+      body: [{id: 1, name: 'Saucer Trio'}].to_json
+    )
+    req_stub = webmock(:patch, '/fleets/1').with(
+      body: {fleet: {ships_attributes: []}}.to_json
+    ).to_return(
+      body: {id: 1, name: 'Armada Uno'}.to_json
+    )
+
+    fleet = Fleet.find(1)
+    assert fleet.update(ships: [])
+    assert_requested req_stub
+  end
+  
+end