acts-as-dag 2.5.5 → 2.5.7

data/.gitignore

@@ -0,0 +1,8 @@
+.idea/*
+*.gem
+.rvmrc
+.bundle
+Gemfile.lock
+pkg/*
+rdoc
+test/database.test

data/Gemfile

@@ -0,0 +1,28 @@
+source 'http://rubygems.org'
+
+gem 'bundler'
+gem 'rails', '3.2.3'
+gem 'rake'
+gem 'rack'
+gem 'jeweler'
+gem 'sqlite3'
+
+group :development, :test do
+  gem 'pry'
+  gem 'pry-doc'
+  gem 'pry-rails'
+end
+
+group :development do
+  gem 'awesome_print'
+  gem 'wirble'
+  gem 'foreman'
+  gem 'ruby-prof'
+end
+
+group :test do
+  gem 'test-unit'
+  gem 'simplecov'
+  gem 'flog'
+	gem 'flay'
+end

data/README.rdoc

@@ -43,13 +43,13 @@ Version 2.x of Acts As Dag uses validate and scope/where and ActiveModel::Valida
 Add to your Gemfile:
 
     gem 'acts-as-dag'
-	
+    
 == Terminology
 
 - Node: A source or destination of a link or edge in the graph.
 - Edge: A direct connection between two nodes. These can only be created by your application.
 - Link: A indirect connection between two nodes. Denotes the existence of a path. These can only be created by the plugin internally.
-	
+    
 == Singleton Methods
 
 This section outlines the two methods that need to be included in your ActiveRecord models. In general this whole plugin can be thought of as one big has_many association.
@@ -58,11 +58,11 @@ This section outlines the two methods that need to be included in your ActiveRec
 
 This singleton class method needs to be called in your ActiveRecord model that represents the links for the DAG graph. For non-polymorphic graphs it has a required parameter:
 
-	acts_as_dag_links :node_class_name => 'Class Name of the node model'
+    acts_as_dag_links :node_class_name => 'Class Name of the node model'
 
 If the graph is polymorphic :node_class_name is unnecessary. A polymorphic call would be:
 
-	acts_as_dag_links :polymorphic => true
+    acts_as_dag_links :polymorphic => true
 
 ==== Optional Parameters
 
@@ -81,98 +81,98 @@ With polymorphic graphs we also have...
 
 Each of the optional column parameters needs a field in the link table. Hence for non-polymorphic graphs a migration would look like...
 
-	create_table :links, do |t|
-		t.integer :ancestor_id
-		t.integer :descendant_id
-		t.boolean :direct
-		t.integer :count
-	end
-	
+    create_table :links, do |t|
+        t.integer :ancestor_id
+        t.integer :descendant_id
+        t.boolean :direct
+        t.integer :count
+    end
+    
 And for polymorphic graphs...
 
-	create_table :links, do |t|
-		t.integer :ancestor_id
-		t.string  :ancestor_type
-		t.integer :descendant_id
-		t.string  :descendant_type
-		t.boolean :direct
-		t.integer :count
-	end
-	
+    create_table :links, do |t|
+        t.integer :ancestor_id
+        t.string  :ancestor_type
+        t.integer :descendant_id
+        t.string  :descendant_type
+        t.boolean :direct
+        t.integer :count
+    end
+    
 ==== Injected Associations
 
 Calling acts_as_dag_links method in the class definition injects the following associations.
 
-	belongs_to :ancestor
-	belongs_to :descendant
-	
+    belongs_to :ancestor
+    belongs_to :descendant
+    
 ==== Injected Named Scopes
 
-The recieves the following named scopes. The following two scopes narrows a query to only links with a certain ancestor or descendant
+The receives the following named scopes. The following two scopes narrows a query to only links with a certain ancestor or descendant
 
-	named_scope :with_ancestor(ancestor_instance)
-	named_scope :with_descendant(descendant_instance)
-	
+    named_scope :with_ancestor(ancestor_instance)
+    named_scope :with_descendant(descendant_instance)
+    
 The scopes below narrow queries to direct or indirect links
 
-	named_scope :direct
-	named_scope :indirect
-	
+    named_scope :direct
+    named_scope :indirect
+    
 The scopes below attach the actual ancestor or descendant nodes
 
-	named_scope :ancestor_nodes, :joins => :ancestor
-	named_scope :descendant_nodes, :joins => :descendant
-	
+    named_scope :ancestor_nodes, :joins => :ancestor
+    named_scope :descendant_nodes, :joins => :descendant
+    
 ==== Injected Class Methods
 
 Several class methods get added to the link model to make it easier to find and create edges, and find links.
 
-	#Finds an edge of returns nil
-	self.find_edge(ancestor,descendant)
-	#Returns true if an edge exists
-	self.edge?(ancestor,descendant)
-	self.direct?(ancestor,descendant)
-	
-	#Finds a link or returns nil
-	self.find_link(ancestor,descendant)
-	#Returns true if a link exists
-	self.connected?(ancestor,descendant)
-	
-	#Creates an edge between an ancestor and descendant
-	self.create_edge(ancestor,descendant)
-	self.connect(ancestor,descendant)
-	
-	#Creates an edge using save! between an ancestor and descendant
-	self.create_edge!(ancestor,descendant)
-	self.connect!(ancestor,descendant)
-	
-	#Builds an edge between an ancestor and descendant, returning an unsaved edge
-	self.build_edge(ancestor,descendant)
-	
-	#Finds and returns the edge if it exists, or calls build_edge
-	self.find_or_build_edge(ancestor,descendant)
-	
+    #Finds an edge of returns nil
+    self.find_edge(ancestor,descendant)
+    #Returns true if an edge exists
+    self.edge?(ancestor,descendant)
+    self.direct?(ancestor,descendant)
+    
+    #Finds a link or returns nil
+    self.find_link(ancestor,descendant)
+    #Returns true if a link exists
+    self.connected?(ancestor,descendant)
+    
+    #Creates an edge between an ancestor and descendant
+    self.create_edge(ancestor,descendant)
+    self.connect(ancestor,descendant)
+    
+    #Creates an edge using save! between an ancestor and descendant
+    self.create_edge!(ancestor,descendant)
+    self.connect!(ancestor,descendant)
+    
+    #Builds an edge between an ancestor and descendant, returning an unsaved edge
+    self.build_edge(ancestor,descendant)
+    
+    #Finds and returns the edge if it exists, or calls build_edge
+    self.find_or_build_edge(ancestor,descendant)
+    
 ==== Injected Instance Methods
 
 Here is a sample of some of the important instance methods that get added to the link model.
 
-	#whether the current edge can be destroyed. If the edge also has a link, ie it can be made indirectly, then it cannot be 	destroyed.	
-	destroyable?()
-	
-	#Make the edge indirect. Removes the direct edge but keeps the indirect links
-	make_indirect()
-	
-	#Makes the link direct. Adds a direct edge onto a link.
-	make_direct()
-	
-	#Number of unique ways to get from the ancestor to the descendant
-	count()
-	
+    #whether the current edge can be destroyed. If the edge also has a link, ie it can be made indirectly, then it cannot be     destroyed.    
+    destroyable?()
+    
+    #Make the edge indirect. Removes the direct edge but keeps the indirect links
+    make_indirect()
+    
+    #Makes the link direct. Adds a direct edge onto a link.
+    make_direct()
+    
+    #Number of unique ways to get from the ancestor to the descendant
+    count()
+    
 === has_dag_links
 
 This singleton class method can be optionally called from the node ActiveRecord model. If you do not call it you don't get all the nice associations within the node model, yet everything will still work fine. It takes the required parameter:
 
-	has_dag_links :link_class_name => 'Class Name of the link model'
+    has_dag_links :link_class_name => 'Class Name of the link model'
 
 ==== Optional Parameters
 
@@ -203,32 +203,32 @@ For non-polymorphic graphs you also get the following associations. These find t
 
 For polymorphic graphs where the ancestor_class_names or descendant_class_names includes the specified class names the following associations are also built. For each ancestor_class_name:
 
--links_as_descendant_for_#{ancestor_class_name.tableize}
--links_as_child_for_#{ancestor_class_name.tableize}
--ancestor_#{ancestor_class_name.tableize}
--parent_#{ancestor_class_name.tableize}
+- links_as_descendant_for_#{ancestor_class_name.tableize}
+- links_as_child_for_#{ancestor_class_name.tableize}
+- ancestor_#{ancestor_class_name.tableize}
+- parent_#{ancestor_class_name.tableize}
 
 For each descendant_class_name
 
--links_as_ancestor_for_#{ancestor_class_name.tableize}
--links_as_parent_for_#{ancestor_class_name.tableize}
--descendant_#{ancestor_class_name.tableize}
--child_#{ancestor_class_name.tableize}
+- links_as_ancestor_for_#{ancestor_class_name.tableize}
+- links_as_parent_for_#{ancestor_class_name.tableize}
+- descendant_#{ancestor_class_name.tableize}
+- child_#{ancestor_class_name.tableize}
 
 ==== Injected Instance Methods
 
 Along with the above associations a number of instance methods are defined.
 
--leaf? , Boolean value as to whether the current node is a leaf (no descendants)
--root? , Boolean value as to whether the current node is a root (no ancestors)
+- leaf? , Boolean value as to whether the current node is a leaf (no descendants)
+- root? , Boolean value as to whether the current node is a root (no ancestors)
 
 With polymorphic graphs for each ancestor_class_name another method is defined.
 
--root_for_#{ancestor_class_name.tableize}? , Returns true if the node has no ancestors of the represented type.
+- root_for_#{ancestor_class_name.tableize}? , Returns true if the node has no ancestors of the represented type.
 
 Likewise for each descendant_class_name.
 
--leaf_for_#{descendent_class_name.tableize}? , Returns true if the node has no descendants of the represented type.
+- leaf_for_#{descendent_class_name.tableize}? , Returns true if the node has no descendants of the represented type.
 
 == Usage
 
@@ -236,27 +236,27 @@ This section goes over some basic usage examples and presents some caveats.
 
 === Basic Non-polymorphic Graphs.
 
-	class Node < ActiveRecord::Base
-		has_dag_links :link_class_name => 'Link'
-	end
-	
-	class Link < ActiveRecord::Base
-		acts_as_dag_links :node_class_name => 'Node'
-	end
-	
-	#Adding an edge
-	parent_node = Node.create!
-	child_node = Node.create!
-	parent_node.children << child_node
-	
-	#Removing it
-	link = Link.find_link(parent_node,child_node)
-	if link.destroyable?
-		link.destory
-	else
-		link.make_indirect
-		link.save!
-	end
+    class Node < ActiveRecord::Base
+        has_dag_links :link_class_name => 'Link'
+    end
+    
+    class Link < ActiveRecord::Base
+        acts_as_dag_links :node_class_name => 'Node'
+    end
+    
+    #Adding an edge
+    parent_node = Node.create!
+    child_node = Node.create!
+    parent_node.children << child_node
+    
+    #Removing it
+    link = Link.find_link(parent_node,child_node)
+    if link.destroyable?
+        link.destroy
+    else
+        link.make_indirect
+        link.save!
+    end
 
 === Caveats for Adding, Updating, Deleting Links
 

data/Rakefile

@@ -1,6 +1,6 @@
-require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
+require 'bundler/gem_tasks'
 
 desc 'Default: run unit tests.'
 task :default => :test
@@ -18,22 +18,6 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.title    = 'ActsAsDag'
   rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/active_record/acts/dag.rb')
+  rdoc.rdoc_files.include('lib/dag/dag.rb')
 end
 
-# setup to build plugin as a gem
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "acts-as-dag"
-    gemspec.summary = "Acts As DAG Gem"
-    gemspec.description = "Acts As Dag, short for Acts As Directed Acyclic Graph, is a gem which allows you to represent DAG hierarchy using your ActiveRecord models. Versions 1.x were built using Rails 2.x. Versions 2.x were built using Rails 3.x."
-    gemspec.authors = ["Matthew Leventi", "Robert Schmitt"]
-    gemspec.email = "mleventi@gmail.com"
-    gemspec.rubyforge_project = "acts-as-dag"
-    gemspec.homepage = "http://github.com/resgraph/acts-as-dag"
-    gemspec.files = FileList["[A-Z]*", "{lib,test}/**/*"]
-  end
-rescue
-  puts "Jeweler or one of its dependencies is not installed."
-end

data/acts-as-dag.gemspec

@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+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.email       = ["resgraph@cox.net"]
+  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}
+
+  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.require_paths = ["lib"]
+
+  # As specified in test/dag_test.rb
+  s.add_development_dependency 'activerecord', '~> 3.0.3'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'sqlite3'
+  s.add_runtime_dependency 'activemodel'
+  s.add_runtime_dependency 'activerecord'
+end

data/init.rb

@@ -0,0 +1 @@
+require "#{File.dirname(__FILE__)}/lib/acts-as-dag"

data/lib/acts-as-dag/version.rb

@@ -0,0 +1,7 @@
+module Acts
+  module As
+    module Dag
+      VERSION = "2.5.7"
+    end
+  end
+end

data/lib/dag/dag.rb

@@ -19,8 +19,8 @@ module Dag
       end
     end
 
-    write_inheritable_attribute :acts_as_dag_options, conf
-    class_inheritable_reader :acts_as_dag_options
+    class_attribute :acts_as_dag_options, :instance_writer => false
+    self.acts_as_dag_options = conf
 
     extend Columns
     include Columns
@@ -284,6 +284,13 @@ module Dag
       EOL4
     end
     self.class_eval <<-EOL5
+            def #{prefix}self_and_ancestors
+              [self] + #{prefix}ancestors
+            end
+            def #{prefix}self_and_descendants
+              [self] + #{prefix}descendants
+            end
+            
             def #{prefix}leaf?
               self.#{prefix}links_as_ancestor.empty?
 						end

data/lib/dag/edges.rb

@@ -20,14 +20,14 @@ module Dag
     def find_edge(ancestor, descendant)
       source = self::EndPoint.from(ancestor)
       sink = self::EndPoint.from(descendant)
-      self.find(:first, :conditions => self.conditions_for(source, sink).merge!({direct_column_name => true}))
+      self.first :conditions => self.conditions_for(source, sink).merge!({direct_column_name => true})
     end
 
     #Finds a link between two points
     def find_link(ancestor, descendant)
       source = self::EndPoint.from(ancestor)
       sink = self::EndPoint.from(descendant)
-      self.find(:first, :conditions => self.conditions_for(source, sink))
+      self.first :conditions => self.conditions_for(source, sink)
     end
 
     #Finds or builds an edge between two points

data/test/dag_test.rb

@@ -70,6 +70,7 @@ class DagTest < Test::Unit::TestCase
 
   #Setups up database in memory
   def setup
+    ActiveRecord::Migration.verbose = false
     ActiveRecord::Schema.define(:version => 1) do
       create_table :edges do |t|
         t.column :ancestor_id, :integer
@@ -593,6 +594,14 @@ class DagTest < Test::Unit::TestCase
     assert !e.nil?
   end
 
+  #Tests self_and_descendants
+  def test_self_and_descendants
+    a = Node.create!(:name => 'a')
+    b = Node.create!(:name => 'b')
+    a.descendants << b
+    assert_equal [a,b], a.self_and_descendants
+  end
+
   #Tests has_many ancestors
   def test_has_many_ancestors
     a = Node.create!
@@ -602,6 +611,14 @@ class DagTest < Test::Unit::TestCase
     assert !e.nil?
   end
 
+  #Tests self_and_ancestors
+  def test_self_and_ancestors
+    a = Node.create!
+    b = Node.create!
+    b.ancestors << a
+    assert_equal [b,a], b.self_and_ancestors
+  end
+
   #Tests has_many children
   def test_has_many_children
     a = Node.create!

metadata

@@ -1,34 +1,114 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: acts-as-dag
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 2.5.7
   prerelease: 
-  version: 2.5.5
 platform: ruby
-authors: 
+authors:
 - Matthew Leventi
 - Robert Schmitt
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-29 00:00:00 -07:00
-default_executable: 
-dependencies: []
-
-description: Acts As Dag, short for Acts As Directed Acyclic Graph, is a gem which allows you to represent DAG hierarchy using your ActiveRecord models. Versions 1.x were built using Rails 2.x. Versions 2.x were built using Rails 3.x.
-email: mleventi@gmail.com
+date: 2012-05-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.3
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Directed Acyclic Graph hierarchy for Rail's ActiveRecord
+email:
+- resgraph@cox.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.rdoc
-files: 
+extra_rdoc_files: []
+files:
+- .gitignore
+- Gemfile
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
+- acts-as-dag.gemspec
+- init.rb
 - lib/acts-as-dag.rb
+- lib/acts-as-dag/version.rb
 - lib/dag/columns.rb
 - lib/dag/dag.rb
 - lib/dag/edges.rb
@@ -37,34 +117,30 @@ files:
 - lib/dag/standard.rb
 - lib/dag/validators.rb
 - test/dag_test.rb
-- test/database.test
-has_rdoc: true
-homepage: http://github.com/resgraph/acts-as-dag
+homepage: https://github.com/resgraph/acts-as-dag
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: acts-as-dag
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Acts As DAG Gem
-test_files: 
+summary: Directed Acyclic Graph hierarchy for Rail's ActiveRecord
+test_files:
 - test/dag_test.rb
+has_rdoc: