relation 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 853bc18cefd0604f0b9292840ea11d6ba76ec7375bf0d9802cf078f61c7b4823
-  data.tar.gz: 82bb8714278faf2abe55bcae1387443783e1fec691dc54c1bc0585991b2d90f2
+  metadata.gz: 5e1f65b86857cd18b3d25cee2c73dd2e6a8774a1e462ff4a014713a8aa14d623
+  data.tar.gz: b9a57c23c9a5e2c035f7745a9ef5738a0bedd84f1489b168cd8b4c8c1438c93e
 SHA512:
-  metadata.gz: 5b25cebb6364b1978bcc3c447adb9407d31d191483c26adc3da12eae5dda385d00ab250476de1775bb9101ea1b60a41c79b9f6aad03f6512f6ed812c0292a722
-  data.tar.gz: 5f2f0501587bb4b3cdba3b9190759ed6ed0fedc4da7938dcba4f0693eab3d5a989c32ede95accf0d59b2224cf215e38d6f8cb9252ba4396d3341f9f58b48a2d3
+  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

@@ -2,6 +2,7 @@ inherit_from:
   - ~/configs/.rubocop.yml
 
 AllCops:
+  NewCops: enable
   Include:
     - 'lib/**/*.rb'
   Exclude:

data/.ruby-gemset

@@ -1 +1 @@
-rails-6.0
+rails-6.1

data/.ruby-version

@@ -1 +1 @@
-ruby-2.6.6
+ruby-2.7.2

data/.watchr

@@ -1,3 +1,4 @@
+TESTING = %w[test]
 HH = '#' * 22  unless defined?(HH)
 H = '#' * 5    unless defined?(H)
 
@@ -16,7 +17,7 @@ end
 
 def run_it(type, file)
   case type
-  when 'test';  run %(ruby -I test #{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
@@ -24,21 +25,31 @@ end
 
 def run_all_tests
   puts "\n#{HH} Running all tests #{HH}\n"
-  %w[test spec].each { |dir| run "rake #{dir}" if  File.exist?(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(".*/(.*)\.#{type}") { |match|
+    run_matching_files(match[1])
+  }
 }
 
 # Ctrl-\ or ctrl-4

data/Appraisals

@@ -1,11 +1,15 @@
-appraise 'rails-6.0' do
-  gem 'rails', '~> 6.0.0'
+appraise 'rails-6.1' do
+  gem 'rails', '~> 6.1'
 end
 
-appraise 'rails-5.2' do
-  gem 'rails', '~> 5.2.0'
+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/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2015-2020 Dittmar Krall - www.matique.com
+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

data/gemfiles/rails_6.0.gemfile

@@ -2,10 +2,12 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 6.0.0"
+gem "rails", "~> 6.0"
 
 group :test do
   gem "observr"
+  gem "rubocop", require: false
+  gem "simplecov", require: false
 end
 
 gemspec path: "../"

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

@@ -2,10 +2,12 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.2.0"
+gem "rails", "~> 6.1"
 
 group :test do
   gem "observr"
+  gem "rubocop", require: false
+  gem "simplecov", require: false
 end
 
 gemspec path: "../"

data/lib/relation/version.rb

@@ -1,7 +1,8 @@
 # rubocop: disable all
 
 module ModRelation
-  VERSION = '0.3.7'  # 2020-07-14
+  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

data/relation.gemspec

@@ -13,21 +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', '~>6'
+  s.add_dependency 'activerecord'
 
-  s.add_development_dependency 'bundler', '~>1'
-  s.add_development_dependency 'rake', '~>13'
-  s.add_development_dependency 'appraisal', '~>2'
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'appraisal'
 
-  s.add_development_dependency 'minitest', '~>5'
-  s.add_development_dependency 'sqlite3', '~>1'
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'sqlite3'
 end

metadata

@@ -1,99 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: relation
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-14 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: '6'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 description: "    A Rails gem that adds simple support for organizing ActiveRecord
   models.\n"
 email:
@@ -102,11 +102,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/rake.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - ".watchr"
 - Appraisals
 - Gemfile
@@ -118,8 +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
@@ -132,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:
@@ -149,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.6
 signing_key: 
 specification_version: 4
 summary: Provides a simple directed relationship between active_record models.

data/.travis.yml

@@ -1,43 +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.6  # 2020-07-14
-#  - 2.6.5  # 2019-10-29
-#  - 2.6.4  # 2019-10-04
-#  - 2.6.3  # 2019-06-21
-#  - 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_6.0.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