acts-as-dag 3.0.0 → 4.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f9877ef3e8a02c7abe9783aecd4baecc299eedd2
+  data.tar.gz: ab13f7dcf3c411dda2f238edf2d6d52307a3547b
+SHA512:
+  metadata.gz: 2a213bdbf6c023a145623e4c0839dad678c3540a48a06cda7b0fac15630c27a7320f154fe4b0f2f67d14534e156c0716761f44ad6de1e5030762627000222c63
+  data.tar.gz: a00bb1e52e0a2e12e5c14605aa9a945a788cb3e2fdf97e1e6924ca23909d3a8c9c9b961eb068048ae759d3172719ac2c9522076a6409a0643b5d2dbb17894a4f

data/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'bundler'
 gem 'rake'
-gem 'rails', '3.2.12'
+gem 'rails', '>= 4.0.0'
 gem 'rack'
 gem 'jeweler'
 gem 'sqlite3'

data/README.rdoc

@@ -12,6 +12,8 @@ Version 2.0.x tested using Rails 3.0.0 and Ruby 1.9.2-p0, without major structur
 
 Version 2.5.3 is based on Rails 3.0.0 and uses all of the new ActiveModel/ActiveRecord goodness found there.
 
+Version 3.0.0 is based on Rails 3.2.12 and tested against Ruby 1.9.3-p385. 3.0.0 fixes issues with the ActiveRecord method connected? being overwritten by acts-as-dag. Thanks to Ryan Glover (@ersatzryan) for the patch.
+
 === What's a DAG?
 
 http://en.wikipedia.org/wiki/Directed_acyclic_graph

data/acts-as-dag.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   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.description = %q{Directed Acyclic Graph hierarchy for Rail's ActiveRecord, supporting Rails 4.x}
 
   s.rubyforge_project = "acts-as-dag"
 
@@ -19,9 +19,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # As specified in test/dag_test.rb
-  s.add_development_dependency 'activerecord', '~> 3.2.12'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'sqlite3'
   s.add_runtime_dependency 'activemodel'
-  s.add_runtime_dependency 'activerecord'
+  s.add_runtime_dependency 'activerecord', '~> 4.0', '>= 4.0.0'
 end

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

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

data/lib/dag/dag.rb

@@ -93,12 +93,11 @@ module Dag
       include Standard
     end
 
-    # TODO: rename? breaks when using 'where' query because :direct scope name and :direct => true parameter conflict?
-    scope :direct, :conditions => {:direct => true}
-    scope :indirect, :conditions => {:direct => false}
+    scope :direct, lambda { where(:direct => true) }
+    scope :indirect, lambda { where(:direct => false) }
 
-    scope :ancestor_nodes, :joins => :ancestor
-    scope :descendant_nodes, :joins => :descendant
+    scope :ancestor_nodes, lambda { joins(:ancestor) }
+    scope :descendant_nodes, lambda { joins(:descendant) }
 
     validates ancestor_id_column_name.to_sym, :presence => true,
               :numericality => true
@@ -163,8 +162,8 @@ module Dag
               has_many :#{prefix}links_as_ancestor, :as => :ancestor, :class_name => '#{dag_link_class_name}'
               has_many :#{prefix}links_as_descendant, :as => :descendant, :class_name => '#{dag_link_class_name}'
 
-              has_many :#{prefix}links_as_parent, :as => :ancestor, :class_name => '#{dag_link_class_name}', :conditions => {'#{dag_link_class.direct_column_name}' => true}
-              has_many :#{prefix}links_as_child, :as => :descendant, :class_name => '#{dag_link_class_name}', :conditions => {'#{dag_link_class.direct_column_name}' => true}
+              has_many :#{prefix}links_as_parent, lambda { where('#{dag_link_class.direct_column_name}' => true) }, :as => :ancestor, :class_name => '#{dag_link_class_name}'
+              has_many :#{prefix}links_as_child, lambda { where('#{dag_link_class.direct_column_name}' => true) }, :as => :descendant, :class_name => '#{dag_link_class_name}'
 
       EOL
 
@@ -173,9 +172,9 @@ module Dag
       conf[:ancestor_class_names].each do |class_name|
         table_name = class_name.tableize
         self.class_eval <<-EOL2
-                has_many :#{prefix}links_as_descendant_for_#{table_name}, :as => :descendant, :class_name => '#{dag_link_class_name}', :conditions => {'#{dag_link_class.ancestor_type_column_name}' => '#{class_name}'}
+                has_many :#{prefix}links_as_descendant_for_#{table_name}, lambda { where('#{dag_link_class.ancestor_type_column_name}' => '#{class_name}') }, :as => :descendant, :class_name => '#{dag_link_class_name}'
                 has_many :#{prefix}ancestor_#{table_name}, :through => :#{prefix}links_as_descendant_for_#{table_name}, :source => :ancestor, :source_type => '#{class_name}'
-                has_many :#{prefix}links_as_child_for_#{table_name}, :as => :descendant, :class_name => '#{dag_link_class_name}', :conditions => {'#{dag_link_class.ancestor_type_column_name}' => '#{class_name}','#{dag_link_class.direct_column_name}' => true}
+                has_many :#{prefix}links_as_child_for_#{table_name}, lambda { where('#{dag_link_class.ancestor_type_column_name}' => '#{class_name}','#{dag_link_class.direct_column_name}' => true) }, :as => :descendant, :class_name => '#{dag_link_class_name}'
                 has_many :#{prefix}parent_#{table_name}, :through => :#{prefix}links_as_child_for_#{table_name}, :source => :ancestor, :source_type => '#{class_name}'
 
               	def #{prefix}root_for_#{table_name}?
@@ -223,10 +222,10 @@ module Dag
       conf[:descendant_class_names].each do |class_name|
         table_name = class_name.tableize
         self.class_eval <<-EOL3
-                has_many :#{prefix}links_as_ancestor_for_#{table_name}, :as => :ancestor, :class_name => '#{dag_link_class_name}', :conditions => {'#{dag_link_class.descendant_type_column_name}' => '#{class_name}'}
+                has_many :#{prefix}links_as_ancestor_for_#{table_name}, lambda { where('#{dag_link_class.descendant_type_column_name}' => '#{class_name}') }, :as => :ancestor, :class_name => '#{dag_link_class_name}'
                 has_many :#{prefix}descendant_#{table_name}, :through => :#{prefix}links_as_ancestor_for_#{table_name}, :source => :descendant, :source_type => '#{class_name}'
 
-                has_many :#{prefix}links_as_parent_for_#{table_name}, :as => :ancestor, :class_name => '#{dag_link_class_name}', :conditions => {'#{dag_link_class.descendant_type_column_name}' => '#{class_name}','#{dag_link_class.direct_column_name}' => true}
+                has_many :#{prefix}links_as_parent_for_#{table_name}, lambda { where('#{dag_link_class.descendant_type_column_name}' => '#{class_name}','#{dag_link_class.direct_column_name}' => true) }, :as => :ancestor, :class_name => '#{dag_link_class_name}'
                 has_many :#{prefix}child_#{table_name}, :through => :#{prefix}links_as_parent_for_#{table_name}, :source => :descendant, :source_type => '#{class_name}'
 
 								def #{prefix}leaf_for_#{table_name}?
@@ -275,8 +274,8 @@ module Dag
               has_many :#{prefix}ancestors, :through => :#{prefix}links_as_descendant, :source => :ancestor
               has_many :#{prefix}descendants, :through => :#{prefix}links_as_ancestor, :source => :descendant
 
-              has_many :#{prefix}links_as_parent, :foreign_key => '#{dag_link_class.ancestor_id_column_name}', :class_name => '#{dag_link_class_name}', :conditions => {'#{dag_link_class.direct_column_name}' => true}
-              has_many :#{prefix}links_as_child, :foreign_key => '#{dag_link_class.descendant_id_column_name}', :class_name => '#{dag_link_class_name}', :conditions => {'#{dag_link_class.direct_column_name}' => true}
+              has_many :#{prefix}links_as_parent, lambda { where('#{dag_link_class.direct_column_name}' => true) }, :foreign_key => '#{dag_link_class.ancestor_id_column_name}', :class_name => '#{dag_link_class_name}'
+              has_many :#{prefix}links_as_child, lambda { where('#{dag_link_class.direct_column_name}' => true) }, :foreign_key => '#{dag_link_class.descendant_id_column_name}', :class_name => '#{dag_link_class_name}'
 
               has_many :#{prefix}parents, :through => :#{prefix}links_as_child, :source => :ancestor
               has_many :#{prefix}children, :through => :#{prefix}links_as_parent, :source => :descendant

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.first :conditions => self.conditions_for(source, sink).merge!({direct_column_name => true})
+      self.where(self.conditions_for(source, sink).merge!({direct_column_name => true})).first
     end
 
     #Finds a link between two points
     def find_link(ancestor, descendant)
       source = self::EndPoint.from(ancestor)
       sink = self::EndPoint.from(descendant)
-      self.first :conditions => self.conditions_for(source, sink)
+      self.where(self.conditions_for(source, sink)).first
     end
 
     #Finds or builds an edge between two points

data/test/dag_test.rb

@@ -1,8 +1,8 @@
 require 'test/unit'
 require 'rubygems'
-gem 'activerecord', '~> 3.2.8'
+gem 'activerecord', '~> 4.1.0'
 require "./init"
-
+I18n.enforce_available_locales = true
 
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => "#{File.dirname(__FILE__)}/database.test")
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-dag
 version: !ruby/object:Gem::Version
-  version: 3.0.0
-  prerelease: 
+  version: 4.0.0
 platform: ruby
 authors:
 - Matthew Leventi
@@ -10,96 +9,79 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-18 00:00:00.000000000 Z
+date: 2014-04-09 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.2.12
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.12
 - !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'
+        version: '4.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.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
+        version: '4.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+description: Directed Acyclic Graph hierarchy for Rail's ActiveRecord, supporting
+  Rails 4.x
 email:
 - resgraph@cox.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - MIT-LICENSE
 - README.rdoc
@@ -118,30 +100,26 @@ files:
 - test/dag_test.rb
 homepage: https://github.com/resgraph/acts-as-dag
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -251717266432713559
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: acts-as-dag
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Directed Acyclic Graph hierarchy for Rail's ActiveRecord
 test_files:
 - test/dag_test.rb