duckdb 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a27e917703a870dba56470e00cb4ae70f5b62dcb256d39da63cc88a0a888b5e
-  data.tar.gz: 8dc0b2f58cc6345540d62cdee126951de02e83b61d555da747ebc7f9a3d486a8
+  metadata.gz: 743c5cd93509adeb83483bc5dfc363ef65a4b92aacc1c72b0845c2a5d722c913
+  data.tar.gz: 93f5aac3993b0b1cd1512e1dd32fbcab216e6e2ab9b94df229b29d36c1bcd89e
 SHA512:
-  metadata.gz: 45ee35ed43062e134e6c672f16ad92c99a7552607ed221795be8a22bc1b0b33b58b946e323cffc07fb032ad00833f1ec6b667fdceac537cf2dd1968663c44dd7
-  data.tar.gz: b57c3c55f4cda72fddf72909b16182448b5466c0d14b59afc2776f312c8640af6353786e862a086d782fe9f6f4670fd7d8f6d03fe6f8be47464b3aadcf039d7c
+  metadata.gz: c93239f6fe857b8761fa88a223be2a4b45e883291687feeaf1a2215ab0238d87a04d5d72a8854c2610a3333f6c282e6a17f81baae8fe61d8ebb4ce59801ad5ff
+  data.tar.gz: c2b45b34783c366075a42c22765bf2406ebbaa5ee9024b3260003d20be4321b16efc565839f93ec3fd6a6e25582b7c1d12f265d8d56e92003b9eb40e26e51a58

data/.github/workflows/test_by_github.yml

@@ -8,35 +8,54 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.5.x', '2.6.x']
-        duckdb: ['0.1.5']
+        ruby: ['2.5.8', '2.6.6', '2.7.1', 'head']
+        duckdb: ['0.1.8', '0.1.9']
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
 
     - name: Set up Ruby
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
 
-    - name: duckdb 0.1.5 cache
-      id: duckdb-cache-v0_1_5
+    - name: duckdb 0.1.8 cache
+      id: duckdb-cache-v0_1_8
       uses: actions/cache@v1.1.0
       with:
-        path: duckdb-v0.1.5
-        key: ${{ runner.os }}-duckdb-v0_1_5_001
+        path: duckdb-v0.1.8
+        key: ${{ runner.os }}-duckdb-v0_1_8_001
         restore-keys: |
-          ${{ runner.os }}-duckdb-v0_1_5
+          ${{ runner.os }}-duckdb-v0_1_8
 
-    - name: Build duckdb 0.1.5
-      if: steps.duckdb-cache-v0_1_5.outputs.cache-hit != 'true'
+    - name: duckdb 0.1.9 cache
+      id: duckdb-cache-v0_1_9
+      uses: actions/cache@v1.1.0
+      with:
+        path: duckdb-v0.1.9
+        key: ${{ runner.os }}-duckdb-v0_1_9_001
+        restore-keys: |
+          ${{ runner.os }}-duckdb-v0_1_9
+
+    - name: Build duckdb 0.1.8
+      if: steps.duckdb-cache-v0_1_8.outputs.cache-hit != 'true'
+      run: |
+        git clone -b v0.1.8 https://github.com/cwida/duckdb.git duckdb-tmp-v0.1.8
+        cd duckdb-tmp-v0.1.8 && make && cd ..
+        rm -rf duckdb-v0.1.8
+        mkdir -p duckdb-v0.1.8/build/release/src duckdb-v0.1.8/src
+        cp -rip duckdb-tmp-v0.1.8/build/release/src/*.so duckdb-v0.1.8/build/release/src
+        cp -rip duckdb-tmp-v0.1.8/src/include duckdb-v0.1.8/src/
+
+    - name: Build duckdb 0.1.9
+      if: steps.duckdb-cache-v0_1_9.outputs.cache-hit != 'true'
       run: |
-        git clone -b v0.1.5 https://github.com/cwida/duckdb.git duckdb-tmp-v0.1.5
-        cd duckdb-tmp-v0.1.5 && make && cd ..
-        rm -rf duckdb-v0.1.5
-        mkdir -p duckdb-v0.1.5/build/release/src duckdb-v0.1.5/src
-        cp -rip duckdb-tmp-v0.1.5/build/release/src/*.so duckdb-v0.1.5/build/release/src
-        cp -rip duckdb-tmp-v0.1.5/src/include duckdb-v0.1.5/src/
+        git clone -b v0.1.9 https://github.com/cwida/duckdb.git duckdb-tmp-v0.1.9
+        cd duckdb-tmp-v0.1.9 && make && cd ..
+        rm -rf duckdb-v0.1.9
+        mkdir -p duckdb-v0.1.9/build/release/src duckdb-v0.1.9/src
+        cp -rip duckdb-tmp-v0.1.9/build/release/src/*.so duckdb-v0.1.9/build/release/src
+        cp -rip duckdb-tmp-v0.1.9/src/include duckdb-v0.1.9/src/
 
     - name: Build and test with Rake with Ruby ${{ matrix.ruby }}
       env:

data/.travis.yml

@@ -2,16 +2,17 @@ language: ruby
 cache:
   bundler: true
   directories:
-    - ${HOME}/duckdb-v0.1.5
+    - ${HOME}/duckdb-v0.1.9
 before_install:
   - yes | gem update --system
-  - if [[ ! -d ${HOME}/duckdb-v0.1.5/build ]]; then cd ${HOME} && git clone -b v0.1.5 https://github.com/cwida/duckdb.git duckdb-v0.1.5 && cd duckdb-v0.1.5 && make && cd ${TRAVIS_BUILD_DIR}; fi
+  - if [[ ! -d ${HOME}/duckdb-v0.1.9/build ]]; then cd ${HOME} && git clone -b v0.1.9 https://github.com/cwida/duckdb.git duckdb-v0.1.9 && cd duckdb-v0.1.9 && make && cd ${TRAVIS_BUILD_DIR}; fi
 
 env:
-  - DUCKDB_VERSION=0.1.5
+  - DUCKDB_VERSION=0.1.9
 rvm:
-  - 2.5.7
-  - 2.6.5
+  - 2.5.8
+  - 2.6.6
   - 2.7.0
+  - 2.7.1
   - ruby-head
 script: bundle exec rake -- --with-duckdb-include=${HOME}/duckdb-v${DUCKDB_VERSION}/src/include --with-duckdb-lib=${HOME}/duckdb-v${DUCKDB_VERSION}/build/release/src/

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # ChangeLog
 
+## 0.0.8
+
+- remove test with Ruby 2.4.10
+- bump DuckDB to v0.1.8
+- bump DuckDB to v0.1.8
+- bump DuckDB to v0.1.7
+  - current ruby-duckdb supports DuckDB version 0.1.5 and 0.1.6
+- support Ruby 2.7.1
+- bump DuckDB to v0.1.6
+  - current ruby-duckdb supports DuckDB version 0.1.5 and 0.1.6
+- DuckDB::Connection#connect accepts block
+- add DuckDB::Connection#connect
+- DuckDB::Database#connect accepts block
+- DuckDB::Database.open accepts block
+- update duckdb.gemspec, required ruby version >= 2.4.0
+
 ## 0.0.7
 
 - bump DuckDB to v0.1.5

data/README.md

@@ -42,3 +42,24 @@ result.each do |row|
   p row
 end
 ```
+
+Or, you can use block.
+
+```
+require 'duckdb'
+
+DuckDB::Database.open do |db|
+  db.connect do |con|
+    con.query('CREATE TABLE users (id INTEGER, name VARCHAR(30))')
+
+    con.query("INSERT into users VALUES(1, 'Alice')")
+    con.query("INSERT into users VALUES(2, 'Bob')")
+    con.query("INSERT into users VALUES(3, 'Cathy')")
+
+    result = con.query('SELECT * from users')
+    result.each do |row|
+      p row
+    end
+  end
+end
+```

data/duckdb.gemspec

@@ -1,32 +1,35 @@
-lib = File.expand_path("lib", __dir__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "duckdb/version"
+require 'duckdb/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "duckdb"
+  spec.name          = 'duckdb'
   spec.version       = DuckDB::VERSION
-  spec.authors       = ["Masaki Suketa"]
-  spec.email         = ["masaki.suketa@nifty.ne.jp"]
+  spec.authors       = ['Masaki Suketa']
+  spec.email         = ['masaki.suketa@nifty.ne.jp']
 
-  spec.summary       = %q{This module is Ruby binding for DuckDB database engine.}
-  spec.description   = "This module is Ruby binding for DuckDB database engine. You must have the DuckDB engine installed to build/use this module."
-  spec.homepage      = "https://github.com/suketa/ruby-duckdb"
-  spec.license       = "MIT"
+  spec.summary       = 'This module is Ruby binding for DuckDB database engine.'
+  spec.description   = 'This module is Ruby binding for DuckDB database engine. You must have the DuckDB engine installed to build/use this module.'
+  spec.homepage      = 'https://github.com/suketa/ruby-duckdb'
+  spec.license       = 'MIT'
 
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/suketa/ruby-duckdb"
-  spec.metadata["changelog_uri"] = "https://github.com/suketa/ruby-duckdb/blob/master/CHANGELOG.md"
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = 'https://github.com/suketa/ruby-duckdb'
+  spec.metadata['changelog_uri'] = 'https://github.com/suketa/ruby-duckdb/blob/master/CHANGELOG.md'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.require_paths = ["lib"]
-  spec.extensions    = ["ext/duckdb/extconf.rb"]
+  spec.require_paths = ['lib']
+  spec.extensions    = ['ext/duckdb/extconf.rb']
+  spec.required_ruby_version = '>= 2.4.0'
 
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rake-compiler"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rake-compiler'
 end

data/ext/duckdb/connection.c

@@ -87,6 +87,6 @@ void init_duckdb_connection(void)
     rb_define_alloc_func(cDuckDBConnection, allocate);
 
     rb_define_method(cDuckDBConnection, "disconnect", duckdb_connection_disconnect, 0);
-    rb_define_method(cDuckDBConnection, "connect", duckdb_connection_connect, 1);
+    rb_define_private_method(cDuckDBConnection, "_connect", duckdb_connection_connect, 1);
     rb_define_private_method(cDuckDBConnection, "query_sql", duckdb_connection_query_sql, 1);
 }

data/ext/duckdb/database.c

@@ -64,7 +64,7 @@ void init_duckdb_database(void)
 {
     cDuckDBDatabase = rb_define_class_under(mDuckDB, "Database", rb_cObject);
     rb_define_alloc_func(cDuckDBDatabase, allocate);
-    rb_define_singleton_method(cDuckDBDatabase, "open", duckdb_database_s_open, -1);
-    rb_define_method(cDuckDBDatabase, "connect", duckdb_database_connect, 0);
+    rb_define_singleton_method(cDuckDBDatabase, "_open", duckdb_database_s_open, -1);
+    rb_define_private_method(cDuckDBDatabase, "_connect", duckdb_database_connect, 0);
     rb_define_method(cDuckDBDatabase, "close", duckdb_database_close, 0);
 }

data/lib/duckdb/connection.rb

@@ -29,6 +29,21 @@ module DuckDB
       stmt.execute
     end
 
+    #
+    # connects DuckDB database
+    # The first argument is DuckDB::Database object
+    #
+    def connect(db)
+      conn = _connect(db)
+      return conn unless block_given?
+
+      begin
+        yield conn
+      ensure
+        conn.disconnect
+      end
+    end
+
     alias execute query
     alias open connect
     alias close disconnect

data/lib/duckdb/database.rb

@@ -20,5 +20,58 @@ module DuckDB
   #   end
   #
   class Database
+    private_class_method :_open
+
+    class << self
+      ##
+      # Opens database.
+      # The first argument is DuckDB database file path to open.
+      # If there is no argument, the method opens DuckDB database in memory.
+      # The method yields block if block is given.
+      #
+      #   DuckDB::Database.open('duckdb_database.db') #=> DuckDB::Database
+      #
+      #   DuckDB::Database.open #=> opens DuckDB::Database in memory.
+      #
+      #   DuckDB::Database.open do |db|
+      #     con = db.connect
+      #     con.query('CREATE TABLE users (id INTEGER, name VARCHAR(30))')
+      #   end
+      #
+      def open(*args)
+        db = _open(*args)
+        return db unless block_given?
+
+        begin
+          yield db
+        ensure
+          db.close
+        end
+      end
+    end
+
+    ##
+    # connects database.
+    #
+    # The method yields block and disconnects the database if block given
+    #
+    #   db = DuckDB::Database.open
+    #
+    #   con = db.connect # => DuckDB::Connection
+    #
+    #   db.connect do |con|
+    #     con.query('CREATE TABLE users (id INTEGER, name VARCHAR(30))')
+    #   end
+    #
+    def connect
+      conn = _connect
+      return conn unless block_given?
+
+      begin
+        yield conn
+      ensure
+        conn.disconnect
+      end
+    end
   end
 end

data/lib/duckdb/version.rb

@@ -1,5 +1,5 @@
 module DuckDB
   # The version string of ruby-duckdb.
   # Currently, ruby-duckdb is NOT semantic versioning.
-  VERSION = '0.0.7'.freeze
+  VERSION = '0.0.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duckdb
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Masaki Suketa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-07 00:00:00.000000000 Z
+date: 2020-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,47 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 description: This module is Ruby binding for DuckDB database engine. You must have
   the DuckDB engine installed to build/use this module.
 email:
@@ -121,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="