(WIP) Add scoped record id column

Gemfile

@@ -1,3 +1,3 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec

Rakefile

@@ -1,23 +1,22 @@
-require 'rake/testtask'
-require 'rdoc/task'
-require 'bundler/gem_tasks'
+require "rake/testtask"
+require "rdoc/task"
+require "bundler/gem_tasks"
 
-desc 'Default: run unit tests.'
-task :default => :test
+desc "Default: run unit tests."
+task default: :test
 
-desc 'Test the acts_as_dag plugin.'
+desc "Test the acts_as_dag plugin."
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
+  t.libs << "lib"
+  t.pattern = "test/**/*_test.rb"
   t.verbose = true
 end
 
-desc 'Generate documentation for the acts_as_dag plugin.'
+desc "Generate documentation for the acts_as_dag plugin."
 Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ActsAsDag'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/dag/dag.rb')
+  rdoc.rdoc_dir = "rdoc"
+  rdoc.title = "ActsAsDag"
+  rdoc.options << "--line-numbers" << "--inline-source"
+  rdoc.rdoc_files.include("README.rdoc")
+  rdoc.rdoc_files.include("lib/dag/dag.rb")
 end
-

acts-as-dag.gemspec

@@ -1,26 +1,25 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push File.expand_path("lib", __dir__)
 require "acts-as-dag/version"
 
 Gem::Specification.new do |s|
   s.name        = "acts-as-dag"
   s.version     = Acts::As::Dag::VERSION
-  s.authors     = ['Matthew Leventi', 'Robert Schmitt']
+  s.authors     = ["Matthew Leventi", "Robert Schmitt"]
   s.email       = ["[email protected]"]
-  s.homepage    = 'https://github.com/resgraph/acts-as-dag'
-  s.summary     = %q{Directed Acyclic Graph hierarchy for Rail's ActiveRecord}
-  s.description = %q{Directed Acyclic Graph hierarchy for Rail's ActiveRecord, supporting Rails 4.x}
+  s.homepage    = "https://github.com/resgraph/acts-as-dag"
+  s.summary     = "Directed Acyclic Graph hierarchy for Rail's ActiveRecord"
+  s.description = "Directed Acyclic Graph hierarchy for Rail's ActiveRecord, supporting Rails 4.x"
 
   s.rubyforge_project = "acts-as-dag"
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
   # As specified in test/dag_test.rb
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'sqlite3'
-  s.add_runtime_dependency 'activemodel'
-  s.add_runtime_dependency 'activerecord', '>= 4.0.0'
+  s.add_development_dependency "rake"
+  s.add_development_dependency "sqlite3"
+  s.add_dependency "activemodel"
+  s.add_dependency "activerecord", ">= 4.0.0"
+  s.metadata["rubygems_mfa_required"] = "true"
 end

lib/acts-as-dag.rb

@@ -13,6 +13,4 @@
 
 $LOAD_PATH.shift
 
-if defined?(ActiveRecord::Base)
-  ActiveRecord::Base.extend Dag
-end
+ActiveRecord::Base.extend Dag if defined?(ActiveRecord::Base)

lib/acts-as-dag/version.rb

@@ -1,7 +1,7 @@
 module Acts
   module As
     module Dag
-      VERSION = "4.0.0"
+      VERSION = "5.0.0"
     end
   end
 end

lib/dag/columns.rb

@@ -1,26 +1,34 @@
 module Dag
-
-  #Methods that show columns
+  # Methods that show columns
   module Columns
-      def ancestor_id_column_name
-        acts_as_dag_options[:ancestor_id_column]
-      end
+    def ancestor_id_column_name
+      acts_as_dag_options[:ancestor_id_column]
+    end
 
-      def descendant_id_column_name
-        acts_as_dag_options[:descendant_id_column]
-      end
+    def descendant_id_column_name
+      acts_as_dag_options[:descendant_id_column]
+    end
 
-      def direct_column_name
-        acts_as_dag_options[:direct_column]
-      end
+    def scoped_record_id_column_name
+      acts_as_dag_options[:scoped_record_id_column]
+    end
 
-      def count_column_name
-        acts_as_dag_options[:count_column]
-      end
+    def direct_column_name
+      acts_as_dag_options[:direct_column]
+    end
 
-      def acts_as_dag_polymorphic?
-        acts_as_dag_options[:polymorphic]
-      end
+    def count_column_name
+      acts_as_dag_options[:count_column]
     end
 
-end
+    def acts_as_dag_polymorphic?
+      acts_as_dag_options[:polymorphic]
+    end
+
+    def scoped_record_id
+      return unless scoped_record_id_column_name && respond_to?(scoped_record_id_column_name)
+
+      public_send(scoped_record_id_column_name)
+    end
+  end
+end