awesome_nested_set 2.1.6 → 3.0.0.rc.1

data/lib/awesome_nested_set/tree.rb

@@ -0,0 +1,63 @@
+module CollectiveIdea #:nodoc:
+  module Acts #:nodoc:
+    module NestedSet #:nodoc:
+      class Tree
+        attr_reader :model, :validate_nodes
+        attr_accessor :indices
+
+        delegate :left_column_name, :right_column_name, :quoted_parent_column_full_name,
+                 :order_for_rebuild, :scope_for_rebuild,
+                 :to => :model
+
+        def initialize(model, validate_nodes)
+          @model = model
+          @validate_nodes = validate_nodes
+          @indices = {}
+        end
+
+        def rebuild!
+          # Don't rebuild a valid tree.
+          return true if model.valid?
+
+          root_nodes.each do |root_node|
+            # setup index for this scope
+            indices[scope_for_rebuild.call(root_node)] ||= 0
+            set_left_and_rights(root_node)
+          end
+        end
+
+        private
+
+        def increment_indice!(node)
+          indices[scope_for_rebuild.call(node)] += 1
+        end
+
+        def set_left_and_rights(node)
+          set_left!(node)
+          # find
+          node_children(node).each { |n| set_left_and_rights(n) }
+          set_right!(node)
+
+          node.save!(:validate => validate_nodes)
+        end
+
+        def node_children(node)
+          model.where(["#{quoted_parent_column_full_name} = ? #{scope_for_rebuild.call(node)}", node]).
+                order(order_for_rebuild)
+        end
+
+        def root_nodes
+          model.where("#{quoted_parent_column_full_name} IS NULL").order(order_for_rebuild)
+        end
+
+        def set_left!(node)
+          node[left_column_name] = increment_indice!(node)
+        end
+
+        def set_right!(node)
+          node[right_column_name] = increment_indice!(node)
+        end
+      end
+    end
+  end
+end

data/lib/awesome_nested_set/version.rb

@@ -1,3 +1,3 @@
 module AwesomeNestedSet
-  VERSION = '2.1.6' unless defined?(::AwesomeNestedSet::VERSION)
+  VERSION = '3.0.0.rc.1' unless defined?(::AwesomeNestedSet::VERSION)
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awesome_nested_set
 version: !ruby/object:Gem::Version
-  version: 2.1.6
-  prerelease: 
+  version: 3.0.0.rc.1
 platform: ruby
 authors:
 - Brandon Keepers
@@ -11,28 +10,25 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -40,7 +36,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,7 +43,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -56,7 +50,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -64,60 +57,84 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.3
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An awesome nested set implementation for Active Record
 email: info@collectiveidea.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.rdoc
+- README.md
 files:
 - lib/awesome_nested_set/awesome_nested_set.rb
+- lib/awesome_nested_set/columns.rb
 - lib/awesome_nested_set/helper.rb
+- lib/awesome_nested_set/iterator.rb
+- lib/awesome_nested_set/model/movable.rb
+- lib/awesome_nested_set/model/prunable.rb
+- lib/awesome_nested_set/model/rebuildable.rb
+- lib/awesome_nested_set/model/relatable.rb
+- lib/awesome_nested_set/model/transactable.rb
+- lib/awesome_nested_set/model/validatable.rb
+- lib/awesome_nested_set/model.rb
+- lib/awesome_nested_set/move.rb
+- lib/awesome_nested_set/set_validator.rb
+- lib/awesome_nested_set/tree.rb
 - lib/awesome_nested_set/version.rb
 - lib/awesome_nested_set.rb
 - MIT-LICENSE
-- README.rdoc
+- README.md
 - CHANGELOG
 homepage: http://github.com/collectiveidea/awesome_nested_set
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
-- README.rdoc
+- README.md
 - --inline-source
 - --line-numbers
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An awesome nested set implementation for Active Record
 test_files: []
+has_rdoc: 

data/README.rdoc

@@ -1,153 +0,0 @@
-= AwesomeNestedSet
-
-Awesome Nested Set is an implementation of the nested set pattern for ActiveRecord models. It is replacement for acts_as_nested_set and BetterNestedSet, but more awesome.
-
-Version 2 supports Rails 3. Gem versions prior to 2.0 support Rails 2.
-
-== What makes this so awesome?
-
-This is a new implementation of nested set based off of BetterNestedSet that fixes some bugs, removes tons of duplication, adds a few useful methods, and adds STI support.
-
-== Installation
-
-  Add to your Gemfile:
-
-  gem 'awesome_nested_set'
-
-== Usage
-
-To make use of awesome_nested_set, your model needs to have 3 fields: lft, rgt, and parent_id.
-You can also have an optional field: depth:
-
-  class CreateCategories < ActiveRecord::Migration
-    def self.up
-      create_table :categories do |t|
-        t.string :name
-        t.integer :parent_id
-        t.integer :lft
-        t.integer :rgt
-        t.integer :depth # this is optional.
-      end
-    end
-
-    def self.down
-      drop_table :categories
-    end
-  end
-
-Enable the nested set functionality by declaring acts_as_nested_set on your model
-
-  class Category < ActiveRecord::Base
-    acts_as_nested_set
-  end
-
-Run `rake rdoc` to generate the API docs and see CollectiveIdea::Acts::NestedSet for more info.
-
-== Callbacks
-
-There are three callbacks called when moving a node. `before_move`, `after_move` and `around_move`.
-
-  class Category < ActiveRecord::Base
-    acts_as_nested_set
-
-    after_move :rebuild_slug
-    around_move :da_fancy_things_around
-
-    private
-    
-    def rebuild_slug
-      # do whatever
-    end
-
-    def da_fancy_things_around
-      # do something...
-      yield # actually moves
-      # do something else...
-    end
-  end
-
-Beside this there are also hooks to act on the newly added or removed children.
-
-  class Category < ActiveRecord::Base  
-    acts_as_nested_set  :before_add     => :do_before_add_stuff,
-                        :after_add      => :do_after_add_stuff,
-                        :before_remove  => :do_before_remove_stuff,
-                        :after_remove   => :do_after_remove_stuff
-
-    private
-
-    def do_before_add_stuff(child_node)
-      # do whatever with the child
-    end
-
-    def do_after_add_stuff(child_node)
-      # do whatever with the child
-    end
-
-    def do_before_remove_stuff(child_node)
-      # do whatever with the child
-    end
-
-    def do_after_remove_stuff(child_node)
-      # do whatever with the child
-    end
-  end
-
-
-== Protecting attributes from mass assignment
-
-It's generally best to "white list" the attributes that can be used in mass assignment:
-
-  class Category < ActiveRecord::Base
-    acts_as_nested_set
-    attr_accessible :name, :parent_id
-  end
-
-If for some reason that is not possible, you will probably want to protect the lft and rgt attributes:
-
-  class Category < ActiveRecord::Base
-    acts_as_nested_set
-    attr_protected :lft, :rgt
-  end
-
-== Conversion from other trees
-
-Coming from acts_as_tree or another system where you only have a parent_id? No problem. Simply add the lft & rgt fields as above, and then run
-
-  Category.rebuild!
-
-Your tree will be converted to a valid nested set. Awesome!
-
-== View Helper
-
-The view helper is called #nested_set_options.
-
-Example usage:
-
-  <%= f.select :parent_id, nested_set_options(Category, @category) {|i| "#{'-' * i.level} #{i.name}" } %>
-
-  <%= select_tag 'parent_id', options_for_select(nested_set_options(Category) {|i| "#{'-' * i.level} #{i.name}" } ) %>
-
-See CollectiveIdea::Acts::NestedSet::Helper for more information about the helpers.
-
-== References
-
-You can learn more about nested sets at: http://threebit.net/tutorials/nestedset/tutorial1.html
-
-== How to contribute
-
-If you find what you might think is a bug:
-
-1. Check the GitHub issue tracker to see if anyone else has had the same issue.
-   https://github.com/collectiveidea/awesome_nested_set/issues/
-2. If you don't see anything, create an issue with information on how to reproduce it.
-
-If you want to contribute an enhancement or a fix:
-
-1. Fork the project on GitHub.
-   https://github.com/collectiveidea/awesome_nested_set/
-2. Make your changes with tests.
-3. Commit the changes without making changes to the Rakefile, VERSION, or any other files that aren't related to your enhancement or fix
-4. Send a pull request.
-
-Copyright ©2008 Collective Idea, released under the MIT license