relation 0.3.8 → 0.4.2

data/lib/relation/version.rb

@@ -1,13 +1,16 @@
 # rubocop: disable all
 
 module ModRelation
-  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'  #
+  VERSION = "0.4.2"  # 2023-01-19
+  # VERSION = "0.4.1"  # 2023-01-18
+  # VERSION = "0.4.0"  # 2023-01-12
+  # 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/lib/relation.rb

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

data/relation.gemspec

@@ -1,34 +1,29 @@
-$:.push File.expand_path('../lib', __FILE__)
-require 'relation/version'
+require_relative "lib/relation/version"
 
 Gem::Specification.new do |s|
-  s.name        = 'relation'
-  s.version     = ModRelation::VERSION
-  s.summary     = <<-'END'
-    Provides a simple directed relationship between active_record models.
+  s.name = "relation"
+  s.version = ModRelation::VERSION
+  s.summary = <<-'END'
+    Rails gem adding relationships between ActiveRecord models.
   END
   s.description = <<-'END'
     A Rails gem that adds simple support for organizing ActiveRecord models.
+    Relationships are stored in one additional database table.
   END
-  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.authors = ["Dittmar Krall"]
+  s.email = ["dittmar.krall@matiq.com"]
+  s.homepage = "https://matiq.com"
+  s.license = "MIT"
+  s.platform = Gem::Platform::RUBY
 
-  s.metadata['source_code_uri'] = 'https://github.com/matique/relation'
+  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.files = `git ls-files`.split("\n")
+  s.require_paths = ["lib", "app"]
 
-  s.add_dependency 'activerecord'
-
-  s.add_development_dependency 'bundler'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'appraisal'
-
-  s.add_development_dependency 'minitest'
-  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency "bundler"
+  s.add_development_dependency "combustion"
+  s.add_development_dependency "minitest"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "sqlite3"
 end

data/test/dangling_test.rb

@@ -1,40 +1,35 @@
-require 'test_helper'
+require "test_helper"
 
 describe Relation do
-  let(:user)   { User.create! name: 'user' }
-  let(:user2)  { User.create! name: 'user2' }
-  let(:order)  { Order.create! name: 'order' }
-  let(:order2) { Order.create! name: 'order2' }
+  let(:user) { User.create! email: "info@sample.com" }
+  let(:user2) { User.create! email: "info2@sample.com" }
+  let(:order) { Order.create! name: "order" }
+  let(:order2) { Order.create! name: "order2" }
 
   def setup
-    DB.setup
-
-    Relation.add user,  order
+    Relation.delete_all
+    Relation.add user, order
     Relation.add user2, order
     Relation.add user2, order2
   end
 
-  def teardown
-    DB.teardown
-  end
-
   it "test remove dangling #1" do
-    hsh = { 'User' => [user.id] }
-    assert_difference('Relation.count', -1) do
+    hsh = {"User" => [user.id]}
+    assert_difference("Relation.count", -1) do
       Relation.remove_dangling(hsh)
     end
   end
 
   it "test remove dangling #2" do
-    hsh = { 'User' => [user2.id] }
-    assert_difference('Relation.count', -2) do
+    hsh = {"User" => [user2.id]}
+    assert_difference("Relation.count", -2) do
       Relation.remove_dangling(hsh)
     end
   end
 
   it "test remove dangling #3" do
-    hsh = { 'Order' => [order.id] }
-    assert_difference('Relation.count', -2) do
+    hsh = {"Order" => [order.id]}
+    assert_difference("Relation.count", -2) do
       Relation.remove_dangling(hsh)
     end
   end
@@ -42,12 +37,11 @@ describe Relation do
   it "test dangling" do
     assert_equal({}, Relation.dangling)
     user.destroy
-    assert_equal({"User"=>[user.id]}, Relation.dangling)
+    assert_equal({"User" => [user.id]}, Relation.dangling)
     user2.destroy
-    assert_equal({"User"=>[user.id, user2.id]}, Relation.dangling)
+    assert_equal({"User" => [user.id, user2.id]}, Relation.dangling)
     order.destroy
-    assert_equal({"User"=>[user.id, user2.id].sort, "Order"=>[order.id]},
-		Relation.dangling)
+    assert_equal({"User" => [user.id, user2.id].sort, "Order" => [order.id]},
+      Relation.dangling)
   end
-
 end

data/test/internal/app/models/order.rb

@@ -0,0 +1,2 @@
+class Order < ActiveRecord::Base
+end

data/test/internal/app/models/user.rb

@@ -0,0 +1,2 @@
+class User < ActiveRecord::Base
+end

data/test/internal/config/database.yml

@@ -0,0 +1,3 @@
+test:
+  adapter:  sqlite3
+  database: db/test.sqlite3

data/test/internal/db/schema.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+ActiveRecord::Schema.define(version: 202208) do
+  create_table :relations, force: true, id: false do |t|
+    t.string     :name
+    t.references :from, null: false
+    t.references :to, null: false
+    t.timestamps
+
+    t.index :name
+  end
+
+  create_table "orders", force: true do |t|
+    t.string :name
+    t.string :category
+    t.text :bag
+
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "users", force: true do |t|
+    t.string :email
+
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+end

data/test/relation_ext_test.rb

@@ -1,63 +1,56 @@
-require 'test_helper'
+require "test_helper"
 
 describe Relation do
-  let(:user)   { User.create! name: 'user' }
-  let(:user2)  { User.create! name: 'user2' }
-  let(:order)  { Order.create! name: 'order' }
-  let(:order2) { Order.create! name: 'order2' }
+  let(:user) { User.create! email: "info@sample.com" }
+  let(:user2) { User.create! email: "info2@sample.com" }
+  let(:order) { Order.create! name: "order" }
+  let(:order2) { Order.create! name: "order2" }
 
   def setup
-    DB.setup
-
-    Relation.add user,  order
+    Relation.add user, order
     Relation.add user2, order
     Relation.add user2, order2
   end
 
-  def teardown
-    DB.teardown
-  end
-
   it "should add a connection" do
-    assert_difference('Relation.count') do
+    assert_difference("Relation.count") do
       Relation.add user2, user
     end
   end
 
   it "should delete a connection" do
     Relation.add user2, user
-    assert_difference('Relation.count', -1) do
+    assert_difference("Relation.count", -1) do
       Relation.delete user2, user
     end
   end
 
   it "should return references (using class name)" do
-    arr = Relation.references(user, 'Order')
+    arr = Relation.references(user, "Order")
     assert_equal [order].sort, arr.sort
 
-    arr = Relation.references(user2, 'Order')
+    arr = Relation.references(user2, "Order")
     assert_equal [order, order2].sort, arr.sort
   end
 
   it "should return followers (using class name)" do
-    arr = Relation.followers('User', order)
+    arr = Relation.followers("User", order)
     assert_equal [user, user2].sort, arr.sort
 
-    arr = Relation.followers('User', order2)
+    arr = Relation.followers("User", order2)
     assert_equal [user2].sort, arr.sort
   end
 
   it "should not add twice the same connection" do
-    assert_difference('Relation.count') do
+    assert_difference("Relation.count") do
       Relation.add user2, user
       Relation.add user2, user
     end
   end
 
   it "should handle unexistent connection" do
-    assert_difference('Relation.count', 0) do
+    assert_difference("Relation.count", 0) do
       Relation.delete user2, user
     end
   end
-
 end

data/test/relation_test.rb

@@ -1,34 +1,28 @@
-require 'test_helper'
+require "test_helper"
 
 # testing raw/basic relations
 describe Relation do
-  let(:u_id)   { User.create!(name: 'user').id }
-  let(:u2_id)  { User.create!(name: 'user2').id }
-  let(:o_id)   { Order.create!(name: 'order').id }
-  let(:o2_id)  { Order.create!(name: 'order2').id }
-  let(:unknown_id)  { 123456 }
+  let(:u_id) { User.create!(email: "info@sample.com").id }
+  let(:u2_id) { User.create!(email: "info2@sample.com").id }
+  let(:o_id) { Order.create!(name: "order").id }
+  let(:o2_id) { Order.create!(name: "order2").id }
+  let(:unknown_id) { 123456 }
 
   def setup
-    DB.setup
-
     Relation.add_raw :rel, u_id, o_id
     Relation.add_raw :rel, u2_id, o_id
     Relation.add_raw :rel, u2_id, o2_id
   end
 
-  def teardown
-    DB.teardown
-  end
-
   it "should add a relation" do
-    assert_difference('Relation.count') do
+    assert_difference("Relation.count") do
       Relation.add_raw :raw, u2_id, u_id
     end
   end
 
   it "should delete a relation" do
     Relation.add_raw :raw, u2_id, u_id
-    assert_difference('Relation.count', -1) do
+    assert_difference("Relation.count", -1) do
       Relation.delete_raw :raw, u2_id, u_id
     end
   end
@@ -50,16 +44,15 @@ describe Relation do
   end
 
   it "should not add twice the same connection" do
-    assert_difference('Relation.count') do
+    assert_difference("Relation.count") do
       Relation.add_raw :rel, u2_id, unknown_id
       Relation.add_raw :rel, u2_id, unknown_id
     end
   end
 
   it "should handle unexistent connection" do
-    assert_difference('Relation.count', 0) do
+    assert_difference("Relation.count", 0) do
       Relation.delete_raw :rel, u2_id, unknown_id
     end
   end
-
 end

data/test/test_helper.rb

@@ -1,17 +1,16 @@
-if ENV['COVERAGE']
-  require 'simplecov'
+if ENV["COVERAGE"]
+  require "simplecov"
   SimpleCov.start do
-    add_filter '/test/'
+    add_filter "/test/"
   end
 end
 
-require 'active_record'
-require 'minitest/autorun'
-
-# Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each { |f| require f }
-
-class Minitest::Test
-  require 'active_support/testing/assertions'
-  include ActiveSupport::Testing::Assertions
+require "combustion"
+Combustion.path = "test/internal"
+Combustion.initialize! :active_record do
+  config.active_record.yaml_column_permitted_classes = [Symbol, Time, Date]
 end
+
+require "rails/test_help"
+require "minitest/autorun"
+require "minitest/benchmark"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: relation
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.4.2
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-22 00:00:00.000000000 Z
+date: 2023-01-19 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,21 +80,19 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: "    A Rails gem that adds simple support for organizing ActiveRecord
-  models.\n"
+description: |2
+      A Rails gem that adds simple support for organizing ActiveRecord models.
+      Relationships are stored in one additional database table.
 email:
-- dittmar.krall@matique.de
+- dittmar.krall@matiq.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
 - ".gitignore"
-- ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".watchr"
-- Appraisals
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
@@ -117,19 +101,20 @@ files:
 - app/models/dangling.rb
 - app/models/relation.rb
 - app/models/relation_ext.rb
-- db/migrate/20150810152808_relation.rb
-- gemfiles/rails_6.0.gemfile
-- gemfiles/rails_6.1.gemfile
+- db/migrate/003_create_relations.rb
 - lib/relation.rb
 - lib/relation/engine.rb
 - lib/relation/version.rb
 - relation.gemspec
 - test/dangling_test.rb
+- test/internal/app/models/order.rb
+- test/internal/app/models/user.rb
+- test/internal/config/database.yml
+- test/internal/db/schema.rb
 - test/relation_ext_test.rb
 - test/relation_test.rb
-- test/support/database.rb
 - test/test_helper.rb
-homepage: https://github.com/matique/relation
+homepage: https://matiq.com
 licenses:
 - MIT
 metadata:
@@ -150,8 +135,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.6
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
-summary: Provides a simple directed relationship between active_record models.
+summary: Rails gem adding relationships between ActiveRecord models.
 test_files: []

data/.rubocop.yml

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

data/.watchr

@@ -1,59 +0,0 @@
-TESTING = %w[test]
-HH = '#' * 22  unless defined?(HH)
-H = '#' * 5    unless defined?(H)
-
-def usage
-  puts <<-EOS
-  Ctrl-\\ or ctrl-4   Running all tests
-  Ctrl-C             Exit
-  EOS
-end
-
-def run(cmd)
-  puts "#{HH} #{Time.now} #{HH}"
-  puts "#{H} #{cmd}"
-  system "/usr/bin/time --format '#{HH} Elapsed time %E' #{cmd}"
-end
-
-def run_it(type, file)
-  case type
-  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"
-  TESTING.each { |dir| run "bundle exec rake #{dir}" if  File.exist?(dir) }
-end
-
-def run_matching_files(base)
-  base = base.split('_').first
-  TESTING.each { |type|
-    files = Dir["#{type}/**/*.rb"].select { |file| file =~ /#{base}_.*\.rb/ }
-    run_it type, files.join(' ')  unless files.empty?
-  }
-end
-
-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
-    Signal.trap('QUIT') { run_all_tests }
-# Ctrl-C
-    Signal.trap('INT')  { abort("Interrupted\n") }
-usage

data/Appraisals

@@ -1,19 +0,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
-#
-#appraise 'rails-5.1' do
-#  gem 'rails', '~> 5.1'
-#end

data/gemfiles/rails_6.0.gemfile

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

data/gemfiles/rails_6.1.gemfile

@@ -1,13 +0,0 @@
-# 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/test/support/database.rb

@@ -1,57 +0,0 @@
-class DB
-  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
-      end
-
-      Order.reset_column_information
-    end
-  end
-
-  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)
-      end
-    else
-      ActiveRecord::Base.connection.tables.each do |table|
-        ActiveRecord::Base.connection.drop_table(table)
-      end
-    end
-  end
-
-  def self.capture_stdout
-    real_stdout = $stdout
-
-    $stdout = StringIO.new
-    yield
-    $stdout.string
-  ensure
-    $stdout = real_stdout
-  end
-end
-
-class Order < ActiveRecord::Base
-end
-
-class User < ActiveRecord::Base
-end
-
-require_relative '../../app/models/relation'
-require_relative '../../app/models/relation_ext'
-require_relative '../../app/models/dangling'