relation 0.3.8 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e1f65b86857cd18b3d25cee2c73dd2e6a8774a1e462ff4a014713a8aa14d623
-  data.tar.gz: b9a57c23c9a5e2c035f7745a9ef5738a0bedd84f1489b168cd8b4c8c1438c93e
+  metadata.gz: dad2321dbb5e4ef524d79ca664f20f7a1d23831de4272adaf0e0327629cada11
+  data.tar.gz: 4e2662c4c9aaaa281d95b06e0ef8e231350c13c81cef3519b545cb8472d9bcff
 SHA512:
-  metadata.gz: 805a350eb86db74b7e807432cf4915d5eb081c7adc0b50de26a17eee9126be6b92d47e0461f12b83d393f5c8620ba196aa27458d093fc443e5cec13f536e7b23
-  data.tar.gz: 39c06a31e6e590ed3e5d5a9ba11d955630852c9ba374ca8334e89ac09e3c416068ddf8ee4fd82495856b0812670a79f60e67ca279d5b149d557158a5f759f389
+  metadata.gz: a1bec683b5a73845826e1c06c0449c29ad308ab8246565df5e4c22e2f8a58635cd0fcb6940d8fb4d9e17d7b271df96326cf47be1701a2a0d94ebd69c6bf7b8b9
+  data.tar.gz: 17177607e1e03c3159de5d73eeff1ee5577ccbd93166998b667f028272a3ba0d4834e6e867c054e78fb3a6d994c172724a3acb6c3ec4ae51a8f8d4c29b0e6d11

data/.github/workflows/rake.yml

@@ -1,6 +1,6 @@
+# see also https://github.com/whitequark/parser/blob/master/.github/workflows/test.yml
 name: Rake
 
-#on: [push, pull_request]
 on: [push]
 
 jobs:
@@ -8,17 +8,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-#        os: [ubuntu-latest, macos-latest]
         os: [ubuntu-latest]
-        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
-#        ruby: [2.5, 2.6, 2.7, '3.0', head, jruby, jruby-head, truffleruby, truffleruby-head]
-        ruby: [2.7]
+        ruby: ["2.7", "3.0", "3.2", head]
+        test_command: ["bundle exec rake"]
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - run: bundle exec rake
+    - name: Bundle install
+      run: |
+        bundle config path /home/runner/bundle
+        bundle install
+        bundle update
+    - run: ${{ matrix.test_command }}

data/.gitignore

@@ -8,4 +8,4 @@ coverage/
 **/*.gem
 **/*.log
 **/*.lock
-**/*.sqlite3
+**/*.sqlite3*

data/.ruby-gemset

@@ -1 +1 @@
-rails-6.1
+rails-7.0

data/.ruby-version

@@ -1 +1 @@
-ruby-2.7.2
+ruby-3.2.0

data/Gemfile

@@ -1,10 +1,12 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 gemspec
 
-gem 'rails'
+gem "rails"
 
 group :test do
-  gem 'observr'
-  gem 'rubocop', require: false
-  gem 'simplecov', require: false
+  gem "minitest-spec-rails"
+  gem "observr"
+  gem "ricecream"
+  gem "simplecov", require: false
+  gem "standard", require: false
 end

data/Gemfile.lock

@@ -1,184 +1,212 @@
 PATH
   remote: .
   specs:
-    relation (0.3.8)
-      activerecord
+    relation (0.4.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actioncable (7.0.4.1)
+      actionpack (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activestorage (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actionmailbox (7.0.4.1)
+      actionpack (= 7.0.4.1)
+      activejob (= 7.0.4.1)
+      activerecord (= 7.0.4.1)
+      activestorage (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       mail (>= 2.7.1)
-    actionmailer (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      actionview (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.4.1)
+      actionpack (= 7.0.4.1)
+      actionview (= 7.0.4.1)
+      activejob (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.3.2)
-      actionview (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.4.1)
+      actionview (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
+      rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activestorage (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actiontext (7.0.4.1)
+      actionpack (= 7.0.4.1)
+      activerecord (= 7.0.4.1)
+      activestorage (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actionview (7.0.4.1)
+      activesupport (= 7.0.4.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.3.2)
-      activesupport (= 6.1.3.2)
+    activejob (7.0.4.1)
+      activesupport (= 7.0.4.1)
       globalid (>= 0.3.6)
-    activemodel (6.1.3.2)
-      activesupport (= 6.1.3.2)
-    activerecord (6.1.3.2)
-      activemodel (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
-    activestorage (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
-      marcel (~> 1.0.0)
-      mini_mime (~> 1.0.2)
-    activesupport (6.1.3.2)
+    activemodel (7.0.4.1)
+      activesupport (= 7.0.4.1)
+    activerecord (7.0.4.1)
+      activemodel (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
+    activestorage (7.0.4.1)
+      actionpack (= 7.0.4.1)
+      activejob (= 7.0.4.1)
+      activerecord (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (7.0.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    appraisal (2.4.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
     ast (2.4.2)
     builder (3.2.4)
-    concurrent-ruby (1.1.9)
+    combustion (1.3.7)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
+      thor (>= 0.14.6)
+    concurrent-ruby (1.1.10)
     crass (1.0.6)
+    date (3.3.3)
     docile (1.4.0)
-    erubi (1.10.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.8.10)
+    erubi (1.12.0)
+    globalid (1.0.1)
+      activesupport (>= 5.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.10.0)
+    json (2.6.3)
+    language_server-protocol (3.17.0.2)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.1)
+    mail (2.8.0.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.2)
     method_source (1.0.0)
-    mini_mime (1.0.3)
-    minitest (5.14.4)
-    nio4r (2.5.7)
-    nokogiri (1.11.7-x86_64-linux)
+    mini_mime (1.1.2)
+    minitest (5.17.0)
+    minitest-spec-rails (6.2.0)
+      minitest (>= 5.0)
+      railties (>= 4.1)
+    net-imap (0.3.4)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
+    nio4r (2.5.8)
+    nokogiri (1.14.0-x86_64-linux)
       racc (~> 1.4)
     observr (1.0.5)
-    parallel (1.20.1)
-    parser (3.0.1.1)
+    parallel (1.22.1)
+    parser (3.2.0.0)
       ast (~> 2.4.1)
-    racc (1.5.2)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (6.1.3.2)
-      actioncable (= 6.1.3.2)
-      actionmailbox (= 6.1.3.2)
-      actionmailer (= 6.1.3.2)
-      actionpack (= 6.1.3.2)
-      actiontext (= 6.1.3.2)
-      actionview (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activemodel (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activestorage (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    racc (1.6.2)
+    rack (2.2.6.2)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rails (7.0.4.1)
+      actioncable (= 7.0.4.1)
+      actionmailbox (= 7.0.4.1)
+      actionmailer (= 7.0.4.1)
+      actionpack (= 7.0.4.1)
+      actiontext (= 7.0.4.1)
+      actionview (= 7.0.4.1)
+      activejob (= 7.0.4.1)
+      activemodel (= 7.0.4.1)
+      activerecord (= 7.0.4.1)
+      activestorage (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       bundler (>= 1.15.0)
-      railties (= 6.1.3.2)
-      sprockets-rails (>= 2.0.0)
+      railties (= 7.0.4.1)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
+    railties (7.0.4.1)
+      actionpack (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       method_source
-      rake (>= 0.8.7)
+      rake (>= 12.2)
       thor (~> 1.0)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.1.1)
+      zeitwerk (~> 2.5)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.6.1)
     rexml (3.2.5)
-    rubocop (1.17.0)
+    ricecream (0.2.1)
+    rubocop (1.42.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.7.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.7.0)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.24.1)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.15.2)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
-    simplecov (0.21.2)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
-    sprockets (4.0.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
-    thor (1.1.0)
-    tzinfo (2.0.4)
+    simplecov_json_formatter (0.1.4)
+    sqlite3 (1.6.0-x86_64-linux)
+    standard (1.22.0)
+      language_server-protocol (~> 3.17.0.2)
+      rubocop (= 1.42.0)
+      rubocop-performance (= 1.15.2)
+    thor (1.2.1)
+    timeout (0.3.1)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
+    unicode-display_width (2.4.2)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.4.2)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  appraisal
   bundler
+  combustion
   minitest
+  minitest-spec-rails
   observr
   rails
   rake
   relation!
-  rubocop
+  ricecream
   simplecov
   sqlite3
+  standard
 
 BUNDLED WITH
-   2.2.17
+   2.4.1

data/MIT-LICENSE

@@ -1,4 +1,6 @@
-Copyright 2015-2021 Dittmar Krall - www.matique.com
+The MIT License (MIT)
+
+Copyright (c) 2015-2023 Dittmar Krall (www.matiq.com)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -5,7 +5,7 @@ AFAIK, Relation can replace all kind of relationships in a Rails database.
 The gem stores the relationships in a additional table (named
 "relations") containing
 triples (name of relationship, from:id, to_id).
-No additional column/field is required in a particular tables.
+No additional column/field is required in a particular table.
 Adding/removing a relationship do not required a migration.
 
 Is it recommendable? Well, you should know.
@@ -28,20 +28,17 @@ i.e. you are responsible for them.
 ## Installation
 
 As usual:
-
-    $ [sudo] gem install relation
-
-or:
-
-    # Gemfile file
-    gem 'relation'
-
-    $ bundle
+``` ruby
+# Gemfile
+gem "relation"
+```
+and run "bundle install".
 
 Furthermore the association table (an n-ways-join table) must be
 installed and migrated.
-You may copy the migration "db/migrate/20150810152808_relation.rb"
+You may copy the migration "./db/migrate/003_create_relations.rb"
 from the gem.
+Add indexes if required (benchmarking give clues).
 The migration is then done, as usual, by:
 
     $ rails db:migrate
@@ -50,17 +47,19 @@ The migration is then done, as usual, by:
 
 In short (order* and user* are instances of ActiveRecords):
 
-    Relation.add order, user
-    Relation.add order, user2
-    Relation.add order2, user2
+``` ruby
+Relation.add order, user
+Relation.add order, user2
+Relation.add order2, user2
 
-    Relation.references order, User   # -> [user, user2]
-    Relation.references order2, User  # -> [user2]
-    Relation.followers  Order, user   # -> [order]
-    Relation.followers  Order, user2  # -> [order, order2]
+Relation.references order, User   # -> [user, user2]
+Relation.references order2, User  # -> [user2]
+Relation.followers  Order, user   # -> [order]
+Relation.followers  Order, user2  # -> [order, order2]
 
-    Relation.delete     order2, user2
-    Relation.followers  Order, user2  # -> [order]
+Relation.delete     order2, user2
+Relation.followers  Order, user2  # -> [order]
+```
 
 See also the tests.
 
@@ -76,15 +75,21 @@ and cleaned by:
 
 Above mentioned methods are based on the following low level methods:
 
-    Relation.add_raw(name, from_id, to_id)
-    Relation.delete_raw(name, from_id, to_id)
-    Relation.references_raw(name, from_id)
-    Relation.followers_raw(name, to_id)
+``` ruby
+Relation.add_raw(name, from_id, to_id)
+Relation.delete_raw(name, from_id, to_id)
+Relation.references_raw(name, from_id)
+Relation.followers_raw(name, to_id)
+```
 
 They may be used for relationships which can not be based on the
 class name of the ActiveRecords.
 Keep in mind that dangling relations must be handled by yourself.
 
+** Version 4
+
+Version 4.+ is intended for Rails 7.
+
 ## Rails 6
 
 This gem is intended for Rails 6.
@@ -92,4 +97,9 @@ Rails 5 should work fine.
 
 Older Rails versions may use "gem 'relation', '= 0.1.1'".
 
-## License MIT
+## Miscellaneous
+
+Copyright (c) 2015-2023 Dittmar Krall (www.matiq.com),
+released under the MIT license:
+
+* https://opensource.org/licenses/MIT

data/Rakefile

@@ -1,10 +1,10 @@
-require 'rake/testtask'
+require "rake/testtask"
 
-desc 'Run the tests.'
+desc "Run the tests."
 Rake::TestTask.new do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
+  t.libs << "lib"
+  t.libs << "test"
+  t.pattern = "test/**/*_test.rb"
   t.verbose = false
 end
 

data/app/models/dangling.rb

@@ -1,16 +1,17 @@
-# extended Relation: extracts relation from rows
+# frozen_string_literal: true
 
 class Relation < ActiveRecord::Base
+  # dangling relations
   def self.dangling
     names = Relation.pluck(:name).uniq
     models = []
-    names.each { |name| models |= name.split(' ') }
+    names.each { |name| models |= name.split(" ") }
     hsh = {}
     models.each do |class_name|
       klass = class_name.constantize
       ids = klass.pluck(:id)
-      idx = Relation.where('name like ?', "#{class_name} %").pluck(:from_id)
-      idy = Relation.where('name like ?', "% #{class_name}").pluck(:to_id)
+      idx = Relation.where("name like ?", "#{class_name} %").pluck(:from_id)
+      idy = Relation.where("name like ?", "% #{class_name}").pluck(:to_id)
       arr = (idx | idy) - ids
       hsh[class_name] = arr if arr.length.positive?
     end
@@ -20,8 +21,8 @@ class Relation < ActiveRecord::Base
   def self.remove_dangling(hsh)
     hsh.each do |name, arr|
       arr.each do |idx|
-        Relation.where(from_id: idx).where('name like ?', "#{name} %").delete_all
-        Relation.where(to_id: idx).where('name like ?', "% #{name}").delete_all
+        Relation.where(from_id: idx).where("name like ?", "#{name} %").delete_all
+        Relation.where(to_id: idx).where("name like ?", "% #{name}").delete_all
       end
     end
   end

data/app/models/relation.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 class Relation < ActiveRecord::Base
   def self.add_raw(name, from_id, to_id)
-    hsh = { name: name, from_id: from_id, to_id: to_id }
+    hsh = {name: name, from_id: from_id, to_id: to_id}
     Relation.create!(hsh) if Relation.where(hsh).first.nil?
   end
 
   def self.delete_raw(name, from_id, to_id)
-    hsh = { name: name, from_id: from_id, to_id: to_id }
+    hsh = {name: name, from_id: from_id, to_id: to_id}
     Relation.where(hsh).delete_all
   end
 

data/app/models/relation_ext.rb

@@ -1,5 +1,7 @@
-# extended Relation: extracts relation from rows
+# frozen_string_literal: true
+
 class Relation < ActiveRecord::Base
+  # extended Relation
   def self.add(row_from, row_to)
     hsh = normalize(row_from, row_to)
     Relation.create!(hsh) if Relation.where(hsh).first.nil?
@@ -25,16 +27,16 @@ class Relation < ActiveRecord::Base
   end
 
   def self.name_id(resource)
-    raise 'missing resource' unless resource
+    raise "missing resource" unless resource
 
     [resource.class.name, resource.id]
   end
 
   def self.normalize(row_from, row_to)
     name_from, from_id = name_id(row_from)
-    name_to, to_id     = name_id(row_to)
+    name_to, to_id = name_id(row_to)
     name = "#{name_from} #{name_to}"
-    { name: name, from_id: from_id, to_id: to_id }
+    {name: name, from_id: from_id, to_id: to_id}
   end
 
   def self.normalize2(kind, row)

data/db/migrate/{20150810152808_relation.rb → 003_create_relations.rb}

@@ -1,7 +1,7 @@
-class CreateRelations < ActiveRecord::Migration[5.2]
+class CreateRelations < ActiveRecord::Migration[7.0]
   def change
     create_table :relations, id: false do |t|
-      t.string     :name
+      t.string :name
       t.references :from, null: false
       t.references :to, null: false
       t.timestamps

data/lib/relation/engine.rb

@@ -1,26 +1,4 @@
-# rubocop: disable all
-
 module ModRelation
-  class Engine < Rails::Engine
-    isolate_namespace ModRelation
-
-    # # https://github.com/rails/rails/issues/22261
-    #     initializer :append_migrations do |app|
-    #       config.paths['db/migrate'].expanded.each do |path|
-    #         app.config.paths['db/migrate'] << path
-    #         ActiveRecord::Migrator.migrations_paths << path
-    #       end
-    #     end
-
-    # # https://github.com/rails/rails/issues/22261
-    # module ActiveRecord
-    # #module ActiveRecord::Current
-    #   class Schema < Migration
-    #     def migrations_paths
-    #       (ActiveRecord::Migrator.migrations_paths +
-    #        Rails.application.paths['db/migrate'].to_a).uniq
-    #     end
-    #   end
-    # end
+  class Engine < ::Rails::Engine
   end
 end