relation 0.3.5 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93715ff3317b45a8eaca2ef3535a5e302c425d15da1ac6d0d3a5769f246c530c
-  data.tar.gz: 8d24db836b7135dfbfd7cf11a1853f30fef528fcce6123a0980c0cbf568d77fc
+  metadata.gz: 853bc18cefd0604f0b9292840ea11d6ba76ec7375bf0d9802cf078f61c7b4823
+  data.tar.gz: 82bb8714278faf2abe55bcae1387443783e1fec691dc54c1bc0585991b2d90f2
 SHA512:
-  metadata.gz: 4446a651fc0ba70ba460c81375f84cfe0e58045f5d30e5631a389ecd639197b9ffcc6aeb804eb133db6b7e677e4a38135ab234d2a88394e895314d5ca6dd3acb
-  data.tar.gz: 312cee0a84e13b28caa953226707dc805692c30da46805bd1b2e0d2bf4be6ef4fc03ad675376facff37b7840ade293e402b04d304a82f9e0839e85561c31061a
+  metadata.gz: 5b25cebb6364b1978bcc3c447adb9407d31d191483c26adc3da12eae5dda385d00ab250476de1775bb9101ea1b60a41c79b9f6aad03f6512f6ed812c0292a722
+  data.tar.gz: 5f2f0501587bb4b3cdba3b9190759ed6ed0fedc4da7938dcba4f0693eab3d5a989c32ede95accf0d59b2224cf215e38d6f8cb9252ba4396d3341f9f58b48a2d3

data/.rubocop.yml

@@ -1,51 +1,8 @@
-# rubocop --auto-gen-config
-# rubocop
-# rubocop:disable all
-
-#inherit_from: .rubocop_todo.yml
+inherit_from:
+  - ~/configs/.rubocop.yml
 
 AllCops:
   Include:
-    - '**/*.rb'
-#    - 'lib/**/*.rb'
-#    - '**/*.gemfile'
-
-  Exclude:
-    - 'gemfiles/*'
-#    - 'test/**/*_test.rb'
-    - '**/*_test.rb'
-    - lib/relation/version.rb
-#    - !ruby/regexp /old_and_unused\.rb$/
-
-Bundler/OrderedGems:
+    - 'lib/**/*.rb'
   Exclude:
-    - 'Gemfile'
-
-Layout/AccessModifierIndentation:
-  Enabled: false
-Layout/EmptyLinesAroundAccessModifier:
-  Enabled: false
-Layout/LineLength:
-  Enabled: false
-
-Metrics/AbcSize:
-  Enabled: false
-Metrics/MethodLength:
-  Enabled: false
-
-Style/HashEachMethods:
-  Enabled: false
-Style/HashTransformKeys:
-  Enabled: false
-Style/HashTransformValues:
-  Enabled: false
-
-Style/ClassAndModuleChildren:
-  Enabled: false
-Style/Documentation:
-  Enabled: false
-Style/FrozenStringLiteralComment:
-  Enabled: false
-#Style/WhenThen:
-#  Exclude:
-#    - '.watchr'
+    - 'test/**/*'

data/.ruby-version

@@ -1 +1 @@
-ruby-2.6.5
+ruby-2.6.6

data/.travis.yml

@@ -13,7 +13,8 @@ bundler_args: --without production
 #bundler_args: --without development
 
 rvm:
-  - 2.6.5  # 2019-10-29
+  - 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
@@ -26,7 +27,7 @@ rvm:
 
 gemfile:
   - gemfiles/rails_6.0.gemfile
-  - gemfiles/rails_5.2.gemfile
+#  - gemfiles/rails_5.2.gemfile
 #  - gemfiles/rails_5.1.gemfile
 #  - gemfiles/rails_5.0.gemfile
 #  - gemfiles/rails_4.gemfile

data/.watchr

@@ -16,36 +16,30 @@ 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 %(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) }
+  %w[test spec].each { |dir| run "rake #{dir}" if  File.exist?(dir) }
 end
 
 def run_matching_files(base)
   base = base.split('_').first
-  %w{test spec}.each { |type|
+  %w[test spec].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|
+%w[test spec].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] }
 }
-%w{rb erb haml slim}.each { |type|
-  watch("app/.*/.*\.#{type}") { |m|
-    run_matching_files("#{m[0].split('/').at(2).split('.').first}")
-  }
-}
 
 # Ctrl-\ or ctrl-4
     Signal.trap('QUIT') { run_all_tests }

data/Gemfile

@@ -5,4 +5,6 @@ gem 'rails'
 
 group :test do
   gem 'observr'
+  gem 'rubocop', require: false
+  gem 'simplecov', require: false
 end

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2015-2020 Dittmar Krall - http://matique.de
+Copyright 2015-2020 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/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/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,3 +1,5 @@
+# rubocop: disable all
+
 module ModRelation
   class Engine < Rails::Engine
     isolate_namespace ModRelation

data/lib/relation/version.rb

@@ -1,7 +1,9 @@
-# frozen_string_literal: true
+# rubocop: disable all
 
 module ModRelation
-  VERSION = '0.3.5'  # 2020-03-03
+  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

data/relation.gemspec

@@ -22,13 +22,12 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,features}/*`.split("\n")
   s.require_paths = ['lib', 'app']
 
-  s.add_dependency 'activerecord'
+  s.add_dependency 'activerecord', '~>6'
 
-  s.add_development_dependency 'appraisal'
-  s.add_development_dependency 'bundler'
-  s.add_development_dependency 'rake'
+  s.add_development_dependency 'bundler', '~>1'
+  s.add_development_dependency 'rake', '~>13'
+  s.add_development_dependency 'appraisal', '~>2'
 
-  s.add_development_dependency 'minitest'
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'minitest', '~>5'
+  s.add_development_dependency 'sqlite3', '~>1'
 end

data/test/test_helper.rb

@@ -1,9 +1,10 @@
-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'
 

metadata

@@ -1,113 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: relation
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.7
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2020-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  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'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 description: "    A Rails gem that adds simple support for organizing ActiveRecord
   models.\n"
 email: