acts_as_ordered_tree 1.0.3 → 1.0.4

data/lib/acts_as_ordered_tree/instance_methods.rb

@@ -179,7 +179,7 @@ module ActsAsOrderedTree
     # Move the node to the child of another node with specify index
     def move_to_child_with_index(node, index)
       raise ActiveRecord::ActiveRecordError, "index cant be nil" unless index
-      new_siblings = node.try(:children) || self.class.roots.delete_if { |root_node| root_node == self }
+      new_siblings = (node.try(:children) || self.class.roots).reject { |root_node| root_node == self }
 
       if new_siblings.empty?
         node ? move_to_child_of(node) : move_to_root

data/lib/acts_as_ordered_tree/version.rb

@@ -1,3 +1,3 @@
 module ActsAsOrderedTree
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/spec/acts_as_ordered_tree_spec.rb

@@ -435,17 +435,24 @@ describe ActsAsOrderedTree do
     context "on_save_when_parent_changed" do
       example "move_1_to_root" do
         child_1.parent = nil
-        child_1.save
+        expect{ child_1.save! }.to_not raise_exception
         expect(child_1.position).to eq 2
         expect([root, child_1]).to be_sorted
       end
 
       example "move_3_to_root" do
         child_3.parent = nil
-        child_3.save
+        expect{ child_3.save! }.to_not raise_exception
         expect(child_3.position).to eq 2
         expect([root, child_3]).to be_sorted
       end
+
+      example "move_grandchild" do
+        grandchild = FactoryGirl.create(:default_with_counter_cache, :parent => child_3)
+        grandchild.parent = child_2
+        expect{ grandchild.save! }.to_not raise_exception
+        expect([grandchild]).to eq child_2.children
+      end
     end
 
     describe "#move_left" do

data/spec/support/matchers.rb

@@ -92,7 +92,7 @@ module RSpec::Matchers
     def with_temporary_callback
       kind, name = @callback.to_s.split('_')
 
-      method_name = :"__temporary_callback_#{object_id}"
+      method_name = :"__temporary_callback_#{object_id.abs}"
 
       @subject.class.class_eval <<-CODE
         def #{method_name}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_ordered_tree
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000 Z
+date: 2012-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -164,13 +164,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- Appraisals
-- Gemfile
-- README.md
-- Rakefile
-- acts_as_ordered_tree.gemspec
 - lib/acts_as_ordered_tree.rb
 - lib/acts_as_ordered_tree/class_methods.rb
 - lib/acts_as_ordered_tree/fake_scope.rb
@@ -197,7 +190,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -720580582503752285
+      hash: -557915249
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -206,11 +199,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -720580582503752285
+      hash: -557915249
 requirements: []
 rubyforge_project: acts_as_ordered_tree
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ActiveRecord extension for sorted adjacency lists support
-test_files: []
+test_files:
+- spec/acts_as_ordered_tree_spec.rb
+- spec/db/schema.rb
+- spec/spec_helper.rb
+- spec/support/factories.rb
+- spec/support/matchers.rb
+- spec/support/models.rb

data/.gitignore

@@ -1,8 +0,0 @@
-*.gem
-.bundle
-Gemfile.lock
-pkg/*
-.idea/*
-coverage/*
-.rbx/*
-gemfiles/*

data/.rspec

@@ -1,2 +0,0 @@
---color
---format progress

data/Appraisals

@@ -1,11 +0,0 @@
-appraise "rails3.0" do
-  gem "activerecord", "~> 3.0.0"
-end
-
-appraise "rails3.1" do
-  gem "activerecord", "~> 3.1.0"
-end
-
-appraise "rails3.2" do
-  gem "activerecord", "~> 3.2.0"
-end

data/Gemfile

@@ -1,8 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in acts_as_ordered_tree.gemspec
-gemspec
-
-gem "sqlite3", :platforms => :ruby
-gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
-gem "simplecov", :platform => :ruby_19

data/README.md

@@ -1,107 +0,0 @@
-# Acts As Ordered Tree
-WARNING! THIS GEM IS NOT COMPATIBLE WITH <a href="http://ordered-tree.rubyforge.org">ordered_tree gem</a>.
-
-Specify this `acts_as` extension if you want to model an ordered tree structure ([adjacency list hierarchical structure](http://www.sqlsummit.com/AdjacencyList.htm)) by providing a parent association, a children association and a sort column. For proper use you should have a foreign key column, which by default is called `parent_id`, and a sort column, which is by default called `position`.
-
-This extension is mostly compatible with [`awesome_nested_set`](https://github.com/collectiveidea/awesome_nested_set/) gem
-
-## Requirements
-Gem depends on `active_record >= 3`. We test it with `rails-3.0`, `rails-3.1`, `rails-3.2` and with `ruby-1.9.3`, `ruby-1.9.2`, `ruby-1.8.7`, `jruby-1.6.7` and `rubinius-2.0`.
-
-## Installation
-Install it via rubygems:
-
-```bash
-gem install acts_as_ordered_tree
-```
-
-## Usage
-
-To make use of `acts_as_ordered_tree`, your model needs to have 2 fields: parent_id and position. You can also have an optional fields: depth and children_count:
-```ruby
-class CreateCategories < ActiveRecord::Migration
-  def self.up
-    create_table :categories do |t|
-      t.integer :company_id
-      t.string  :name
-      t.integer :parent_id # this is mandatory
-      t.integer :position # this is mandatory
-      t.integer :depth # this is optional
-      t.integer :children_count # this is optional
-    end
-  end
-
-  def self.down
-    drop_table :categories
-  end
-end
-```
-
-Setup your model:
-
-```ruby
-class Category < ActiveRecord::Base
-  acts_as_ordered_tree
-
-  # gem introduces new ActiveRecord callbacks:
-  # *_reorder - fires when position (but not parent node) is changed
-  # *_move - fires when parent node is changed
-  before_reorder :do_smth
-  before_move :do_smth_else
-end
-```
-
-Now you can use `acts_as_ordered_tree` features:
-
-```ruby
-# root
-#  \_ child1
-#       \_ subchild1
-#       \_ subchild2
-
-
-root = Category.create(:name => "root")
-child1 = root.children.create(:name => "child1")
-subchild1 = child1.children.create("name" => "subchild1")
-subchild2 = child1.children.create("name" => "subchild2")
-
-Category.roots # => [root]
-
-root.root? # => true
-root.parent # => nil
-root.ancestors # => []
-root.descendants # => [child1, subchild1, subchild2]
-
-child1.parent # => root
-child1.ancestors # => [root]
-child1.children # => [subchild1, subchild2]
-child1.descendants # => [subchild1, subchild2]
-child1.root? # => false
-child1.leaf? # => false
-
-subchild1.ancestors # => [child1, root]
-subchild1.root # => [root]
-subchild1.leaf? # => true
-subchild1.first? # => true
-subchild1.last? # => false
-subchild2.last? # => true
-
-subchild1.move_to_above_of(child1)
-subchild1.move_to_bottom_of(child1)
-subchild1.move_to_child_of(root)
-subchild1.move_lower
-subchild1.move_higher
-```
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
-## TODO
-1. Fix README typos and grammatical errors (english speaking contributors are welcomed)
-2. Add moar examples and docs.
-3. Implement converter from other structures (nested_set, closure_tree)

data/Rakefile

@@ -1,5 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-require "appraisal"
-
-RSpec::Core::RakeTask.new(:spec)

data/acts_as_ordered_tree.gemspec

@@ -1,30 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "acts_as_ordered_tree/version"
-
-Gem::Specification.new do |s|
-  s.name        = "acts_as_ordered_tree"
-  s.version     = ActsAsOrderedTree::VERSION
-  s.authors     = ["Alexei Mikhailov", "Vladimir Kuznetsov"]
-  s.email       = %w(amikhailov83@gmail.com kv86@mail.ru)
-  s.homepage    = "https://github.com/take-five/acts_as_ordered_tree"
-  s.summary     = %q{ActiveRecord extension for sorted adjacency lists support}
-
-  s.rubyforge_project = "acts_as_ordered_tree"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = %w(lib)
-
-  s.add_dependency "activerecord", ">= 3.0.0"
-
-  s.add_development_dependency "bundler", ">= 1.0"
-  s.add_development_dependency "rails", ">= 3.0.0"
-  s.add_development_dependency "rspec", ">= 2.11"
-  s.add_development_dependency "rspec-rails", ">= 2.11"
-  s.add_development_dependency "shoulda-matchers", ">= 1.2.0"
-  s.add_development_dependency "factory_girl", "< 3"
-  s.add_development_dependency "factory_girl_rails", "< 3"
-  s.add_development_dependency "appraisal", ">= 0.4.0"
-end