extralite 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6467de8ba44e1e77c57965e0360a18f9e2cf97084f0c507d0b1946e2cb0bb153
-  data.tar.gz: a12610ea4fab0207d5360f5410428ab7d8ce004c98ecd05fcb13785bf173c196
+  metadata.gz: 407877ae6a216daacd70b87735171f77845fe57ec6a0b109a96e4cc31c00f97b
+  data.tar.gz: 2273841ec089faac02d3e7901d0e9ffd91cf1bc95e47e0b7c912cfbb218f6f55
 SHA512:
-  metadata.gz: 5c17e8b73c0e94718a80bdcce58c98072c640b952959b441c7053f367984650688ee25ce5d7e0c6c4706d9d13d688f6e006c336e78c0c803d35af3a9cab15885
-  data.tar.gz: 194b2b8e9d469927e08bb6bc9b9e88238fb2b289bace6501c736817cfdee29e4c13d20d420a1a344c107ce039786b703826a11091a8f2eb3cc366dde6f922d46
+  metadata.gz: eed74e69024c0e714e1a1e8449e3e2503e8dde5e2ed807a64ce46cec079b58c9c7417014ac6a4600958e355e0218b0ccc63def43b1ba98c5d5fe0de11b4d4559
+  data.tar.gz: dd20969cb233586cbaf998fda0d65cafe703d5cdaa3f1ff9377a9a679f7b9dd602d71525259cd459bfabddc6d2a4c01b330c59a673b23de6ed37abe9920b7aab

data/.github/workflows/test.yml

@@ -0,0 +1,31 @@
+name: Tests
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        ruby: [2.6, 2.7, 3.0]
+
+    name: >-
+      ${{matrix.os}}, ${{matrix.ruby}}
+
+    runs-on: ${{matrix.os}}
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-ruby@v1
+      with:
+        ruby-version: ${{matrix.ruby}}
+    - name: Install dependencies
+      run: |
+        gem install bundler
+        bundle install
+    - name: Show Linux kernel version
+      run: uname -r
+    - name: Compile C-extension
+      run: bundle exec rake compile
+    - name: Run tests
+      run:  bundle exec rake test

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+## 0.2 2021-05-24
+
+- Implement `Database#transaction_active?`
+- Add tests
+
+## 0.1 2021-05-21
+
+- First release
+

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,66 @@
+PATH
+  remote: .
+  specs:
+    extralite (0.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ansi (1.5.0)
+    ast (2.4.2)
+    builder (3.2.4)
+    coderay (1.1.3)
+    docile (1.4.0)
+    json (2.5.1)
+    method_source (1.0.0)
+    minitest (5.14.4)
+    minitest-reporters (1.4.2)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    parallel (1.20.1)
+    parser (3.0.1.1)
+      ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rainbow (3.0.0)
+    rake (13.0.3)
+    rake-compiler (1.1.1)
+      rake
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rubocop (0.85.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.0.3)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.5.0)
+      parser (>= 3.0.1.1)
+    ruby-progressbar (1.11.0)
+    simplecov (0.17.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    unicode-display_width (1.7.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  extralite!
+  minitest (= 5.14.4)
+  minitest-reporters (= 1.4.2)
+  pry (= 0.13.1)
+  rake-compiler (= 1.1.1)
+  rubocop (= 0.85.1)
+  simplecov (= 0.17.1)
+
+BUNDLED WITH
+   2.1.4

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Digital Fabric
+Copyright (c) 2021 Sharon Rosner
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -21,9 +21,11 @@ require 'extralite'
 db = Extralite::Database.new('mydb')
 
 # get query results as array of hashes
+db.query('select 1 as foo') #=> [{ :foo => 1 }]
+# or:
 db.query_hash('select 1 as foo') #=> [{ :foo => 1 }]
 # or iterate over results
-db.query_hash('select 1 as foo') { |r| p r }
+db.query('select 1 as foo') { |r| p r }
 # { :foo => 1 }
 
 # get query results as array of arrays
@@ -45,7 +47,11 @@ db.query_single_value("select 'foo'") #=> "foo"
 db.query_hash('select ? as foo, ? as bar', 1, 2) #=> [{ :foo => 1, :bar => 2 }]
 
 # get last insert rowid
-rowid = db.last_insert_id()
-```
+rowid = db.last_insert_id
 
+# get rows changed in last query
+rows_changed = db.changes
 
+# get db filename
+Extralite::Database.new('/tmp/my.db').filename #=> "/tmp/my.db"
+```

data/Rakefile

@@ -12,7 +12,7 @@ task :recompile => [:clean, :compile]
 
 task :default => [:compile, :test]
 task :test do
-  exec 'ruby test/run.rb'
+  exec 'ruby test/test_database.rb'
 end
 
 CLEAN.include "**/*.o", "**/*.so", "**/*.so.*", "**/*.a", "**/*.bundle", "**/*.jar", "pkg", "tmp"

data/ext/extralite/extralite.c

@@ -162,12 +162,16 @@ step:
     case SQLITE_DONE:
       break;
     case SQLITE_BUSY:
+      sqlite3_finalize(stmt);
       rb_raise(cError, "Database is busy");
     case SQLITE_ERROR:
+      sqlite3_finalize(stmt);
       rb_raise(cError, "%s", sqlite3_errmsg(db->sqlite3_db));
     default:
+      sqlite3_finalize(stmt);
       rb_raise(cError, "Invalid return code for sqlite3_step: %d", rc);
   }
+  // TODO, use ensure to finalize statement
   sqlite3_finalize(stmt);
   RB_GC_GUARD(column_names);
   RB_GC_GUARD(row);
@@ -354,6 +358,13 @@ VALUE Database_filename(int argc, VALUE *argv, VALUE self) {
   return filename ? rb_str_new_cstr(filename) : Qnil;
 }
 
+VALUE Database_transaction_active_p(VALUE self) {
+  Database_t *db;
+  GetDatabase(self, db);
+
+  return sqlite3_get_autocommit(db->sqlite3_db) ? Qfalse : Qtrue;
+}
+
 void Init_Extralite() {
   VALUE mExtralite = rb_define_module("Extralite");
   VALUE cDatabase = rb_define_class_under(mExtralite, "Database", rb_cObject);
@@ -370,6 +381,7 @@ void Init_Extralite() {
   rb_define_method(cDatabase, "last_insert_rowid", Database_last_insert_rowid, 0);
   rb_define_method(cDatabase, "changes", Database_changes, 0);
   rb_define_method(cDatabase, "filename", Database_filename, -1);
+  rb_define_method(cDatabase, "transaction_active?", Database_transaction_active_p, 0);
 
   cError = rb_define_class_under(mExtralite, "Error", rb_eRuntimeError);
 }

data/extralite.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.author      = 'Sharon Rosner'
   s.email       = 'sharon@noteflakes.com'
   s.files       = `git ls-files`.split
-  s.homepage    = 'https://digital-fabric.github.io/extralite'
+  s.homepage    = 'https://github.com/digital-fabric/extralite'
   s.metadata    = {
     "source_code_uri" => "https://github.com/digital-fabric/extralite",
     "documentation_uri" => "https://digital-fabric.github.io/extralite/",

data/lib/extralite/version.rb

@@ -1,3 +1,3 @@
 module Extralite
-  VERSION = '0.1'
+  VERSION = '0.2'
 end

data/test/helper.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'extralite'
+require 'minitest/autorun'
+require 'minitest/reporters'
+
+Minitest::Reporters.use! [
+  Minitest::Reporters::SpecReporter.new
+]

data/test/test_database.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class DatabaseTest < MiniTest::Test
+  def setup
+    @db = Extralite::Database.new('/tmp/extralite.db')
+    @db.query('create table if not exists t (x,y,z)')
+    @db.query('delete from t')
+    @db.query('insert into t values (1, 2, 3)')
+    @db.query('insert into t values (4, 5, 6)')
+  end
+
+  def test_database
+    r = @db.query('select 1 as foo')
+    assert_equal [{foo: 1}], r
+  end
+
+  def test_query
+    r = @db.query('select * from t')
+    assert_equal [{x: 1, y: 2, z: 3}, {x: 4, y: 5, z: 6}], r
+  end
+
+  def test_query_hash
+    r = @db.query_hash('select * from t')
+    assert_equal [{x: 1, y: 2, z: 3}, {x: 4, y: 5, z: 6}], r
+  end
+
+  def test_query_ary
+    r = @db.query_ary('select * from t')
+    assert_equal [[1, 2, 3], [4, 5, 6]], r
+  end
+
+  def test_query_single_column
+    r = @db.query_single_column('select y from t')
+    assert_equal [2, 5], r
+  end
+
+  def test_query_single_value
+    r = @db.query_single_value('select z from t order by Z desc limit 1')
+    assert_equal 6, r
+  end
+
+  def test_transaction_active?
+    assert_equal false, @db.transaction_active?
+    @db.query('begin')
+    assert_equal true, @db.transaction_active?
+    @db.query('rollback')
+    assert_equal false, @db.transaction_active?
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extralite
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-21 00:00:00.000000000 Z
+date: 2021-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -102,9 +102,11 @@ extensions:
 extra_rdoc_files:
 - README.md
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -116,7 +118,9 @@ files:
 - extralite.gemspec
 - lib/extralite.rb
 - lib/extralite/version.rb
-homepage: https://digital-fabric.github.io/extralite
+- test/helper.rb
+- test/test_database.rb
+homepage: https://github.com/digital-fabric/extralite
 licenses:
 - MIT
 metadata:
@@ -143,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Extra-lightweight SQLite3 wrapper for Ruby