sunstone 6.0.0.4 → 6.1.0.2

data/lib/sunstone.rb

@@ -35,7 +35,21 @@ require File.expand_path(File.join(__FILE__, '../../ext/active_support/core_ext/
 
 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/finder_methods'))
+
+if ActiveRecord::VERSION::MAJOR == 6 && ActiveRecord::VERSION::MINOR == 1
+  # Patch to allow Rails 6.1 pass url to adapter, all other versions work
+  require 'active_record/database_configurations'
+  class ActiveRecord::DatabaseConfigurations::UrlConfig
+    private
+    def build_url_hash
+      if url.nil? || %w(jdbc: http: https:).any? { |protocol| url.start_with?(protocol) }
+        { url: url }
+      else
+        ConnectionUrlResolver.new(url).to_hash
+      end
+    end
+  end
+end

data/lib/sunstone/connection.rb

@@ -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.4'
+  VERSION = '6.1.0.2'
 end

data/sunstone.gemspec

@@ -30,10 +30,11 @@ 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', '>= 6.0.0.rc1'
+  s.add_development_dependency 'activesupport', '>= 6.1.0'
   
   # Runtime
   s.add_runtime_dependency 'msgpack'
   s.add_runtime_dependency 'cookie_store'
-  s.add_runtime_dependency 'activerecord', '>= 6.0.0.rc1'
+  s.add_runtime_dependency 'activerecord', '>= 6.1.0'
+  s.add_runtime_dependency 'arel-extensions', '>= 6.1.0'
 end

data/test/active_record/persistance_test.rb

@@ -11,9 +11,10 @@ class ActiveRecord::PersistanceTest < ActiveSupport::TestCase
     create_table "fleets" do |t|
       t.string   "name",                    limit: 255
     end
-    
+
     create_table "sailors" do |t|
       t.string   "name",                    limit: 255
+      t.text     "assignment"
     end
 
     create_table "sailors_ships", id: false do |t|
@@ -22,7 +23,7 @@ class ActiveRecord::PersistanceTest < ActiveSupport::TestCase
     end
 
   end
-  
+
   class Fleet < ActiveRecord::Base
     has_many :ships
   end
@@ -36,16 +37,19 @@ class ActiveRecord::PersistanceTest < ActiveSupport::TestCase
   class Sailor < ActiveRecord::Base
     has_and_belongs_to_many :ships
   end
-  
+
   class TestModelA < ActiveRecord::Base
   end
-  
+
   class TestModelB < ActiveRecord::Base
     before_save do
       TestModelA.create
     end
   end
 
+  class TestModelC < ActiveRecord::Base
+  end
+
   test '#create with errors' do
     req_stub = webmock(:post, "/fleets").with(
       body: { fleet: {} }.to_json
@@ -71,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
     )
@@ -82,9 +86,30 @@ 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
+    webmock(:get, '/test_model_cs/schema').to_return(
+      body: {
+        attributes: {
+          id: {type: 'integer', primary_key: true, null: false, array: false},
+          name: {type: 'string', primary_key: false, null: true, array: false}
+        }
+      }.to_json,
+      headers: { 'StandardAPI-Version' => '6.0.0.29' }
+    )
     webmock(:get, '/test_model_bs/schema').to_return(
       body: {
         columns: {
@@ -156,4 +181,4 @@ class ActiveRecord::PersistanceTest < ActiveSupport::TestCase
     assert_requested req_stub
   end
 
-end
+end

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
@@ -119,5 +119,13 @@ class ActiveRecord::QueryTest < ActiveSupport::TestCase
     query = MessagePack.unpack(CGI.unescape(uri.query))
     assert_equal({"where"=>{"ownerships"=>{"id"=>{"eq"=>1}}}}, query)
   end
+  
+  test 'Arel::Nodes::HomogeneousIn' do
+    webmock(:get, "/ships", { where: {id: {in: [10,12]} }, limit: 100, offset: 0 }).to_return({
+      body: [].to_json
+    })
+
+    Ship.where(id: [10,12]).to_a
+  end
 
 end

data/test/schema_mock.rb

@@ -1,23 +1,23 @@
 class ActiveSupport::TestCase
   class Schema
-  
+
     class Table
-      
+
       class Column
-        
+
         def initialize(name, type, options={})
           @name = name
           @type = type
           @options = options
         end
-        
+
         def as_json
           {type: @type, primary_key: false, null: true, array: false}.merge(@options)
         end
       end
-      
+
       attr_accessor :name, :options, :columns
-      
+
       def initialize(name, options={}, &block)
         @name = name
         @options = options
@@ -30,36 +30,40 @@ class ActiveSupport::TestCase
 
         block.call(self)
       end
-    
+
       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)
       end
-    
+
       def integer(name, options={})
         @columns[name] = Column.new(name, :integer, options)
       end
-    
+
       def to_json
         json = @options.slice(:limit)
-        json[:columns] = {}
+        json[:attributes] = {}
         @columns.each do |name, column|
-          json[:columns][name] = column.as_json
+          json[:attributes][name] = column.as_json
         end
         json.to_json
       end
-      
+
     end
-  
+
     attr_accessor :tables
-    
+
     def initialize
       @tables = {}
     end
-  
+
     def self.define(&block)
       i = new
       i.define(&block)
@@ -69,21 +73,21 @@ class ActiveSupport::TestCase
     def define(&block)
       instance_eval(&block)
     end
-  
+
     def create_table(name, options={}, &block)
       @tables[name] = Table.new(name, options, &block)
     end
-  
+
   end
-  
+
   def self.schema(&block)
     self.class_variable_set(:@@schema, Schema.define(&block))
   end
-  
+
   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')
-      
+
       req_stub = stub_request(:get, /^http:\/\/example.com/).with do |req|
         case req.uri.path
         when '/tables'
@@ -94,24 +98,24 @@ class ActiveSupport::TestCase
           false
         end
       end
-      
+
       req_stub.to_return do |req|
         case req.uri.path
         when '/tables'
           {
             body: self.class.class_variable_get(:@@schema).tables.keys.to_json,
-            headers: { 'StandardAPI-Version' => '5.0.0.5' }
+            headers: { 'StandardAPI-Version' => '6.0.0.29' }
           }
         when /^\/(\w+)\/schema$/i
           {
             body: self.class.class_variable_get(:@@schema).tables[$1].to_json,
-            headers: { 'StandardAPI-Version' => '5.0.0.5' }
+            headers: { 'StandardAPI-Version' => '6.0.0.29' }
           }
         end
       end
-      
+
     end
     @suite_setup_run = true
   end
-  
-end
+
+end

data/test/sunstone/connection/column_definition_test.rb

@@ -0,0 +1,30 @@
+require 'test_helper'
+
+class Sunstone::Connection::ColumnDefinitionTest < ActiveSupport::TestCase
+
+  schema do
+    create_table "ships", limit: 100 do |t|
+      t.string   "name",          limit: 255
+      t.integer  "guns",          limit: 8
+      t.integer  "sailor_count"
+    end
+  end
+
+  class Ship < ActiveRecord::Base
+  end
+
+  test "default limit on column" do
+    assert_nil Ship.columns_hash['sailor_count'].limit
+  end
+
+  test "custom limit on column" do
+    assert_equal 8, Ship.columns_hash['guns'].limit
+  end
+
+  test "custom limit on string column" do
+    assert_equal 255, Ship.columns_hash['name'].limit
+  end
+  
+end
+
+

data/test/test_helper.rb

@@ -69,6 +69,7 @@ class ActiveSupport::TestCase
 
     stub_request(method, /^#{ActiveRecord::Base.connection.instance_variable_get(:@connection).url}/).with do |req|
       if query
+        puts unpack(req&.uri&.query&.sub(/=true$/, '')) if req&.uri&.query
         req&.uri&.path == path && req.uri.query && unpack(req.uri.query.sub(/=true$/, '')) == query
       else
         req&.uri&.path == path && req.uri.query.nil?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunstone
 version: !ruby/object:Gem::Version
-  version: 6.0.0.4
+  version: 6.1.0.2
 platform: ruby
 authors:
 - Jon Bracy
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-25 00:00:00.000000000 Z
+date: 2021-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +226,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.1.0
+- !ruby/object:Gem::Dependency
+  name: arel-extensions
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.0
 description: A library for interacting with REST APIs. Similar to ActiveResource
 email:
 - jonbracy@gmail.com
@@ -241,9 +255,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".tm_properties"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -262,7 +276,6 @@ files:
 - ext/active_record/transactions.rb
 - ext/active_support/core_ext/object/to_query.rb
 - ext/arel/attributes/empty_relation.rb
-- ext/arel/attributes/relation.rb
 - ext/arel/nodes/eager_load.rb
 - ext/arel/nodes/select_statement.rb
 - ext/arel/select_manager.rb
@@ -271,6 +284,7 @@ files:
 - lib/active_record/connection_adapters/sunstone/schema_dumper.rb
 - lib/active_record/connection_adapters/sunstone/schema_statements.rb
 - lib/active_record/connection_adapters/sunstone/type/array.rb
+- lib/active_record/connection_adapters/sunstone/type/binary.rb
 - lib/active_record/connection_adapters/sunstone/type/date_time.rb
 - lib/active_record/connection_adapters/sunstone/type/ewkb.rb
 - lib/active_record/connection_adapters/sunstone/type/json.rb
@@ -301,6 +315,7 @@ files:
 - test/active_record/query_test.rb
 - test/active_record/rpc_test.rb
 - test/schema_mock.rb
+- test/sunstone/connection/column_definition_test.rb
 - test/sunstone/connection/configuration_test.rb
 - test/sunstone/connection/cookie_store_test.rb
 - test/sunstone/connection/request_helper_test.rb
@@ -310,7 +325,7 @@ files:
 homepage: http://sunstonerb.com
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -325,8 +340,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A library for interacting with REST APIs
 test_files:
@@ -346,6 +361,7 @@ test_files:
 - test/active_record/query_test.rb
 - test/active_record/rpc_test.rb
 - test/schema_mock.rb
+- test/sunstone/connection/column_definition_test.rb
 - test/sunstone/connection/configuration_test.rb
 - test/sunstone/connection/cookie_store_test.rb
 - test/sunstone/connection/request_helper_test.rb