acts_as_ordered_tree 1.3.1 → 2.0.0.beta3

data/spec/tree/children_association_spec.rb

@@ -0,0 +1,72 @@
+# coding: utf-8
+
+require 'spec_helper'
+
+# All these examples throw deprecation errors with Rails 4.2
+describe ActsAsOrderedTree::Tree::ChildrenAssociation, :transactional do
+  shared_examples 'ChildrenAssociation' do |model|
+    describe model.to_s do
+      around(:each) do |example|
+        ActiveSupport::Deprecation.silence(&example)
+      end
+
+      tree :factory => model do
+        root {
+          child_1
+          child_2
+          child_3
+        }
+      end
+
+      let(:klass) { current_tree }
+
+      describe 'joining to association' do
+        let(:relation) { klass.joins(:children) }
+
+        it { expect(relation).to eq [root, root, root] }
+      end
+
+      describe 'loading association' do
+        it { expect(root.children.size).to eq 3 }
+        it { expect(root.children).to eq [child_1, child_2, child_3] }
+
+        it { expect{root.children.to_a}.to query_database(/ORDER BY .*position/) }
+      end
+
+      describe 'eager_loading association' do
+        let(:relation) { klass.eager_load(:children).order(klass.arel_table[:id]) }
+        let(:first) { relation.to_a.first }
+
+        it { expect(relation).to eq [root, child_1, child_2, child_3] }
+        it { expect(first.children).to be_loaded }
+        it { expect(first.children.size).to eq 3 }
+      end
+
+      describe 'preloading association' do
+        let(:relation) { klass.preload(:children).order(klass.arel_table[:id]) }
+        let(:first) { relation.to_a.first }
+
+        it { expect(relation).to eq [root, child_1, child_2, child_3] }
+        it { expect(first.children).to be_loaded }
+        it { expect(first.children.size).to eq 3 }
+      end
+
+      describe 'preloading association (via includes method)' do
+        let(:relation) { klass.includes(:children).order(klass.arel_table[:id]) }
+        let(:first) { relation.to_a.first }
+
+        it { expect(relation).to eq [root, child_1, child_2, child_3] }
+        it { expect(first.children).to be_loaded }
+        it { expect(first.children.size).to eq 3 }
+      end
+
+      describe 'extensions' do
+        it { expect(root.children).to respond_to :each_with_level }
+        it { expect(root.children).to respond_to :each_without_orphans }
+      end
+    end
+  end
+
+  include_examples 'ChildrenAssociation', :default
+  include_examples 'ChildrenAssociation', :scoped
+end

data/spec/tree/columns_spec.rb

@@ -0,0 +1,65 @@
+# coding: utf-8
+
+require 'spec_helper'
+
+require 'acts_as_ordered_tree/tree'
+
+describe ActsAsOrderedTree::Tree::Columns do
+  let(:klass) { Default }
+
+  shared_examples 'ordered tree column' do |method, option_name, value, klass=Default|
+    context 'when existing column name given' do
+      subject(:columns) { described_class.new(klass, option_name => value) }
+
+      it { expect(columns.send(method)).to eq value.to_s }
+      it { expect(columns.send("#{method}?")).to be true }
+    end
+
+    context 'when column name given but klass.columns_hash does not contain given name' do
+      subject(:columns) { described_class.new(klass, method => :x) }
+
+      it { expect(columns.send(method)).to be nil }
+      it { expect(columns.send("#{method}?")).to be false }
+    end
+
+    context 'when column name not given' do
+      subject(:columns) { described_class.new(klass, {}) }
+
+      it { expect(columns.send(method)).to be nil }
+      it { expect(columns.send("#{method}?")).to be false }
+    end
+
+    context 'when false given' do
+      subject(:columns) { described_class.new(klass, option_name => false) }
+
+      it { expect(columns.send(method)).to be nil }
+      it { expect(columns.send("#{method}?")).to be false }
+    end
+  end
+
+  include_examples 'ordered tree column', :parent, :parent_column, :parent_id
+  include_examples 'ordered tree column', :position, :position_column, :position
+  include_examples 'ordered tree column', :depth, :depth_column, :depth
+  include_examples 'ordered tree column', :counter_cache, :counter_cache, :categories_count do
+    context 'when true value as column name given' do
+      class Category < ActiveRecord::Base
+      end
+
+      subject(:columns) { described_class.new(Category, :counter_cache => true) }
+
+      it { expect(columns.counter_cache).to eq 'categories_count' }
+    end
+  end
+
+  describe 'scope columns' do
+    it 'raises error when any unknown column given' do
+      expect{described_class.new(Scoped, :scope => :x)}.to raise_error(described_class::UnknownColumn)
+    end
+
+    it 'returns array' do
+      subject = described_class.new(Scoped, :scope => :scope_type)
+
+      expect(subject.scope).to eq %w(scope_type)
+    end
+  end
+end

data/spec/tree/scopes_spec.rb

@@ -0,0 +1,39 @@
+# coding: utf-8
+
+require 'spec_helper'
+
+describe ActsAsOrderedTree::Tree::Scopes, :transactional do
+  shared_examples 'ActsAsOrderedTree scopes' do |model, attrs = {}|
+    describe model.to_s do
+      tree :factory => model, :attributes => attrs do
+        root_1 {
+          child_1 {
+            grandchild_1
+          }
+        }
+        root_2 {
+          child_2 {
+            grandchild_2
+          }
+        }
+      end
+
+      describe '.leaves' do
+        it { expect(current_tree.leaves.order(:id)).to eq [grandchild_1, grandchild_2] }
+        it { expect(root_1.descendants.leaves).to eq [grandchild_1] }
+      end
+
+      describe '.roots' do
+        it { expect(current_tree.roots).to eq [root_1, root_2] }
+      end
+
+      describe '.root' do
+        it { expect(current_tree.root).to eq root_1 }
+      end
+    end
+  end
+
+  include_examples 'ActsAsOrderedTree scopes', :default
+  include_examples 'ActsAsOrderedTree scopes', :default_with_counter_cache
+  include_examples 'ActsAsOrderedTree scopes', :scoped
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_ordered_tree
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 2.0.0.beta3
 platform: ruby
 authors:
 - Alexei Mikhailov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,98 +17,112 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: activerecord-hierarchical_query
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 10.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 10.3.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: 2.99.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: 2.99.0
 - !ruby/object:Gem::Dependency
-  name: shoulda-matchers
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 4.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.0.2
 description: 
 email:
 - amikhailov83@gmail.com
@@ -118,24 +132,97 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/acts_as_ordered_tree.rb
-- lib/acts_as_ordered_tree/adapters/postgresql_adapter.rb
-- lib/acts_as_ordered_tree/arrangeable.rb
-- lib/acts_as_ordered_tree/class_methods.rb
+- lib/acts_as_ordered_tree/adapters.rb
+- lib/acts_as_ordered_tree/adapters/abstract.rb
+- lib/acts_as_ordered_tree/adapters/postgresql.rb
+- lib/acts_as_ordered_tree/adapters/recursive.rb
+- lib/acts_as_ordered_tree/compatibility.rb
+- lib/acts_as_ordered_tree/compatibility/active_record/association_scope.rb
+- lib/acts_as_ordered_tree/compatibility/active_record/default_scoped.rb
+- lib/acts_as_ordered_tree/compatibility/active_record/null_relation.rb
+- lib/acts_as_ordered_tree/compatibility/features.rb
+- lib/acts_as_ordered_tree/deprecate.rb
+- lib/acts_as_ordered_tree/hooks.rb
+- lib/acts_as_ordered_tree/hooks/update.rb
 - lib/acts_as_ordered_tree/instance_methods.rb
-- lib/acts_as_ordered_tree/relation/base.rb
+- lib/acts_as_ordered_tree/iterators/arranger.rb
+- lib/acts_as_ordered_tree/iterators/level_calculator.rb
+- lib/acts_as_ordered_tree/iterators/orphans_pruner.rb
+- lib/acts_as_ordered_tree/node.rb
+- lib/acts_as_ordered_tree/node/attributes.rb
+- lib/acts_as_ordered_tree/node/movement.rb
+- lib/acts_as_ordered_tree/node/movements.rb
+- lib/acts_as_ordered_tree/node/predicates.rb
+- lib/acts_as_ordered_tree/node/reloading.rb
+- lib/acts_as_ordered_tree/node/siblings.rb
+- lib/acts_as_ordered_tree/node/traversals.rb
+- lib/acts_as_ordered_tree/persevering_transaction.rb
+- lib/acts_as_ordered_tree/position.rb
+- lib/acts_as_ordered_tree/relation/arrangeable.rb
+- lib/acts_as_ordered_tree/relation/iterable.rb
 - lib/acts_as_ordered_tree/relation/preloaded.rb
-- lib/acts_as_ordered_tree/tenacious_transaction.rb
+- lib/acts_as_ordered_tree/transaction/base.rb
+- lib/acts_as_ordered_tree/transaction/callbacks.rb
+- lib/acts_as_ordered_tree/transaction/create.rb
+- lib/acts_as_ordered_tree/transaction/destroy.rb
+- lib/acts_as_ordered_tree/transaction/dsl.rb
+- lib/acts_as_ordered_tree/transaction/factory.rb
+- lib/acts_as_ordered_tree/transaction/move.rb
+- lib/acts_as_ordered_tree/transaction/passthrough.rb
+- lib/acts_as_ordered_tree/transaction/reorder.rb
+- lib/acts_as_ordered_tree/transaction/save.rb
+- lib/acts_as_ordered_tree/transaction/update.rb
+- lib/acts_as_ordered_tree/tree.rb
+- lib/acts_as_ordered_tree/tree/association.rb
+- lib/acts_as_ordered_tree/tree/callbacks.rb
+- lib/acts_as_ordered_tree/tree/children_association.rb
+- lib/acts_as_ordered_tree/tree/columns.rb
+- lib/acts_as_ordered_tree/tree/deprecated_columns_accessors.rb
+- lib/acts_as_ordered_tree/tree/parent_association.rb
+- lib/acts_as_ordered_tree/tree/perseverance.rb
+- lib/acts_as_ordered_tree/tree/scopes.rb
 - lib/acts_as_ordered_tree/validators.rb
 - lib/acts_as_ordered_tree/version.rb
 - spec/acts_as_ordered_tree_spec.rb
-- spec/concurrency_support_spec.rb
-- spec/db/config.travis.yml
-- spec/db/config.yml
-- spec/db/schema.rb
+- spec/adapters/postgresql_spec.rb
+- spec/adapters/recursive_spec.rb
+- spec/adapters/shared.rb
+- spec/callbacks_spec.rb
+- spec/counter_cache_spec.rb
+- spec/create_spec.rb
+- spec/destroy_spec.rb
+- spec/inheritance_spec.rb
+- spec/move_spec.rb
+- spec/node/movements/concurrent_movements_spec.rb
+- spec/node/movements/move_higher_spec.rb
+- spec/node/movements/move_lower_spec.rb
+- spec/node/movements/move_to_child_of_spec.rb
+- spec/node/movements/move_to_child_with_index_spec.rb
+- spec/node/movements/move_to_child_with_position_spec.rb
+- spec/node/movements/move_to_left_of_spec.rb
+- spec/node/movements/move_to_right_of_spec.rb
+- spec/node/movements/move_to_root_spec.rb
+- spec/node/predicates_spec.rb
+- spec/node/reloading_spec.rb
+- spec/node/siblings_spec.rb
+- spec/node/traversals_spec.rb
+- spec/persevering_transaction_spec.rb
+- spec/relation/arrangeable_spec.rb
+- spec/relation/iterable_spec.rb
+- spec/relation/preloaded_spec.rb
+- spec/reorder_spec.rb
 - spec/spec_helper.rb
+- spec/support/db/boot.rb
+- spec/support/db/config.travis.yml
+- spec/support/db/config.yml
+- spec/support/db/schema.rb
 - spec/support/factories.rb
 - spec/support/matchers.rb
 - spec/support/models.rb
+- spec/support/tree_factory.rb
+- spec/tree/children_association_spec.rb
+- spec/tree/columns_spec.rb
+- spec/tree/scopes_spec.rb
 homepage: https://github.com/take-five/acts_as_ordered_tree
 licenses: []
 metadata: {}
@@ -150,22 +237,53 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: acts_as_ordered_tree
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord extension for sorted adjacency lists support
 test_files:
 - spec/acts_as_ordered_tree_spec.rb
-- spec/concurrency_support_spec.rb
-- spec/db/config.travis.yml
-- spec/db/config.yml
-- spec/db/schema.rb
+- spec/adapters/postgresql_spec.rb
+- spec/adapters/recursive_spec.rb
+- spec/adapters/shared.rb
+- spec/callbacks_spec.rb
+- spec/counter_cache_spec.rb
+- spec/create_spec.rb
+- spec/destroy_spec.rb
+- spec/inheritance_spec.rb
+- spec/move_spec.rb
+- spec/node/movements/concurrent_movements_spec.rb
+- spec/node/movements/move_higher_spec.rb
+- spec/node/movements/move_lower_spec.rb
+- spec/node/movements/move_to_child_of_spec.rb
+- spec/node/movements/move_to_child_with_index_spec.rb
+- spec/node/movements/move_to_child_with_position_spec.rb
+- spec/node/movements/move_to_left_of_spec.rb
+- spec/node/movements/move_to_right_of_spec.rb
+- spec/node/movements/move_to_root_spec.rb
+- spec/node/predicates_spec.rb
+- spec/node/reloading_spec.rb
+- spec/node/siblings_spec.rb
+- spec/node/traversals_spec.rb
+- spec/persevering_transaction_spec.rb
+- spec/relation/arrangeable_spec.rb
+- spec/relation/iterable_spec.rb
+- spec/relation/preloaded_spec.rb
+- spec/reorder_spec.rb
 - spec/spec_helper.rb
+- spec/support/db/boot.rb
+- spec/support/db/config.travis.yml
+- spec/support/db/config.yml
+- spec/support/db/schema.rb
 - spec/support/factories.rb
 - spec/support/matchers.rb
 - spec/support/models.rb
+- spec/support/tree_factory.rb
+- spec/tree/children_association_spec.rb
+- spec/tree/columns_spec.rb
+- spec/tree/scopes_spec.rb