crate_ruby 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72fb2668765dffdf58642563d96e75aa751e8c3c
-  data.tar.gz: f071d33f570d3108a9a34f4899a3f6ac63666f28
+  metadata.gz: 7e341cd1fe4282c3dedd29e547b99d0b21c47dff
+  data.tar.gz: 8bab3933fea54fbaa6026c1226d37842a241803a
 SHA512:
-  metadata.gz: 95523cb97d5db61f189a383330e0d42e4877a9fb893ee6e6ec1ad11a156fc89a1836de17cba8446f4c18523b94b4b20b5fca8bdb6f40aca2e44a9f0389832a9e
-  data.tar.gz: 759a5002f9498893ea8c888ee3bcf9974c8e53620b5e3ef78f78b076481505404bec3dc63fd750069cab7c7192856a9b974b27f4f8fb40a5769917b42448e574
+  metadata.gz: 4be61df43ff7bfe34d8098523a9096bcb2e6ebdf99913d17834b12a9e372c4ee3a4fc87d772acb052353b87d491a6f6563601b35e0f845346ccdf3bd97bf6b4a
+  data.tar.gz: 79e1e90745e375d1aa8c4aaa7600d18ed6c0e44e708ffd2391e9eeaa855f8024fb00682025015553bb1d7b9aa8c53ca0f2cbaa802b0355d6c64440eafcb0f9e8

data/.gitignore

@@ -18,4 +18,7 @@ tmp
 .idea/*
 .rvmrc
 log/crate.log
-crate_test_server.*
+crate_test_server.*
+parts/
+
+.byebug_history

data/.travis.yml

@@ -3,12 +3,12 @@ rvm:
   - "2.0.0"
   - "2.1.5"
   - "2.2.0"
+  - "2.4.2"
 sudo:
   false
-
 before_script:
-  - wget https://cdn.crate.io/downloads/releases/crate-0.48.2.tar.gz -O /tmp/crate.tar.gz
-  - tar -xvf /tmp/crate.tar.gz
-  - bundle exec ruby spec/test_server.rb $PWD/crate-0.48.2/ true
-
-script: bundle exec rspec spec
+  - bundle exec ruby spec/bootstrap.rb
+script:
+  bundle exec rspec spec
+before_install:
+  - gem update bundler

data/CONTRIBUTING.rst

@@ -1,93 +1,10 @@
-Contributing to Crate Ruby
-==========================
+============
+Contributing
+============
 
-Thanks for considering contributing to the Crate Data Ruby library.
+Thank you for your interest in contributing.
 
+Please see the CrateDB `contribution guide`_ for more information. Everything in
+the CrateDB contribution guide applies to this repository.
 
-Reporting an issue
-------------------
-
-- Search existing issues before raising a new one.
-
-- include as much details as possible. This might include:
-
-  - Which OS you're using.
-
-  - Which version you've been running.
-
-  - Logs/Stacktrace of the error that occurred.
-
-  - Steps to reproduce.
-
-
-Pull requests
--------------
-
-Before we can accept any pull requests to the Crate Data Ruby library
-we need you to agree to our CLA_. Once that is done, we suggest to
-continue as follows:
-
-- Add an issue on Github and let us know that you're working on something.
-
-- Use a feature branch, not master.
-
-- Rebase your feature branch onto origin/master before raising the PR
-
-- Be descriptive in your PR and commit messages. What is it for, why is it
-  needed, etc.
-
-- Make sure the tests pass.
-
-- Squash related commits
-
-.. _CLA: https://crate.io/community/contribute/
-
-
-Rebase
-------
-
-If while you've been working in the feature branch new commits were added to
-the master branch please don't merge them but use rebase::
-
-    git fetch origin
-    git rebase origin/master
-
-This will apply all commits on your feature branch on top of the master branch.
-Any conflicts can be resolved just the same as if ``git merge`` was used. After
-the conflict has been resolved use ``git rebase --continue`` to continue the
-rebase process.
-
-
-Squash
-------
-
-Minor commits that only fix typos or rename variables that are related to a
-bigger change should be squashed into that commit.
-
-This can be done using ``git rebase -i ( <hash> | <branch> )``
-
-For example while working on a feature branch you'd use::
-
-    git add .
-    git commit -m "implemented feature XY"
-
-    # push and ask for a merge/review
-
-    git add .
-    git commit --fixup $(git rev-parse HEAD)
-
-    # push and ask for a merge/review
-
-    git add .
-    git commit --fixup $(git rev-parse HEAD)
-
-    git rebase -i origin/master
-
-``git commit --fixup`` will mark the commit as a fixup relating to the commit
-HEAD currently points to.
-
-This is useful because ``git rebase -i`` will then automatically recognize the
-fixup commits and mark them to squash. But in order for that to work the
-``autosquash`` setting has to be enabled in the ``.gitconfig``::
-
-    git config --global rebase.autosquash true
+.. _contribution guide: https://github.com/crate/crate/blob/master/CONTRIBUTING.rst

data/DEVELOP.rst

@@ -0,0 +1,46 @@
+===============
+Developer Guide
+===============
+
+Tests
+=====
+
+First, download and install CrateDB locally::
+
+    $ ruby spec/bootstrap.rb
+
+Then, run tests like so::
+
+    $ bundle exec rspec spec
+
+Preparing a Release
+===================
+
+To create a new release, you must:
+
+- Update ``CrateRuby.version`` in ``lib/crate_ruby/version.rb``
+
+- Add a section for the new version in the ``history.txt`` file
+
+- Commit your changes with a message like "prepare release x.y.z"
+
+- Push to origin
+
+- Create a tag by running ``./devtools/create_tag.sh``
+
+RubyGems Deployment
+===================
+
+Update your package manager::
+
+    $ gem update --system
+
+Build the new gem::
+
+    $ gem build crate_ruby.gemspec
+
+Publish the new gem::
+
+    $ gem push crate_ruby-<VERISON>.gem
+
+Here, ``<VERISON>`` is the version you are releasing.

data/README.rst

@@ -0,0 +1,109 @@
+===================
+CrateDB Ruby Client
+===================
+
+.. image:: https://badge.fury.io/rb/crate_ruby.svg
+   :target: http://badge.fury.io/rb/crate_ruby
+   :alt: Gem Version
+
+.. image:: https://travis-ci.org/crate/crate_ruby.svg?branch=master
+   :target: https://travis-ci.org/crate/crate_ruby
+   :alt: Build Status
+
+.. image:: https://codeclimate.com/github/crate/crate_ruby.png
+   :target: https://codeclimate.com/github/crate/crate_ruby
+   :alt: Code Climate
+
+|
+
+A Ruby client library for CrateDB_.
+
+Prerequisites
+=============
+
+You will need Ruby 2.0 or greater.
+
+Installation
+============
+
+The CrateDB Ruby client is available as a Ruby gem_.
+
+Add this line to your application's ``Gemfile``::
+
+    gem 'crate_ruby'
+
+Or, install it manually, like so::
+
+    $ gem install crate_ruby
+
+Examples
+========
+
+Set up the client like so::
+
+    require 'crate_ruby'
+
+    client = CrateRuby::Client.new
+
+Execute SQL queries like so::
+
+    result = client.execute("Select * from posts")
+     => #<CrateRuby::ResultSet:0x00000002a9c5e8 @rowcount=1, @duration=5>
+
+    result.each do |row|
+      puts row.inspect
+    end
+     => [1, "test", 5]
+
+    result.cols
+     => ["id", "my_column", "my_integer_col"]
+
+
+Perform parameter substitution like so::
+
+     client.execute(
+         "INSERT INTO posts (id, title, tags) VALUES (\$1, \$2, \$3)",
+         [1, "My life with crate", ['awesome', 'cool']])
+
+Manipulate BLOBs like so::
+
+    digest = Digest::SHA1.file(file_path).hexdigest
+
+    # upload
+    f = File.read(file_path)
+    client.blob_put(table_name, digest, f)
+
+    # download
+    data = client.blob_get(table_name, digest)
+    open(file_path, "wb") do |file|
+      file.write(data)
+    end
+
+    # deletion
+    client.blob_delete(table_name, digest)
+
+Contributing
+============
+
+This project is primarily maintained by Crate.io_, but we welcome community
+contributions!
+
+See the `developer docs`_ and the `contribution docs`_ for more information.
+
+Help
+====
+
+Looking for more help?
+
+- Check `StackOverflow`_ for common problems
+- Chat with us on `Slack`_
+- Get `paid support`_
+
+.. _contribution docs: CONTRIBUTING.rst
+.. _Crate.io: https://crate.io
+.. _CrateDB: https://github.com/crate/crate
+.. _developer docs: DEVELOP.rst
+.. _gem: https://rubygems.org/
+.. _paid support: https://crate.io/pricing/
+.. _Slack: https://crate.io/docs/support/slackin/
+.. _StackOverflow: https://stackoverflow.com/tags/crate

data/crate_ruby.gemspec

@@ -28,8 +28,8 @@ Gem::Specification.new do |spec|
   spec.version       = CrateRuby::VERSION
   spec.authors       = ["Christoph Klocker", "CRATE Technology GmbH"]
   spec.email         = ["office@crate.io"]
-  spec.summary       = "A simple interface for the Crate database"
-  spec.description   = "A Ruby interface for Crate, the distributed database for Docker."
+  spec.summary       = "A simple interface for the Crate.IO database."
+  spec.description   = "A Ruby interface for Crate.IO. Put your data to work. Simply."
   spec.homepage      = "http://crate.io"
   spec.license       = "Apache License, v2.0"
   spec.required_ruby_version = '>= 2.0'
@@ -39,7 +39,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 2.14"
+  spec.add_development_dependency "rspec", "~> 2.99"
 end

data/devtools/create_tag.sh

@@ -0,0 +1,77 @@
+#!/bin/bash
+#
+# Licensed to CRATE Technology GmbH ("Crate") under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  Crate licenses
+# this file to you under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.  You may
+# obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# However, if you have executed another commercial license agreement
+# with Crate these terms will supersede the license and you may use the
+# software solely pursuant to the terms of the relevant commercial agreement.
+
+# check if everything is committed
+CLEAN=`git status -s`
+if [ ! -z "$CLEAN" ]
+then
+   echo "Working directory not clean. Please commit all changes before tagging"
+   echo "Aborting."
+   exit -1
+fi
+
+echo "Fetching origin..."
+git fetch origin > /dev/null
+
+# get current branch
+BRANCH=`git branch | grep "^*" | cut -d " " -f 2`
+echo "Current branch is $BRANCH."
+
+# check if master == origin/master
+LOCAL_COMMIT=`git show --format="%H" $BRANCH`
+ORIGIN_COMMIT=`git show --format="%H" origin/$BRANCH`
+
+if [ "$LOCAL_COMMIT" != "$ORIGIN_COMMIT" ]
+then
+   echo "Local $BRANCH is not up to date. "
+   echo "Aborting."
+   exit -1
+fi
+
+# get version from version.rb
+VERSION=$(grep "VERSION =" lib/crate_ruby/version.rb | \
+    cut -d' ' -f5 | tr -d "\'")
+echo "Version: $VERSION"
+
+# check if tag to create has already been created
+EXISTS=`git tag | grep $VERSION`
+
+if [ "$VERSION" == "$EXISTS" ]
+then
+   echo "Revision $VERSION already tagged."
+   echo "Aborting."
+   exit -1
+fi
+
+# check if VERSION is in head of CHANGES.txt
+REV_NOTE=`grep "=== $VERSION" history.txt`
+if [ -z "$REV_NOTE" ]
+then
+    echo "No notes for revision $VERSION found in history.txt"
+    echo "Aborting."
+    exit -1
+fi
+
+echo "Creating tag $VERSION..."
+git tag -a "$VERSION" -m "Tag release for revision $VERSION"
+git push --tags
+echo "Done."
+

data/history.txt

@@ -1,13 +1,16 @@
 # coding: UTF-8
 
-=== unreleased
-
-=== 0.0.8
+=== 0.0.9
 
+  * fixed breaking changes that kept driver from working with crate > v2.0
   * removed ruby 1.9.3 from travis.yml
   * client now supports HTTP options
   * update travis.yml and fix broken test
 
+=== 0.0.8
+
+  * undocumented gem release
+
 === 0.0.7
 
   * use prepared statements for insert

data/lib/crate_ruby.rb

@@ -23,14 +23,16 @@ require "crate_ruby/version"
 require "crate_ruby/error"
 require 'crate_ruby/result_set'
 require 'crate_ruby/client'
+require 'crate_ruby/utils'
 
 include CrateRuby
 
 module CrateRuby
+
   def self.logger
     @logger ||= begin
       require 'logger'
-      log = Logger.new(File.join(File.dirname(__FILE__), "../log/crate.log"), 10, 1024000)
+      log = Logger.new(STDERR)
       log.level = Logger::INFO
       log
     end
@@ -40,4 +42,4 @@ module CrateRuby
     @logger = logger
   end
 
-end
+end

data/lib/crate_ruby/client.rb

@@ -83,13 +83,13 @@ module CrateRuby
     # List all user tables
     # @return [ResultSet]
     def show_tables
-      execute("select table_name from information_schema.tables where schema_name = 'doc'")
+      execute("select table_name from information_schema.tables where table_schema = 'doc'")
     end
 
     # Returns all tables in schema 'doc'
     # @return [Array] Array of table names
     def tables
-      execute("select table_name from information_schema.tables where schema_name = 'doc'").map(&:first)
+      execute("select table_name from information_schema.tables where table_schema = 'doc'").map(&:first)
     end
 
     # Executes a SQL statement against the Crate HTTP REST endpoint.
@@ -97,11 +97,12 @@ module CrateRuby
     # @param [Array] args Array of values used for parameter substitution
     # @param [Hash] Net::HTTP options (open_timeout, read_timeout)
     # @return [ResultSet]
-    def execute(sql, args = nil, http_options = {})
+    def execute(sql, args = nil, bulk_args = nil, http_options = {})
       @logger.debug sql
       req = Net::HTTP::Post.new("/_sql", initheader = {'Content-Type' => 'application/json'})
       body = {"stmt" => sql}
-      body.merge!({'args' =>  args}) if args
+      body.merge!({'args' => args}) if args
+      body.merge!({'bulk_args' => bulk_args}) if bulk_args
       req.body = body.to_json
       response = request(req, http_options)
       @logger.debug response.body
@@ -179,7 +180,7 @@ module CrateRuby
     # @param [String] table_name Table name to get structure
     # @param [ResultSet]
     def table_structure(table_name)
-      execute("select * from information_schema.columns where schema_name = 'doc' AND table_name = '#{table_name}'")
+      execute("select * from information_schema.columns where table_schema = 'doc' AND table_name = '#{table_name}'")
     end
 
 

data/lib/crate_ruby/utils.rb

@@ -0,0 +1,117 @@
+# -*- coding: utf-8; -*-
+#
+# Licensed to CRATE Technology GmbH ("Crate") under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  Crate licenses
+# this file to you under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.  You may
+# obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# However, if you have executed another commercial license agreement
+# with Crate these terms will supersede the license and you may use the
+# software solely pursuant to the terms of the relevant commercial agreement.
+
+require 'net/http'
+
+module CrateRuby
+
+  class TestCluster
+
+    def initialize(num_nodes = 1, http_port=44200)
+      @nodes = []
+      idx = 0
+      while idx < num_nodes do
+        name = "crate#{idx-1}"
+        port = http_port + idx
+        @nodes << TestServer.new(name, port)
+        idx += 1
+      end
+    end
+
+    def start_nodes
+      @nodes.each do |node|
+        node.start
+      end
+    end
+
+    def stop_nodes
+      @nodes.each do |node|
+        node.stop
+      end
+    end
+
+  end
+
+  class TestServer
+
+    STARTUP_TIMEOUT = 30
+
+    def initialize(name, http_port)
+      @node_name = name
+      @http_port = http_port
+
+      @crate_bin = File.join('parts', 'crate', 'bin', 'crate')
+      if !File.file?(@crate_bin)
+        puts "Crate is not available. Please run 'bundle exec ruby spec/bootstrap.rb' first."
+        exit 1
+      end
+    end
+
+    def start
+      cmd = "sh #{@crate_bin} #{start_params}"
+      @pid = spawn(cmd)
+      wait_for
+      Process.detach(@pid)
+    end
+
+    def wait_for
+      time_slept = 0
+      interval = 1
+      while true
+        if !alive? and time_slept > STARTUP_TIMEOUT
+          puts "Crate hasn't started for #{STARTUP_TIMEOUT} seconds. Giving up now..."
+          exit 1
+        end
+        if alive?
+          break
+        else
+          sleep(interval)
+          time_slept += interval
+        end
+      end
+    end
+
+    def stop
+      Process.kill('HUP', @pid)
+    end
+
+    private
+
+    def start_params
+      "-Cnode.name=#{@node_name} " +
+        "-Chttp.port=#{@http_port} " +
+        "-Cnetwork.host=localhost "
+    end
+
+    def alive?
+      req = Net::HTTP::Get.new('/')
+      resp = Net::HTTP.new('localhost', @http_port)
+      begin
+        response = resp.start { |http| http.request(req) }
+        response.code == "200" ? true : false
+      rescue Errno::ECONNREFUSED
+        false
+      end
+    end
+  end
+
+end
+

data/lib/crate_ruby/version.rb

@@ -20,5 +20,5 @@
 # software solely pursuant to the terms of the relevant commercial agreement.
 
 module CrateRuby
-  VERSION = "0.0.8"
+  VERSION = '0.0.9'
 end

data/spec/bootstrap.rb

@@ -0,0 +1,79 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8; -*-
+#
+# Licensed to CRATE Technology GmbH ("Crate") under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  Crate licenses
+# this file to you under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.  You may
+# obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# However, if you have executed another commercial license agreement
+# with Crate these terms will supersede the license and you may use the
+# software solely pursuant to the terms of the relevant commercial agreement.
+
+require 'rubygems/package'
+require 'net/http'
+require 'zlib'
+
+class Bootstrap
+
+  VERSION = '2.1.8'
+
+  def initialize
+    @fname = "crate-#{VERSION}.tar.gz"
+    @crate_bin = File.join('parts', 'crate' 'bin', 'crate')
+  end
+
+  def run
+    if !File.file?(@crate_bin)
+      if !File.file?(@fname)
+        download
+      end
+      extract
+    end
+  end
+
+  def download
+    uri = URI("https://cdn.crate.io/downloads/releases/#{@fname}")
+    puts "Downloading Crate from #{uri} ..."
+    Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
+      request = Net::HTTP::Get.new uri
+      resp = http.request request
+      open(@fname, "wb") do |file|
+        file.write(resp.body)
+      end
+    end
+  end
+
+  def extract
+    tar_extract = Gem::Package::TarReader.new(Zlib::GzipReader.open(@fname))
+    tar_extract.rewind # The extract has to be rewinded after every iteration
+    tar_extract.each do |entry|
+      dest_file = File.join 'parts', entry.full_name.gsub(/^(crate)(\-\d+\.\d+\.\d+)(.*)/, '\1\3')
+      puts dest_file
+      if entry.directory?
+        FileUtils.mkdir_p dest_file
+      else
+        dest_dir = File.dirname(dest_file)
+        FileUtils.mkdir_p dest_dir unless File.directory?(dest_dir)
+        File.open dest_file, "wb" do |f|
+          f.print entry.read
+        end
+      end
+    end
+    tar_extract.close
+  end
+end
+
+bootstrap = Bootstrap.new(*ARGV)
+bootstrap.run()
+

data/spec/crate_ruby/client_spec.rb

@@ -20,13 +20,21 @@
 # software solely pursuant to the terms of the relevant commercial agreement.
 
 require_relative '../spec_helper'
+require 'securerandom'
 
 describe CrateRuby::Client do
-  TABLE_NAME = 'blob_table'
-  CRATE_HOST = "localhost:44200"
+  let(:client) { CrateRuby::Client.new(['localhost:44200']) }
+  
+  before(:all) do
+    @cluster = CrateRuby::TestCluster.new(1)
+    @cluster.start_nodes
+  end
+
+  after(:all) do
+    @cluster.stop_nodes
+  end
 
   describe '#create_table' do
-    let(:client) { CrateRuby::Client.new([CRATE_HOST]) }
 
     describe 'blob management' do
       let(:file) { 'logo-crate.png' }
@@ -35,110 +43,106 @@ describe CrateRuby::Client do
       let(:digest) { Digest::SHA1.file(file_path).hexdigest }
       let(:store_location) { File.join(path, "get_#{file}") }
 
-      before(:all) do
-        CrateRuby::Client.new([CRATE_HOST]).execute("create blob TABLE #{TABLE_NAME}")
+      before do
+        @blob_table = 'my_blobs'
+        client.execute("create blob table #{@blob_table} clustered into 1 shards with (number_of_replicas=0)")
       end
 
-      after(:all) do
-        CrateRuby::Client.new([CRATE_HOST]).execute("drop blob TABLE #{TABLE_NAME}")
+      after do
+        client.execute("drop blob table #{@blob_table}")
       end
 
       describe '#blob_put' do
-
-        after do
-          client.blob_delete(TABLE_NAME, digest)
-        end
-
         context 'file' do
-
           it 'should upload a file to the blob table' do
             f = File.read(file_path)
-            client.blob_put(TABLE_NAME, digest, f).should be_truthy
+            client.blob_put(@blob_table, digest, f).should be_truthy
           end
         end
-
         context '#string' do
           let(:string) { "my crazy" }
           let(:digest) { Digest::SHA1.hexdigest(string) }
-
           it 'should upload a string to the blob table' do
-            client.blob_delete(TABLE_NAME, digest)
-            client.blob_put TABLE_NAME, digest, string
+            client.blob_put(@blob_table, digest, string).should be_truthy
           end
         end
       end
 
       describe '#blob_get' do
-
         before do
           f = File.read(file_path)
-          client.blob_put(TABLE_NAME, digest, f)
+          client.blob_put(@blob_table, digest, f)
         end
-
         it 'should download a blob' do
-          data = client.blob_get(TABLE_NAME, digest)
+          data = client.blob_get(@blob_table, digest)
           data.should_not be_falsey
           open(store_location, "wb") { |file|
             file.write(data)
           }
         end
-
-        after do
-          client.blob_delete(TABLE_NAME, digest)
-        end
       end
 
       describe '#blob_delete' do
         before do
           f = File.read(file_path)
-          client.blob_put(TABLE_NAME, digest, f)
+          client.blob_put(@blob_table, digest, f)
         end
-
         it 'should delete a blob' do
-          client.blob_delete(TABLE_NAME, digest)
+          client.blob_delete(@blob_table, digest)
         end
       end
     end
 
+
     describe '#execute' do
-      let(:table_name) { "post" }
+      let(:table_name) { "t_test" }
 
-      after do
-        client.execute("drop TABLE #{table_name}").should be_truthy
+      before do
+        client.execute("create table #{table_name} (id integer primary key, name string, address object, tags array(string)) ")
       end
 
-      it 'should create a new table' do
-        client.execute("CREATE TABLE #{table_name} (id int)").should be_truthy
+      after do
+        client.execute("drop table #{table_name}")
       end
 
-      it 'should allow parameter substitution' do
-        client.execute("CREATE TABLE #{table_name} (id int, title string, tags array(string) )").should be_truthy
-        client.execute("INSERT INTO #{table_name} (id, title, tags) VALUES (\$1, \$2, \$3)",
-                       [1, "My life with crate", ['awesome', 'freaky']]).should be_truthy
+      it 'should allow parameters' do
+        client.execute("insert into #{table_name} (id, name, address, tags) VALUES (?, ?, ?, ?)",
+                       [1, "Post 1", {:street=>'1010 W 2nd Ave', :city=>'Vancouver'}, ['awesome', 'freaky']]).should be_truthy
+        client.refresh_table table_name
+        client.execute("select * from #{table_name}").rowcount.should eq(1)
       end
 
-      it 'should create an object' do
-        client.execute("CREATE TABLE  #{table_name} (id STRING PRIMARY KEY, name string, address object) ")
-        client.execute(%Q{INSERT INTO  #{table_name} (address, id, name) VALUES ({street='1010 W 2nd Ave',city='Vancouver'}, 'fb7183ac-d049-462c-85a9-732aca59a1c1', 'Mad Max')})
+      it 'should allow bulk parameters' do
+        bulk_args = [
+          [1, "Post 1", {:street=>'1010 W 2nd Ave', :city=>'New York'}, ['foo','bar']],
+          [2, "Post 2", {:street=>'1010 W 2nd Ave', :city=>'San Fran'}, []]
+        ]
+        client.execute("insert into #{table_name} (id, name, address, tags) VALUES (?, ?, ?, ?)", nil, bulk_args).should be_truthy
         client.refresh_table table_name
-        client.execute(%Q{select * from #{table_name}})
+        client.execute("select * from #{table_name}").rowcount.should eq(2)
+        client.execute("select count(*) from #{table_name}")[0][0].should eq(2)
       end
 
       it 'should accept http options' do
-        client.execute("CREATE TABLE  #{table_name} (id STRING PRIMARY KEY, name string, address object) ")
-        client.execute(%Q{INSERT INTO  #{table_name} (address, id, name) VALUES ({street='1010 W 2nd Ave',city='Vancouver'}, 'fb7183ac-d049-462c-85a9-732aca59a1c1', 'Mad Max')})
-        client.refresh_table table_name
-        expect { client.execute("SELECT * FROM #{table_name}", nil, {read_timeout: 0}) }.to raise_error Net::ReadTimeout
+        expect { client.execute("select * from #{table_name}", nil, nil, {'read_timeout'=>0}) }.to raise_error Net::ReadTimeout
       end
     end
 
 
     describe '#initialize' do
-
       it 'should use host and ports parameters' do
         logger = double()
-        client = CrateRuby::Client.new ["10.0.0.1:5000"], logger: logger
-        client.instance_variable_get(:@servers).should eq(["10.0.0.1:5000"])
+        client = CrateRuby::Client.new ["10.0.0.1:4200"], logger: logger
+        client.instance_variable_get(:@servers).should eq(["10.0.0.1:4200"])
+      end
+      it 'should use default request parameters' do
+        client = CrateRuby::Client.new
+        client.instance_variable_get(:@http_options).should eq({:read_timeout=>3600})
+      end
+      it 'should use request parameters' do
+        client = CrateRuby::Client.new ['10.0.0.1:4200'],
+            http_options: {:read_timeout=>60}
+        client.instance_variable_get(:@http_options).should eq({:read_timeout=>60})
       end
     end
 
@@ -155,7 +159,7 @@ describe CrateRuby::Client do
       end
 
       it 'should return all user tables as an array of string values' do
-        client.tables.should eq ['posts', 'comments']
+        client.tables.should eq %w(comments posts)
       end
     end
 
@@ -163,8 +167,8 @@ describe CrateRuby::Client do
     describe '#insert' do
       before do
         client.create_table("posts", id: [:string, "primary key"],
-                            title: :string,
-                            views: :integer)
+                             title: :string,
+                             views: :integer)
       end
 
       after do

data/spec/spec_helper.rb

@@ -21,3 +21,4 @@
 
 require_relative '../lib/crate_ruby'
 require 'net/http'
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crate_ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Christoph Klocker
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -45,15 +31,15 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
-description: A Ruby interface for Crate, the distributed database for Docker.
+        version: '2.99'
+description: A Ruby interface for Crate.IO. Put your data to work. Simply.
 email:
 - office@crate.io
 executables: []
@@ -63,24 +49,26 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - CONTRIBUTING.rst
-- DEVELOP.md
+- DEVELOP.rst
 - Gemfile
 - LICENSE
 - NOTICE
-- README.md
+- README.rst
 - Rakefile
 - crate_ruby.gemspec
+- devtools/create_tag.sh
 - history.txt
 - lib/crate_ruby.rb
 - lib/crate_ruby/client.rb
 - lib/crate_ruby/error.rb
 - lib/crate_ruby/result_set.rb
+- lib/crate_ruby/utils.rb
 - lib/crate_ruby/version.rb
 - log/.keep
+- spec/bootstrap.rb
 - spec/crate_ruby/client_spec.rb
 - spec/crate_ruby/result_set_spec.rb
 - spec/spec_helper.rb
-- spec/test_server.rb
 - spec/uploads/get_logo-crate.png
 - spec/uploads/logo-crate.png
 - spec/uploads/text.txt
@@ -104,15 +92,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
-summary: A simple interface for the Crate database
+summary: A simple interface for the Crate.IO database.
 test_files:
+- spec/bootstrap.rb
 - spec/crate_ruby/client_spec.rb
 - spec/crate_ruby/result_set_spec.rb
 - spec/spec_helper.rb
-- spec/test_server.rb
 - spec/uploads/get_logo-crate.png
 - spec/uploads/logo-crate.png
 - spec/uploads/text.txt

data/DEVELOP.md

@@ -1,13 +0,0 @@
-# Release Process
-
-Business as usual, but in case you forgot, here it is.
-
-* update ``CrateRuby.version`` in ``lib/crate_ruby/version.rb``
-* update history.txt to reflect the changes of this release
-* Do the traditional trinity of:
-
-```ruby
-gem update --system
-gem build crate_ruby.gemspec
-gem push crate_ruby-<version>.gem
-```

data/README.md

@@ -1,85 +0,0 @@
-[![Gem Version](https://badge.fury.io/rb/crate_ruby.svg)](http://badge.fury.io/rb/crate_ruby)
-[![Build Status](https://travis-ci.org/crate/crate_ruby.svg?branch=master)](https://travis-ci.org/crate/crate_ruby)
-[![Code Climate](https://codeclimate.com/github/crate/crate_ruby.png)](https://codeclimate.com/github/crate/crate_ruby)
-
-
-# CrateRuby
-
-Official Ruby library to access a [Crate](http://crate.io) database.
-
-## Installation
-
-This gem requires Ruby 2.0 or greater.
-
-Add this line to your application's Gemfile:
-
-    gem 'crate_ruby'
-
-Or install it yourself as:
-
-    $ gem install crate_ruby
-
-## Usage
-
-### Issueing SQL statements
-    require 'crate_ruby'
-
-    client = CrateRuby::Client.new
-
-    result = client.execute("Select * from posts")
-     => #<CrateRuby::ResultSet:0x00000002a9c5e8 @rowcount=1, @duration=5>
-
-    result.each do |row|
-      puts row.inspect
-    end
-     => [1, "test", 5]
-
-    result.cols
-     => ["id", "my_column", "my_integer_col"]
-
-
-#### Using parameter substitution
-
-     client.execute("INSERT INTO posts (id, title, tags) VALUES (\$1, \$2, \$3)",
-                     [1, "My life with crate", ['awesome', 'freaky']])
-
-### Up/Downloading data
-
-    digest = Digest::SHA1.file(file_path).hexdigest
-
-    # upload
-    f = File.read(file_path)
-    client.blob_put(table_name, digest, f)
-
-    # download
-    data = client.blob_get(table_name, digest)
-    open(file_path, "wb") do |file|
-      file.write(data)
-    end
-
-    # deletion
-    client.blob_delete(table_name, digest)
-
-## Tests
-
-Start up the crate server before running the tests
-
-    ruby spec/test_server.rb /path/to/crate
-
-Then run tests with
-
-    bundle exec rspec spec
-
-## Contributing
-
-If you think something is missing, either create a pull request
-or log a new issue, so someone else can tackle it.
-Please refer to CONTRIBUTING.rst for further information.
-
-##Maintainer
-
-* [CRATE Technology GmbH](http://crate.io)
-* [Christoph Klocker](http://www.vedanova.com), [@corck](http://www.twitter.com/corck)
-
-##License & Copyright
-See LICENSE for details.

data/spec/test_server.rb

@@ -1,81 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: utf-8; -*-
-#
-# Licensed to CRATE Technology GmbH ("Crate") under one or more contributor
-# license agreements.  See the NOTICE file distributed with this work for
-# additional information regarding copyright ownership.  Crate licenses
-# this file to you under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.  You may
-# obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-# However, if you have executed another commercial license agreement
-# with Crate these terms will supersede the license and you may use the
-# software solely pursuant to the terms of the relevant commercial agreement.
-
-require 'net/http'
-
-class TestServer
-  NAME = "TestCluster"
-  HOST = "127.0.0.1"
-  PORT = 44200
-  TIMEOUT = 30
-
-  def initialize(crate_home = '~/crate', run_in_background = false)
-    @crate_home = crate_home
-    @run_in_background = run_in_background
-  end
-
-  def start
-    cmd = "sh #{File.join(@crate_home, 'bin', 'crate')} #{start_params}"
-    @pid = spawn(cmd, out: "/tmp/crate_test_server.out",
-                 err: "/tmp/crate_test_server.err")
-    Process.detach(@pid)
-    puts 'Starting Crate... (this will take a few seconds)'
-    time_slept = 0
-    interval = 2
-    while true
-      if !alive? and time_slept > TIMEOUT
-        puts "Crate hasn't started for #{TIMEOUT} seconds. Giving up now..."
-        exit
-      end
-      if alive? and @run_in_background
-        exit
-      end
-      sleep(interval)
-      time_slept += interval
-    end
-  end
-
-  private
-
-  def start_params
-    "-Des.index.storage.type=memory " +
-        "-Des.node.name=#{NAME} " +
-        "-Des.cluster.name=Testing#{PORT} " +
-        "-Des.http.port=#{PORT}-#{PORT} " +
-        "-Des.network.host=localhost " +
-        "-Des.discovery.zen.ping.multicast.enabled=false"
-  end
-
-  def alive?
-    req = Net::HTTP::Get.new('/')
-    resp = Net::HTTP.new(HOST, PORT)
-    begin
-      response = resp.start { |http| http.request(req) }
-      response.code == "200" ? true : false
-    rescue Errno::ECONNREFUSED
-      false
-    end
-  end
-end
-
-server = TestServer.new(*ARGV)
-server.start