edge 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aae17b676f3e8c7f0c5228f66a548816cd41bb17
-  data.tar.gz: a45d3fb5955a229e42e319fbfa99e2da9342e533
+  metadata.gz: de6a7e89e268d6a04bcb12ea49f331c0492a12c0
+  data.tar.gz: d3223c0995b78bc3c9de539948b225ee2c0a148a
 SHA512:
-  metadata.gz: 51317099a665b022b83d0d5bda61d8483a636fb9fe0ff01cd5e5560e87999d283878a71cba51dc3f62cca1c19cf26570932bdf884c3617fa1877e96b0e9c2aa2
-  data.tar.gz: f526a15443b51f5cb52d7619f3cbdfd54cdf511cec4a33bf245b7e79c7a4a0bc0bfde6fbe5b00fae89f8d929e5a6ed4282db958b5f1d21291d29787b7872674c
+  metadata.gz: e906301864501743b6848b67a40b33d60e5447c7a34c39023327d577e03e43b0ad926834435c31dbaa5b924f16a1b4dcf3bf095565d18779d8cd180b9b4e3776
+  data.tar.gz: 85d2f8ea8e2e95dd163f17a2e436cec52b50bb80cc8bda6afc012cedba282548cd23991ea0bb4917b91847832ea9a7fb51734ff9a34bfc1b4a5df9011cd1f115

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.4.3 (October 23, 2015)
+
+* Allow dependent option to acts_as_forest (WANG QUANG)
+
 # 0.4.2 (May 21, 2015)
 
 * Fixed premature SQL-ization that could result in PG protocol violation errors (Neil E. Pearson)

data/Rakefile

@@ -8,7 +8,7 @@ task :default => :spec
 namespace :db do
   desc 'bootstrap database'
   task :setup do
-    sh "createdb edge_test"
+    sh "createdb edge_test || true"
     sh "psql edge_test < spec/database_structure.sql"
   end
 end

data/gemfiles/4.0.gemfile

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem "activerecord", "4.0.0"
+gem "activerecord", "4.0.13"
 
 gemspec :path=>"../"

data/gemfiles/4.1.gemfile

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem "activerecord", "~> 4.1.8"
+gem "activerecord", "~> 4.1.13"
 
 gemspec :path=>"../"

data/gemfiles/4.2.gemfile

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem "activerecord", "~> 4.2.0"
+gem "activerecord", "~> 4.2.4"
 
 gemspec :path=>"../"

data/lib/edge/forest.rb

@@ -4,10 +4,11 @@ module Edge
     module ActsAsForest
       # options:
       #
+      # * dependent - passed to children has_many (default: none)
       # * foreign_key - column name to use for parent foreign_key (default: parent_id)
       # * order - how to order children (default: none)
       def acts_as_forest(options={})
-        options.assert_valid_keys :foreign_key, :order
+        options.assert_valid_keys :foreign_key, :order, :dependent
 
         class_attribute :forest_foreign_key
         self.forest_foreign_key = options[:foreign_key] || "parent_id"
@@ -20,15 +21,16 @@ module Edge
           :foreign_key => forest_foreign_key
         }
 
+        dependent_options = options[:dependent] ? { dependent: options[:dependent] } : {}
+
         belongs_to :parent, common_options.merge(inverse_of: :children)
 
         if forest_order
-          has_many :children, -> { order(forest_order) }, common_options.merge(inverse_of: :parent)
+          has_many :children, -> { order(forest_order) }, common_options.merge(inverse_of: :parent).merge(dependent_options)
         else
-          has_many :children, common_options.merge(inverse_of: :parent)
+          has_many :children, common_options.merge(inverse_of: :parent).merge(dependent_options)
         end
 
-
         scope :root, -> { where(forest_foreign_key => nil) }
 
         include Edge::Forest::InstanceMethods
@@ -116,7 +118,7 @@ module Edge
 
         as_statement = Arel::Nodes::As.new all_nodes, union
 
-        manager = Arel::SelectManager.new(Arel::Table.engine)
+        Arel::SelectManager.new(Arel::Table.engine)
           .with(:recursive, as_statement)
           .from(all_nodes)
           .join(arel_table)
@@ -132,7 +134,7 @@ module Edge
 
       # Returns true is this node is a root or false otherwise
       def root?
-        !parent_id
+        !self[forest_foreign_key]
       end
 
       # Returns all sibling nodes (nodes that have the same parent). If this

data/lib/edge/version.rb

@@ -1,3 +1,3 @@
 module Edge
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/spec/database_structure.sql

@@ -1,4 +1,5 @@
 DROP TABLE IF EXISTS locations;
+DROP TABLE IF EXISTS body_parts;
 
 CREATE TABLE locations(
   id serial PRIMARY KEY,
@@ -6,3 +7,8 @@ CREATE TABLE locations(
   name varchar NOT NULL,
   attrs json DEFAULT NULL -- include a column that does not have an operator defined that can be used with union
 );
+
+CREATE TABLE body_parts(
+  id serial PRIMARY KEY,
+  body_part_id integer REFERENCES body_parts -- something that uses a non-standard parent ID
+);

data/spec/forest_spec.rb

@@ -4,9 +4,14 @@ class Location < ActiveRecord::Base
   acts_as_forest :order => "name"
 end
 
+class BodyPart < ActiveRecord::Base
+  acts_as_forest :foreign_key => "body_part_id"
+end
+
 Location.delete_all
 
 describe "Edge::Forest" do
+  let(:skeleton) { BodyPart.create! }
   let!(:usa) { Location.create! :name => "USA" }
   let!(:illinois) { Location.create! :parent => usa, :name => "Illinois" }
   let!(:chicago) { Location.create! :parent => illinois, :name => "Chicago" }
@@ -21,6 +26,12 @@ describe "Edge::Forest" do
       end
     end
 
+    context "of model with custom foreign key" do
+      it "should be true" do
+        expect(skeleton.root?).to eq true
+      end
+    end
+
     context "of child node" do
       it "should be false" do
         expect(illinois.root?).to eq false
@@ -226,4 +237,24 @@ describe "Edge::Forest" do
       Location2.find_forest
     end
   end
+
+  describe "dependent destroy" do
+    it 'cascades destroys' do
+      class Location3 < ActiveRecord::Base
+        self.table_name = 'locations'
+        acts_as_forest dependent: :destroy
+      end
+
+      Location3.find(usa.id).destroy
+
+      expect(Location.exists?(usa.id)).to eq false
+      expect(Location.exists?(illinois.id)).to eq false
+      expect(Location.exists?(chicago.id)).to eq false
+      expect(Location.exists?(indiana.id)).to eq false
+
+      expect(Location.exists?(canada.id)).to eq true
+      expect(Location.exists?(british_columbia.id)).to eq true
+    end
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edge
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Jack Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -159,9 +159,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Graph functionality for ActiveRecord. Provides tree/forest modeling structure
   that can load entire trees in a single query.
-test_files: []
+test_files:
+- spec/database.yml
+- spec/database.yml.travis
+- spec/database_structure.sql
+- spec/forest_spec.rb
+- spec/spec_helper.rb