pg_objects 1.0.3 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2794a5dc0139bf6ad60619166faf652f4e9f5bc0bd587400222892f1fec37e9b
-  data.tar.gz: 5b53a16cfa89bfc94aa6eea3d56f381c8a4af4e167afbace126278b962b4eac7
+  metadata.gz: 91c7eb71d09850bc60f89da023336a3b23da1032b708edd25d6d7c4c36cda48a
+  data.tar.gz: 68b0c1d67c6f8954b385bb92d9e56b4e9f26d493aeaa7ce436f853415d5df016
 SHA512:
-  metadata.gz: d850aa08d47a0e0bff2392cbc4c17da3c8a4262b5ae9612eb7a2a98309180dd38f547e3562c11728e862059b342f43b3d060fa55ffc516a8deaefc3ca8d6a80b
-  data.tar.gz: d6c065a60674901d207525c029b5113ba2ca47d9911df32663d5f6a8818065fec3106be61b7c86f648786aac050b5e14cc209eae7c50ae75aa870501854aacd7
+  metadata.gz: 58455882d344d4dff87af1855313bb2cf534408a43d8ead7c98d5eaf726cdd5d7c53576d066d018ea51932281bd7d4c38f716b21fb3a276cc859d074fc83ffd4
+  data.tar.gz: 74199983303ce4ef51a41c2131c5f70e384e1ebeeb730681ed8458fe8fa24da481e6240ca6efad0a18350ae9428aae06d4f884f314e0dd27cecea03116292ad1

data/.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

data/.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0', '3.1', '3.2']
+        ruby-version: ['3.1', '3.2', '3.3']
     steps:
       - name: Checkout
         uses: actions/checkout@v2

data/.rubocop.yml

@@ -8,7 +8,7 @@ inherit_from: .rubocop_todo.yml
 
 AllCops:
   # EnabledByDefault: true
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.1
   # Cop names are not d§splayed in offense messages by default. Change behavior
   # by overriding DisplayCopNames, or by giving the -D/--display-cop-names
   # option.
@@ -210,6 +210,9 @@ Style/BisectedAttrAccessor:
 Style/CaseLikeIf:
   Enabled: true
 
+Style/ClassAndModuleChildren:
+  EnforcedStyle: compact
+
 Style/ExponentialNotation:
   Enabled: true
 

data/Gemfile

@@ -5,9 +5,11 @@ gemspec
 group :development, :test do
   gem 'bundler', require: false
   gem 'bundler-audit', require: false
-  gem 'byebug', require: false
+  gem 'faker', require: false
+  gem 'pry-byebug'
   gem 'rake', require: false
   gem 'rspec', require: false
+  gem 'rspec-parameterized', require: false
   gem 'rubocop', require: false
   gem 'rubocop-rails', require: false
   gem 'rubocop-rake', require: false

data/Gemfile.lock

@@ -1,150 +1,265 @@
 PATH
   remote: .
   specs:
-    pg_objects (1.0.3)
-      activerecord (>= 6.0.3.5, < 7)
-      pg_query (~> 1)
-      railties (>= 4, < 7)
+    pg_objects (1.2.1)
+      activerecord (>= 6.1.7.0, < 8)
+      dry-auto_inject (~> 1)
+      dry-configurable (~> 1)
+      dry-container (= 0.11.0)
+      dry-monads (~> 1.6)
+      memery (~> 1.5.0)
+      pg_query (~> 5)
+      railties (>= 4, < 8)
       rake-hooks (~> 1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.1.7.3)
-      actionview (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.1.3.4)
+      actionview (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.1.7.3)
-      activesupport (= 6.1.7.3)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actionview (7.1.3.4)
+      activesupport (= 7.1.3.4)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (6.1.7.3)
-      activesupport (= 6.1.7.3)
-    activerecord (6.1.7.3)
-      activemodel (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
-    activesupport (6.1.7.3)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activemodel (7.1.3.4)
+      activesupport (= 7.1.3.4)
+    activerecord (7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      timeout (>= 0.4.0)
+    activesupport (7.1.3.4)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     ast (2.4.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
+    binding_of_caller (1.0.1)
+      debug_inspector (>= 1.2.0)
     builder (3.2.4)
     bundler-audit (0.9.1)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
     byebug (11.1.3)
-    concurrent-ruby (1.2.2)
+    coderay (1.1.3)
+    concurrent-ruby (1.3.1)
+    connection_pool (2.4.1)
     crass (1.0.6)
-    diff-lcs (1.5.0)
+    debug_inspector (1.2.0)
+    diff-lcs (1.5.1)
+    drb (2.2.1)
+    dry-auto_inject (1.0.1)
+      dry-core (~> 1.0)
+      zeitwerk (~> 2.6)
+    dry-configurable (1.1.0)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-container (0.11.0)
+      concurrent-ruby (~> 1.0)
+    dry-core (1.0.1)
+      concurrent-ruby (~> 1.0)
+      zeitwerk (~> 2.6)
+    dry-monads (1.6.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
     erubi (1.12.0)
-    i18n (1.14.1)
+    faker (3.4.1)
+      i18n (>= 1.8.11, < 2)
+    google-protobuf (3.25.3)
+    google-protobuf (3.25.3-aarch64-linux)
+    google-protobuf (3.25.3-arm64-darwin)
+    google-protobuf (3.25.3-x86-linux)
+    google-protobuf (3.25.3-x86_64-darwin)
+    google-protobuf (3.25.3-x86_64-linux)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
+    io-console (0.7.2)
+    irb (1.13.1)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.7.2)
     language_server-protocol (3.17.0.3)
-    loofah (2.21.3)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
+    memery (1.5.0)
+      ruby2_keywords (~> 0.0.2)
     method_source (1.0.0)
-    mini_portile2 (2.8.2)
-    minitest (5.18.1)
-    nokogiri (1.15.2)
-      mini_portile2 (~> 2.8.2)
+    minitest (5.23.1)
+    mutex_m (0.2.0)
+    nokogiri (1.16.5-aarch64-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.5-arm-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.5-arm64-darwin)
       racc (~> 1.4)
-    parallel (1.23.0)
-    parser (3.2.2.3)
+    nokogiri (1.16.5-x86-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.5-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.5-x86_64-linux)
+      racc (~> 1.4)
+    parallel (1.24.0)
+    parser (3.3.2.0)
       ast (~> 2.4.1)
       racc
-    pg_query (1.3.0)
-    racc (1.7.1)
-    rack (2.2.7)
+    pg_query (5.1.0)
+      google-protobuf (>= 3.22.3)
+    proc_to_ast (0.1.0)
+      coderay
+      parser
+      unparser
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.10.1)
+      byebug (~> 11.0)
+      pry (>= 0.13, < 0.15)
+    psych (5.1.2)
+      stringio
+    racc (1.8.0)
+    rack (3.0.11)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
-      method_source
+    railties (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      irb
+      rackup (>= 1.0.0)
       rake (>= 12.2)
-      thor (~> 1.0)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.2.1)
     rake-hooks (1.2.3)
       rake
-    regexp_parser (2.8.1)
-    rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rdoc (6.6.3.1)
+      psych (>= 4.0.0)
+    regexp_parser (2.9.2)
+    reline (0.5.7)
+      io-console (~> 0.5)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.53.0)
+      rspec-support (~> 3.13.0)
+    rspec-parameterized (1.0.2)
+      rspec-parameterized-core (< 2)
+      rspec-parameterized-table_syntax (< 2)
+    rspec-parameterized-core (1.0.0)
+      parser
+      proc_to_ast
+      rspec (>= 2.13, < 4)
+      unparser
+    rspec-parameterized-table_syntax (1.0.1)
+      binding_of_caller
+      rspec-parameterized-core (< 2)
+    rspec-support (3.13.1)
+    rubocop (1.64.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
-      parser (>= 3.2.1.0)
-    rubocop-capybara (2.18.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    rubocop-capybara (2.20.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
-    rubocop-factory_bot (2.23.1)
-      rubocop (~> 1.33)
-    rubocop-rails (2.20.2)
+    rubocop-rails (2.25.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.22.0)
-      rubocop (~> 1.33)
+    rubocop-rspec (2.30.0)
+      rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
+      rubocop-rspec_rails (~> 2.28)
+    rubocop-rspec_rails (2.28.3)
+      rubocop (~> 1.40)
     ruby-progressbar (1.13.0)
-    thor (1.2.2)
+    ruby2_keywords (0.0.5)
+    stringio (3.1.0)
+    strscan (3.1.0)
+    thor (1.3.1)
+    timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
-    zeitwerk (2.6.8)
+    unicode-display_width (2.5.0)
+    unparser (0.6.13)
+      diff-lcs (~> 1.3)
+      parser (>= 3.3.0)
+    webrick (1.8.1)
+    zeitwerk (2.6.14)
 
 PLATFORMS
-  ruby
+  aarch64-linux
+  arm-linux
+  arm64-darwin
+  x86-linux
+  x86_64-darwin
+  x86_64-linux
 
 DEPENDENCIES
   bundler
   bundler-audit
-  byebug
+  faker
   pg_objects!
+  pry-byebug
   rake
   rspec
+  rspec-parameterized
   rubocop
   rubocop-rails
   rubocop-rake
   rubocop-rspec
 
 BUNDLED WITH
-   2.4.12
+   2.5.5

data/lib/generators/pg_objects/install/install_generator.rb

@@ -1,11 +1,9 @@
-module PgObjects
-  ##
-  # Creates default directories structure
-  class InstallGenerator < ::Rails::Generators::Base
-    def create_directories
-      empty_directory 'db/objects'
-      empty_directory 'db/objects/before'
-      empty_directory 'db/objects/after'
-    end
+##
+# Creates default directories structure
+class PgObjects::InstallGenerator < Rails::Generators::Base
+  def create_directories
+    empty_directory 'db/objects'
+    empty_directory 'db/objects/before'
+    empty_directory 'db/objects/after'
   end
 end

data/lib/pg_objects/config.rb

@@ -5,7 +5,7 @@ module PgObjects
   #   PgObjects.configure do |config|
   #     # use relative from RAILS_ROOT
   #     config.before_path = 'db/alternate/before'
-  #     # or full (not recommended)
+  #     # or full
   #     config.after_path = '/var/tmp/alternate/after'
   #     config.extensions = ['sql', 'txt']
   #     # suppress output to console
@@ -13,22 +13,20 @@ module PgObjects
   #   end
   class << self
     def configure
-      yield config
+      yield Config.config
     end
 
     def config
-      @config ||= Config.new
+      Config.config
     end
   end
 
   class Config
-    attr_accessor :before_path, :after_path, :extensions, :silent
+    extend Dry::Configurable
 
-    def initialize
-      @before_path = 'db/objects/before'
-      @after_path = 'db/objects/after'
-      @extensions = ['sql']
-      @silent = false
-    end
+    setting :before_path, default: 'db/objects/before'
+    setting :after_path, default: 'db/objects/after'
+    setting :extensions, default: ['sql']
+    setting :silent, default: false
   end
 end

data/lib/pg_objects/container.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+##
+# Container for dependencies
+#
+class PgObjects::Container
+  extend ::Dry::Container::Mixin
+
+  register 'config' do
+    PgObjects::Config.config
+  end
+
+  register 'db_object_factory' do
+    PgObjects::DbObjectFactory.new
+  end
+
+  register 'parsed_object_factory' do
+    PgObjects::ParsedObjectFactory
+  end
+
+  register 'parser' do
+    PgObjects::Parser.new
+  end
+
+  register 'logger' do
+    PgObjects::Logger.new
+  end
+end
+
+Import = Dry::AutoInject(PgObjects::Container)

data/lib/pg_objects/db_object.rb

@@ -1,24 +1,42 @@
-module PgObjects
-  ##
-  # Represents DB object as it is described in file
-  #
-  # [name]  name of file without extension
-  # [full_name] full pathname of file
-  # [object_name] name of function, trigger etc. if it was successfully parsed, otherwise - nil
-  class DbObject
-    attr_reader :sql_query, :name, :full_name, :object_name, :dependencies
-    attr_accessor :status
-
-    def initialize(file_path)
-      @full_name = file_path
-      @name = File.basename file_path, '.*'
-      @sql_query = File.read file_path
-
-      directives = Parser.fetch_directives @sql_query
-      @dependencies = directives[:depends_on]
-      @object_name = Parser.fetch_object_name @sql_query
-
-      @status = :pending
-    end
+##
+# Represents DB object as it is described in file
+#
+# [name]  name of file without extension
+# [full_name] full pathname of file
+# [object_name] name of function, trigger etc. if it was successfully parsed, otherwise - nil
+class PgObjects::DbObject
+  include Memery
+
+  include Import['parser']
+
+  attr_accessor :status
+  attr_reader :full_name, :object_name
+
+  def initialize(path, status = :new)
+    @full_name = path
+    @status = status
+  end
+
+  def create
+    parser.load(sql_query)
+    @object_name = parser.fetch_object_name
+    @status = :pending
+
+    self
+  end
+
+  memoize
+  def name
+    File.basename(full_name, '.*')
+  end
+
+  memoize
+  def dependencies
+    parser.fetch_directives[:depends_on]
+  end
+
+  memoize
+  def sql_query
+    File.read(full_name)
   end
 end

data/lib/pg_objects/db_object_factory.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+##
+# Factory for DbObject
+#
+class PgObjects::DbObjectFactory
+  include Import['parser']
+
+  def create_instance(path, status: :new)
+    db_object = PgObjects::DbObject.new(path, status)
+    db_object.create
+  end
+end

data/lib/pg_objects/logger.rb

@@ -1,17 +1,10 @@
-module PgObjects
-  ##
-  # Console output
-  #
-  # Pass +silent: true+ to constructor to suppress output
-  class Logger
-    attr_reader :silent
+##
+# Console output
+#
+class PgObjects::Logger
+  include Import['config']
 
-    def initialize(silent: false)
-      @silent = silent
-    end
-
-    def write(str)
-      puts "== #{str} ".ljust(80, '=') unless silent
-    end
+  def write(str)
+    puts "== #{str} ".ljust(80, '=') unless config.silent
   end
 end