rom-yesql 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8a6d3dab4da13310d92b59073bf13b91e284fef8f4da60751aea849debe54a5
-  data.tar.gz: 3482cbe0f53e94a8040b3bb9f9a91137a074d58d4d304c3192e527a026bf733b
+  metadata.gz: 332faa00fcb371dbfa8f7970458a83d923db7aa7af198898ec5512907900b3de
+  data.tar.gz: f2b3658976d44cb28ed12dc5da4f22fa4b3fd1fa912a8b6da157df97962e69f6
 SHA512:
-  metadata.gz: 8d25f12ef1f8538d87bad637f8fa9d64188086606140085138dacc5e84bafacd4f9e4e9c32246117c610fbb46167c033838b069963e54ff2836467d2f15bfe6a
-  data.tar.gz: f93b2e8e2adc49aaea229225cad6f287d456697dc28b8590428d9dd72c3174bc663b277916726528948a6e3b677067cfaef72438ba7d53660ec90fdc4633e272
+  metadata.gz: d285e7991c0753235e1e69024aa1069839687ad53c247004f9ecf4ed449a2ca082cad34e49fcdc4c58568e38a7822c859a2b22346f6f9dc7ea7ccdfd2dfc4835
+  data.tar.gz: 2d5b9f1b2d01ad06a142d96f1d07bba75cf690dc896ca46c8eea604788d62a76856915de090783fca6b3eb074fc369dfa34fd7fb96cd5809c9546644476de812

data/.action_hero.yml

@@ -0,0 +1,20 @@
+# This is a config synced from rom-rb/template-gem repo
+
+sources:
+  - repo: rom-rb/template-gem
+    sync:
+      - ".action_hero.yml.erb"
+      - ".devtools/templates/*.sync:${{dir}}/${{name}}"
+      - ".github/**/*.*"
+      - "spec/support/*"
+      - "CODE_OF_CONDUCT.md"
+      - "CONTRIBUTING.md"
+      - "CODEOWNERS"
+      - "LICENSE.erb"
+      - "README.erb"
+      - "Gemfile.devtools"
+      - ".rspec"
+      - ".rubocop.yml"
+  - repo: action-hero/workflows
+    sync:
+      - ".github/workflows/*.yml"

data/.devtools/templates/README.md.erb

@@ -0,0 +1,29 @@
+[gem]: https://rubygems.org/gems/<%= name %>
+[actions]: https://github.com/rom-rb/<%= name %>/actions
+[codacy]: https://www.codacy.com/gh/rom-rb/<%= name %>
+[chat]: https://rom-rb.zulipchat.com
+[inchpages]: http://inch-ci.org/github/rom-rb/<%= name %>
+
+# <%= name %> [![Join the chat at https://rom-rb.zulipchat.com](https://img.shields.io/badge/rom--rb-join%20chat-%23346b7a.svg)][chat]
+
+[![Gem Version](https://badge.fury.io/rb/<%= name %>.svg)][gem]
+[![CI Status](https://github.com/rom-rb/<%= name %>/workflows/ci/badge.svg)][actions]
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/<%= codacy_id %>)][codacy]
+[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/<%= codacy_id %>)][codacy]
+[![Inline docs](http://inch-ci.org/github/rom-rb/<%= name %>.svg?branch=master)][inchpages]
+
+## Links
+
+* [API documentation](http://rubydoc.info/gems/<%= name %>)
+* User documentation - not written yet, but you [can write it](https://github.com/rom-rb/rom-yesql/issues/16)! 😄
+
+## Supported Ruby versions
+
+This library officially supports the following Ruby versions:
+
+* MRI >= `2.4`
+* jruby >= `9.2`
+
+## License
+
+See `LICENSE` file.

data/.devtools/templates/changelog.erb

@@ -1,3 +1,6 @@
+
+<!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
+
 <% releases.each_with_index do |r, idx| %>
 ## <%= r.version %> <%= r.date %>
 

data/.devtools/templates/release.erb

@@ -0,0 +1,36 @@
+
+<!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
+
+<% if latest_release.summary %>
+<%= latest_release.summary %>
+
+<% end %>
+
+<% if latest_release.added? %>
+### Added
+
+<% latest_release.added.each do |log| %>
+- <%= log %>
+<% end %>
+
+<% end %>
+<% if latest_release.fixed? %>
+### Fixed
+
+<% latest_release.fixed.each do |log| %>
+- <%= log %>
+<% end %>
+
+<% end %>
+<% if latest_release.changed? %>
+### Changed
+
+<% latest_release.changed.each do |log| %>
+- <%= log %>
+<% end %>
+<% end %>
+<% if previous_release %>
+<% ver_range = "v#{previous_release.version}...v#{latest_release.version}" %>
+
+[Compare <%=ver_range%>](https://github.com/rom-rb/<%= project.name %>/compare/<%=ver_range%>)
+<% end %>

data/.github/FUNDING.yml

@@ -0,0 +1 @@
+github: hanami

data/.github/ISSUE_TEMPLATE/{---bug-report.md → bug-report.md}

@@ -2,28 +2,24 @@
 name: "\U0001F41B Bug report"
 about: See CONTRIBUTING.md for more information
 title: ''
-labels: bug
+labels: bug, help wanted
 assignees: ''
 
 ---
 
-**Before you submit this: WE ONLY ACCEPT BUG REPORTS AND FEATURE REQUESTS**
-
-For more information see `CONTRIBUTING.md`.
-
-**Describe the bug**
+## Describe the bug
 
 A clear and concise description of what the bug is.
 
-**To Reproduce**
+## To Reproduce
 
-Provide detailed steps to reproduce, an executable script would be best.
+Provide detailed steps to reproduce, **an executable script would be best**.
 
-**Expected behavior**
+## Expected behavior
 
 A clear and concise description of what you expected to happen.
 
-**Your environment**
+## My environment
 
 - Affects my production application: **YES/NO**
 - Ruby version: ...

data/.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Community Support
+    url: https://discourse.rom-rb.org
+    about: Please ask and answer questions here.

data/.github/SUPPORT.md

@@ -0,0 +1,3 @@
+## Support
+
+If you need help with any of the rom-rb libraries, feel free to ask questions on our [discussion forum](https://discourse.rom-rb.org/). This is the best place to seek help. Make sure to search for a potential solution in past threads before posting your question. Thanks! :heart:

data/.github/workflows/ci.yml

@@ -1,8 +1,7 @@
-# this file is managed by rom-rb/devtools project
-
+# This file is synced from rom-rb/template-gem repo
 name: ci
 
-"on":
+on:
   push:
     paths:
       - ".github/workflows/ci.yml"
@@ -16,29 +15,30 @@ name: ci
       - "project.yml"
   pull_request:
     branches:
-      - master
+      - main
   create:
 
 jobs:
   tests:
     runs-on: ubuntu-latest
+    name: Tests
     strategy:
       fail-fast: false
       matrix:
         ruby:
-          - "2.7.0"
-          - "2.6"
-          - "2.5"
-          - "2.4"
-          - "jruby"
+        - "3.1"
+        - "3.2"
+        - "3.3"
+        - "3.4"
         include:
-          - ruby: "2.6"
+          - ruby: "3.4"
             coverage: "true"
     env:
       COVERAGE: ${{matrix.coverage}}
       COVERAGE_TOKEN: ${{secrets.CODACY_PROJECT_TOKEN}}
     steps:
-      - uses: actions/checkout@v1
+      - name: Checkout
+        uses: actions/checkout@v1
       - name: Install package dependencies
         run: "[ -e $APT_DEPS ] || sudo apt-get install -y --no-install-recommends $APT_DEPS"
       - name: Set up Ruby
@@ -59,24 +59,3 @@ jobs:
         with:
           project-token: ${{secrets.CODACY_PROJECT_TOKEN}}
           coverage-reports: coverage/coverage.xml
-  release:
-    runs-on: ubuntu-latest
-    if: contains(github.ref, 'tags') && github.event_name == 'create'
-    needs: tests
-    env:
-      GITHUB_LOGIN: rom-bot
-      GITHUB_TOKEN: ${{secrets.GH_PAT}}
-    steps:
-      - uses: actions/checkout@v1
-      - name: Install package dependencies
-        run: "[ -e $APT_DEPS ] || sudo apt-get install -y --no-install-recommends $APT_DEPS"
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.6
-      - name: Install dependencies
-        run: gem install ossy --no-document
-      - name: Trigger release workflow
-        run: |
-          tag=$(echo $GITHUB_REF | cut -d / -f 3)
-          ossy gh w rom-rb/devtools release --payload "{\"tag\":\"$tag\",\"tag_creator\":\"$GITHUB_ACTOR\",\"repo\":\"$GITHUB_REPOSITORY\"}"

data/.github/workflows/docsite.yml

@@ -1,4 +1,4 @@
-# this file is managed by rom-rb/devtools project
+# This file is synced from rom-rb/template-gem repo
 
 name: docsite
 
@@ -8,7 +8,7 @@ on:
       - docsite/**
       - .github/workflows/docsite.yml
     branches:
-      - master
+      - main
       - release-**
     tags:
 
@@ -51,7 +51,7 @@ jobs:
 
             git push --all "https://rom-bot:${{secrets.GH_PAT}}@github.com/$GITHUB_REPOSITORY.git"
 
-            git checkout master
+            git checkout main
           else
             echo "no need to update branches"
           fi
@@ -60,3 +60,4 @@ jobs:
           GITHUB_LOGIN: rom-bot
           GITHUB_TOKEN: ${{secrets.GH_PAT}}
         run: ossy github workflow rom-rb/rom-rb.org ci
+

data/.github/workflows/rubocop.yml

@@ -0,0 +1,46 @@
+name: "RuboCop"
+on:
+  push:
+    branches:
+      - "main"
+      - "master"
+    paths:
+      - "**/*.rb"
+      - "**/*.rake"
+      - "Rakefile"
+      - "Gemfile*"
+      - ".rubocop.yml"
+  pull_request:
+    branches:
+      - "main"
+      - "master"
+    types:
+      - "opened"
+      - "synchronize"
+  workflow_dispatch:
+jobs:
+  run:
+    runs-on: ubuntu-latest
+    name: ${{ matrix.type }}
+    strategy:
+      fail-fast: false
+      matrix:
+        type: ["Style", "Layout", "Naming", "Lint", "Metrics", "Security"]
+    steps:
+    - name: Clone
+      uses: actions/checkout@v2
+    - name: Get git diff
+      id: get_diff
+      uses: technote-space/get-diff-action@v4
+      with:
+        PATTERNS: |
+          **/*.rb
+          **/*.rake
+          Gemfile
+          Rakefile
+    - name: Check ${{ matrix.type }}
+      uses: action-hero/actions/rubocop@main
+      if: ${{ env.GIT_DIFF != '' }}
+      with:
+        diff: ${{ env.GIT_DIFF }}
+        type: ${{ matrix.type }}

data/.github/workflows/sync_configs.yml

@@ -1,17 +1,23 @@
-# this file is managed by rom-rb/devtools project
+# This file is synced from rom-rb/template-gem repo
 
-name: sync
+name: Changelog
 
 on:
-  repository_dispatch:
   push:
+    paths:
+      - "changelog.yml"
     branches:
-      - "master"
+      - "main"
+  pull_request:
+    branches:
+      - "main"
+    types: [closed]
 
 jobs:
-  main:
+  sync:
     runs-on: ubuntu-latest
-    if: (github.event_name == 'repository_dispatch' && github.event.action == 'sync_configs') || github.event_name != 'repository_dispatch'
+    if: github.event.pull_request.merged == true
+    name: Update
     env:
       GITHUB_LOGIN: rom-bot
       GITHUB_TOKEN: ${{ secrets.GH_PAT }}
@@ -28,17 +34,11 @@ jobs:
           git config --local user.email "rom-bot@rom-rb.org"
           git config --local user.name "rom-bot"
       - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
+        uses: actions/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: "2.6"
       - name: Install dependencies
         run: gem install ossy --no-document
-      - name: Compile file templates
-        run: tmp/devtools/bin/compile-templates
-      - name: Update workflow files from devtools
-        run: tmp/devtools/bin/sync-workflows
-      - name: Update configuration files from devtools
-        run: tmp/devtools/bin/sync-shared-files
       - name: Update changelog.yml from commit
         run: tmp/devtools/bin/update-changelog-from-commit $GITHUB_SHA
       - name: Compile CHANGELOG.md
@@ -46,8 +46,8 @@ jobs:
       - name: Commit
         run: |
           git add -A
-          git commit -m "[devtools] sync" || echo "nothing to commit"
+          git commit -m "Update CHANGELOG.md" || echo "nothing to commit"
       - name: Push changes
         run: |
-          git pull --rebase origin master
-          git push https://rom-bot:${{secrets.GH_PAT}}@github.com/${{github.repository}}.git HEAD:master
+          git pull --rebase origin main
+          git push https://rom-bot:${{secrets.GH_PAT}}@github.com/${{github.repository}}.git HEAD:main

data/.rubocop.yml

@@ -1,13 +1,19 @@
-# this file is managed by rom-rb/devtools project
-
+# This is a config synced from rom-rb/template-gem repo
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 3.1
+  NewCops: enable
+  SuggestExtensions: false
   Exclude:
     - spec/support/coverage.rb
     - spec/support/warnings.rb
+    - spec/support/rspec_options.rb
     - Gemfile.devtools
     - "*.gemspec"
 
+Layout/ArgumentAlignment:
+  Enabled: false
+  EnforcedStyle: with_fixed_indentation
+
 Layout/SpaceAroundMethodCallOperator:
   Enabled: false
 
@@ -27,13 +33,33 @@ Layout/SpaceInsideHashLiteralBraces:
   EnforcedStyleForEmptyBraces: no_space
 
 Layout/LineLength:
-  Max: 100
+  Max: 120
   Exclude:
     - "spec/**/*_spec.rb"
 
+Lint/AmbiguousBlockAssociation:
+  Enabled: true
+  # because 'expect { foo }.to change { bar }' is fine
+  Exclude:
+    - "spec/**/*.rb"
+
 Lint/BooleanSymbol:
   Enabled: false
 
+Lint/MissingSuper:
+  Enabled: false
+
+Lint/ConstantDefinitionInBlock:
+  Enabled: false
+
+Lint/EmptyBlock:
+  Exclude:
+  - "spec/**/*.rb"
+
+Lint/EmptyClass:
+  Exclude:
+  - "spec/**/*.rb"
+
 Lint/RaiseException:
   Enabled: false
 
@@ -42,7 +68,27 @@ Lint/StructNewOverride:
 
 Lint/SuppressedException:
   Exclude:
-    - "spec/spec_helper.rb"
+    - "spec/**/*.rb"
+
+Lint/UselessMethodDefinition:
+  Exclude:
+    - "lib/rom/struct.rb"
+
+Lint/UnderscorePrefixedVariableName:
+  Enabled: false
+
+Lint/ToEnumArguments:
+  Exclude:
+    - "lib/rom/command.rb"
+
+Naming/MethodParameterName:
+  Enabled: false
+
+Naming/AccessorMethodName:
+  Enabled: false
+
+Naming/VariableNumber:
+  Enabled: false
 
 Naming/PredicateName:
   Enabled: false
@@ -60,6 +106,9 @@ Naming/MemoizedInstanceVariableName:
 Metrics/MethodLength:
   Enabled: false
 
+Metrics/ModuleLength:
+  Enabled: false
+
 Metrics/ClassLength:
   Enabled: false
 
@@ -67,12 +116,21 @@ Metrics/BlockLength:
   Enabled: false
 
 Metrics/AbcSize:
-  Max: 25
+  Max: 36
 
 Metrics/CyclomaticComplexity:
   Enabled: true
   Max: 12
 
+Metrics/PerceivedComplexity:
+  Max: 14
+
+Metrics/ParameterLists:
+  Enabled: false
+
+Style/AccessorGrouping:
+  Enabled: false
+
 Style/ExponentialNotation:
   Enabled: false
 
@@ -99,8 +157,7 @@ Style/BlockDelimiters:
   Enabled: false
 
 Style/ClassAndModuleChildren:
-  Exclude:
-    - "spec/**/*_spec.rb"
+  Enabled: false
 
 Style/ConditionalAssignment:
   Enabled: false
@@ -145,8 +202,46 @@ Style/StringLiteralsInInterpolation:
   EnforcedStyle: double_quotes
 
 Style/SymbolArray:
-  Exclude:
-    - "spec/**/*_spec.rb"
+  Enabled: false
+
+Style/OptionalBooleanParameter:
+  Enabled: false
+
+Style/MultilineBlockChain:
+  Enabled: false
+
+Style/DocumentDynamicEvalDefinition:
+  Enabled: false
 
 Style/TrailingUnderscoreVariable:
   Enabled: false
+
+Style/MultipleComparison:
+  Enabled: false
+
+Style/StringConcatenation:
+  Enabled: false
+
+Style/OpenStructUse:
+  Enabled: false
+
+Style/MapToHash:
+  Enabled: false
+
+Style/FormatStringToken:
+  Enabled: false
+
+Style/StructInheritance:
+  Enabled: false
+
+Style/PreferredHashMethods:
+  Enabled: false
+
+Style/DoubleNegation:
+  Enabled: false
+
+Style/MissingRespondToMissing:
+  Enabled: false
+
+Style/CombinableLoops:
+  Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+<!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
+
+## 1.1.0 2025-01-19
+
+Updated to work with rom 5.4.0
+
+
+[Compare v1.0.0...v1.1.0](https://github.com/rom-rb/rom-yesql/compare/v1.0.0...v1.1.0)
+
 ## 1.0.0 2020-12-06
 
 Updated to work with rom 6.0.0 (@mrship)

data/CODEOWNERS

@@ -0,0 +1 @@
+* @solnic

data/CONTRIBUTING.md

@@ -6,11 +6,11 @@ If you found a bug, report an issue and describe what's the expected behavior ve
 
 ## Reporting feature requests
 
-Report a feature request **only after discussing it first on [discourse.rom-rb.org](https://discourse.rom-rb.org)** where it was accepted. Please provide a concise description of the feature, don't link to a discussion thread, and instead summarize what was discussed.
+Report a feature request **only after discussing it first on [discourse.rom-rb.org](https://discourse.rom-rb.org)** where it was accepted. Please provide a concise description of the feature.
 
 ## Reporting questions, support requests, ideas, concerns etc.
 
-**PLEASE DON'T** - use [discourse.rom-rb.org](http://discourse.rom-rb.org) instead.
+**PLEASE DON'T** - use [discourse.rom-rb.org](https://discourse.rom-rb.org) instead.
 
 # Pull Request Guidelines
 
@@ -26,4 +26,4 @@ Other requirements:
 
 # Asking for help
 
-If these guidelines aren't helpful, and you're stuck, please post a message on [discourse.rom-rb.org](https://discourse.rom-rb.org) or join [our chat](https://rom-rb.zulipchat.com).
+If these guidelines aren't helpful, and you're stuck, please post a message on [discourse.rom-rb.org](https://discourse.rom-rb.org).

data/Gemfile

@@ -7,8 +7,6 @@ gemspec
 eval_gemfile "Gemfile.devtools"
 
 group :test do
-  gem "codeclimate-test-reporter", require: false
-  gem "inflecto"
   gem "jdbc-sqlite3", platforms: :jruby
   gem "rspec", "~> 3.5"
   gem "sqlite3", platforms: %i[mri rbx]

data/Gemfile.devtools

@@ -2,16 +2,19 @@
 
 # this file is managed by rom-rb/devtools project
 
+gem "rake", ">= 12.3.3"
+
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 group :test do
   gem "simplecov", require: false, platforms: :ruby
   gem "simplecov-cobertura", require: false, platforms: :ruby
+  gem "rexml", require: false
 
-  gem "warning" if RUBY_VERSION >= "2.4.0"
+  gem "warning"
 end
 
 group :tools do
   # this is the same version that we use on codacy
-  gem "rubocop", "0.82.0"
+  gem "rubocop", "1.69.2"
 end

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2020 rom-rb team
+Copyright (c) 2015-2021 rom-rb team
 
 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

data/README.md

@@ -1,6 +1,5 @@
 [gem]: https://rubygems.org/gems/rom-yesql
 [actions]: https://github.com/rom-rb/rom-yesql/actions
-[codacy]: https://www.codacy.com/gh/rom-rb/rom-yesql
 [chat]: https://rom-rb.zulipchat.com
 [inchpages]: http://inch-ci.org/github/rom-rb/rom-yesql
 
@@ -8,9 +7,8 @@
 
 [![Gem Version](https://badge.fury.io/rb/rom-yesql.svg)][gem]
 [![CI Status](https://github.com/rom-rb/rom-yesql/workflows/ci/badge.svg)][actions]
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/88fbb464691e4666b94e0455468b68bf)][codacy]
-[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/88fbb464691e4666b94e0455468b68bf)][codacy]
-[![Inline docs](http://inch-ci.org/github/rom-rb/rom-yesql.svg?branch=master)][inchpages]
+[![RuboCop](https://github.com/rom-rb/rom-yesql/actions/workflows/rubocop.yml/badge.svg)](https://github.com/rom-rb/rom-yesql/actions/workflows/rubocop.yml)
+[![Inline docs](http://inch-ci.org/github/rom-rb/rom-yesql.svg?branch=main)][inchpages]
 
 ## Links
 
@@ -21,8 +19,8 @@
 
 This library officially supports the following Ruby versions:
 
-* MRI >= `2.4`
-* jruby >= `9.2`
+* MRI >= `3.1`
+* JRuby >= `9.4` (not tested)
 
 ## License
 

data/changelog.yml

@@ -1,4 +1,9 @@
 ---
+- version: 1.1.0
+  date: '2025-01-19'
+  summary: Updated to work with rom 5.4.0
+  changed:
+  - Minimal Ruby version is now 3.1.0 (@flash-gordon)
 - version: 1.0.0
   date: '2020-12-06'
   summary: Updated to work with rom 6.0.0 (@mrship)

data/lib/rom/yesql/gateway.rb

@@ -15,7 +15,7 @@ module ROM
     # expose access to gateway's queries.
     #
     # @api public
-    class Gateway < ROM::Gateway
+    class Gateway < ::ROM::Gateway
       extend Initializer
 
       adapter :yesql
@@ -71,9 +71,9 @@ module ROM
       #   @option :query_proc [Proc]
       #
       # @api public
-      def initialize(*)
+      def initialize(*, **)
         super
-        @connection = Sequel.connect(uri, options)
+        @connection = ::Sequel.connect(uri, options)
         @queries = @queries.merge(load_queries(path)).freeze
         Relation.query_proc(query_proc)
         Relation.load_queries(queries)
@@ -110,20 +110,21 @@ module ROM
         if path.nil?
           {}
         else
-          Dir["#{path}/*"].each_with_object({}) do |dir, fs_queries|
-            dataset = File.basename(dir).to_sym
-
-            fs_queries[dataset] = Dir["#{dir}/**/*.sql"].each_with_object({}) do |file, ds_queries|
-              query_name = File.basename(file, ".*").to_sym
-              sql = File.read(file).strip
-
-              ds_queries[query_name] = sql
-            end
+          ::Dir["#{path}/*"].to_h do |dir|
+            [
+              ::File.basename(dir).to_sym,
+              ::Dir["#{dir}/**/*.sql"].to_h do |file|
+                query_name = ::File.basename(file, ".*").to_sym
+                sql = ::File.read(file).strip
+
+                [query_name, sql]
+              end
+            ]
           end
         end
       end
     end
   end
 
-  register_adapter(:yesql, ROM::Yesql)
+  register_adapter(:yesql, Yesql)
 end

data/lib/rom/yesql/relation/class_interface.rb

@@ -2,7 +2,7 @@
 
 module ROM
   module Yesql
-    class Relation < ROM::Relation
+    class Relation < ::ROM::Relation
       module ClassInterface
         # Sets dataset name for the relation class
         #

data/lib/rom/yesql/relation.rb

@@ -32,14 +32,14 @@ module ROM
     #   rom.relations[:reports] # use like a normal rom relation
     #
     # @api public
-    class Relation < ROM::Relation
+    class Relation < ::ROM::Relation
       adapter :yesql
 
-      extend Dry::Core::ClassAttributes
+      extend ::Dry::Core::ClassAttributes
 
       defines :query_proc
 
-      Materialized = Class.new(ROM::Relation)
+      Materialized = ::Class.new(::ROM::Relation)
 
       # Extends a relation with query methods
       #
@@ -84,13 +84,9 @@ module ROM
       #
       # @api private
       def self.load_queries(queries)
-        @queries = {}
-        queries.each do |ds, ds_queries|
-          @queries[ds] = ds_queries.each_with_object({}) do |(name, query), h|
-            h[name] = query
-          end
+        @queries = queries.to_h do |ds, ds_queries|
+          [ds, ds_queries.to_h { |name, query| [name, query] }]
         end
-        @queries
       end
 
       # Returns query proc set on a relation class

data/lib/rom/yesql/version.rb

@@ -2,6 +2,6 @@
 
 module ROM
   module Yesql
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/rakelib/rubocop.rake

@@ -16,4 +16,5 @@ begin
     end
   end
 rescue LoadError
+  # rubocop is not available
 end

data/rom-yesql.gemspec

@@ -1,13 +1,15 @@
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'rom/yesql/version'
+require "rom/yesql/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "rom-yesql"
   spec.version       = ROM::Yesql::VERSION.dup
   spec.authors       = ["Piotr Solnica"]
   spec.email         = ["piotr.solnica@gmail.com"]
-  spec.summary       = 'Yesql adapter for ROM'
+  spec.summary       = "Yesql adapter for ROM"
   spec.description   = spec.summary
   spec.homepage      = "http://rom-rb.org"
   spec.license       = "MIT"
@@ -16,10 +18,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = ">= 3.1.0"
 
-  spec.add_runtime_dependency "rom", "~>5"
-  spec.add_runtime_dependency "dry-core", "~>0.4"
-  spec.add_runtime_dependency "sequel", "~>5"
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_runtime_dependency "dry-core", "~>1.1"
+  spec.add_runtime_dependency "rom", "~> 5.4"
+  spec.add_runtime_dependency "sequel", "~> 5"
 end

data/spec/integration/adapter_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe "ROM / Yesql" do
   let(:container) { ROM.container(configuration) }
 
   let!(:configuration) do
-    ROM::Configuration.new(:yesql, [uri, path: path, queries: {reports: report_queries}])
+    ROM::Configuration.new(:yesql, uri, path: path, queries: {reports: report_queries})
   end
 
   let(:report_queries) { {all_users: "SELECT * FROM users ORDER BY %{order}"} }

data/spec/spec_helper.rb

@@ -10,7 +10,6 @@ require_relative "support/warnings"
 Warning.process { |w| raise w } if ENV["FAIL_ON_WARNINGS"].eql?("true")
 
 require "rom-yesql"
-require "inflecto"
 require "logger"
 
 begin
@@ -36,4 +35,4 @@ RSpec.configure do |config|
   config.warnings = true
 end
 
-Dir[root.join("shared/*.rb").to_s].sort.each { |f| require f }
+Dir[root.join("shared/*.rb").to_s].each { |f| require f }

data/spec/support/rspec_options.rb

@@ -0,0 +1,16 @@
+RSpec.configure do |config|
+  # When no filter given, search and run focused tests
+  config.filter_run_when_matching :focus
+
+  # Disables rspec monkey patches (no reason for their existence tbh)
+  config.disable_monkey_patching!
+
+  # Run ruby in verbose mode
+  config.warnings = true
+
+  # Collect all failing expectations automatically,
+  # without calling aggregate_failures everywhere
+  config.define_derived_metadata do |meta|
+    meta[:aggregate_failures] = true
+  end
+end

metadata

@@ -1,43 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: rom-yesql
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Piotr Solnica
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-06 00:00:00.000000000 Z
+date: 2025-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rom
+  name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: dry-core
+  name: rom
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '5.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '5.4'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -52,34 +51,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
 description: Yesql adapter for ROM
 email:
 - piotr.solnica@gmail.com
@@ -87,17 +58,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".action_hero.yml"
+- ".devtools/templates/README.md.erb"
 - ".devtools/templates/changelog.erb"
-- ".github/ISSUE_TEMPLATE/----please-don-t-ask-for-support-via-issues.md"
-- ".github/ISSUE_TEMPLATE/---bug-report.md"
-- ".github/ISSUE_TEMPLATE/---feature-request.md"
+- ".devtools/templates/release.erb"
+- ".github/FUNDING.yml"
+- ".github/ISSUE_TEMPLATE/bug-report.md"
+- ".github/ISSUE_TEMPLATE/config.yml"
+- ".github/SUPPORT.md"
 - ".github/workflows/ci.yml"
 - ".github/workflows/docsite.yml"
+- ".github/workflows/rubocop.yml"
 - ".github/workflows/sync_configs.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - CHANGELOG.md
+- CODEOWNERS
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
@@ -127,13 +104,13 @@ files:
 - spec/shared/users_and_tasks.rb
 - spec/spec_helper.rb
 - spec/support/coverage.rb
+- spec/support/rspec_options.rb
 - spec/support/warnings.rb
 - spec/unit/rom/yesql/repository_spec.rb
 homepage: http://rom-rb.org
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -141,15 +118,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Yesql adapter for ROM
 test_files:
@@ -161,5 +137,6 @@ test_files:
 - spec/shared/users_and_tasks.rb
 - spec/spec_helper.rb
 - spec/support/coverage.rb
+- spec/support/rspec_options.rb
 - spec/support/warnings.rb
 - spec/unit/rom/yesql/repository_spec.rb

data/.github/ISSUE_TEMPLATE/----please-don-t-ask-for-support-via-issues.md

@@ -1,10 +0,0 @@
----
-name: "⚠️  Please don't ask for support via issues"
-about: See CONTRIBUTING.md for more information
-title: ''
-labels: ''
-assignees: ''
-
----
-
-

data/.github/ISSUE_TEMPLATE/---feature-request.md

@@ -1,18 +0,0 @@
----
-name: "\U0001F6E0 Feature request"
-about: See CONTRIBUTING.md for more information
-title: ''
-labels: feature
-assignees: ''
-
----
-
-Summary of what the feature is supposed to do.
-
-## Examples
-
-Code examples showing how the feature could be used.
-
-## Resources
-
-Additional information, like a link to the discussion forum thread where the feature was discussed etc.