relation 0.3.2 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6af933150f769ef1b3ea7ebcabd92d9849daff067c609b7035641fe07f8a3405
-  data.tar.gz: b19581aea5a5570d839e2ff05e156f2f8e8b72f30a504824c7db9a07120b71d0
+  metadata.gz: 5e1f65b86857cd18b3d25cee2c73dd2e6a8774a1e462ff4a014713a8aa14d623
+  data.tar.gz: b9a57c23c9a5e2c035f7745a9ef5738a0bedd84f1489b168cd8b4c8c1438c93e
 SHA512:
-  metadata.gz: d5ffa2ff55b51d48a8c8b7dc33cfd977ad922be836af587cfb5b9e6912f2684267a1dc2db71929a3f3e1406cc43e87e7cf4f677197f45ccff15a7e633795637f
-  data.tar.gz: 61851fc597c04808de3dabb5ac05b4299cf2928763879bd92e6fbdc8cb2f07abcd993a7ea1ddb369ef6e6064f23aa4c1ee798da8d338b08386b276cd8cef2466
+  metadata.gz: 805a350eb86db74b7e807432cf4915d5eb081c7adc0b50de26a17eee9126be6b92d47e0461f12b83d393f5c8620ba196aa27458d093fc443e5cec13f536e7b23
+  data.tar.gz: 39c06a31e6e590ed3e5d5a9ba11d955630852c9ba374ca8334e89ac09e3c416068ddf8ee4fd82495856b0812670a79f60e67ca279d5b149d557158a5f759f389

data/.github/workflows/rake.yml

@@ -0,0 +1,24 @@
+name: Rake
+
+#on: [push, pull_request]
+on: [push]
+
+jobs:
+  test:
+    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]
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v2
+    - 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

data/.rubocop.yml

@@ -0,0 +1,9 @@
+inherit_from:
+  - ~/configs/.rubocop.yml
+
+AllCops:
+  NewCops: enable
+  Include:
+    - 'lib/**/*.rb'
+  Exclude:
+    - 'test/**/*'

data/.ruby-gemset

@@ -1 +1 @@
-rails-5.2
+rails-6.1

data/.ruby-version

@@ -1 +1 @@
-ruby-2.6.1
+ruby-2.7.2

data/.watchr

@@ -1,3 +1,4 @@
+TESTING = %w[test]
 HH = '#' * 22  unless defined?(HH)
 H = '#' * 5    unless defined?(H)
 
@@ -16,34 +17,38 @@ end
 
 def run_it(type, file)
   case type
-  when 'test';  run %Q{ruby -I test #{file}}
-#  when 'spec';  run %Q{spring rspec -X #{file}}
+  when 'test';  run %(bundle exec ruby -I test #{file})
+#  when 'spec';  run %(rspec -X #{file})
   else;         puts "#{H} unknown type: #{type}, file: #{file}"
   end
 end
 
 def run_all_tests
   puts "\n#{HH} Running all tests #{HH}\n"
-#  %w{test spec}.each { |dir| run "spring rake #{dir} RAILS_ENV=test"  if  File.exists?(dir) }
-#  %w{test}.each { |dir| run "spring rake #{dir} RAILS_ENV=test"  if  File.exists?(dir) }
-  %w{test}.each { |dir| run "rake #{dir} RAILS_ENV=test"  if  File.exists?(dir) }
+  TESTING.each { |dir| run "bundle exec rake #{dir}" if  File.exist?(dir) }
 end
 
 def run_matching_files(base)
   base = base.split('_').first
-  %w{test spec}.each { |type|
+  TESTING.each { |type|
     files = Dir["#{type}/**/*.rb"].select { |file| file =~ /#{base}_.*\.rb/ }
     run_it type, files.join(' ')  unless files.empty?
   }
 end
 
-%w{test spec}.each { |type|
+TESTING.each { |type|
   watch("#{type}/#{type}_helper\.rb") { run_all_tests }
+  watch('lib/.*\.rb')                 { run_all_tests }
   watch("#{type}/.*/*_#{type}\.rb")   { |match| run_it type, match[0] }
+  watch("#{type}/data/(.*)\.rb") { |match|
+    m1 = match[1]
+    run_matching_files("#{type}/#{m1}/#{m1}_#{type}.rb")
+  }
 }
-%w{rb erb haml slim}.each { |type|
-  watch("app/.*/.*\.#{type}") { |m|
-    run_matching_files("#{m[0].split('/').at(2).split('.').first}")
+
+%w[rb erb haml slim].each { |type|
+  watch(".*/(.*)\.#{type}") { |match|
+    run_matching_files(match[1])
   }
 }
 

data/Appraisals

@@ -1,7 +1,15 @@
-appraise 'rails-5.2' do
-  gem 'rails', '~> 5.2.0'
+appraise 'rails-6.1' do
+  gem 'rails', '~> 6.1'
 end
 
+appraise 'rails-6.0' do
+  gem 'rails', '~> 6.0'
+end
+
+#appraise 'rails-5.2' do
+#  gem 'rails', '~> 5.2.0'
+#end
+#
 #appraise 'rails-5.0' do
 #  gem 'rails', '~> 5.0.0'
 #end

data/Gemfile

@@ -1,11 +1,10 @@
 source 'https://rubygems.org'
-#ruby '2.6.1'
 gemspec
 
 gem 'rails'
 
 group :test do
   gem 'observr'
-  gem 'sqlite3', '!= 1.4.0'
-#  gem 'sqlite3'
+  gem 'rubocop', require: false
+  gem 'simplecov', require: false
 end

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2015-2019 Dittmar Krall - http://matique.de
+Copyright 2015-2021 Dittmar Krall - www.matique.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

@@ -1,6 +1,5 @@
 # Relation
 [![Gem Version](https://badge.fury.io/rb/relation.png)](http://badge.fury.io/rb/relation)
-[![Build Status](https://travis-ci.org/matique/relation.png?branch=master)](https://travis-ci.org/matique/relation)
 
 AFAIK, Relation can replace all kind of relationships in a Rails database.
 The gem stores the relationships in a additional table (named
@@ -49,7 +48,7 @@ The migration is then done, as usual, by:
 
 ## Usage
 
-In short (order* and user* are ActiveRecords):
+In short (order* and user* are instances of ActiveRecords):
 
     Relation.add order, user
     Relation.add order, user2
@@ -86,9 +85,11 @@ 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.
 
-## Rails 5
+## Rails 6
+
+This gem is intended for Rails 6.
+Rails 5 should work fine.
 
-This gem is intended for Rails 5.
 Older Rails versions may use "gem 'relation', '= 0.1.1'".
 
 ## License MIT

data/Rakefile

@@ -1,13 +1,11 @@
-# credits to https://github.com/jollygoodcode/jollygoodcode.github.io/issues/21
-require "rubygems"
-require "bundler/setup"
+require 'rake/testtask'
 
-require 'bundler/gem_tasks'
-
-desc "Run the tests."
-task :test do
-  $: << "lib" << "test"
-  Dir["test/*_test.rb"].each { |f| require f[5..-4] }
+desc 'Run the tests.'
+Rake::TestTask.new do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
 end
 
-task :default => :test
+task default: :test

data/app/models/dangling.rb

@@ -1,31 +1,28 @@
 # extended Relation: extracts relation from rows
-class Relation < ActiveRecord::Base
 
+class Relation < ActiveRecord::Base
   def self.dangling
     names = Relation.pluck(:name).uniq
     models = []
-    names.each { |name|
-      models |= name.split(' ')
-    }
+    names.each { |name| models |= name.split(' ') }
     hsh = {}
-    models.each { |class_name|
+    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)
       arr = (idx | idy) - ids
-      hsh[class_name] = arr  if arr.length > 0
-    }
+      hsh[class_name] = arr if arr.length.positive?
+    end
     hsh
   end
 
   def self.remove_dangling(hsh)
-    hsh.each { |name, arr|
-      arr.each { |idx|
-	Relation.where(from_id: idx).where('name like ?', "#{name} %").delete_all
-	Relation.where(to_id: idx).where('name like ?', "% #{name}").delete_all
-      }
-    }
+    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
+      end
+    end
   end
-
 end

data/app/models/relation.rb

@@ -1,8 +1,7 @@
 class Relation < ActiveRecord::Base
-
   def self.add_raw(name, from_id, to_id)
     hsh = { name: name, from_id: from_id, to_id: to_id }
-    Relation.create!(hsh)  if Relation.where(hsh).first == nil
+    Relation.create!(hsh) if Relation.where(hsh).first.nil?
   end
 
   def self.delete_raw(name, from_id, to_id)
@@ -17,5 +16,4 @@ class Relation < ActiveRecord::Base
   def self.followers_raw(name, to_id)
     Relation.where(name: name, to_id: to_id).pluck(:from_id)
   end
-
 end

data/app/models/relation_ext.rb

@@ -1,9 +1,8 @@
 # extended Relation: extracts relation from rows
 class Relation < ActiveRecord::Base
-
   def self.add(row_from, row_to)
     hsh = normalize(row_from, row_to)
-    Relation.create!(hsh)  if Relation.where(hsh).first == nil
+    Relation.create!(hsh) if Relation.where(hsh).first.nil?
   end
 
   def self.delete(row_from, row_to)
@@ -25,9 +24,9 @@ class Relation < ActiveRecord::Base
     klass.where(id: ids)
   end
 
- private
   def self.name_id(resource)
-    raise 'missing resource'  unless resource
+    raise 'missing resource' unless resource
+
     [resource.class.name, resource.id]
   end
 
@@ -40,9 +39,8 @@ class Relation < ActiveRecord::Base
 
   def self.normalize2(kind, row)
     klass = kind
-    klass = kind.constantize  unless klass.kind_of?(Class)
+    klass = kind.constantize unless klass.is_a?(Class)
     name, id = name_id(row)
     [klass, name, id]
   end
-
 end

data/gemfiles/{rails_5.2.gemfile → rails_6.0.gemfile}

@@ -2,11 +2,12 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.2.0"
+gem "rails", "~> 6.0"
 
 group :test do
   gem "observr"
-  gem "sqlite3", "!= 1.4.0"
+  gem "rubocop", require: false
+  gem "simplecov", require: false
 end
 
 gemspec path: "../"

data/gemfiles/rails_6.1.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.1"
+
+group :test do
+  gem "observr"
+  gem "rubocop", require: false
+  gem "simplecov", require: false
+end
+
+gemspec path: "../"

data/lib/relation.rb

@@ -1,3 +1,5 @@
+# rubocop: disable all
+
 require 'relation/engine.rb'
 require 'models/relation.rb'
 require 'models/relation_ext.rb'

data/lib/relation/engine.rb

@@ -1,25 +1,26 @@
+# 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
+    #     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
   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

data/lib/relation/version.rb

@@ -1,5 +1,13 @@
+# rubocop: disable all
+
 module ModRelation
-  VERSION = '0.3.2'  # 2019-03-05
-#  VERSION = '0.3.1'  # 2018-08-05
-#  VERSION = '0.3.0'  #
+  VERSION = '0.3.8'  # 2021-06-22
+# VERSION = '0.3.7'  # 2020-07-14
+# VERSION = '0.3.6'  # 2020-04-27
+# VERSION = '0.3.5'  # 2020-03-03
+# VERSION = '0.3.4'  # 2019-10-04
+# VERSION = '0.3.3'  # 2019-03-23
+# VERSION = '0.3.2'  # 2019-03-05
+# VERSION = '0.3.1'  # 2018-08-05
+# VERSION = '0.3.0'  #
 end

data/relation.gemspec

@@ -13,22 +13,22 @@ Gem::Specification.new do |s|
   s.authors     = ['Dittmar Krall']
   s.email       = ['dittmar.krall@matique.de']
   s.homepage    = 'https://github.com/matique/relation'
-
   s.license     = 'MIT'
   s.platform    = Gem::Platform::RUBY
 
+  s.metadata['source_code_uri'] = 'https://github.com/matique/relation'
+
   s.files         = `git ls-files`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.test_files    = `git ls-files -- {test,features}/*`.split("\n")
   s.require_paths = ['lib', 'app']
 
-  s.add_dependency 'activerecord', '~> 5'
+  s.add_dependency 'activerecord'
 
-  s.add_development_dependency 'appraisal'
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'
+  s.add_development_dependency 'appraisal'
 
   s.add_development_dependency 'minitest'
-  s.add_development_dependency 'simplecov'
   s.add_development_dependency 'sqlite3'
 end

data/test/support/database.rb

@@ -1,22 +1,22 @@
 class DB
-  ActiveRecord::Base.establish_connection adapter: "sqlite3",
-		database: ":memory:"
+  ActiveRecord::Base.establish_connection adapter: 'sqlite3',
+                                          database: ':memory:'
 
   def self.setup
     capture_stdout do
       ActiveRecord::Base.logger
       ActiveRecord::Schema.define(version: 1) do
-	create_table :orders do |t|
-	  t.column :name, :string
-	end
-	create_table :users do |t|
-	  t.column :name, :string
-	end
-	create_table :relations, id: false do |t|
-	  t.string     :name
-	  t.references :from, null: false
-	  t.references :to, null: false
-	end
+        create_table :orders do |t|
+          t.column :name, :string
+        end
+        create_table :users do |t|
+          t.column :name, :string
+        end
+        create_table :relations, id: false do |t|
+          t.string     :name
+          t.references :from, null: false
+          t.references :to, null: false
+        end
       end
 
       Order.reset_column_information
@@ -26,17 +26,16 @@ class DB
   def self.teardown
     if ActiveRecord::Base.connection.respond_to?(:data_sources)
       ActiveRecord::Base.connection.data_sources.each do |table|
-	ActiveRecord::Base.connection.drop_table(table)
+        ActiveRecord::Base.connection.drop_table(table)
       end
     else
       ActiveRecord::Base.connection.tables.each do |table|
-	ActiveRecord::Base.connection.drop_table(table)
+        ActiveRecord::Base.connection.drop_table(table)
       end
     end
   end
 
- private
-  def self.capture_stdout(&block)
+  def self.capture_stdout
     real_stdout = $stdout
 
     $stdout = StringIO.new
@@ -45,7 +44,6 @@ class DB
   ensure
     $stdout = real_stdout
   end
-
 end
 
 class Order < ActiveRecord::Base
@@ -54,6 +52,6 @@ end
 class User < ActiveRecord::Base
 end
 
-require_relative ('../../app/models/relation')
-require_relative ('../../app/models/relation_ext')
-require_relative ('../../app/models/dangling')
+require_relative '../../app/models/relation'
+require_relative '../../app/models/relation_ext'
+require_relative '../../app/models/dangling'

data/test/test_helper.rb

@@ -1,14 +1,15 @@
-require 'simplecov'
-SimpleCov.start do
-  add_filter '/test/'
+if ENV['COVERAGE']
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter '/test/'
+  end
 end
 
-ENV["RAILS_ENV"] = "test"
 require 'active_record'
 require 'minitest/autorun'
 
 # Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each { |f| require f }
 
 class Minitest::Test
   require 'active_support/testing/assertions'

metadata

@@ -1,37 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: relation
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.8
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2021-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -67,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -116,10 +102,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/rake.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - ".watchr"
 - Appraisals
 - Gemfile
@@ -131,7 +118,8 @@ files:
 - app/models/relation.rb
 - app/models/relation_ext.rb
 - db/migrate/20150810152808_relation.rb
-- gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.1.gemfile
 - lib/relation.rb
 - lib/relation/engine.rb
 - lib/relation/version.rb
@@ -144,7 +132,8 @@ files:
 homepage: https://github.com/matique/relation
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/matique/relation
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -161,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.2.6
 signing_key: 
 specification_version: 4
 summary: Provides a simple directed relationship between active_record models.

data/.travis.yml

@@ -1,38 +0,0 @@
-language: ruby
-sudo: false
-
-## speeding up
-#env:
-#  - TEST_SUITE=units
-#  - TEST_SUITE=integration
-#
-#script: "bundle exec rake test:$TEST_SUITE"
-
-#bundler_args: --without test
-bundler_args: --without production
-#bundler_args: --without development
-
-rvm:
-  - 2.6.1  # 2019-03-05
-#  - 2.5.1  # 2018-04-27
-#  - 2.5.0  # 2018-02-22
-#  - 2.4.1  # tested: working for Rails 5
-#  - 2.3.1  # tested: working for Rails 5
-#  - 2.2.7  # tested: working for Rails 5
-#  - 2.2.0  # tested: failing for Rails 5
-
-gemfile:
-  - gemfiles/rails_5.2.gemfile
-#  - gemfiles/rails_5.1.gemfile
-#  - gemfiles/rails_5.0.gemfile
-#  - gemfiles/rails_4.gemfile
-
-notifications:
-  email: false
-
-matrix:
-#  allow_failures:
-#    - gemfile: gemfiles/rails_5.0.gemfile
-#      rvm: 2.2.0
-#    - gemfile: gemfiles/rails_5.1.gemfile
-#      rvm: 2.2.0