monetdb 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b124803dcab2b1006f95c5bfd252d1982350ae6c
-  data.tar.gz: 7472c8d1410fa5cd5e39bb79dea8059c43d5ba7a
+  metadata.gz: a5ec545e31663df97597447cdbd33b25e2d88c86
+  data.tar.gz: f3bc08654b1fac1b7cc99988e269aa8d3707c412
 SHA512:
-  metadata.gz: b894e704798f71cd4791a4c019fde839a69cb75c89d30073210c8032e0e8e042da347cf786bdb8615dd86a26fe946994f6513e0d9b4ed238811da96f8ef44f71
-  data.tar.gz: 7bc0cd53a34cf88e7c85c5ede1343fe35e3a63ab9659b9c427a7a582f6a2df33f93f167703bd3d434cff036914faea273ce6d450ca282846428fb9ccfe29d69e
+  metadata.gz: ab6e208b3f0c3a93de085f7ee71d15277b1615e7cd3b77f722d7cf35f96abb9fcf463083cffa724ec691497cfaf6dd7f91a3553b74bbe3260ca848e876e62781
+  data.tar.gz: e10a8e18b1a99d5fdaff880af3ab7b358a4962a6ffdbc9a179c454901f5b6df9f77cb4327db2756e1daa9cee3848d2fa9e3918f6e9e41085d373ce8ce360acd4

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 = MonetDB CHANGELOG
 
+== Version 0.2.1 (October 13, 2014)
+
+* Extracted IO related methods to MonetDB::Connection::IO
+* Fixed bug when parsing rows (excluding "\t]" at end of string)
+
 == Version 0.2.0 (October 13, 2014)
 
 * Complete rewrite of the gem (only focussed on querying data using SQL)

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/monetdb/connection.rb

@@ -1,4 +1,5 @@
 require "socket"
+require "monetdb/connection/io"
 require "monetdb/connection/messages"
 require "monetdb/connection/setup"
 require "monetdb/connection/query"
@@ -6,6 +7,7 @@ require "monetdb/connection/query"
 module MonetDB
   class Connection
 
+    include IO
     include Messages
     include Setup
     include Query
@@ -82,44 +84,5 @@ module MonetDB
       MonetDB.logger.send(type, msg) if MonetDB.logger
     end
 
-    def read
-      raise ConnectionError, "Not connected to server" unless connected?
-
-      length, last_chunk = read_length
-      data, iterations = "", 0
-
-      while (length > 0) && (iterations < 1000) do
-        received = socket.recv(length)
-        data << received
-        length -= received.bytesize
-        iterations += 1
-      end
-      data << read unless last_chunk
-
-      data
-    end
-
-    def read_length
-      bytes = socket.recv(2).unpack("v")[0]
-      [(bytes >> 1), (bytes & 1) == 1]
-    end
-
-    def write(message)
-      raise ConnectionError, "Not connected to server" unless connected?
-      pack(message).each do |chunk|
-        socket.write(chunk)
-      end
-      true
-    end
-
-    def pack(message)
-      chunks = message.scan(/.{1,#{MAX_MSG_SIZE}}/m)
-      chunks.each_with_index.to_a.collect do |chunk, index|
-        last_bit = (index == chunks.size - 1) ? 1 : 0
-        length = [(chunk.size << 1) | last_bit].pack("v")
-        "#{length}#{chunk}"
-      end.freeze
-    end
-
   end
 end

data/lib/monetdb/connection/io.rb

@@ -0,0 +1,47 @@
+module MonetDB
+  class Connection
+    module IO
+    private
+
+      def read
+        raise ConnectionError, "Not connected to server" unless connected?
+
+        length, last_chunk = read_length
+        data, iterations = "", 0
+
+        while (length > 0) && (iterations < 1000) do
+          received = socket.recv(length)
+          data << received
+          length -= received.bytesize
+          iterations += 1
+        end
+        data << read unless last_chunk
+
+        data
+      end
+
+      def read_length
+        bytes = socket.recv(2).unpack("v")[0]
+        [(bytes >> 1), (bytes & 1) == 1]
+      end
+
+      def write(message)
+        raise ConnectionError, "Not connected to server" unless connected?
+        pack(message).each do |chunk|
+          socket.write(chunk)
+        end
+        true
+      end
+
+      def pack(message)
+        chunks = message.scan(/.{1,#{MAX_MSG_SIZE}}/m)
+        chunks.each_with_index.to_a.collect do |chunk, index|
+          last_bit = (index == chunks.size - 1) ? 1 : 0
+          length = [(chunk.size << 1) | last_bit].pack("v")
+          "#{length}#{chunk}"
+        end.freeze
+      end
+
+    end
+  end
+end

data/lib/monetdb/connection/query.rb

@@ -76,7 +76,7 @@ module MonetDB
 
       def parse_rows(table_header, response)
         column_types = table_header[:column_types]
-        response.split("\t]\n").collect do |row|
+        response.slice(0..-3).split("\t]\n").collect do |row|
           parsed, values = [], row.slice(1..-1).split(",\t")
           values.each_with_index do |value, index|
             parsed << parse_value(column_types[index], value.strip)
@@ -101,7 +101,7 @@ module MonetDB
           when :tinyint
             parse_boolean_value value
           else
-            raise NotImplementedError, "Cannot parse value of type #{type}"
+            raise NotImplementedError, "Cannot parse value of type #{type.inspect}"
           end
         end
       end

data/lib/monetdb/version.rb

@@ -1,7 +1,7 @@
 module MonetDB
   MAJOR = 0
   MINOR = 2
-  TINY  = 0
+  TINY  = 1
 
   VERSION = [MAJOR, MINOR, TINY].join(".")
 end

data/test/test_helper/simple_connection.rb

@@ -10,4 +10,14 @@ class SimpleConnection
     }
   end
 
+  def connected?
+    !@socket.nil?
+  end
+
+private
+
+  def socket
+    @socket
+  end
+
 end

data/test/unit/connection/test_io.rb

@@ -0,0 +1,86 @@
+require_relative "../../test_helper"
+
+module Unit
+  module Connection
+    class TestIO < MiniTest::Test
+
+      class Connection < SimpleConnection
+        include MonetDB::Connection::Messages
+        include MonetDB::Connection::IO
+      end
+
+      describe MonetDB::Connection::IO do
+        before do
+          @connection = Connection.new
+        end
+
+        describe "#read" do
+          describe "when disconnected" do
+            it "raises a connection error" do
+              assert_raises MonetDB::ConnectionError do
+                @connection.send(:read)
+              end
+            end
+          end
+
+          describe "when connected" do
+            it "obtains the block size and reads the server response" do
+              socket = mock
+              @connection.instance_variable_set(:@socket, socket)
+
+              first_chunk = " " * 44
+              last_chunk = " " * 22
+
+              socket.expects(:recv).with(2).returns("\x85\x00")
+              socket.expects(:recv).with(66).returns(first_chunk)
+              socket.expects(:recv).with(22).returns(last_chunk)
+
+              assert_equal first_chunk + last_chunk, @connection.send(:read)
+            end
+          end
+        end
+
+        describe "#write" do
+          describe "when disconnected" do
+            it "raises a connection error" do
+              assert_raises MonetDB::ConnectionError do
+                @connection.send(:write, "")
+              end
+            end
+          end
+
+          describe "when connected" do
+            it "writes chunks to the active socket provided with the length header" do
+              socket = mock
+              socket.expects(:write).with("\f\x00Hello")
+              socket.expects(:write).with("\t\x00World!")
+
+              @connection.instance_variable_set(:@socket, socket)
+              @connection.expects(:pack).with("foo bar").returns(["\f\x00Hello", "\t\x00World!"])
+
+              assert_equal true, @connection.send(:write, "foo bar")
+            end
+          end
+        end
+
+        describe "#pack" do
+          it "returns chunks provided with a length header" do
+            message = "BIG:monetdb:{MD5}6432e841c9943d524b9b922ee1e5924a:sql:test_drive:"
+            assert_equal ["#{[131].pack("v")}#{message}"], @connection.send(:pack, message)
+
+            message = "hKszBZEmQ1uOPYrpVFEc:merovingian:9:RIPEMD160,SHA256,SHA1,MD5:LIT:SHA512:"
+            assert_equal ["#{[145].pack("v")}#{message}"], @connection.send(:pack, message)
+
+            message.expects(:scan).with(/.{1,#{MonetDB::Connection::MAX_MSG_SIZE}}/m).returns(%w(foobar bazqux paul))
+            assert_equal [
+              "#{[12].pack("v")}foobar",
+              "#{[12].pack("v")}bazqux",
+              "#{[9].pack("v")}paul"
+            ], @connection.send(:pack, message)
+          end
+        end
+      end
+
+    end
+  end
+end

data/test/unit/connection/test_query.rb

@@ -14,6 +14,80 @@ module Unit
           @connection = Connection.new
         end
 
+        describe "#query" do
+          describe "when disconnected" do
+            it "raises a connection error" do
+              assert_raises MonetDB::ConnectionError do
+                @connection.query("")
+              end
+            end
+          end
+
+          describe "when connected" do
+            before do
+              @connection.instance_variable_set(:@socket, mock)
+            end
+
+            describe "when doing a select query" do
+              describe "when returning the correct amount of records" do
+                it "returns the result set" do
+                  query = "SELECT * FROM foo_bars"
+                  response = <<-RESPONSE
+&1 0 2 2 2
+% sys.foo_bars,\tsys.foo_bars # table_name
+% id,\tname # name
+% int,\tvarchar # type
+% 2,\t17 # length
+[ 1,\t"Paul Engel"\t]
+[ 2,\t"Ken Adams"\t]
+                  RESPONSE
+
+                  @connection.expects(:write).with("s#{query};")
+                  @connection.expects(:read).returns(response.strip)
+
+                  assert_equal [
+                    [1, "Paul Engel"],
+                    [2, "Ken Adams"]
+                  ], @connection.query(query)
+                end
+              end
+
+              describe "when not returning the correct amount of records" do
+                it "raises a query error" do
+                  query = "SELECT * FROM foo_bars"
+                  response = <<-RESPONSE
+&1 0 3 2 2
+% sys.foo_bars,\tsys.foo_bars # table_name
+% id,\tname # name
+% int,\tvarchar # type
+% 2,\t17 # length
+[ 1,\t"Paul Engel"\t]
+[ 2,\t"Ken Adams"\t]
+                  RESPONSE
+
+                  @connection.expects(:write).with("s#{query};")
+                  @connection.expects(:read).returns(response.strip)
+
+                  assert_raises MonetDB::QueryError do
+                    @connection.query(query)
+                  end
+                end
+              end
+            end
+
+            describe "when doing another query" do
+              it "returns true" do
+                query = "UPDATE foo_bars SET updated_at = NOW()"
+
+                @connection.expects(:write).with("s#{query};")
+                @connection.expects(:read).returns("&2 23 -1")
+
+                assert_equal true, @connection.query(query)
+              end
+            end
+          end
+        end
+
         describe "#extract_headers!" do
           it "returns an array with delegated return values" do
             response, foo, bar = mock, mock, mock

data/test/unit/test_connection.rb

@@ -106,72 +106,6 @@ module Unit
           end
         end
       end
-
-      describe "#read" do
-        describe "when disconnected" do
-          it "raises a connection error" do
-            assert_raises MonetDB::ConnectionError do
-              @connection.send(:read)
-            end
-          end
-        end
-
-        describe "when connected" do
-          it "obtains the block size and reads the server response" do
-            socket = mock
-            @connection.instance_variable_set(:@socket, socket)
-
-            first_chunk = " " * 44
-            last_chunk = " " * 22
-
-            socket.expects(:recv).with(2).returns("\x85\x00")
-            socket.expects(:recv).with(66).returns(first_chunk)
-            socket.expects(:recv).with(22).returns(last_chunk)
-
-            assert_equal first_chunk + last_chunk, @connection.send(:read)
-          end
-        end
-      end
-
-      describe "#write" do
-        describe "when disconnected" do
-          it "raises a connection error" do
-            assert_raises MonetDB::ConnectionError do
-              @connection.send(:write, "")
-            end
-          end
-        end
-
-        describe "when connected" do
-          it "writes chunks to the active socket provided with the length header" do
-            socket = mock
-            socket.expects(:write).with("\f\x00Hello")
-            socket.expects(:write).with("\t\x00World!")
-
-            @connection.instance_variable_set(:@socket, socket)
-            @connection.expects(:pack).with("foo bar").returns(["\f\x00Hello", "\t\x00World!"])
-
-            assert_equal true, @connection.send(:write, "foo bar")
-          end
-        end
-      end
-
-      describe "#pack" do
-        it "returns chunks provided with a length header" do
-          message = "BIG:monetdb:{MD5}6432e841c9943d524b9b922ee1e5924a:sql:test_drive:"
-          assert_equal ["#{[131].pack("v")}#{message}"], @connection.send(:pack, message)
-
-          message = "hKszBZEmQ1uOPYrpVFEc:merovingian:9:RIPEMD160,SHA256,SHA1,MD5:LIT:SHA512:"
-          assert_equal ["#{[145].pack("v")}#{message}"], @connection.send(:pack, message)
-
-          message.expects(:scan).with(/.{1,#{MonetDB::Connection::MAX_MSG_SIZE}}/m).returns(%w(foobar bazqux paul))
-          assert_equal [
-            "#{[12].pack("v")}foobar",
-            "#{[12].pack("v")}bazqux",
-            "#{[9].pack("v")}paul"
-          ], @connection.send(:pack, message)
-        end
-      end
     end
 
   end

data/test/unit/test_monetdb.rb

@@ -7,7 +7,7 @@ module Unit
       it "has the current version" do
         version = File.read(path("VERSION")).strip
         assert_equal version, MonetDB::VERSION
-        assert File.read(path "CHANGELOG.rdoc").include?("Version #{version}")
+        assert File.read(path "CHANGELOG.rdoc").include?("Version #{version} ")
       end
 
       describe ".logger" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: monetdb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Paul Engel
@@ -125,6 +125,7 @@ files:
 - VERSION
 - lib/monetdb.rb
 - lib/monetdb/connection.rb
+- lib/monetdb/connection/io.rb
 - lib/monetdb/connection/messages.rb
 - lib/monetdb/connection/query.rb
 - lib/monetdb/connection/setup.rb
@@ -136,6 +137,7 @@ files:
 - test/test_helper/coverage.rb
 - test/test_helper/minitest.rb
 - test/test_helper/simple_connection.rb
+- test/unit/connection/test_io.rb
 - test/unit/connection/test_messages.rb
 - test/unit/connection/test_query.rb
 - test/unit/connection/test_setup.rb
@@ -169,6 +171,7 @@ test_files:
 - test/test_helper/coverage.rb
 - test/test_helper/minitest.rb
 - test/test_helper/simple_connection.rb
+- test/unit/connection/test_io.rb
 - test/unit/connection/test_messages.rb
 - test/unit/connection/test_query.rb
 - test/unit/connection/test_setup.rb