acts_as_graph 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 85713371daed2a84ea58c068c10a373165ad9b3b
-  data.tar.gz: 448fd7508d466a053e8568e3958326f0115bd68f
+SHA256:
+  metadata.gz: 1e2c2c5547d606eb07ee5f497397e85b61e05937a5b4eac9f1641f5a8c5c51ea
+  data.tar.gz: f405e59e5356dcf1099f27a7f4b139c7fb1a776ab87109e611caa2b0ba7f152d
 SHA512:
-  metadata.gz: da1fe3794e4b6d89fe824908f1d1767e3a45dad7206dcf1cb3b4dee9926ff253c6085e7e3067608f2a795dbee6362463a65fc8dc4cbf8346d33573fb43ff6cc5
-  data.tar.gz: 6f2f24d36ca3530c70f9d2a3f700e93fcb6b216b6305ee4a4d8e634445273b91427da69745eaa3f12ba0d0117845ad31438ac6367576f7a133649c342fc6a021
+  metadata.gz: d9e53a8bbcd9da65eb69e40ad61a0a59f97aca36daf9e94aaf0141bd5aac1bf980495f9f8c5b14f336ac3968e0704d5ffe23cc57166b809ab2b6f68a7a3a4920
+  data.tar.gz: 8593e2dd8c8ec45c4942eac7f437a8fa6fdcd5182f4cf5c9d482990aad94872644b93aaebf92f163f31ef41fa8664dceac3a65f4bbc9cb08482da357c93e1afa

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    acts_as_graph (0.0.1)
-      rspec
+    acts_as_graph (0.0.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    byebug (10.0.2)
     diff-lcs (1.3)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -27,6 +27,8 @@ PLATFORMS
 
 DEPENDENCIES
   acts_as_graph!
+  byebug
+  rspec
 
 BUNDLED WITH
-   1.16.1
+   1.17.2

data/acts_as_graph.gemspec

@@ -9,18 +9,20 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Zhichao Feng']
   s.email       = ['flankerfc@gmail.com']
-  s.homepage    = 'https://github.com/flanker'
+  s.homepage    = 'https://github.com/flanker/acts_as_graph'
   s.summary     = 'A very simple acts as graph for your model'
   s.description = 'A very simple acts as graph for your model'
   s.license     = 'MIT'
+  s.metadata    = {'source_code_uri' => 'https://github.com/flanker/acts_as_graph'}
 
-  s.required_ruby_version     = '>= 2.3'
+  s.required_ruby_version     = '>= 2.5'
   s.required_rubygems_version = '>= 1.3.6'
 
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files -- test/*`.split("\n")
   s.require_path = ['lib']
 
-  s.add_runtime_dependency 'rspec'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'byebug'
 
 end

data/lib/acts_as_graph.rb

@@ -1,3 +1,5 @@
+require 'acts_as_graph/dag'
+
 module ActsAsGraph
 
   def self.included base
@@ -30,31 +32,33 @@ module ActsAsGraph
     child_vertices.each do |child_vertice|
       next if vertices_found.include?(child_vertice) || child_vertice == starting_vertice
       vertices_found << child_vertice
-      child_vertice.collect_child_vertices vertices_found, starting_vertice: starting_vertice
+      child_vertice.collect_child_vertices vertices_found, starting_vertice: starting_vertice if child_vertice.respond_to?(:collect_child_vertices)
     end
   end
 
   def has_circular_reference?
-    vertices_found = []
-    has_circular_reference_in_child_vertices? vertices_found, starting_vertice: self
+    child_vertices.any? do |child_vertice|
+      path = [self, child_vertice]
+      child_vertice.has_circular_reference_in_path?(path) if child_vertice.respond_to?(:has_circular_reference_in_path?)
+    end
   end
 
-  def has_circular_reference_in_child_vertices? vertices_found, starting_vertice: nil
+  def has_circular_reference_in_path? path
     child_vertices.any? do |child_vertice|
-      return true if vertices_found.include?(child_vertice) || child_vertice == starting_vertice
-      vertices_found << child_vertice
-      child_vertice.has_circular_reference_in_child_vertices? vertices_found, starting_vertice: starting_vertice
+      return true if path.include?(child_vertice)
+      next_path = path + [child_vertice]
+      child_vertice.has_circular_reference_in_path?(next_path) if child_vertice.respond_to?(:has_circular_reference_in_path?)
     end
   end
 
+  def child_vertices
+    self.send children_method_name
+  end
+
   private
 
   def children_method_name
     self.class.children_method_name
   end
 
-  def child_vertices
-    self.send children_method_name
-  end
-
 end

data/lib/acts_as_graph/dag.rb

@@ -0,0 +1,30 @@
+module ActsAsGraph
+  class Dag
+
+    attr_reader :vertices
+
+    def initialize vertices
+      @vertices = vertices
+    end
+
+    def topological_sort
+      visited = []
+      post_order = []
+      vertices.each do |vertice|
+        dfs(vertice, visited, post_order) unless visited.include?(vertice)
+      end
+      post_order
+    end
+
+    private
+
+    def dfs vertice, visited, post_order
+      visited << vertice
+      vertice.child_vertices.each do |child_vertice|
+        dfs(child_vertice, visited, post_order) unless visited.include?(child_vertice)
+      end if vertice.respond_to?(:child_vertices)
+      post_order << vertice
+    end
+
+  end
+end

data/lib/acts_as_graph/version.rb

@@ -1,3 +1,3 @@
 module ActsAsGraph
-  VERSION = '0.0.1'
+  VERSION = '0.0.3'
 end

data/spec/acts_as_graph/dag_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+module ActsAsGraph
+  RSpec.describe Dag do
+
+    class Task
+
+      include ActsAsGraph
+
+      acts_as_graph children: :depended_tasks
+
+      attr_reader :title
+      attr_accessor :depended_tasks
+
+      def initialize title, depended_tasks = []
+        @title = title
+        @depended_tasks = depended_tasks
+      end
+
+    end
+
+    it 'sorts as topological order' do
+      task_1 = Task.new 'task_1'
+      task_2 = Task.new 'task_2'
+      task_3 = Task.new 'task_3'
+      task_4 = Task.new 'task_4'
+      task_5 = Task.new 'task_5'
+      task_6 = Task.new 'task_6'
+      task_7 = Task.new 'task_7'
+      task_8 = Task.new 'task_8'
+
+      task_2.depended_tasks = [task_1]
+      task_3.depended_tasks = [task_2]
+      task_4.depended_tasks = [task_2]
+      task_6.depended_tasks = [task_5]
+      task_7.depended_tasks = [task_3, task_4]
+      task_8.depended_tasks = [task_2, task_3]
+
+      dag = Dag.new [task_8, task_7, task_6, task_5, task_4, task_3, task_2, task_1]
+
+      result = dag.topological_sort
+      expect(result.length).to eq(8)
+      expect(result).to match_array([task_1, task_2, task_3, task_8, task_4, task_7, task_5, task_6])
+    end
+
+  end
+end

data/spec/acts_as_graph_spec.rb

@@ -18,6 +18,15 @@ RSpec.describe ActsAsGraph do
 
   end
 
+  class Job
+
+    attr_reader :title
+
+    def initialize title
+      @title = title
+    end
+  end
+
   context '#descendant_depended_tasks' do
 
     it 'should get all descendant tasks' do
@@ -57,13 +66,24 @@ RSpec.describe ActsAsGraph do
       expect(descendant_depended_tasks.length).to eq(5)
       expect(descendant_depended_tasks).to match_array([task_2, task_3, task_4, task_5, task_6])
     end
+
+    it 'supports other type of object as a child' do
+      task_1 = Task.new 'task_1'
+      task_2 = Task.new 'task_2'
+      job_1 = Job.new 'job_1'
+      task_1.depended_tasks = [task_2, job_1]
+
+      descendant_depended_tasks = task_1.descendant_depended_tasks
+      expect(descendant_depended_tasks.length).to eq(2)
+      expect(descendant_depended_tasks).to match_array([task_2, job_1])
+    end
   end
 
   context '#has_circular_reference?' do
 
     it 'works if there is no circular reference' do
       task_1 = Task.new 'task_1'
-      task_2 = Task.new 'task_2'
+      task_2 = Task.new 'task_2', [task_1]
       task_3 = Task.new 'task_3', [task_1, task_2]
 
       expect(task_3.has_circular_reference?).to be false
@@ -83,6 +103,23 @@ RSpec.describe ActsAsGraph do
       expect(task_3.has_circular_reference?).to be true
     end
 
+    it 'works if the circular reference has longer path' do
+      task_1 = Task.new 'task_1'
+      task_2 = Task.new 'task_2'
+      task_3 = Task.new 'task_3'
+      task_4 = Task.new 'task_4'
+
+      task_1.depended_tasks = [task_2]
+      task_2.depended_tasks = [task_3]
+      task_3.depended_tasks = [task_4]
+      task_4.depended_tasks = [task_1]
+
+      expect(task_1.has_circular_reference?).to be true
+      expect(task_2.has_circular_reference?).to be true
+      expect(task_3.has_circular_reference?).to be true
+      expect(task_4.has_circular_reference?).to be true
+    end
+
     it 'works if there are two vertices reference with each other' do
       task_1 = Task.new 'task_1'
       task_2 = Task.new 'task_2'
@@ -96,6 +133,29 @@ RSpec.describe ActsAsGraph do
       expect(task_2.has_circular_reference?).to be true
       expect(task_3.has_circular_reference?).to be true
     end
+
+    it 'works in complex case' do
+      task_1 = Task.new 'task_1'
+      task_2 = Task.new 'task_2'
+      task_3 = Task.new 'task_3'
+      task_4 = Task.new 'task_4'
+
+      task_2.depended_tasks = [task_1]
+      task_3.depended_tasks = [task_1, task_2]
+      task_4.depended_tasks = [task_2, task_3]
+
+      # expect(task_2.has_circular_reference?).to be false
+      # expect(task_3.has_circular_reference?).to be false
+      expect(task_4.has_circular_reference?).to be false
+    end
+
+    it 'supports other type of object as a child' do
+      task_1 = Task.new 'task_1'
+      job_1 = Job.new 'job_1'
+      task_1.depended_tasks = [job_1]
+
+      expect(task_1.has_circular_reference?).to be false
+    end
   end
 
 end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'bundler/setup'
 require 'acts_as_graph'
+require 'byebug'
 
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_graph
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Zhichao Feng
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2020-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -17,7 +17,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -38,14 +52,17 @@ files:
 - Rakefile
 - acts_as_graph.gemspec
 - lib/acts_as_graph.rb
+- lib/acts_as_graph/dag.rb
 - lib/acts_as_graph/version.rb
+- spec/acts_as_graph/dag_spec.rb
 - spec/acts_as_graph_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/flanker
+homepage: https://github.com/flanker/acts_as_graph
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  source_code_uri: https://github.com/flanker/acts_as_graph
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -53,16 +70,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: A very simple acts as graph for your model
 test_files: []