acts_as_better_tree 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc74272fc7fc3915abb380329b5e94c5c5e1a0443eac3622cf822c6108c4a210
-  data.tar.gz: 35fe1dc2025071cff6d0aa42a006a56eaeede88cf5ad4a4a44c4986c6b6923f6
+  metadata.gz: 4b7f71a6d2b5c286601e25437f287c4e1103d10255303100863d11d12f0d227e
+  data.tar.gz: c2d906d6f8e20c09a3d53d226d04b831bfd60cadd0427fdaacff42c0abd40ad4
 SHA512:
-  metadata.gz: ea0b0db48776dcaf23d73d305beb17e43384f3c85b8faf77c099a2ed829487326154aa7bda9f17094e528f2f3da233f8f07f9c3aa9ecf8556afc2a7a232b77a4
-  data.tar.gz: be207899c3706d392db8d6d4beb7ecec0577eb62874213c4480b59171791eb5cda45cea897424a91e28465aec16cfcdf93ced39d80ba1851a419f502e7810c24
+  metadata.gz: a3eada0c8397efc08bacc7be7c41f03c7e321f6cea8594571110c9d781216bbcf13cc1a33606ce1f17c1059b53d1eb55119ae69566dad2a304fe1a319e7d9364
+  data.tar.gz: 2eeadc73f674efcd38b88c7ee942b81a795811b98377da5a2f1327dec33280f573ea38f196586957430a7081ea47bc3750194241714fd7ed6d5d24dd5390e882

data/Gemfile

@@ -2,7 +2,10 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in acts_as_better_tree.gemspec
 gemspec
-gem 'rspec'
+
+gem 'rspec', '~> 3.12'
 gem 'rails', ">= 3.2.5"
-gem "factory_girl"
-gem "csv"
+gem 'factory_bot', '~> 6.4'
+gem 'csv'
+gem 'observer'
+gem 'sqlite3', '~> 2.1'

data/Gemfile.lock

@@ -86,11 +86,11 @@ GEM
     crass (1.0.6)
     csv (3.3.3)
     date (3.4.1)
-    diff-lcs (1.1.3)
+    diff-lcs (1.6.1)
     drb (2.2.1)
     erubi (1.13.1)
-    factory_girl (3.6.1)
-      activesupport (>= 3.0.0)
+    factory_bot (6.5.1)
+      activesupport (>= 6.1.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
     i18n (1.14.7)
@@ -126,6 +126,7 @@ GEM
     nokogiri (1.18.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
+    observer (0.1.2)
     pp (0.6.2)
       prettyprint
     prettyprint (0.2.0)
@@ -175,15 +176,22 @@ GEM
       psych (>= 4.0.0)
     reline (0.6.1)
       io-console (~> 0.5)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.1)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.3)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.2)
     securerandom (0.4.1)
+    sqlite3 (2.6.0)
+      mini_portile2 (~> 2.8.0)
     stringio (3.1.6)
     thor (1.3.2)
     timeout (0.4.3)
@@ -203,9 +211,11 @@ PLATFORMS
 DEPENDENCIES
   acts_as_better_tree!
   csv
-  factory_girl
+  factory_bot (~> 6.4)
+  observer
   rails (>= 3.2.5)
-  rspec
+  rspec (~> 3.12)
+  sqlite3 (~> 2.1)
 
 BUNDLED WITH
    2.6.5

data/lib/acts_as_better_tree/version.rb

@@ -1,3 +1,3 @@
 module ActsAsBetterTree
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

data/lib/acts_as_better_tree.rb

@@ -1,4 +1,5 @@
 require "acts_as_better_tree/version"
+require "csv"
 module ActiveRecord
   module Acts
     module BetterTree
@@ -28,8 +29,7 @@ module ActiveRecord
           belongs_to :root, 
             class_name: name, 
             foreign_key: :root_id, 
-            optional: true,
-            dependent: :destroy
+            optional: true
           scope :roots, -> {order(configuration[:order]).where(:parent_id => nil)}
           after_create       :assign_csv_ids
           after_validation  :update_csv_ids, :on => :update

data/spec/acts_as_better_tree_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
-ActiveRecord::Base::establish_connection(:adapter => "sqlite3", :dbfile => ":memory:", :database => "gemtest")
+ActiveRecord::Base.establish_connection(
+  adapter: 'sqlite3',
+  database: ':memory:'
+)
 $stdout = StringIO.new
 
 def setup_db
@@ -72,4 +75,43 @@ describe "ActsAsBetterTree" do
   it "should return a csv string of all nodes" do
     Category.to_csv.should eql "Animals,Cats,Lions\nAnimals,Cats,Tiger\nAnimals,Cats,House Cat\nAnimals,Cats,Panther\nAnimals,Cats,Bobcats\n"
   end
+
+  context "when there are multiple category roots" do
+    before do
+      baseball = Category.create(name: "baseball")
+      basketball = Category.create(name: "basketball")
+      football = Category.create(name: "football")
+      Category.create(name: "minor", :parent => baseball)
+      Category.create(name: "major", :parent => baseball)
+      Category.create(name: "minor", :parent => basketball)
+      Category.create(name: "major", :parent => basketball)
+      Category.create(name: "minor", :parent => football)
+      Category.create(name: "major", :parent => football)
+
+    end
+    context "and the category root is deleted" do
+      it "should also remove its children" do
+        category = Category.find_by_name("football")
+        category.children.count.should eql 2
+        category.destroy
+
+        Category.find_by_name("football").should eql nil
+        Category.find_by_name("basketball").children.should_not eql nil
+        Category.find_by_name("baseball").children.should_not eql nil
+      end
+    end
+
+    context "and a non category root is deleted" do
+      it "should remove only its children" do
+        category = Category.find_by_name("football")
+        minor = category.children.find_by_name("minor")
+        minor.children.create(:name => "topps")
+
+        minor.destroy
+        category.children.find_by_name("minor").should eql nil
+        Category.find_by_name("basketball").children.should_not eql nil
+        Category.find_by_name("baseball").children.should_not eql nil
+      end
+    end
+  end
 end

data/spec/factories/categories.rb

@@ -1,10 +1,10 @@
-FactoryGirl.define do
+FactoryBot.define do
     factory :animals, class: Category do
-      name "animals"
+      name { "animals" }
     end
 
     factory :cats, class: Category do
-      name "cats"
+      name { "cats" }
       association :parent, factory: :animals, strategy: :build
     end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'bundler/setup'
 require 'active_record'
-require 'factory_girl'
+require 'factory_bot'
 require 'acts_as_better_tree'
 
 # Requires supporting files with custom matchers and macros, etc,
@@ -8,5 +8,10 @@ require 'acts_as_better_tree'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
+  config.include FactoryBot::Syntax::Methods
   
+  # Explicitly enable the should syntax
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_better_tree
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Isaac Sloan