relation 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3399acd48d09bff9ba7217aa13266aae16b71ad5b382d41ac81942c43f72ef9
-  data.tar.gz: 242b87f319f9e07f9ada3f1b43f662bb0b82db5a613206635b7ec58ab123c7a9
+  metadata.gz: 93715ff3317b45a8eaca2ef3535a5e302c425d15da1ac6d0d3a5769f246c530c
+  data.tar.gz: 8d24db836b7135dfbfd7cf11a1853f30fef528fcce6123a0980c0cbf568d77fc
 SHA512:
-  metadata.gz: ccb68a78d60df20bd6016abcf18ccfc90a510c73b4c2cb163d633c24e29003550ab174370a10ddc20f9fc2427e1d112ab1b57f5e62dde5efd4ee6a83038b9702
-  data.tar.gz: 8e6696a3717909d0cda8461bdabf501068ea65864009112adb7dd52d6ae96bae9a96fafbbac55ae861575f984e60db5fb29624648b4639a3f4be071c3e74f272
+  metadata.gz: 4446a651fc0ba70ba460c81375f84cfe0e58045f5d30e5631a389ecd639197b9ffcc6aeb804eb133db6b7e677e4a38135ab234d2a88394e895314d5ca6dd3acb
+  data.tar.gz: 312cee0a84e13b28caa953226707dc805692c30da46805bd1b2e0d2bf4be6ef4fc03ad675376facff37b7840ade293e402b04d304a82f9e0839e85561c31061a

data/.rubocop.yml

@@ -0,0 +1,51 @@
+# rubocop --auto-gen-config
+# rubocop
+# rubocop:disable all
+
+#inherit_from: .rubocop_todo.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:
+  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'

data/.ruby-version

@@ -1 +1 @@
-ruby-2.6.4
+ruby-2.6.5

data/.travis.yml

@@ -13,8 +13,9 @@ bundler_args: --without production
 #bundler_args: --without development
 
 rvm:
-  - 2.6.4  # 2019-10-04
-  - 2.6.3  # 2019-06-21
+  - 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

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2015-2019 Dittmar Krall - http://matique.de
+Copyright 2015-2020 Dittmar Krall - http://matique.de
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -49,7 +49,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 +86,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/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/lib/relation/engine.rb

@@ -2,24 +2,23 @@ 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,7 +1,10 @@
+# frozen_string_literal: true
+
 module ModRelation
-  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.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/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

@@ -3,12 +3,12 @@ SimpleCov.start do
   add_filter '/test/'
 end
 
-ENV["RAILS_ENV"] = "test"
+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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relation
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-04 00:00:00.000000000 Z
+date: 2020-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -117,6 +117,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
@@ -162,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Provides a simple directed relationship between active_record models.