monetdb 0.2.2 → 0.2.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjA0NTQ0M2UwZDAxMjUxNjFiZTFkMjc5MjUzYmY2MWIyNWY2MTc1ZQ==
+    ZWIxMjU2MTVlNWE5OGI2NmM5OTM5MjljZWVkNTQ2NzViOTUxMDAyOA==
   data.tar.gz: !binary |-
-    NjM3MWRlZGQ4MmI5YjIwZTdkYjM0MmEzNzQ3M2Y4NDJjZmRjZjUwZA==
+    ZmU2YTQ4ZDhkOTk0NGVlMDY0ZTg4ODU4NjA5MThhM2U1YTc1ZjNmZQ==
 SHA512:
   metadata.gz: !binary |-
-    Mjc4ZGU5NzJkYWUzZGQ3ZDIzODVkN2UyZGMzMzUyZmFiNWYyNTZiY2YxMzU5
-    MmE4OWRhMWE5Mjk2Yjc4YjE2M2VkYTQ2ZTU2ZjQ5ODY3NDAzNzg1YTJhOGIz
-    ZWM1ODdmOTg1MjhjZTljNDg3NmU1OWFhZjEyYWQyZDhmOWEyYjM=
+    NjJmYzAxZGQ1MmY0ZDk4OWU3MzViNzYyYTNhMTVmYjhiZWEyZWM2YjZlMmYw
+    YWVhOTA5NWM1YWNlZmM3NTc5ZDJhNjQ1MDU4NWJlZTQyYTIwZWEyNzcxNjM4
+    N2VlZTc2ZGY4OGM4N2Y2MjBiYjZiYmFhYzU3Y2JiMzIxNTU2ZmU=
   data.tar.gz: !binary |-
-    ZjkxYWY4ZTQwYWU5MWZiNzk0MmE2NzJkZTYzYzRiZjFlMTE4NDA1NmY4YWU5
-    N2Y5Y2UyYTVjYmEzMmFhMDE3ZDU3YjE0YzA3ODVjYjg3YWVlZGZkMmUzMmRm
-    MzI2ZmViNGQxNjcwOTA4Mjc2MTc1MmQ4ZGE2NmQ5NTRiZmY4YzE=
+    NDM2MWJlNjg0NTkzNTY5ZjhmNTdhM2E0M2I4MjIzZDYyZjMwMjdjN2VhMmY3
+    OGU1MzQ0YWE2NzczNjhjODAyOTI3MTgyZTExYTc5Yzg1OGEwOGNlN2JkY2Y1
+    NGI2YTg3MjUxYjkxYWFmMWVmNmIyYjY3ZmVmNzE0YzhlMDI1MGU=

data/CHANGELOG.rdoc

@@ -1,5 +1,11 @@
 = MonetDB CHANGELOG
 
+== Version 0.2.3 (October 22, 2014)
+
+* Dropped activesupport dependency
+* Extracted logging related method to MonetDB::Connection::Logger
+* Logging query info
+
 == Version 0.2.2 (October 13, 2014)
 
 * Added MonetDB::Connection#select_values

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/monetdb.rb

@@ -1,5 +1,3 @@
-require "active_support/core_ext/hash/reverse_merge"
-
 require "monetdb/connection"
 require "monetdb/error"
 require "monetdb/version"

data/lib/monetdb/connection.rb

@@ -3,6 +3,7 @@ require "monetdb/connection/io"
 require "monetdb/connection/messages"
 require "monetdb/connection/setup"
 require "monetdb/connection/query"
+require "monetdb/connection/logger"
 
 module MonetDB
   class Connection
@@ -11,6 +12,7 @@ module MonetDB
     include Messages
     include Setup
     include Query
+    include Logger
 
     Q_TABLE        = "1" # SELECT statement
     Q_UPDATE       = "2" # INSERT/UPDATE statement
@@ -80,9 +82,5 @@ module MonetDB
       @socket
     end
 
-    def log(type, msg)
-      MonetDB.logger.send(type, msg) if MonetDB.logger
-    end
-
   end
 end

data/lib/monetdb/connection/logger.rb

@@ -0,0 +1,12 @@
+module MonetDB
+  class Connection
+    module Logger
+    private
+
+      def log(type, msg)
+        MonetDB.logger.send(type, msg) if MonetDB.logger
+      end
+
+    end
+  end
+end

data/lib/monetdb/connection/query.rb

@@ -5,16 +5,20 @@ module MonetDB
       def query(statement)
         raise ConnectionError, "Not connected to server" unless connected?
 
+        start = Time.now
+
         write "s#{statement};"
         response = read.split("\n")
 
+        log :info, "\n  SQL (#{((Time.now - start) * 1000).round(1)}ms)  #{statement}"
+
         query_header, table_header = extract_headers!(response)
 
         if query_header[:type] == Q_TABLE
           unless query_header[:rows] == response.size
             raise QueryError, "Amount of fetched rows does not match header value (#{response.size} instead of #{query_header[:rows]})"
           end
-          response = parse_rows(table_header, response.join("\n"))
+          response = parse_rows(query_header, table_header, response.join("\n"))
         else
           response = true
         end
@@ -83,14 +87,18 @@ module MonetDB
         {:table_name => table_name, :column_names => column_names, :column_types => column_types, :column_lengths => column_lengths}.freeze
       end
 
-      def parse_rows(table_header, response)
+      def parse_rows(query_header, table_header, response)
+        start = Time.now
         column_types = table_header[:column_types]
+
         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)
           end
           parsed
+        end.tap do
+          log :info, "  RUBY (#{((Time.now - start) * 1000).round(1)}ms) [ Rows: #{query_header[:rows]}, Bytesize: #{response.bytesize} bytes ]"
         end
       end
 

data/lib/monetdb/version.rb

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

data/monetdb.gemspec

@@ -15,8 +15,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = MonetDB::VERSION
 
-  gem.add_dependency "activesupport"
-
   gem.add_development_dependency "rake"
   gem.add_development_dependency "yard"
   gem.add_development_dependency "pry"

data/test/unit/connection/test_logger.rb

@@ -0,0 +1,35 @@
+require_relative "../../test_helper"
+
+module Unit
+  module Connection
+    class TestLogger < MiniTest::Test
+
+      class Connection < SimpleConnection
+        include MonetDB::Connection::Logger
+      end
+
+      describe MonetDB::Connection::Logger do
+        before do
+          @connection = Connection.new
+        end
+
+        describe "#log" do
+          describe "when MonetDB.logger" do
+            it "delegates to MonetDB.logger" do
+              (logger = mock).expects(:info, "Hello world!")
+              MonetDB.expects(:logger).returns(logger).twice
+              @connection.send :log, :info, "Hello world!"
+            end
+          end
+
+          describe "when no MonetDB.logger" do
+            it "does nothing" do
+              assert_nil @connection.send(:log, :info, "Boo!")
+            end
+          end
+        end
+      end
+
+    end
+  end
+end

data/test/unit/connection/test_query.rb

@@ -7,6 +7,7 @@ module Unit
       class Connection < SimpleConnection
         include MonetDB::Connection::Messages
         include MonetDB::Connection::Query
+        include MonetDB::Connection::Logger
       end
 
       describe MonetDB::Connection::Query do
@@ -263,19 +264,23 @@ module Unit
 
         describe "#parse_rows" do
           it "returns an array of hashes" do
+            query_header = {
+              :rows => 2
+            }
+
             table_header = {
               :column_types => [:varchar, :date, :double]
             }
 
             response = [
-              "[ \"Paul Engel\",\t1982-08-01,\t19.82\t]",
-              "[ \"Ken Adams\",\t1980-10-13,\t20.47\t]"
+              "[ \"Paul Engel\",\t1982-08-01,\t1709.34\t]",
+              "[ \"Ken Adams\",\t1980-10-31,\t2003.47\t]"
             ].join("\n")
 
             assert_equal [
-              ["Paul Engel", Date.parse("1982-08-01"), 19.82],
-              ["Ken Adams", Date.parse("1980-10-13"), 20.47]
-            ], @connection.send(:parse_rows, table_header, response)
+              ["Paul Engel", Date.parse("1982-08-01"), 1709.34],
+              ["Ken Adams", Date.parse("1980-10-31"), 2003.47]
+            ], @connection.send(:parse_rows, query_header, table_header, response)
           end
         end
 

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: monetdb
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -126,6 +112,7 @@ files:
 - lib/monetdb.rb
 - lib/monetdb/connection.rb
 - lib/monetdb/connection/io.rb
+- lib/monetdb/connection/logger.rb
 - lib/monetdb/connection/messages.rb
 - lib/monetdb/connection/query.rb
 - lib/monetdb/connection/setup.rb
@@ -138,6 +125,7 @@ files:
 - test/test_helper/minitest.rb
 - test/test_helper/simple_connection.rb
 - test/unit/connection/test_io.rb
+- test/unit/connection/test_logger.rb
 - test/unit/connection/test_messages.rb
 - test/unit/connection/test_query.rb
 - test/unit/connection/test_setup.rb
@@ -172,6 +160,7 @@ test_files:
 - test/test_helper/minitest.rb
 - test/test_helper/simple_connection.rb
 - test/unit/connection/test_io.rb
+- test/unit/connection/test_logger.rb
 - test/unit/connection/test_messages.rb
 - test/unit/connection/test_query.rb
 - test/unit/connection/test_setup.rb