sunstone 5.0.0.1 → 5.0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1fc21e0215013059317cc971ba06e8a221343e2
-  data.tar.gz: 9c9f8128129d8d9ff50e398f7982f9288573a41f
+  metadata.gz: 251b8b254f40eac45d625f004fe405db180eefe0
+  data.tar.gz: e06aa5cf5ce843ccfe6c495fd5e0e7d7ec3d5685
 SHA512:
-  metadata.gz: ccb44a14900ab3434926246a341740026723695e868283a0d09f3b4d6e41700da0aaf2f77f61c4bc69ca6fe3cdeee5204924fc67695b5ddcc09c211ae4a466a4
-  data.tar.gz: 2fb90af0945f9c7ae8dbd1dad2dc7c0072efa24dcd2bd3cf1b76507fb6754e4a06f6093117d2e94c5900624f7083effdcaab8d02a00ff648c28e268fa2fc46b7
+  metadata.gz: 1ad88a3734db407224aa3addb478b5eaabfd9b5ad1ae0e3effe18c67e783a6131c652b58cbb55508f300a630f0c3aea259904743418cc711af0f8ab356bfc546
+  data.tar.gz: 628039ec1b81d9f4630a85dca9decd0e455e47d45d2386721cb96765628c86f19a5372275e52e1d6bdd0ac42082da8ee3ba2e4104969731a524448e10caabdbb

data/ext/active_record/finder_methods.rb

@@ -101,7 +101,7 @@ module ActiveRecord
         else
           if parent.association_cached?(reflection.name)
             model = parent.association(reflection.name).target
-            construct(model, attributes.select{|k,v| !reflection.klass.column_names.include?(k.to_s) }, seen, model_cache)
+            construct(model, attributes.select{|k,v| !model.class.column_names.include?(k.to_s) }, seen, model_cache)
           end
         end
 

data/lib/active_record/connection_adapters/sunstone/database_statements.rb

@@ -13,20 +13,57 @@ module ActiveRecord
           end
         end
 
+        # Returns an ActiveRecord::Result instance.
+        def select_all(arel, name = nil, binds = [], preparable: nil)
+          arel, binds = binds_from_relation arel, binds
+          select(arel, name, binds)
+        end
+
         def exec_query(arel, name = 'SAR', binds = [], prepare: false)
-          sar = to_sar(arel, binds)
-          
-          log_mess = sar.path.split('?', 2)
-          result = log("#{sar.method} #{log_mess[0]} #{(log_mess[1] && !log_mess[1].empty?) ? MessagePack.unpack(CGI.unescape(log_mess[1])) : '' }", name) {
-            response = @connection.send_request(sar)
-            if response.is_a?(Net::HTTPNoContent)
-              nil
-            else
-              JSON.parse(response.body)
+
+          sars = []
+          multiple_requests = arel.is_a?(Arel::SelectManager) && arel&.limit
+
+          if multiple_requests
+            allowed_limit = limit_definition(arel.source.left.name)
+            requested_limit = binds.find { |x| x.name == 'LIMIT' }.value
+            multiple_requests = requested_limit > allowed_limit
+          end
+
+          send_request = lambda { |req_arel|
+            sar = to_sar(req_arel, binds)
+            sars.push(sar)
+            log_mess = sar.path.split('?', 2)
+            log("#{sar.method} #{log_mess[0]} #{(log_mess[1] && !log_mess[1].empty?) ? MessagePack.unpack(CGI.unescape(log_mess[1])) : '' }", name) do
+              response = @connection.send_request(sar)
+              if response.is_a?(Net::HTTPNoContent)
+                nil
+              else
+                JSON.parse(response.body)
+              end
             end
           }
 
-          if sar.instance_variable_get(:@sunstone_calculation)
+          result = if multiple_requests
+            bind = binds.find { |x| x.name == 'LIMIT' }
+            binds.delete(bind)
+
+            limit, offset, results = allowed_limit, 0, []
+            while offset < requested_limit
+              split_arel = arel.clone
+              split_arel.limit = limit
+              split_arel.offset = offset
+              request_results = send_request.call(split_arel)
+              results = results + request_results
+              break if request_results.size < limit
+              offset = offset + limit
+            end
+            results
+          else
+            send_request.call(arel)
+          end
+
+          if !multiple_requests && sars[0].instance_variable_get(:@sunstone_calculation)
             # this is a count, min, max.... yea i know..
             ActiveRecord::Result.new(['all'], [result], {:all => type_map.lookup('integer')})
           elsif result.is_a?(Array)
@@ -35,7 +72,7 @@ module ActiveRecord
             ActiveRecord::Result.new(result.keys, [result])
           end
         end
-        
+
         def last_inserted_id(result)
           row = result.rows.first
           row && row['id']
@@ -46,7 +83,3 @@ module ActiveRecord
   end
 end
 
-
-
-
-

data/lib/active_record/connection_adapters/sunstone/schema_statements.rb

@@ -19,17 +19,35 @@ module ActiveRecord
           end
         end
 
+        def definition(table_name)
+          response = @connection.get("/#{table_name}/schema")
+
+          version = Gem::Version.create(response['StandardAPI-Version'] || '5.0.0.4')
+
+          if (version >= Gem::Version.create('5.0.0.5'))
+            JSON.parse(response.body)
+          else
+            { 'columns' => JSON.parse(response.body), 'limit' => nil }
+          end
+        rescue ::Sunstone::Exception::NotFound
+          raise ActiveRecord::StatementInvalid, "Table \"#{table_name}\" does not exist"
+        end
+
         # Returns the list of a table's column names, data types, and default values.
         #
         # Query implementation notes:
         #  - format_type includes the column size constraint, e.g. varchar(50)
         #  - ::regclass is a function that gives the id for a table name
         def column_definitions(table_name) # :nodoc:
-          JSON.parse(@connection.get("/#{table_name}/schema").body)
-        rescue ::Sunstone::Exception::NotFound
-          raise ActiveRecord::StatementInvalid, "Table \"#{table_name}\" does not exist"
+          definition(table_name)['columns']
         end
-        
+
+        # Returns the limit definition of the table (the maximum limit that can
+        # be used).
+        def limit_definition(table_name)
+          definition(table_name)['limit'] || Float::INFINITY
+        end
+
         def tables
           JSON.parse(@connection.get('/tables').body)
         end

data/lib/active_record/connection_adapters/sunstone/type/json.rb

@@ -0,0 +1,20 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module Sunstone
+      module Type
+        class Json < ActiveRecord::Type::Internal::AbstractJson
+
+
+          def deserialize(value)
+            value.nil? ? nil : value.dup
+          end
+          
+          def serialize(value)
+            value
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/active_record/connection_adapters/sunstone_adapter.rb

@@ -10,6 +10,7 @@ require 'active_record/connection_adapters/sunstone/column'
 require 'active_record/connection_adapters/sunstone/type/date_time'
 require 'active_record/connection_adapters/sunstone/type/array'
 require 'active_record/connection_adapters/sunstone/type/uuid'
+require 'active_record/connection_adapters/sunstone/type/json'
 
 module ActiveRecord
   module ConnectionHandling # :nodoc:
@@ -20,12 +21,8 @@ module ActiveRecord
     # objects
     def sunstone_connection(config)
       conn_params = config.symbolize_keys
-
       conn_params.delete_if { |_, v| v.nil? }
 
-      # Map ActiveRecords param names to PGs.
-      conn_params[:user] = conn_params.delete(:username) if conn_params[:username]
-      conn_params[:dbname] = conn_params.delete(:database) if conn_params[:database]
       if conn_params[:url]
         uri = URI.parse(conn_params.delete(:url))
         conn_params[:api_key] ||= (uri.user ? CGI.unescape(uri.user) : nil)
@@ -34,12 +31,11 @@ module ActiveRecord
         conn_params[:use_ssl] ||= (uri.scheme == 'https')
       end
       
-      # Forward only valid config params to PGconn.connect.
+      # Forward only valid config params to Sunstone::Connection
       conn_params.slice!(*VALID_SUNSTONE_CONN_PARAMS)
 
-      # The postgres drivers don't allow the creation of an unconnected PGconn object,
-      # so just pass a nil connection object for the time being.
-      ConnectionAdapters::SunstoneAPIAdapter.new(nil, logger, conn_params, config)
+      client = ::Sunstone::Connection.new(conn_params)
+      ConnectionAdapters::SunstoneAPIAdapter.new(client, logger, conn_params, config)
     end
   end
 
@@ -71,44 +67,29 @@ module ActiveRecord
       include Sunstone::ColumnDumper
       # include Savepoints
       
-      # Returns 'SunstoneAPI' as adapter name for identification purposes.
-      def adapter_name
-        ADAPTER_NAME
-      end
-      
       # Initializes and connects a SunstoneAPI adapter.
       def initialize(connection, logger, connection_parameters, config)
         super(connection, logger, config)
 
         @prepared_statements = false
-        @visitor = Arel::Visitors::Sunstone.new
-        @connection_parameters, @config = connection_parameters, config
+        @connection_parameters = connection_parameters
 
-        connect
-
-        @type_map = Type::HashLookupTypeMap.new
-        initialize_type_map(type_map)
+        # @type_map = Type::HashLookupTypeMap.new
+        # initialize_type_map(type_map)
       end
 
-      # Is this connection alive and ready for queries?
       def active?
-        @connection.ping
-        true
-      rescue Net::HTTPExceptions
-        false
+        @connection.active?
       end
 
-      # TODO: this doesn't work yet
-      # Close then reopen the connection.
       def reconnect!
         super
-        @connection.reset
-        # configure_connection
+        @connection.reconnect!
       end
-
-      # TODO don't know about this yet
-      def reset!
-        # configure_connection
+      
+      def disconnect!
+        super
+        @connection.disconnect!
       end
       
       # Executes the delete statement and returns the number of rows affected.
@@ -117,14 +98,6 @@ module ActiveRecord
         r.rows.first.to_i
       end
 
-      # TODO: deal with connection.close
-      # Disconnects from the database if already connected. Otherwise, this
-      # method does nothing.
-      def disconnect!
-        super
-        @connection.close rescue nil
-      end
-
       def native_database_types #:nodoc:
         NATIVE_DATABASE_TYPES
       end
@@ -140,7 +113,11 @@ module ActiveRecord
       def update_table_definition(table_name, base) #:nodoc:
         SunstoneAPI::Table.new(table_name, base)
       end
-
+      
+      def arel_visitor
+        Arel::Visitors::Sunstone.new
+      end
+      
       def collector
         Arel::Collectors::Sunstone.new
       end
@@ -206,7 +183,7 @@ module ActiveRecord
           m.register_type 'integer',    Type::Integer.new
           m.register_type 'decimal',    Type::Decimal.new
           m.register_type 'datetime',   Sunstone::Type::DateTime.new
-          m.register_type 'json',       Type::Internal::AbstractJson.new
+          m.register_type 'json',       Sunstone::Type::Json.new
           m.register_type 'uuid',       Sunstone::Type::Uuid.new
           
           if defined?(Sunstone::Type::EWKB)
@@ -214,12 +191,6 @@ module ActiveRecord
           end
         end
 
-        # Connects to a Sunstone API server and sets up the adapter depending on
-        # the connected server's characteristics.
-        def connect
-          @connection = ::Sunstone::Connection.new(@connection_parameters)
-        end
-
         def create_table_definition(name, temporary, options, as = nil) # :nodoc:
           SunstoneAPI::TableDefinition.new native_database_types, name, temporary, options, as
         end

data/lib/arel/collectors/sunstone.rb

@@ -2,7 +2,9 @@ module Arel
   module Collectors
     class Sunstone < Arel::Collectors::Bind
 
-      attr_accessor :request_type, :table, :where, :limit, :offset, :order, :operation, :columns, :updates, :eager_loads, :id
+      MAX_URI_LENGTH = 2083
+
+      attr_accessor :request_type, :table, :where, :limit, :offset, :order, :operation, :columns, :updates, :eager_loads, :id, :distinct, :distinct_on
 
       def cast_attribute(v)
         if (v.is_a?(ActiveRecord::Attribute))
@@ -58,49 +60,81 @@ module Arel
 
       def compile bvs, conn = nil
         path = "/#{table}"
+        headers = {}
+        request_type_override = nil
 
+        body = nil
         if updates
-          body = {table.singularize => substitute_binds(updates.clone, bvs)}.to_json
+          body = {
+            table.singularize => substitute_binds(updates.clone, bvs)
+          }
         end
 
-        get_params = {}
+        params = {}
         if where
-          get_params[:where] = substitute_binds(where.clone, bvs)
-          if get_params[:where].size == 1
-            get_params[:where] = get_params[:where].pop
+          params[:where] = substitute_binds(where.clone, bvs)
+          if params[:where].size == 1
+            params[:where] = params[:where].pop
           end
         end
         
         if eager_loads
-          get_params[:include] = eager_loads.clone
+          params[:include] = eager_loads.clone
+        end
+
+        if distinct_on
+          params[:distinct_on] = distinct_on
+        elsif distinct
+          params[:distinct] = true 
+        end
+
+        if limit.is_a?(Arel::Nodes::BindParam)
+          params[:limit] = substitute_binds(limit, bvs)
+        elsif limit
+          params[:limit] = limit
+        end
+
+        if offset.is_a?(Arel::Nodes::BindParam)
+          params[:offset] = substitute_binds(offset, bvs)
+        elsif offset
+          params[:offset] = offset
         end
 
-        get_params[:limit] = substitute_binds(limit, bvs) if limit
-        get_params[:offset] = substitute_binds(offset, bvs) if offset
-        get_params[:order] = substitute_binds(order, bvs) if order
+        params[:order] = substitute_binds(order, bvs) if order
 
         case operation
         when :count
           path += "/#{operation}"
         when :calculate
           path += "/calculate"
-          get_params[:select] = columns
+          params[:select] = columns
         when :update, :delete
-          path += "/#{get_params[:where]['id']}"
-          get_params.delete(:where)
-        end
-        if get_params.size > 0
-          path += "?#{CGI.escape(MessagePack.pack(get_params))}"
+          path += "/#{params[:where]['id']}"
+          params.delete(:where)
         end
         
-        request = request_type.new(path)
-        if get_params.size > 0
-          request['Query-Encoding'] = 'application/msgpack'
+        if params.size > 0 && request_type == Net::HTTP::Get
+          newpath = path + "?#{CGI.escape(MessagePack.pack(params))}"
+          if newpath.length > MAX_URI_LENGTH
+            request_type_override = Net::HTTP::Post
+            headers['X-Http-Method-Override'] = 'GET'
+            if body
+              body.merge!(params)
+            else
+              body = params
+            end
+          else
+            path = newpath
+            headers['Query-Encoding'] = 'application/msgpack'
+          end
         end
+
+        request = (request_type_override || request_type).new(path)
+        headers.each { |k,v| request[k] = v }
         request.instance_variable_set(:@sunstone_calculation, true) if [:calculate, :delete].include?(operation)
 
-        if updates
-          request.body = body
+        if body
+          request.body = body.to_json
         end
 
         request

data/lib/arel/visitors/sunstone.rb

@@ -55,6 +55,8 @@ module Arel
           collector.operation = :select
         end
 
+        collector = maybe_visit o.set_quantifier, collector
+
         if o.source && !o.source.empty?
           collector.table = o.source.left.name
         end
@@ -296,13 +298,15 @@ module Arel
       #   visit o.expr, collector
       # end
       #
-      # def visit_Arel_Nodes_Distinct o, collector
-      #   collector << DISTINCT
-      # end
-      #
-      # def visit_Arel_Nodes_DistinctOn o, collector
-      #   raise NotImplementedError, 'DISTINCT ON not implemented for this db'
-      # end
+      def visit_Arel_Nodes_Distinct o, collector
+        collector.distinct = true
+        collector
+      end
+
+      def visit_Arel_Nodes_DistinctOn o, collector
+        collector.distinct_on = o.expr.map(&:name)
+        collector
+      end
       #
       # def visit_Arel_Nodes_With o, collector
       #   collector << "WITH "
@@ -840,13 +844,7 @@ module Arel
       end
       
       def visit_Arel_Attributes_Cast(o, collector)
-        key = visit(o.relation, collector)
-        value = { :cast => o.name }
-        if key.is_a?(Hash)
-          add_to_bottom_of_hash(key, value)
-        else
-          { key => value }
-        end
+        visit(o.relation, collector) # No casting yet
       end
       
       def visit_Arel_Attributes_Key o, collector
@@ -914,7 +912,7 @@ module Arel
       end
 
       def literal(o, collector)
-        o.to_s;
+        o
       end
       alias :visit_Arel_Nodes_SqlLiteral :literal
       alias :visit_Bignum                :literal

data/lib/sunstone/connection.rb

@@ -42,16 +42,34 @@ module Sunstone
     end
 
     # Ping the Sunstone. If everything is configured and operating correctly
-    # <tt>"pong"</tt> will be returned. Otherwise and Sunstone::Exception should be
-    # thrown.
+    # <tt>"pong"</tt> will be returned. Otherwise and Sunstone::Exception should
+    # be thrown.
     #
     #  #!ruby
     #  Sunstone.ping # => "pong"
     #
-    #  Sunstone.ping # raises Sunstone::Exception::ServiceUnavailable if a 503 is returned
+    #  Sunstone.ping # raises Sunstone::Exception::ServiceUnavailable if a
+    #  503 is returned
     def ping
       get('/ping').body
     end
+    
+    def connect!
+      @connection.start
+    end
+    
+    def active?
+      @connection.active?
+    end
+    
+    def reconnect!
+      disconnect!
+      connect!
+    end
+    
+    def disconnect!
+      @connection.finish if @connection.active?
+    end
 
     # Returns the User-Agent of the client. Defaults to:
     # "sunstone-ruby/SUNSTONE_VERSION RUBY_VERSION-pPATCH_LEVEL PLATFORM"
@@ -150,6 +168,7 @@ module Sunstone
       return_value = nil
       retry_count = 0
       begin
+        close_connection = false
         @connection.request(request) do |response|
           if response['Deprecation-Notice']
             ActiveSupport::Deprecation.warn(response['Deprecation-Notice'])
@@ -159,17 +178,23 @@ module Sunstone
 
           # Get the cookies
           response.each_header do |key, value|
-            if key.downcase == 'set-cookie' && Thread.current[:sunstone_cookie_store]
-              Thread.current[:sunstone_cookie_store].set_cookie(request_uri, value)
+            case key.downcase
+            when 'set-cookie'
+              if Thread.current[:sunstone_cookie_store]
+                Thread.current[:sunstone_cookie_store].set_cookie(request_uri, value)
+              end
+            when 'connection'
+              close_connection = (value == 'close')
             end
           end
 
           if block_given?
-            return_value =yield(response)
+            return_value = yield(response)
           else
-            return_value =response
+            return_value = response
           end
         end
+        @connection.finish if close_connection
       rescue ActiveRecord::ConnectionNotEstablished
         retry_count += 1
         retry_count == 1 ? retry : raise
@@ -322,6 +347,7 @@ module Sunstone
       headers['Accept'] = 'application/json'
       headers['User-Agent'] = user_agent
       headers['Api-Version'] = '0.1.0'
+      headers['Connection'] = 'keep-alive'
       
       request_api_key = Thread.current[:sunstone_api_key] || api_key
       headers['Api-Key'] = request_api_key if request_api_key

data/lib/sunstone/version.rb

@@ -1,3 +1,3 @@
 module Sunstone
-  VERSION = '5.0.0.1'
+  VERSION = '5.0.0.2'
 end

data/sunstone.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'sdoc-templates-42floors'
   s.add_development_dependency 'rgeo'
   s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'byebug'
 
   # Runtime
   s.add_runtime_dependency 'msgpack'

data/test/active_record/persistance_test.rb

@@ -52,15 +52,23 @@ class ActiveRecord::PersistanceTest < Minitest::Test
   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
+        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(: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
+        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' }
     )
 
     assert_raises ActiveRecord::StatementInvalid do

data/test/active_record/query_test.rb

@@ -2,9 +2,31 @@ require 'test_helper'
 
 class ActiveRecord::QueryTest < Minitest::Test
 
-  test '::find' do
+  test '::find w/ old schema definition' do
+    replaced_stub = WebMock::StubRegistry.instance.global_stubs.find { |x|
+      x.request_pattern.uri_pattern.to_s == 'http://example.com/ships/schema'
+    }
+    WebMock::StubRegistry.instance.global_stubs.delete(replaced_stub)
+
+    new_stub = WebMock::API.stub_request(:get, "http://example.com/ships/schema").to_return(
+      body: {
+        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}
+      }.to_json
+    )
+
     webmock(:get, "/ships", { where: {id: 42}, limit: 1 }).to_return(body: [{id: 42}].to_json)
+
+    assert_equal 42, Ship.find(42).id
     
+    WebMock::API.remove_request_stub(new_stub)
+    WebMock::StubRegistry.instance.global_stubs.push(replaced_stub)
+  end
+
+  test '::find' do
+    webmock(:get, "/ships", { where: {id: 42}, limit: 1 }).to_return(body: [{id: 42}].to_json)
+
     assert_equal 42, Ship.find(42).id
   end
   
@@ -21,7 +43,8 @@ class ActiveRecord::QueryTest < Minitest::Test
   end
   
   test '::find_each' do
-    webmock(:get, "/ships", { limit: 1000, order: [{id: :asc}] }).to_return(body: [].to_json)
+    webmock(:get, "/ships", { limit: 100, offset: 0, order: [{id: :asc}] }).to_return(body: Array.new(100, { id:  1 }).to_json)
+    webmock(:get, "/ships", { limit: 100, offset: 100, order: [{id: :asc}] }).to_return(body: Array.new(10, { id: 2 }).to_json)
     
     assert_nil Ship.find_each { |s| s }
   end
@@ -63,6 +86,20 @@ class ActiveRecord::QueryTest < Minitest::Test
     assert_equal [], Ship.where(nations: {id: 1}).limit(10).to_a
   end
   ### end polymorphic test
+
+  # Distinct
+  test '::distinct query' do
+    webmock(:get, "/ships", distinct: true).to_return(body: [].to_json)
+
+    assert_equal [], Ship.distinct
+  end
+
+  # TODO: i need arel-extensions....
+  # test '::distinct_on query' do
+  #   webmock(:get, "/ships", distinct_on: ['id']).to_return(body: [].to_json)
+  #
+  #   assert_equal [], Ship.distinct_on(:id)
+  # end
   
   test '::count' do
     webmock(:get, "/ships/calculate", select: [{count: "*"}]).to_return(body: [10].to_json)
@@ -82,6 +119,16 @@ class ActiveRecord::QueryTest < Minitest::Test
     assert_equal 10, Ship.sum(:weight)
   end
   
+  test '::where(....big get request turns into post...)' do
+    name = 'q' * 3000
+    webmock(:post, "/ships").with(
+      headers: {'X-Http-Method-Override' => 'GET'},
+      body: {where: {name: name}}.to_json
+    ).to_return(body: [{id: 42}].to_json)
+
+    assert_equal 42, Ship.where(name: name)[0].id
+  end
+
   # Relation test
   
   test '#to_sql' do

data/test/models.rb

@@ -1,56 +1,80 @@
-
-
 WebMock::StubRegistry.instance.global_stubs.push(
   WebMock::RequestStub.new(:get, "http://example.com/ping").to_return(
-    body: "pong"
+    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
+    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: {
-      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}
-    }.to_json
+      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: {
-      id: {type: 'integer', primary_key: true, null: false, array: false},
-      name: {type: 'string', primary_key: false, null: true, array: false}
-    }.to_json
+      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/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
+      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: {
-      sailor_id: {type: 'integer', primary_key: false, null: false, array: false},
-      ship_id: {type: 'integer', primary_key: false, null: true, array: false}
-    }.to_json
+      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: {
-      id: {type: 'integer', primary_key: true, null: false, array: false},
-      name: {type: 'string', primary_key: false, null: true, array: false}
-    }.to_json
+      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: {
-      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}
-    }.to_json
+      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' }
   )
 )
 

data/test/test_helper.rb

@@ -9,6 +9,7 @@ SimpleCov.start do
 end
 
 require 'rgeo'
+require 'byebug'
 require "minitest/autorun"
 require 'minitest/unit'
 require 'minitest/reporters'
@@ -18,13 +19,6 @@ require 'mocha/mini_test'
 require 'sunstone'
 require File.expand_path('../models.rb', __FILE__)
 
-
-
-# require 'faker'
-# require "mocha"
-# require "mocha/mini_test"
-# require 'active_support/testing/time_helpers'
-
 Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
 
 # File 'lib/active_support/testing/declarative.rb', somewhere in rails....
@@ -70,7 +64,7 @@ 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|
       if query
         req&.uri&.path == path && req.uri.query && unpack(req.uri.query.sub(/=true$/, '')) == query

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunstone
 version: !ruby/object:Gem::Version
-  version: 5.0.0.1
+  version: 5.0.0.2
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  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: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -286,6 +300,7 @@ files:
 - 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/json.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
@@ -329,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A library for interacting with REST APIs