pgtk 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf2baec150dc433da7546167e7a988caaa569784d16431f25e53f176e16530dc
-  data.tar.gz: c6412d26aac23a8ac1002b25a0f8a18150eafe7e4b881d2116463e688b7fab06
+  metadata.gz: f41534dffad429c075e89f8281a87a7e18e8f2367177d5ad01f58cb5d97e1874
+  data.tar.gz: a9d3c137d5130aa409b628a8645803e8c282b06512a02e38b4e42371f7deedc6
 SHA512:
-  metadata.gz: 5895ea43f14a1296543d22baec13f535d755810815492b4aca7679b3991f8caca858a3bf89f8ce1726da7832fd77b7eff97bed3b2deeaf7e71ee48e692b837e4
-  data.tar.gz: a2d11cd3221b38c1ebcb231c8a48e24287c2f7a4144413dc5c9449d810f9a1b8fc4d88c9b32656db864c1fa656070c41ab3ca8a9db36610ea716055de78061b1
+  metadata.gz: 06b8af281bb9f2823875384e4d1b81eb0561d03946a1b7472ee23641ba0fe0084ac8327101214888b5f452c331181c1e4aaff1f9884173d62adc4eda170a723e
+  data.tar.gz: c84061bce114c7b79e646cc9851d3b13086629f6c8b0a2dcec6ed548fa128e24bd95b2a00d6ccb71c952dddb25f7216c118977dd1892354121add6e2017ad83f

data/.rultor.yml

@@ -1,6 +1,6 @@
 assets:
-  rubygems.yml: zerocracy/home#assets/rubygems.yml
-  s3cfg: zerocracy/home#assets/s3cfg
+  rubygems.yml: yegor256/home#assets/rubygems.yml
+  s3cfg: yegor256/home#assets/s3cfg
 install: |
   export PATH=$PATH:/usr/lib/postgresql/10/bin
   sudo apt-get -y update
@@ -8,7 +8,7 @@ install: |
   export GEM_HOME=~/.ruby
   export GEM_PATH=$GEM_HOME:$GEM_PATH
   sudo apt-get -y update
-  sudo gem install pdd
+  sudo gem install pdd -v 0.20.5
 release:
   script: |-
     bundle install

data/README.md

@@ -1,9 +1,9 @@
 <img src="https://upload.wikimedia.org/wikipedia/commons/2/29/Postgresql_elephant.svg" height="64px"/>
 
-[![EO principles respected here](http://www.elegantobjects.org/badge.svg)](http://www.elegantobjects.org)
+[![EO principles respected here](https://www.elegantobjects.org/badge.svg)](https://www.elegantobjects.org)
 [![Managed by Zerocracy](https://www.0crat.com/badge/C3RFVLU72.svg)](https://www.0crat.com/p/C3RFVLU72)
 [![DevOps By Rultor.com](http://www.rultor.com/b/yegor256/pgtk)](http://www.rultor.com/p/yegor256/pgtk)
-[![We recommend RubyMine](http://www.elegantobjects.org/rubymine.svg)](https://www.jetbrains.com/ruby/)
+[![We recommend RubyMine](https://www.elegantobjects.org/rubymine.svg)](https://www.jetbrains.com/ruby/)
 
 [![Build Status](https://travis-ci.org/yegor256/pgtk.svg)](https://travis-ci.org/yegor256/pgtk)
 [![Build status](https://ci.appveyor.com/api/projects/status/tbeaa0d4dk38xdb5?svg=true)](https://ci.appveyor.com/project/yegor256/pgtk)
@@ -11,6 +11,7 @@
 [![Gem Version](https://badge.fury.io/rb/pgtk.svg)](http://badge.fury.io/rb/pgtk)
 [![Maintainability](https://api.codeclimate.com/v1/badges/3a5bebac001e5288b00d/maintainability)](https://codeclimate.com/github/yegor256/pgtk/maintainability)
 
+[![License](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/yegor256/pgtk/blob/master/LICENSE.txt)
 [![Test Coverage](https://img.shields.io/codecov/c/github/yegor256/pgtk.svg)](https://codecov.io/github/yegor256/pgtk?branch=master)
 [![Hits-of-Code](https://hitsofcode.com/github/yegor256/pgtk)](https://hitsofcode.com/view/github/yegor256/pgtk)
 
@@ -81,13 +82,7 @@ From inside your app you may find this class useful:
 
 ```ruby
 require 'pgtk/pool'
-yaml = YAML.load_file('config.yml')
-pgsql = Pgtk::Pool.new(
-  port: yaml['pgsql']['port'],
-  dbname: yaml['pgsql']['dbname'],
-  user: yaml['pgsql']['user'],
-  password: yaml['pgsql']['password']
-)
+pgsql = Pgtk::Pool.new(Pgtk::Wire::Yaml.new('config.yml'))
 pgsql.start(5) # Start it with five simultaneous connections
 name = pgsql.exec('SELECT name FROM user WHERE id = $1', [id])[0]['name']
 ```
@@ -112,13 +107,9 @@ require 'pgtk/pool'
 module Minitest
   class Test
     def test_pgsql
-      config = YAML.load_file('target/pgsql-config.yml')
+      config = YAML.load_file()
       @@test_pgsql ||= Pgtk::Pool.new(
-        host: config['pgsql']['host'],
-        port: config['pgsql']['port'],
-        dbname: config['pgsql']['dbname'],
-        user: config['pgsql']['user'],
-        password: config['pgsql']['password']
+        Pgtk::Wire::Yaml.new('target/pgsql-config.yml')
       ).start
     end
   end

data/lib/pgtk/pool.rb

@@ -21,40 +21,20 @@
 # SOFTWARE.
 
 require 'pg'
+require 'loog'
 require_relative '../pgtk'
+require_relative 'wire'
 
 # Pool.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2019 Yegor Bugayenko
 # License:: MIT
 class Pgtk::Pool
-  # A temporary class for logging.
-  class Log
-    def initialize(out)
-      @out = out
-    end
-
-    def debug(msg)
-      if @out.respond_to?(:debug)
-        @out.debug(msg)
-      elsif @out.respond_to?(:puts)
-        @out.puts(msg)
-      end
-    end
-  end
-
   # Constructor.
-  def initialize(
-    host: 'localhost', port:, dbname:, user:,
-    password:, log: STDOUT
-  )
-    @host = host
-    @port = port
-    @dbname = dbname
-    @user = user
-    @password = password
+  def initialize(wire, log: Loog::NULL)
+    @wire = wire
+    @log = log
     @pool = Queue.new
-    @log = Log.new(log)
   end
 
   # Get the version of PostgreSQL server.
@@ -70,10 +50,7 @@ class Pgtk::Pool
   # allows only one connection open.
   def start(max = 8)
     max.times do
-      @pool << PG.connect(
-        dbname: @dbname, host: @host, port: @port,
-        user: @user, password: @password
-      )
+      @pool << @wire.connection
     end
     @log.debug("PostgreSQL pool started with #{max} connections")
     self
@@ -182,6 +159,9 @@ class Pgtk::Pool
     conn = @pool.pop
     begin
       yield conn
+    rescue PG::Error
+      conn.close
+      @pool << @wire.connection
     ensure
       @pool << conn
     end

data/lib/pgtk/version.rb

@@ -28,5 +28,5 @@ require_relative '../pgtk'
 # License:: MIT
 module Pgtk
   # Current version of the library.
-  VERSION = '0.6.2'
+  VERSION = '0.7.0'
 end

data/lib/pgtk/wire.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2019 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'pg'
+require 'uri'
+require 'yaml'
+require_relative '../pgtk'
+
+# Wires.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2019 Yegor Bugayenko
+# License:: MIT
+module Pgtk::Wire
+end
+
+# Simple wire with details.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2019 Yegor Bugayenko
+# License:: MIT
+class Pgtk::Wire::Direct
+  # Constructor.
+  def initialize(host:, port:, dbname:, user:, password:)
+    @host = host
+    @port = port
+    @dbname = dbname
+    @user = user
+    @password = password
+  end
+
+  # Create a new connection to PostgreSQL server.
+  def connection
+    PG.connect(
+      dbname: @dbname, host: @host, port: @port,
+      user: @user, password: @password
+    )
+  end
+end
+
+# Using ENV variable.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2019 Yegor Bugayenko
+# License:: MIT
+class Pgtk::Wire::Env
+  # Constructor.
+  def initialize(var)
+    @var = var
+  end
+
+  # Create a new connection to PostgreSQL server.
+  def connection
+    uri = URI(ENV[@var])
+    Pgtk::Wire::Direct.new(
+      host: uri.host,
+      port: uri.port,
+      dbname: uri.path[1..-1],
+      user: uri.userinfo.split(':')[0],
+      password: uri.userinfo.split(':')[1]
+    ).connection
+  end
+end
+
+# Using configuration from YAML file.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2019 Yegor Bugayenko
+# License:: MIT
+class Pgtk::Wire::Yaml
+  # Constructor.
+  def initialize(file, node = 'pgsql')
+    @file = file
+    @node = node
+  end
+
+  # Create a new connection to PostgreSQL server.
+  def connection
+    cfg = YAML.load_file(@file)
+    Pgtk::Wire::Direct.new(
+      host: cfg['pgsql']['host'],
+      port: cfg['pgsql']['port'],
+      dbname: cfg['pgsql']['dbname'],
+      user: cfg['pgsql']['user'],
+      password: cfg['pgsql']['password']
+    ).connection
+  end
+end

data/pgtk.gemspec

@@ -48,6 +48,7 @@ connection pool and query processor, to make SQL manipulation simpler.'
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
   s.add_runtime_dependency 'backtrace', '~> 0.3'
+  s.add_runtime_dependency 'loog', '~> 0.2'
   s.add_runtime_dependency 'pg', '~> 1.1'
   s.add_runtime_dependency 'random-port', '~> 0.3'
   s.add_development_dependency 'codecov', '0.1.10'

data/test/test_liquibase_task.rb

@@ -29,7 +29,7 @@ require_relative '../lib/pgtk/liquibase_task'
 
 # Liquibase rake task test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2017-2018 Yegor Bugayenko
+# Copyright:: Copyright (c) 2017-2019 Yegor Bugayenko
 # License:: MIT
 class TestLiquibaseTask < Minitest::Test
   def test_basic

data/test/test_pgsql_task.rb

@@ -28,7 +28,7 @@ require_relative '../lib/pgtk/pgsql_task'
 
 # Pgsql rake task test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2017-2018 Yegor Bugayenko
+# Copyright:: Copyright (c) 2017-2019 Yegor Bugayenko
 # License:: MIT
 class TestPgsqlTask < Minitest::Test
   def test_basic

data/test/test_pool.rb

@@ -30,7 +30,7 @@ require_relative '../lib/pgtk/pool'
 
 # Pool test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2017-2018 Yegor Bugayenko
+# Copyright:: Copyright (c) 2017-2019 Yegor Bugayenko
 # License:: MIT
 class TestPool < Minitest::Test
   def test_reads_version
@@ -87,14 +87,7 @@ class TestPool < Minitest::Test
         t.quiet = true
       end
       Rake::Task["liquibase#{id}"].invoke
-      yaml = YAML.load_file(File.join(dir, 'cfg.yml'))
-      pool = Pgtk::Pool.new(
-        port: yaml['pgsql']['port'],
-        dbname: yaml['pgsql']['dbname'],
-        user: yaml['pgsql']['user'],
-        password: yaml['pgsql']['password'],
-        log: nil
-      )
+      pool = Pgtk::Pool.new(Pgtk::Wire::Yaml.new(File.join(dir, 'cfg.yml')))
       pool.start(1)
       yield pool
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgtk
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-13 00:00:00.000000000 Z
+date: 2019-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: loog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -180,6 +194,7 @@ files:
 - lib/pgtk/pgsql_task.rb
 - lib/pgtk/pool.rb
 - lib/pgtk/version.rb
+- lib/pgtk/wire.rb
 - pgtk.gemspec
 - resources/pom.xml
 - test-resources/2019/01-test.xml