lb-persistence 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10650bcb263b3de597e131ce4845195860359394fe2cf06736a31d82e488377b
-  data.tar.gz: 5e0bb4741af426964b54db10bc2852aea3d7d56c53efe0d5cdf540bbaf4c6bac
+  metadata.gz: 0aaa4e82cdf55105539b2b0b922221f1c13edba4f415550f606c92f992154616
+  data.tar.gz: d67a1ad39dfc23b52720978f5283ae1cb4fe0d808ab14e8a709fcdb067320556
 SHA512:
-  metadata.gz: bc3cbbffd86a14edb1880e61cd55a3e6c48ee4827206b269c18978ac5b062093a4b63f427215e8093c0918632d736ceb49108b975363da7a6ad5eb12622563e7
-  data.tar.gz: 7b4ed1360817c34611391c6f47963ea9b061128fee48b4a0e07b82cf65c5ff305396c9f01730652bfd104c3b860cdd2334a60da39e7283d7b974bd2b1917a079
+  metadata.gz: 01ca45c267be5d5a4d072d65a67d0fb26635f3c0c37587ccfb3d9951a8965ebb3851616ce660484c253715971c7b0da4554f2f3caf8bca51208067631b379496
+  data.tar.gz: 1b2f8d96eca4a1cf9340180dadb3935904f1eb900a8131cdeb700e15eb9bd8936a17f9a3a3a76b9c5d16e9dcf1c5386773d0060589305232caa347e2e5fd8aec

data/.github/workflows/ci.yml

@@ -9,19 +9,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby_version: ['2.5.x', '2.6.x', '2.7.x']
+        ruby_version: ['2.7', '3.0', '3.1', 'head']
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: actions/setup-ruby@v1
+    - uses: actions/checkout@v3
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@359bebbc29cbe6c87da6bc9ea3bc930432750108
       with:
         ruby-version: ${{ matrix.ruby_version }}
     - name: Install dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y libsqlite3-dev
-    - name: Build and test with Rake
-      run: |
-        gem install bundler
-        bundle install --jobs 4 --retry 3
-        bundle exec rake ci
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake ci

data/.gitignore

@@ -33,6 +33,7 @@ measurements
 ## BUNDLER
 .bundle
 Gemfile.lock
+vendor
 
 ## ctags
 tags

data/.rubocop.yml

@@ -0,0 +1,18 @@
+AllCops:
+  TargetRubyVersion: 2.7
+  NewCops: enable
+  DisplayCopNames: true
+  Exclude:
+    - 'vendor/**/*'
+Naming/FileName:
+  Exclude:
+    - Rakefile
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*.rb'
+    - '*.gemspec'
+Lint/ConstantDefinitionInBlock:
+  Exclude:
+    - 'spec/**/*.rb'
+Style/OperatorMethodCall:
+  Enabled: false

data/Guardfile

@@ -6,8 +6,7 @@ guard :bundler do
   watch(/\A(.+)\.gemspec\z/)
 end
 
-guard :rspec, cmd: 'bundle exec rspec ' +
-                   File.read('.rspec').split.join(' '),
+guard :rspec, cmd: "bundle exec rspec #{File.read('.rspec').split.join(' ')}",
               failed_mode: :keep do
   # Run all specs if configuration is modified
   watch('.rspec')              { 'spec' }

data/Rakefile

@@ -1,5 +1,3 @@
 # frozen_string_literal: true
 
-require 'devtools'
-
-Devtools.init_rake_tasks
+require 'bundler/setup'

data/lb-persistence.gemspec

@@ -18,20 +18,17 @@ Gem::Specification.new do |gem|
                               .split($INPUT_RECORD_SEPARATOR)
   gem.executables           = `git ls-files -- bin/*`
                               .split("\n").map { |f| File.basename(f) }
-  gem.test_files            = `git ls-files -- spec`
-                              .split($INPUT_RECORD_SEPARATOR)
   gem.extra_rdoc_files      = %w[README.md]
-  gem.required_ruby_version = '>= 2.4'
+  gem.required_ruby_version = '>= 2.7'
 
-  gem.add_dependency 'dry-struct',       '~> 1.3'
-  gem.add_dependency 'rom',              '~> 5.2'
-  gem.add_dependency 'rom-sql',          '~> 3.2'
+  gem.add_dependency 'dry-struct',       '~> 1.6'
+  gem.add_dependency 'rom',              '~> 5.3'
+  gem.add_dependency 'rom-sql',          '~> 3.6'
 
-  gem.add_development_dependency 'devtools',       '~> 0.1.25'
-  gem.add_development_dependency 'guard',          '~> 2.16'
-  gem.add_development_dependency 'guard-bundler',  '~> 3.0'
-  gem.add_development_dependency 'guard-rspec',    '~> 4.7', '>= 4.7.3'
-  gem.add_development_dependency 'guard-rubocop',  '~> 1.3'
-  gem.add_development_dependency 'rubocop',        '~> 0.79'
-  gem.add_development_dependency 'sqlite3',        '~> 1.3'
+  gem.add_development_dependency 'rake',       '~> 13.0.6'
+  gem.add_development_dependency 'rspec',      '~> 3.12.0'
+  gem.add_development_dependency 'rspec-core', '~> 3.12.1'
+  gem.add_development_dependency 'rubocop',    '~> 1.5'
+  gem.add_development_dependency 'sqlite3',    '~> 1.6'
+  gem.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/lb/persistence/functions.rb

@@ -39,9 +39,7 @@ module LB
           group: :remove_key_prefix_inject_for,
           wrap: :remove_key_prefix_inject_hash_for
         }.each do |operation, inject|
-          # rubocop:disable Layout/LineLength
           define_method :"#{operation}_prefix" do |array, key, keys, prefix, model = nil|
-            # rubocop:enable Layout/LineLength
             compose do |ops|
               ops << t(operation, key, keys)
               ops << t(:map_array,

data/lib/lb/persistence/relation/joins.rb

@@ -21,11 +21,11 @@ module LB
         end
 
         def qualify_on(on)
-          on.map do |source, target|
+          on.to_h do |source, target|
             source = source.qualified if source.respond_to?(:qualified)
             target = target.qualified if target.respond_to?(:qualified)
             [source, target]
-          end.to_h
+          end
         end
 
         def prefixed(relation,

data/lib/lb/persistence/version.rb

@@ -3,6 +3,6 @@
 module LB
   class Persistence
     # Version
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/lib/lb/persistence.rb

@@ -123,7 +123,7 @@ module LB
     # @api private
     #
     def configure(config)
-      config.auto_registration(settings.source_dir, options)
+      config.auto_registration(settings.source_dir, **options)
 
       config
     end

data/rakelib/ci.rake

@@ -1,24 +1,28 @@
 # frozen_string_literal: true
 
-# Remove existing same-named tasks
-%w[ci ci:metrics].each do |task|
-  klass = Rake::Task
-  klass[task].clear if klass.task_defined?(task)
+namespace :metrics do
+  desc 'Check code style with RuboCop'
+  task :rubocop do
+    require 'rubocop'
+    begin
+      # args = %W[--config #{config.config_file}]
+      args = []
+      raise 'Rubocop failed' unless RuboCop::CLI.new.run(args).zero?
+    rescue Encoding::CompatibilityError => e
+      abort e.message
+    end
+  end
 end
 
-desc 'Run all specs, metrics and mutant'
+desc 'Run CI tasks'
 task ci: %w[ci:metrics]
 
 namespace :ci do
   tasks = %w[
-    metrics:coverage
-    metrics:yardstick:verify
     metrics:rubocop
-    metrics:flog
-    metrics:flay
     spec:integration
   ]
 
-  desc 'Run metrics (except mutant)'
+  desc 'Run metrics'
   task metrics: tasks
 end

data/rakelib/spec.rake

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+begin
+  require 'rspec/core/rake_task'
+
+  # Remove existing same-named tasks
+  %w[spec spec:unit spec:integration].each do |task|
+    klass = Rake::Task
+    klass[task].clear if klass.task_defined?(task)
+  end
+
+  desc 'Run all specs'
+  RSpec::Core::RakeTask.new(:spec) do |task|
+    task.pattern = 'spec/{unit,integration}/**/*_spec.rb'
+  end
+
+  namespace :spec do
+    desc 'Run unit specs'
+    RSpec::Core::RakeTask.new(:unit) do |task|
+      task.pattern = 'spec/unit/**/*_spec.rb'
+    end
+
+    desc 'Run integration specs'
+    RSpec::Core::RakeTask.new(:integration) do |task|
+      task.pattern = 'spec/integration/**/*_spec.rb'
+    end
+  end
+rescue LoadError
+  %w[spec spec:unit spec:integration].each do |name|
+    task name do
+      warn "In order to run #{name}, do: gem install rspec"
+    end
+  end
+end
+
+task test: :spec

data/spec/spec_helper.rb

@@ -17,8 +17,6 @@ $LOAD_PATH << 'lib'
 
 require 'lb-persistence'
 
-require 'devtools/spec_helper'
-
 # require spec support files and shared behavior
 Dir[File.expand_path('{support,shared}/**/*.rb', __dir__)].sort.each do |file|
   require file

data/spec/unit/lb/persistence/functions/class_methods/group_prefix_spec.rb

@@ -7,7 +7,7 @@ describe LB::Persistence::Functions, '.group_prefix' do
 
   let(:object) do
     described_class.t(:group_prefix, key, keys, prefix, nested_class)
-      .>> described_class.t(:model, model_class)
+                   .>> described_class.t(:model, model_class)
   end
 
   let(:key) { :items }

data/spec/unit/lb/persistence/functions/class_methods/wrap_prefix_spec.rb

@@ -7,7 +7,7 @@ describe LB::Persistence::Functions, '.wrap_prefix' do
 
   let(:object) do
     described_class.t(:wrap_prefix, key, keys, prefix, nested_class)
-      .>> described_class.t(:model, model_class)
+                   .>> described_class.t(:model, model_class)
   end
 
   let(:key) { :item }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lb-persistence
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Firas Zaidan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-16 00:00:00.000000000 Z
+date: 2023-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -16,146 +16,112 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rom
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: rom-sql
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
-  name: devtools
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.25
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.25
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.16'
+        version: 3.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.16'
+        version: 3.12.0
 - !ruby/object:Gem::Dependency
-  name: guard-bundler
+  name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.7.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.7.3
-- !ruby/object:Gem::Dependency
-  name: guard-rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 3.12.1
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.79'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.79'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
 description: LB Persistence API
 email:
 - firas@zaidan.de
@@ -178,7 +144,6 @@ files:
 - config/flog.yml
 - config/mutant.yml
 - config/reek.yml
-- config/rubocop.yml
 - config/yardstick.yml
 - lb-persistence.gemspec
 - lib/lb-persistence.rb
@@ -189,6 +154,7 @@ files:
 - lib/lb/persistence/types.rb
 - lib/lb/persistence/version.rb
 - rakelib/ci.rake
+- rakelib/spec.rake
 - spec/shared/settings.rb
 - spec/spec_helper.rb
 - spec/support/helper.rb
@@ -202,8 +168,9 @@ files:
 homepage: https://github.com/lb-rb/lb-persistence
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -212,26 +179,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: LB Persistence API
-test_files:
-- spec/shared/settings.rb
-- spec/spec_helper.rb
-- spec/support/helper.rb
-- spec/unit/lb/persistence/class_methods/new_spec.rb
-- spec/unit/lb/persistence/connect_spec.rb
-- spec/unit/lb/persistence/container_spec.rb
-- spec/unit/lb/persistence/functions/class_methods/group_prefix_spec.rb
-- spec/unit/lb/persistence/functions/class_methods/wrap_prefix_spec.rb
-- spec/unit/lb/persistence/repository_spec.rb
-- spec/unit/lb/persistence/uri_spec.rb
+test_files: []

data/.rubocop.yml

@@ -1 +0,0 @@
-./config/rubocop.yml

data/config/rubocop.yml

@@ -1,11 +0,0 @@
-AllCops:
-  TargetRubyVersion: 2.4
-  DisplayCopNames: true
-  Exclude: []
-Naming/FileName:
-  Exclude:
-    - Rakefile
-Metrics/BlockLength:
-  Exclude:
-    - 'spec/**/*'
-    - '*.gemspec'