acts_as_recursive_tree 2.1.0 → 3.0.0

data/spec/db/database.yml

@@ -1,12 +1,9 @@
-common: &common
+sqlite:
   database:
   host: localhost
   pool: 50
   timeout: 5000
   reaping_frequency: 1000
   min_messages: ERROR
-
-sqlite:
-  <<: *common
   adapter: sqlite3
-  database: test.sqlite3
+  database: test.sqlite3

data/spec/db/models.rb

@@ -1,37 +1,38 @@
-ActiveRecord::Base.class_exec do
+# frozen_string_literal: true
+
+# Base test class
+class ApplicationRecord < ::ActiveRecord::Base
+  self.abstract_class = true
+
   extend ActsAsRecursiveTree::ActsMacro
 end
 
-class Node < ActiveRecord::Base
+class Node < ApplicationRecord
   acts_as_tree
   has_one :node_info
 end
 
-class NodeInfo < ActiveRecord::Base
+class NodeInfo < ApplicationRecord
   belongs_to :node
 end
 
-class NodeWithPolymorphicParent < ActiveRecord::Base
+class NodeWithPolymorphicParent < ApplicationRecord
   acts_as_tree parent_key: :other_id, parent_type_column: :other_type
 end
 
-
-class NodeWithOtherParentKey < ActiveRecord::Base
+class NodeWithOtherParentKey < ApplicationRecord
   acts_as_tree parent_key: :other_id
 end
 
-class Location < ActiveRecord::Base
+class Location < ApplicationRecord
   acts_as_tree
 end
 
 class Building < Location
-
 end
 
 class Floor < Location
-
 end
 
 class Room < Location
-
-end
+end

data/spec/db/schema.rb

@@ -1,7 +1,6 @@
-# encoding: UTF-8
-
-ActiveRecord::Schema.define(:version => 0) do
+# frozen_string_literal: true
 
+ActiveRecord::Schema.define(version: 0) do
   create_table :nodes do |t|
     t.integer :parent_id
     t.string :name
@@ -31,4 +30,4 @@ ActiveRecord::Schema.define(:version => 0) do
   end
 
   add_foreign_key(:locations, :locations, column: :parent_id)
-end
+end

data/spec/model/location_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Location do
@@ -10,7 +12,6 @@ describe Location do
       @building.children << floor
 
       1.upto(5) do |index_room|
-
         floor.children << Room.create!(name: "#{index_room}. Room")
       end
     end
@@ -22,34 +23,29 @@ describe Location do
     end
 
     context '::descendants_of' do
-
       context 'with Room' do
         let(:rooms) { Room.descendants_of(@building) }
 
-        it 'should have 25 rooms' do
+        it 'has 25 rooms' do
           expect(rooms.count).to eq(25)
         end
 
-        it 'should all be of type Room' do
+        it 'alls be of type Room' do
           expect(rooms.all).to all(be_an(Room))
         end
-
       end
 
       context 'with Floor' do
         let(:floors) { Floor.descendants_of(@building) }
 
-        it 'should have 5 Floors' do
+        it 'has 5 Floors' do
           expect(floors.count).to eq(5)
         end
 
-        it 'should all be of type Floor' do
+        it 'alls be of type Floor' do
           expect(floors.all).to all(be_an(Floor))
         end
-
       end
-
     end
   end
-
-end
+end

data/spec/model/node_spec.rb

@@ -1,12 +1,10 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Node do
-
   def create_tree(max_level, current_level = 0, node = nil)
-
-    if node.nil?
-      node = Node.create!(name: 'root')
-    end
+    node = Node.create!(name: 'root') if node.nil?
 
     1.upto(max_level - current_level) do |index|
       child = node.children.create!(name: "child #{index} - level #{current_level}")
@@ -21,80 +19,72 @@ describe Node do
     @child = @root.children.first
   end
 
-  context '#children' do
-    it 'should have 3 children' do
-      expect(@root.children.count).to eql(3)
+  describe '#children' do
+    it 'has 3 children' do
+      expect(@root.children.count).to be(3)
     end
 
-    it 'should not include root node ' do
-      expect(@root.children).to_not include(@root)
+    it 'does not include root node ' do
+      expect(@root.children).not_to include(@root)
     end
-
   end
 
-  context '#descendants' do
-
-    it 'should have 15 descendants' do
+  describe '#descendants' do
+    it 'has 15 descendants' do
       expect(@root.descendants.count).to eql(3 + (3 * 2) + (3 * 2 * 1))
     end
 
-    it 'should not include root' do
-      expect(@root.descendants).to_not include(@root)
+    it 'does not include root' do
+      expect(@root.descendants).not_to include(@root)
     end
   end
-  context '#self_and_descendants' do
 
-    it 'should have 15 descendants and self' do
+  describe '#self_and_descendants' do
+    it 'has 15 descendants and self' do
       expect(@root.self_and_descendants.count).to eql(@root.descendants.count + 1)
     end
 
-    it 'should include self' do
+    it 'includes self' do
       expect(@root.self_and_descendants.all).to include(@root)
     end
   end
 
-  context '#root?' do
-
-    it 'should be true for root node' do
-      expect(@root.root?).to be_truthy
+  describe '#root?' do
+    it 'is true for root node' do
+      expect(@root).to be_root
     end
 
-    it 'should be false for children' do
-      expect(@child.root?).to be_falsey
+    it 'is false for children' do
+      expect(@child).not_to be_root
     end
-
   end
 
-  context '#leaf?' do
-
-    it 'should be false for root node' do
-      expect(@root.leaf?).to be_falsey
+  describe '#leaf?' do
+    it 'is false for root node' do
+      expect(@root).not_to be_leaf
     end
 
-    it 'should be true for children' do
-      expect(@root.leaves.first.leaf?).to be_truthy
+    it 'is true for children' do
+      expect(@root.leaves.first).to be_leaf
     end
-
   end
 
-
-  context '#leaves' do
-    it 'should have 6 leaves' do
-      expect(@root.leaves.count).to eql(6)
+  describe '#leaves' do
+    it 'has 6 leaves' do
+      expect(@root.leaves.count).to be(6)
     end
   end
 
   describe 'child' do
-
-    it 'should have root as parent' do
+    it 'has root as parent' do
       expect(@child.parent).to eql(@root)
     end
 
-    it 'should have 1 ancestor' do
-      expect(@child.ancestors.count).to eql(1)
+    it 'has 1 ancestor' do
+      expect(@child.ancestors.count).to be(1)
     end
 
-    it 'should have root as only ancestor' do
+    it 'has root as only ancestor' do
       expect(@child.ancestors.first).to eql(@root)
     end
 
@@ -111,19 +101,15 @@ describe Node do
     end
   end
 
-
   describe 'scopes' do
-
     context 'roots' do
-
       it 'has only one root node' do
-        expect(Node.roots.count).to eql(1)
+        expect(described_class.roots.count).to be(1)
       end
 
       it 'is the @root node' do
-        expect(Node.roots.first).to eql(@root)
+        expect(described_class.roots.first).to eql(@root)
       end
     end
-
   end
-end
+end

data/spec/model/relation_spec.rb

@@ -1,12 +1,10 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'Relation' do
-
   def create_tree(max_level, current_level: 0, node: nil, stop_at: nil)
-
-    if node.nil?
-      node = Node.create!(name: 'root')
-    end
+    node = Node.create!(name: 'root') if node.nil?
 
     1.upto(max_level - current_level) do |index|
       child = node.children.create!(name: "child #{index} - level #{current_level}", active: stop_at > current_level)
@@ -23,7 +21,6 @@ describe 'Relation' do
   end
 
   context 'descendants' do
-
     it 'works with simple relation' do
       desc = @root.descendants { |opts| opts.condition = Node.where(active: true) }
       desc.all.each do |node|
@@ -40,7 +37,6 @@ describe 'Relation' do
   end
 
   context 'ancestors' do
-
     it 'works with simple relation' do
       ancestors = @root.leaves.first.ancestors { |opts| opts.condition = Node.where(active: false) }.to_a
 
@@ -48,7 +44,7 @@ describe 'Relation' do
         expect(node.active).to be_falsey
       end
 
-      expect(ancestors).to_not include(@root)
+      expect(ancestors).not_to include(@root)
     end
 
     it 'works with joins relation' do
@@ -56,8 +52,7 @@ describe 'Relation' do
       ancestors.all.each do |node|
         expect(node.node_info.status).to eql('bar')
       end
-      expect(ancestors).to_not include(@root)
+      expect(ancestors).not_to include(@root)
     end
   end
-
-end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
+# frozen_string_literal: true
 
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib")
+
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 require 'active_record'
 
@@ -9,7 +11,6 @@ require_relative 'db/database'
 
 require 'database_cleaner'
 
-
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause
@@ -54,64 +55,62 @@ RSpec.configure do |config|
 
   # The settings below are suggested to provide a good initial experience
   # with RSpec, but feel free to customize to your heart's content.
-=begin
-  # These two settings work together to allow you to limit a spec run
-  # to individual examples or groups you care about by tagging them with
-  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
-  # get run.
-  config.filter_run :focus
-  config.run_all_when_everything_filtered = true
-
-  # Allows RSpec to persist some state between runs in order to support
-  # the `--only-failures` and `--next-failure` CLI options. We recommend
-  # you configure your source control system to ignore this file.
-  config.example_status_persistence_file_path = "spec/examples.txt"
-
-  # Limits the available syntax to the non-monkey patched syntax that is
-  # recommended. For more details, see:
-  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
-  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
-  config.disable_monkey_patching!
-
-  # This setting enables warnings. It's recommended, but in some cases may
-  # be too noisy due to issues in dependencies.
-  config.warnings = true
-
-  # Many RSpec users commonly either run the entire suite or an individual
-  # file, and it's useful to allow more verbose output when running an
-  # individual spec file.
-  if config.files_to_run.one?
-    # Use the documentation formatter for detailed output,
-    # unless a formatter has already been configured
-    # (e.g. via a command-line flag).
-    config.default_formatter = 'doc'
-  end
-
-  # Print the 10 slowest examples and example groups at the
-  # end of the spec run, to help surface which specs are running
-  # particularly slow.
-  config.profile_examples = 10
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = :random
-
-  # Seed global randomization in this process using the `--seed` CLI option.
-  # Setting this allows you to use `--seed` to deterministically reproduce
-  # test failures related to randomization by passing the same `--seed` value
-  # as the one that triggered the failure.
-  Kernel.srand config.seed
-=end
+  #   # These two settings work together to allow you to limit a spec run
+  #   # to individual examples or groups you care about by tagging them with
+  #   # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  #   # get run.
+  #   config.filter_run :focus
+  #   config.run_all_when_everything_filtered = true
+  #
+  #   # Allows RSpec to persist some state between runs in order to support
+  #   # the `--only-failures` and `--next-failure` CLI options. We recommend
+  #   # you configure your source control system to ignore this file.
+  #   config.example_status_persistence_file_path = "spec/examples.txt"
+  #
+  #   # Limits the available syntax to the non-monkey patched syntax that is
+  #   # recommended. For more details, see:
+  #   #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  #   config.disable_monkey_patching!
+  #
+  #   # This setting enables warnings. It's recommended, but in some cases may
+  #   # be too noisy due to issues in dependencies.
+  #   config.warnings = true
+  #
+  #   # Many RSpec users commonly either run the entire suite or an individual
+  #   # file, and it's useful to allow more verbose output when running an
+  #   # individual spec file.
+  #   if config.files_to_run.one?
+  #     # Use the documentation formatter for detailed output,
+  #     # unless a formatter has already been configured
+  #     # (e.g. via a command-line flag).
+  #     config.default_formatter = 'doc'
+  #   end
+  #
+  #   # Print the 10 slowest examples and example groups at the
+  #   # end of the spec run, to help surface which specs are running
+  #   # particularly slow.
+  #   config.profile_examples = 10
+  #
+  #   # Run specs in random order to surface order dependencies. If you find an
+  #   # order dependency and want to debug it, you can fix the order by providing
+  #   # the seed, which is printed after each run.
+  #   #     --seed 1234
+  #   config.order = :random
+  #
+  #   # Seed global randomization in this process using the `--seed` CLI option.
+  #   # Setting this allows you to use `--seed` to deterministically reproduce
+  #   # test failures related to randomization by passing the same `--seed` value
+  #   # as the one that triggered the failure.
+  #   Kernel.srand config.seed
 
   config.before(:suite) do
     DatabaseCleaner.strategy = :transaction
     DatabaseCleaner.clean_with(:truncation)
   end
 
-  config.around(:each) do |example|
+  config.around do |example|
     DatabaseCleaner.cleaning do
       example.run
     end