sunstone 5.0.0.beta3 → 5.0.0.1

data/test/sunstone/connection_test.rb

@@ -2,304 +2,10 @@ require 'test_helper'
 
 class Sunstone::ConnectionTest < Minitest::Test
 
-  # ::new =====================================================================
-  test "setting the site sets the api_key" do
-    connection = Sunstone::Connection.new(:site => 'https://my_api_key@localhost')
-    assert_equal('my_api_key', connection.api_key)
-  end
-
-  test "setting the site sets the host" do
-    connection = Sunstone::Connection.new(:site => 'https://my_api_key@example.com')
-    assert_equal('example.com', connection.host)
-  end
-
-  test "setting the site sets the port" do
-    connection = Sunstone::Connection.new(:site => 'http://my_api_key@localhost')
-    assert_equal(80, connection.port)
-
-    connection = Sunstone::Connection.new(:site => 'https://my_api_key@localhost')
-    assert_equal(443, connection.port)
-    
-    connection = Sunstone::Connection.new(:site => 'https://my_api_key@localhost:4321')
-    assert_equal(4321, connection.port)
-  end
-
-  test "setting the site sets the use_ssl option" do
-    connection = Sunstone::Connection.new(:site => 'http://my_api_key@localhost')
-    assert_equal(false, connection.use_ssl)
-    
-    connection = Sunstone::Connection.new(:site => 'https://my_api_key@localhost')
-    assert_equal(true, connection.use_ssl)
-  end
-  
-  test "setting the user_agent appends it to the User-Agent" do
-    connection = Sunstone::Connection.new(:site => 'http://my_api_key@localhost')
-    assert_equal("Sunstone/#{Sunstone::VERSION} Ruby/#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} #{RUBY_PLATFORM}", connection.user_agent)
-    
-    connection = Sunstone::Connection.new(:site => 'http://my_api_key@localhost', :user_agent => "MyGem/3.14")
-    assert_equal("MyGem/3.14 Sunstone/#{Sunstone::VERSION} Ruby/#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} #{RUBY_PLATFORM}", connection.user_agent)
-  end
-
-  #send_request =============================================================
-
-  test '#send_request(#<Net::HTTPRequest>)' do
-    stub_request(:get, "http://testhost.com/test").to_return(:body => "get")
-    
-    connection = Sunstone::Connection.new(:site => "http://test_api_key@testhost.com")
-    assert_equal('get', connection.send_request(Net::HTTP::Get.new('/test')).body)
-  end
-
-  test '#send_request(#<Net::HTTPRequest>, body) with string body' do
-    stub_request(:post, "http://testhost.com/test").with(:body => '{"key":"value"}').to_return(:body => "post")
-
-    connection = Sunstone::Connection.new(:site => "http://test_api_key@testhost.com")
-    assert_equal('post', connection.send_request(Net::HTTP::Post.new('/test'), '{"key":"value"}').body)
-  end
-
-  test '#send_request(#<Net::HTTPRequest>, body) with IO body' do
-    stub_request(:post, "http://testhost.com/test").with { |request|
-      request.headers['Transfer-Encoding'] == "chunked" && request.body == '{"key":"value"}'
-    }.to_return(:body => "post")
-
-    rd, wr = IO.pipe
-    wr.write('{"key":"value"}')
-    wr.close
-
-    connection = Sunstone::Connection.new(:site => "http://test_api_key@testhost.com")
-    assert_equal('post', connection.send_request(Net::HTTP::Post.new('/test'), rd).body)
-  end
-
-  test '#send_request(#<Net::HTTPRequest>, body) with Ruby Object body' do
-    stub_request(:post, "http://testhost.com/test").with(:body => '{"key":"value"}').to_return(:body => "post")
-
-    connection = Sunstone::Connection.new(:site => "http://test_api_key@testhost.com")
-    assert_equal('post', connection.send_request(Net::HTTP::Post.new('/test'), {:key => 'value'}).body)
-  end
-
-  test '#send_request(#<Net::HTTPRequest>) raises Sunstone::Exceptions on non-200 responses' do
-    stub_request(:get, "http://testhost.com/400").to_return(:status => 400)
-    stub_request(:get, "http://testhost.com/401").to_return(:status => 401)
-    stub_request(:get, "http://testhost.com/404").to_return(:status => 404)
-    stub_request(:get, "http://testhost.com/410").to_return(:status => 410)
-    stub_request(:get, "http://testhost.com/422").to_return(:status => 422)
-    stub_request(:get, "http://testhost.com/450").to_return(:status => 450)
-    stub_request(:get, "http://testhost.com/503").to_return(:status => 503)
-    stub_request(:get, "http://testhost.com/550").to_return(:status => 550)
-
-    connection = Sunstone::Connection.new(:site => "http://test_api_key@testhost.com")
-    assert_raises(Sunstone::Exception::BadRequest)   { connection.send_request(Net::HTTP::Get.new('/400')) }
-    assert_raises(Sunstone::Exception::Unauthorized) { connection.send_request(Net::HTTP::Get.new('/401')) }
-    assert_raises(Sunstone::Exception::NotFound)     { connection.send_request(Net::HTTP::Get.new('/404')) }
-    assert_raises(Sunstone::Exception::Gone)         { connection.send_request(Net::HTTP::Get.new('/410')) }
-    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')) }
-  end
-
-  test '#send_request(#<Net::HTTPRequest>, &block) returns value returned from &block' do
-    stub_request(:get, "http://testhost.com/test").to_return(:body => 'get')
-
-    connection = Sunstone::Connection.new(:site => "http://test_api_key@testhost.com")
-    value = connection.send_request(Net::HTTP::Get.new('/test')) do |response|
-      3215
-    end
-
-    assert_equal 3215, value
-  end
-
-  test '#send_request(#<Net::HTTPRequest>, &block)' do
-    connection = Sunstone::Connection.new(:site => "http://test_api_key@testhost.com")
-    stub_request(:get, "http://testhost.com/test").to_return(:body => 'get')
-
-    connection.send_request(Net::HTTP::Get.new('/test')) do |response|
-      assert_equal 'get', response.body
-    end
-
-    # make sure block is not called when not in valid_response_codes
-    stub_request(:get, "http://testhost.com/test").to_return(:status => 401, :body => 'get')
-
-    assert_raises(Sunstone::Exception::Unauthorized) {
-      connection.send_request(Net::HTTP::Get.new('/test')) do |response|
-        raise Sunstone::Exception, 'Should not get here'
-      end
-    }
-  end
-
-  test '#send_request(#<Net::HTTPRequest>, &block) with block reading chunks' do
-    connection = Sunstone::Connection.new(:site => "http://test_api_key@testhost.com")
-    
-    rd, wr = IO.pipe
-    rd = Net::BufferedIO.new(rd)
-    wr.write(<<-DATA.gsub(/^ +/, '').gsub(/\n/, "\r\n"))
-      HTTP/1.1 200 OK
-      Content-Length: 5
-
-      hello
-    DATA
-
-    res = Net::HTTPResponse.read_new(rd)
-    mock_connection = mock('connection')
-    mock_connection.stubs(:request).yields(res)
-    connection.instance_variable_set(:@connection, mock_connection)
-
-    res.reading_body(rd, true) do
-      connection.send_request(Net::HTTP::Get.new('/test')) do |response|
-        response.read_body do |chunk|
-          assert_equal('hello', chunk)
-        end
-      end
-    end
-  end
-  #
-  # test '#send_request(#<Net::HTTPRequest) adds cookies to the cookie store if present' do
-  #   store = CookieStore::HashStore.new
-  #   stub_request(:get, "http://testhost.com/test").to_return(:body => 'get', :headers => {'Set-Cookie' => 'foo=bar; Max-Age=3600'})
-  #
-  #   Sunstone.with_cookie_store(store) do
-  #     Sunstone.send_request(Net::HTTP::Get.new('/test'))
-  #   end
-  #
-  #   assert_equal 1, store.instance_variable_get(:@domains).size
-  #   assert_equal 1, store.instance_variable_get(:@domains)['testhost.com'].size
-  #   assert_equal 1, store.instance_variable_get(:@domains)['testhost.com']['/test'].size
-  #   assert_equal 'bar', store.instance_variable_get(:@domains)['testhost.com']['/test']['foo'].value
-  # end
-  #
-  # test '#send_request(#<Net::HTTPRequest>) includes the headers' do
-  #   stub_request(:get, "http://testhost.com/test").with(:headers => {
-  #     'Api-Key'      => 'test_api_key',
-  #     'Content-Type' => 'application/json',
-  #     'User-Agent'   => Sunstone.user_agent
-  #   }).to_return(:body => "get")
-  #
-  #   assert_equal('get', Sunstone.send_request(Net::HTTP::Get.new('/test')).body)
-  #
-  #   # Test without api key
-  #   Sunstone.site = "http://testhost.com"
-  #   stub_request(:get, "http://testhost.com/test").with(:headers => {
-  #     'Content-Type'=>'application/json',
-  #     'User-Agent'=>'Sunstone/0.1 Ruby/2.1.1-p76 x86_64-darwin13.0'
-  #   }).to_return(:body => "get")
-  #
-  #   assert_equal('get', Sunstone.send_request(Net::HTTP::Get.new('/test')).body)
-  # end
-  
-  #
-  # # Sunstone.with_cookie_store ================================================
-  #
-  # test '#with_cookie_store(store, &block) sets the cookie-store' do
-  #   assert_nil Thread.current[:sunstone_cookie_store]
-  #   Sunstone.with_cookie_store('my_store') do
-  #     assert_equal 'my_store', Thread.current[:sunstone_cookie_store]
-  #   end
-  #   assert_nil Thread.current[:sunstone_cookie_store]
-  # end
-
-  # Sunstone.get ==============================================================
-
-  test '#get(path)' do
-    connection = Sunstone::Connection.new(:site => "http://test_api_key@testhost.com")
-    stub_request(:get, "http://testhost.com/test").to_return(:body => "get")
-
-    assert_equal('get', connection.get('/test').body)
-  end
-
-  test '#get(path, params) with params as string' do
-    connection = Sunstone::Connection.new(:site => "http://test_api_key@testhost.com")
-    stub_request(:get, "http://testhost.com/test").with(:query => {'key' => 'value'}).to_return(:body => "get")
-
-    assert_equal 'get', connection.get('/test', 'key=value').body
-  end
-
-  test '#get(path, params) with params as hash' do
-    connection = Sunstone::Connection.new(:site => "http://test_api_key@testhost.com")
-    stub_request(:get, "http://testhost.com/test").with(:query => {'key' => 'value'}).to_return(:body => "get")
-
-    assert_equal 'get', connection.get('/test', {:key => 'value'}).body
-  end
-
-  test '#get(path, &block)' do
-    connection = Sunstone::Connection.new(:site => "http://test_api_key@testhost.com")
-    stub_request(:get, "http://testhost.com/test").to_return(:body => 'get')
-
-    connection.get('/test') do |response|
-      assert_equal 'get', response.body
-    end
-  end
-
-  # Sunstone.post =============================================================
-
-  test '#post(path)' do
-    connection = Sunstone::Connection.new(:site => "http://test_api_key@testhost.com")
-    stub_request(:post, "http://testhost.com/test").to_return(:body => "post")
-
-    assert_equal('post', connection.post('/test').body)
-  end
-
-  test '#post(path, body)' do
-    connection = Sunstone::Connection.new(:site => "http://test_api_key@testhost.com")
-    stub_request(:post, "http://testhost.com/test").with(:body => 'body').to_return(:body => "post")
-
-    assert_equal('post', connection.post('/test', 'body').body)
-  end
-
-  test '#post(path, &block)' do
-    connection = Sunstone::Connection.new(:site => "http://test_api_key@testhost.com")
-    stub_request(:post, "http://testhost.com/test").to_return(:body => 'post')
-
-    connection.post('/test') do |response|
-      assert_equal 'post', response.body
-    end
-  end
-
-  # Sunstone.put ==============================================================
-
-  test '#put(path)' do
-    connection = Sunstone::Connection.new(:site => "http://test_api_key@testhost.com")
-    stub_request(:put, "http://testhost.com/test").to_return(:body => "put")
-
-    assert_equal('put', connection.put('/test').body)
-  end
-
-  test '#put(path, body)' do
-    connection = Sunstone::Connection.new(:site => "http://test_api_key@testhost.com")
-    stub_request(:put, "http://testhost.com/test").with(:body => 'body').to_return(:body => "put")
-
-    assert_equal('put', connection.put('/test', 'body').body)
-  end
-
-  test '#put(path, &block)' do
-    connection = Sunstone::Connection.new(:site => "http://test_api_key@testhost.com")
-    stub_request(:put, "http://testhost.com/test").to_return(:body => 'put')
-
-    connection.put('/test') do |response|
-      assert_equal 'put', response.body
-    end
-  end
-
-  # Sunstone.delete ===========================================================
-
-  test '#delete' do
-    connection = Sunstone::Connection.new(:site => "http://test_api_key@testhost.com")
-    stub_request(:delete, "http://testhost.com/test").to_return(:body => "delete")
-
-    assert_equal('delete', connection.delete('/test').body)
-  end
-
-  test '#delete(path, &block)' do
-    connection = Sunstone::Connection.new(:site => "http://test_api_key@testhost.com")
-    stub_request(:delete, "http://testhost.com/test").to_return(:body => 'delete')
-
-    connection.delete('/test') do |response|
-      assert_equal 'delete', response.body
-    end
-  end
-
   # #ping =====================================================================
 
   test '#ping' do
-    connection = Sunstone::Connection.new(:site => "http://test_api_key@testhost.com")
+    connection = Sunstone::Connection.new(url: "http://testhost.com")
     stub_request(:get, "http://testhost.com/ping").to_return(:body => 'pong')
 
     assert_equal( 'pong', connection.ping )
@@ -308,12 +14,10 @@ class Sunstone::ConnectionTest < Minitest::Test
   # #server_config ===========================================================
 
   test '#config' do
-    connection = Sunstone::Connection.new(:site => "http://test_api_key@testhost.com")
+    connection = Sunstone::Connection.new(url: "http://testhost.com")
     stub_request(:get, "http://testhost.com/config").to_return(:body => '{"server": "configs"}')
 
     assert_equal( {:server => "configs"}, connection.server_config )
   end
 
-
-
 end

data/test/test_helper.rb

@@ -2,13 +2,21 @@
 # installed gem
 $LOAD_PATH << File.expand_path('../lib', __FILE__)
 
-require 'sunstone'
+require 'simplecov'
+SimpleCov.start do
+  add_group 'lib', 'sunstone/lib'
+  add_group 'ext', 'sunstone/ext'
+end
+
+require 'rgeo'
 require "minitest/autorun"
 require 'minitest/unit'
 require 'minitest/reporters'
 require 'webmock/minitest'
+require 'mocha/mini_test'
 
-Dir.glob(File.expand_path('../models/**/*.rb', __FILE__), &method(:require))
+require 'sunstone'
+require File.expand_path('../models.rb', __FILE__)
 
 
 
@@ -37,6 +45,41 @@ class Minitest::Test
     end
   end
   
+  def pack(data)
+    
+  end
+  
+  def unpack(data)
+    MessagePack.unpack(CGI::unescape(data))
+  end
+
+  def deep_transform_query(object)
+    case object
+    when Hash
+      object.each_with_object({}) do |(key, value), result|
+        result[key.to_s] = deep_transform_query(value)
+      end
+    when Array
+      object.map {|e| deep_transform_query(e) }
+    when Symbol
+      object.to_s
+    else
+      object
+    end
+  end
+  
+  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|
+      if query
+        req&.uri&.path == path && req.uri.query && unpack(req.uri.query.sub(/=true$/, '')) == query
+      else
+        req&.uri&.path == path && req.uri.query.nil?
+      end
+    end
+  end
+  
   # test/unit backwards compatibility methods
   alias :assert_raise :assert_raises
   alias :assert_not_empty :refute_empty

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunstone
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta3
+  version: 5.0.0.1
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -165,13 +165,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: msgpack
+  name: rgeo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -179,13 +179,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: wankel
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -193,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cookie_store
+  name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -207,61 +207,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: arel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
+  name: cookie_store
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: 5.0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: 5.0.0.1
 description: A library for interacting with REST APIs. Similar to ActiveResource
 email:
 - jonbracy@gmail.com
@@ -270,33 +256,37 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".tm_properties"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile.rb
 - TODO.md
-- ext/active_record/associations/builder/has_and_belongs_to_many.rb
 - ext/active_record/associations/collection_association.rb
 - ext/active_record/attribute_methods.rb
 - ext/active_record/batches.rb
-- ext/active_record/calculations.rb
+- ext/active_record/callbacks.rb
 - ext/active_record/finder_methods.rb
 - ext/active_record/persistence.rb
-- ext/active_record/query_methods.rb
 - ext/active_record/relation.rb
-- ext/active_record/relation/predicate_builder.rb
+- ext/active_record/relation/calculations.rb
 - ext/active_record/statement_cache.rb
+- 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
 - lib/active_record/connection_adapters/sunstone/column.rb
 - lib/active_record/connection_adapters/sunstone/database_statements.rb
+- 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/date_time.rb
 - lib/active_record/connection_adapters/sunstone/type/ewkb.rb
+- lib/active_record/connection_adapters/sunstone/type/uuid.rb
 - lib/active_record/connection_adapters/sunstone/type_metadata.rb
 - lib/active_record/connection_adapters/sunstone_adapter.rb
 - lib/arel/collectors/sunstone.rb
@@ -304,13 +294,21 @@ files:
 - lib/sunstone.rb
 - lib/sunstone/connection.rb
 - lib/sunstone/exception.rb
+- lib/sunstone/gis.rb
 - lib/sunstone/version.rb
 - sunstone.gemspec
-- test/models/ship.rb
-- test/query_test.rb
+- test/active_record/associations/has_and_belongs_to_many_test.rb
+- test/active_record/associations/has_many_test.rb
+- test/active_record/eager_loading_test.rb
+- test/active_record/persistance_test.rb
+- test/active_record/preload_test.rb
+- test/active_record/query_test.rb
+- test/models.rb
+- test/sunstone/connection/configuration_test.rb
+- test/sunstone/connection/cookie_store_test.rb
+- test/sunstone/connection/request_helper_test.rb
+- test/sunstone/connection/send_request_test.rb
 - test/sunstone/connection_test.rb
-- test/sunstone/parser_test.rb
-- test/sunstone_test.rb
 - test/test_helper.rb
 homepage: http://sunstonerb.com
 licenses: []
@@ -326,9 +324,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -336,9 +334,16 @@ signing_key:
 specification_version: 4
 summary: A library for interacting with REST APIs
 test_files:
-- test/models/ship.rb
-- test/query_test.rb
+- test/active_record/associations/has_and_belongs_to_many_test.rb
+- test/active_record/associations/has_many_test.rb
+- test/active_record/eager_loading_test.rb
+- test/active_record/persistance_test.rb
+- test/active_record/preload_test.rb
+- test/active_record/query_test.rb
+- test/models.rb
+- test/sunstone/connection/configuration_test.rb
+- test/sunstone/connection/cookie_store_test.rb
+- test/sunstone/connection/request_helper_test.rb
+- test/sunstone/connection/send_request_test.rb
 - test/sunstone/connection_test.rb
-- test/sunstone/parser_test.rb
-- test/sunstone_test.rb
 - test/test_helper.rb