cfgdatabase 1.1.0 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b271fb9a9c94ce05de34ef3997124c8fa19a99ba3f3ab674c71c426f37a4fa94
-  data.tar.gz: cc261a477e286785ecbad926e111c28dc98e7a78f138e93fc2c703c4837d7e3a
+  metadata.gz: 2944c3a5397dbac2ff52e00e1c7f1ddd97f020d39163c6b8782102f704ee59c0
+  data.tar.gz: 4a290291434d2b6e2af52d94f342a28f56cd67447aac83f4c3905cf081dc2b8c
 SHA512:
-  metadata.gz: a92faf73dd97e686fe6af39dc28b87515910f759e01fa2d77cf6d14b7191c7b6d252c0d9ffc82c9d437581279ce7903c2e1cfd49481e795c357f65fab2cbc99e
-  data.tar.gz: 7faf038cdf8daf07140edeed5802abaf6583fcc118f78945f21557aa8c394e4449b0d77815537da4b83cfb114e33f94f291a0e139f22366986baa0c5e49dd38a
+  metadata.gz: 64de309e76937c5bb812c32c97dccc239c7c19bc64b5bd2643d62da7345b5aafe18466de8b0138258bc058975ec17ed54830a2a911ea223ab973990c00fb81d5
+  data.tar.gz: 97d304a78602270719b7e7240d41fc5d2d652bfa2d1f1184ff73957e6fc4edba27a329b4bb7fe3d0f585352b5139fcdd126e933223fbe35a956643f8908fb5df

data/lib/app-database.rb

@@ -1,5 +1,5 @@
+require 'pg'
 require 'sequel'
-require 'singleton'
 require 'app-config'
 require 'app-logger'
 
@@ -10,16 +10,15 @@ require 'app-logger'
 # Предполагается использование глобальной Cfg для настроек
 
 module App
-  class Database
-    include Singleton
+  module Database
     attr_reader :db
-
     ##
     # Ищем секцию настроек Cfg.db
-    def initialize
+    module_function
+    def init
       raise ArgumentError.new("Cfg not found!") if ! defined?( ::Cfg ) || ! Cfg.db || Cfg.db.empty?
       if (! defined? @db ) || ( @db.nil? ) || ( ! @db ) || ( ! @db.test_connection )
-        Log.info{ "БД #{ Cfg.db.database }." }
+        Log.debug{ "БД #{ Cfg.db.database }." }
         Sequel.extension :pg_array, :pg_inet, :pg_json, :pg_json_ops, :pg_array, :pg_array_ops, :pg_row, :pg_hstore, :pg_json_ops
         Sequel::Model.raise_on_save_failure = false
         Sequel::Model.plugin :validation_helpers
@@ -34,10 +33,20 @@ module App
         Sequel::Model.db = @db
         @db.tables.each{ |t| @db.reset_primary_key_sequence t } # Настоящие герои всегда идут в обход
         @db.freeze if Cfg.env == :production
-        Kernel.const_set 'Db', @db
       end
+      Kernel.const_set('Db', @db) unless defined?( ::Db )
       return @db
     end
 
+    def remove
+      if defined?( Db )
+        Db.disconnect if @db.test_connection
+        Kernel.send :remove_const, 'Db'
+      end
+    end
+
+    def connected?
+      !! ( defined?( Db ) && Db.test_connection )
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfgdatabase
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.4
 platform: ruby
 authors:
 - deemytch
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2021-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -52,18 +52,32 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+- !ruby/object:Gem::Dependency
+  name: pg
+  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'
+description:
 email: aspamkiller@yandex.ru
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/app-database.rb
-homepage: https://gitlab.sudo.su/amqp-lib/cfgdatabase
+homepage: https://github.com/deemytch/cfgdatabase
 licenses:
 - GPL-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -78,8 +92,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Удобная загрузка настроек Sequel.
 test_files: []