sunstone 5.0.1.3 → 5.0.1.4

data/test/sunstone/connection/request_helper_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class Sunstone::Connection::RequestHelpersTest < Minitest::Test
+class Sunstone::Connection::RequestHelpersTest < ActiveSupport::TestCase
 
   # Sunstone.get ==============================================================
 

data/test/sunstone/connection/send_request_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class Sunstone::Connection::SendRequestTest < Minitest::Test
+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")

data/test/sunstone/connection_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class Sunstone::ConnectionTest < Minitest::Test
+class Sunstone::ConnectionTest < ActiveSupport::TestCase
 
   # #ping =====================================================================
 

data/test/test_helper.rb

@@ -17,15 +17,17 @@ require 'webmock/minitest'
 require 'mocha/mini_test'
 
 require 'sunstone'
-require File.expand_path('../models.rb', __FILE__)
+require File.expand_path('../schema_mock.rb', __FILE__)
 
 Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
 
+$debugging = false
+
 # File 'lib/active_support/testing/declarative.rb', somewhere in rails....
-class Minitest::Test
+class ActiveSupport::TestCase
+  include WebMock::API
   
 #  include ActiveSupport::Testing::TimeHelpers
-  
   def self.test(name, &block)
     test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
     defined = instance_method(test_name) rescue false
@@ -65,7 +67,8 @@ class Minitest::Test
   def webmock(method, path, query=nil)
     query = deep_transform_query(query) if query
 
-    stub_request(method, /^#{ExampleRecord.connection.instance_variable_get(:@connection).url}/).with do |req|
+    stub_request(method, /^#{ActiveRecord::Base.connection.instance_variable_get(:@connection).url}/).with do |req|
+    # puts "REQ\t#{unpack(req.uri.query.sub(/=true$/, ''))}" if req&.uri&.path == path && req.uri.query
       if query
         req&.uri&.path == path && req.uri.query && unpack(req.uri.query.sub(/=true$/, '')) == query
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunstone
 version: !ruby/object:Gem::Version
-  version: 5.0.1.3
+  version: 5.0.1.4
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-22 00:00:00.000000000 Z
+date: 2017-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sdoc-templates-42floors
+  name: rgeo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rgeo
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,19 +179,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -277,6 +263,7 @@ files:
 - README.md
 - Rakefile.rb
 - 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
@@ -318,8 +305,13 @@ files:
 - test/active_record/eager_loading_test.rb
 - test/active_record/persistance_test.rb
 - test/active_record/preload_test.rb
+- test/active_record/query/all_test.rb
+- test/active_record/query/count_test.rb
+- test/active_record/query/distinct_test.rb
+- test/active_record/query/find_test.rb
+- test/active_record/query/where_test.rb
 - test/active_record/query_test.rb
-- test/models.rb
+- test/schema_mock.rb
 - test/sunstone/connection/configuration_test.rb
 - test/sunstone/connection/cookie_store_test.rb
 - test/sunstone/connection/request_helper_test.rb
@@ -355,8 +347,13 @@ test_files:
 - test/active_record/eager_loading_test.rb
 - test/active_record/persistance_test.rb
 - test/active_record/preload_test.rb
+- test/active_record/query/all_test.rb
+- test/active_record/query/count_test.rb
+- test/active_record/query/distinct_test.rb
+- test/active_record/query/find_test.rb
+- test/active_record/query/where_test.rb
 - test/active_record/query_test.rb
-- test/models.rb
+- test/schema_mock.rb
 - test/sunstone/connection/configuration_test.rb
 - test/sunstone/connection/cookie_store_test.rb
 - test/sunstone/connection/request_helper_test.rb

data/test/models.rb

@@ -1,115 +0,0 @@
-WebMock::StubRegistry.instance.global_stubs.push(
-  WebMock::RequestStub.new(:get, "http://example.com/ping").to_return(
-    body: "pong",
-    headers: { 'StandardAPI-Version' => '5.0.0.5' }
-  ),
-  
-  WebMock::RequestStub.new(:get, "http://example.com/tables").to_return(
-    body: %w(ships fleets sailors).to_json,
-    headers: { 'StandardAPI-Version' => '5.0.0.5' }
-  ),
-  
-  WebMock::RequestStub.new(:get, "http://example.com/ships/schema").to_return(
-    body: {
-      columns: {
-        id: {type: 'integer', primary_key: true, null: false, array: false},
-        fleet_id: {type: 'integer', primary_key: false, null: true, array: false},
-        name: {type: 'string', primary_key: false, null: true, array: false}
-      },
-      limit: 100
-    }.to_json,
-    headers: { 'StandardAPI-Version' => '5.0.0.5' }
-  ),
-  
-  WebMock::RequestStub.new(:get, "http://example.com/fleets/schema").to_return(
-    body: {
-      columns: {
-        id: {type: 'integer', primary_key: true, null: false, array: false},
-        name: {type: 'string', primary_key: false, null: true, array: false}
-      },
-      limit: nil
-    }.to_json,
-    headers: { 'StandardAPI-Version' => '5.0.0.5' }
-  ),
-  
-  WebMock::RequestStub.new(:get, "http://example.com/sailors/schema").to_return(
-    body: {
-      columns: {
-        id: {type: 'integer', primary_key: true, null: false, array: false},
-        name: {type: 'string', primary_key: false, null: true, array: false}
-      },
-      limit: 100
-    }.to_json,
-    headers: { 'StandardAPI-Version' => '5.0.0.5' }
-  ),
-  
-  WebMock::RequestStub.new(:get, "http://example.com/sailors_ships/schema").to_return(
-    body: {
-      columns: {
-        sailor_id: {type: 'integer', primary_key: false, null: false, array: false},
-        ship_id: {type: 'integer', primary_key: false, null: true, array: false}
-      },
-      limit: 100
-    }.to_json,
-    headers: { 'StandardAPI-Version' => '5.0.0.5' }
-  ),
-  
-  WebMock::RequestStub.new(:get, "http://example.com/countries/schema").to_return(
-    body: {
-      columns: {
-        id: {type: 'integer', primary_key: true, null: false, array: false},
-        name: {type: 'string', primary_key: false, null: true, array: false}
-      },
-      limit: 100
-    }.to_json,
-    headers: { 'StandardAPI-Version' => '5.0.0.5' }
-  ),
-  
-  WebMock::RequestStub.new(:get, "http://example.com/ownerships/schema").to_return(
-    body: {
-      columns: {
-        country_id: {type: 'integer', primary_key: false, null: false, array: false},
-        asset_type: {type: 'string', primary_key: false, null: false, array: false},
-        asset_id:   {type: 'integer', primary_key: false, null: true, array: false}
-      },
-      limit: 100
-    }.to_json,
-    headers: { 'StandardAPI-Version' => '5.0.0.5' }
-  )
-)
-
-class ExampleRecord < ActiveRecord::Base
-  self.abstract_class = true
-end
-
-ExampleRecord.establish_connection(
-  adapter: 'sunstone',
-  url: 'http://example.com'
-)
-
-class Fleet < ExampleRecord
-  has_many :ships
-end
-
-class Ship < ExampleRecord
-  belongs_to :fleet
-  
-  has_and_belongs_to_many :sailors
-  
-  has_many :ownerships, as: :asset
-  has_many :nations, through: :ownerships, source: :country, inverse_of: :ships
-end
-
-class Sailor < ExampleRecord
-  has_and_belongs_to_many :ships
-end
-
-class Country < ExampleRecord
-  has_many :ownerships
-  has_many :fleets, through: :ownerships
-end
-
-class Ownership < ExampleRecord
-  belongs_to :country
-  belongs_to :asset, polymorphic: true
-end