relation 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6381b0fed7fc68aab0a9e3518e8e6148f16fcc292ea78536861c85cb597341ab
-  data.tar.gz: 5994578fd40c339c169ef8f74fc04c24ed2d84bcf828187613d763d9bb105621
+  metadata.gz: bad787b4d9a048415f84ac84bb57b0d0c07b78172a2205db2364a1b1d5d23ee4
+  data.tar.gz: a3065ffcbeed05f69f53d0914dec79471f75cbdfc83ec302d251ddef90279a7b
 SHA512:
-  metadata.gz: 6e7149d1b781f01f34ba6aecd9a4df859b1493b51be0ae3a56c51e59cd6204e205ab21b5398a17f9d64612b939d102f5246658b8b30efe3ae0bb0a215d16ce48
-  data.tar.gz: 9b7d23050de06e0267c56cf6fe40c9ca04e419c83b9c7069f406a93e069a67368398f6dae091c93abdb41750cd042d3ef44d529fac6a7233458a843c0ea802a6
+  metadata.gz: 57b2b2295e4ecf25e5572cbd68f2b7dfcda2e5de192a7f10271bebbd0344b8d7607e8ad22ecddc5bbdfcb3390209d2285d17295345b6ea03b12c67a517610b2b
+  data.tar.gz: 97e971f2beb8a47dec9dcc70401e70493f53a309e9c705075ae030f9c7c448f62baa51ef923bd73eede89f864a136edd4a5b0a84802335ee2ebbb287c58e2e4b

data/.travis.yml

@@ -23,8 +23,8 @@ rvm:
 gemfile:
   - gemfiles/rails_5.2.gemfile
   - gemfiles/rails_5.1.gemfile
-#  - gemfiles/rails_5.0.gemfile
-  - gemfiles/rails_4.gemfile
+  - gemfiles/rails_5.0.gemfile
+#  - gemfiles/rails_4.gemfile
 
 notifications:
   email: false

data/Appraisals

@@ -1,8 +1,3 @@
-appraise 'rails-4' do
-  gem 'rack', '< 2'
-  gem 'rails', '= 4.2.3'
-end
-
 appraise 'rails-5.0' do
   gem 'rails', '~> 5.0.0'
 end

data/app/models/dangling.rb

@@ -11,8 +11,8 @@ class Relation < ActiveRecord::Base
     models.each { |class_name|
       klass = class_name.constantize
       ids = klass.pluck(:id)
-      idx = Relation.where('name like ?', "#{class_name} %").pluck(:x_id)
-      idy = Relation.where('name like ?', "% #{class_name}").pluck(:y_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
     }
@@ -22,8 +22,8 @@ class Relation < ActiveRecord::Base
   def self.remove_dangling(hsh)
     hsh.each { |name, arr|
       arr.each { |idx|
-	Relation.where(x_id: idx).where('name like ?', "#{name} %").delete_all
-	Relation.where(y_id: idx).where('name like ?', "% #{name}").delete_all
+	Relation.where(from_id: idx).where('name like ?', "#{name} %").delete_all
+	Relation.where(to_id: idx).where('name like ?', "% #{name}").delete_all
       }
     }
   end

data/app/models/relation.rb

@@ -1,21 +1,21 @@
 class Relation < ActiveRecord::Base
 
-  def self.add_raw(name, id_from, id_to)
-    hsh = { name: name, x_id: id_from, y_id: id_to }
+  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
   end
 
-  def self.delete_raw(name, id_from, id_to)
-    hsh = { name: name, x_id: id_from, y_id: id_to }
+  def self.delete_raw(name, from_id, to_id)
+    hsh = { name: name, from_id: from_id, to_id: to_id }
     Relation.where(hsh).delete_all
   end
 
-  def self.references_raw(name, id_from)
-    Relation.where(name: name, x_id: id_from).pluck(:y_id)
+  def self.references_raw(name, from_id)
+    Relation.where(name: name, from_id: from_id).pluck(:to_id)
   end
 
-  def self.followers_raw(name, id_to)
-    Relation.where(name: name, y_id: id_to).pluck(:x_id)
+  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

@@ -12,16 +12,16 @@ class Relation < ActiveRecord::Base
   end
 
   def self.references(row, kind)
-    klass, name, id_from = normalize2(kind, row)
+    klass, name, from_id = normalize2(kind, row)
     name = "#{name} #{klass.name}"
-    ids = references_raw(name, id_from)
+    ids = references_raw(name, from_id)
     klass.where(id: ids)
   end
 
   def self.followers(kind, row)
-    klass, name, id_to = normalize2(kind, row)
+    klass, name, to_id = normalize2(kind, row)
     name = "#{klass.name} #{name}"
-    ids = followers_raw(name, id_to)
+    ids = followers_raw(name, to_id)
     klass.where(id: ids)
   end
 
@@ -32,10 +32,10 @@ class Relation < ActiveRecord::Base
   end
 
   def self.normalize(row_from, row_to)
-    name_from, id_from = name_id(row_from)
-    name_to, id_to     = name_id(row_to)
+    name_from, from_id = name_id(row_from)
+    name_to, to_id     = name_id(row_to)
     name = "#{name_from} #{name_to}"
-    { name: name, x_id: id_from, y_id: id_to }
+    { name: name, from_id: from_id, to_id: to_id }
   end
 
   def self.normalize2(kind, row)

data/db/migrate/20150810152808_relation.rb

@@ -2,13 +2,11 @@ class CreateRelations < ActiveRecord::Migration[5.2]
   def change
     create_table :relations, id: false do |t|
       t.string     :name
-      t.references :x, null: false
-      t.references :y, null: false
+      t.references :from, null: false
+      t.references :to, null: false
       t.timestamps
 
       t.index :name
-      t.index :x
-      t.index :y
     end
   end
 end

data/lib/relation/version.rb

@@ -1,3 +1,3 @@
 module ModRelation
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

data/relation.gemspec

@@ -22,7 +22,7 @@ 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', '~> 5'
 
   s.add_development_dependency 'appraisal'
   s.add_development_dependency 'bundler'

data/test/support/database.rb

@@ -14,8 +14,8 @@ class DB
 	end
 	create_table :relations, id: false do |t|
 	  t.string     :name
-	  t.references :x, null: false
-	  t.references :y, null: false
+	  t.references :from, null: false
+	  t.references :to, null: false
 	end
       end
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: relation
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-13 00:00:00.000000000 Z
+date: 2018-07-07 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: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +131,6 @@ files:
 - app/models/relation.rb
 - app/models/relation_ext.rb
 - db/migrate/20150810152808_relation.rb
-- gemfiles/rails_4.gemfile
 - gemfiles/rails_5.0.gemfile
 - gemfiles/rails_5.1.gemfile
 - gemfiles/rails_5.2.gemfile

data/gemfiles/rails_4.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "= 4.2.3"
-gem "rack", "< 2"
-
-gemspec path: "../"