jro_apps/redmine Commit - r12869:e22c5c3f80df

awesome_nested_set: import git 2-1-stable branch revision (#6579)...

Toshi MARUYAMA -

r12869:e22c5c3f80df

parent child

Context file:

r12869:e22c5c3f80df

Collapse all files

lib/plugins/awesome_nested_set/.travis.yml +1 -2

              language: ruby
              script: bundle exec rspec spec
              env:
                - DB=sqlite3
                - DB=sqlite3mem
                - DB=postgresql
                - DB=mysql
              rvm:
                - 2.0.0
                - 1.9.3
-               - rbx-19mode
+               - rbx
                - jruby-19mode
                - 1.8.7
-               - rbx-18mode
                - jruby-18mode
              gemfile:
                - gemfiles/Gemfile.rails-3.0.rb
                - gemfiles/Gemfile.rails-3.1.rb
                - gemfiles/Gemfile.rails-3.2.rb

lib/plugins/awesome_nested_set/Gemfile +6 0

              gem 'combustion', :github => 'pat/combustion', :branch => 'master'
              source 'https://rubygems.org'
              gemspec :path => File.expand_path('../', __FILE__)
              platforms :jruby do
                gem 'activerecord-jdbcsqlite3-adapter'
                gem 'activerecord-jdbcmysql-adapter'
                gem 'jdbc-mysql'
                gem 'activerecord-jdbcpostgresql-adapter'
                gem 'jruby-openssl'
              end
              platforms :ruby do
                gem 'sqlite3'
                gem 'mysql2', (MYSQL2_VERSION if defined? MYSQL2_VERSION)
                gem 'pg'
              end
              RAILS_VERSION = nil unless defined? RAILS_VERSION
              gem 'railties', RAILS_VERSION
              gem 'activerecord', RAILS_VERSION
              gem 'actionpack', RAILS_VERSION
+             platforms :rbx do
+               gem 'rubysl', '~> 2.0'
+               gem 'rubysl-test-unit'
+             end
              # Add Oracle Adapters
              # gem 'ruby-oci8'
              # gem 'activerecord-oracle_enhanced-adapter'
              # Debuggers
              gem 'pry'
              gem 'pry-nav'

lib/plugins/awesome_nested_set/lib/awesome_nested_set/awesome_nested_set.rb +4 -2

              require 'awesome_nested_set/columns'
              require 'awesome_nested_set/model'
              module CollectiveIdea #:nodoc:
                module Acts #:nodoc:
                  module NestedSet #:nodoc:
                    # This acts provides Nested Set functionality. Nested Set is a smart way to implement
                    # an _ordered_ tree, with the added feature that you can select the children and all of their
                    # descendants with a single query. The drawback is that insertion or move need some complex
                    # sql queries. But everything is done here by this module!
                    #
                    # Nested sets are appropriate each time you want either an orderd tree (menus,
                    # commercial categories) or an efficient way of querying big trees (threaded posts).
                    #
                    # == API
                    #
                    # Methods names are aligned with acts_as_tree as much as possible to make replacment from one
                    # by another easier.
                    #
                    #   item.children.create(:name => "child1")
                    #
                    # Configuration options are:
                    #
                    # * +:parent_column+ - specifies the column name to use for keeping the position integer (default: parent_id)
                    # * +:left_column+ - column name for left boundry data, default "lft"
                    # * +:right_column+ - column name for right boundry data, default "rgt"
                    # * +:depth_column+ - column name for the depth data, default "depth"
                    # * +:scope+ - restricts what is to be considered a list. Given a symbol, it'll attach "_id"
                    #   (if it hasn't been already) and use that as the foreign key restriction. You
                    #   can also pass an array to scope by multiple attributes.
                    #   Example: <tt>acts_as_nested_set :scope => [:notable_id, :notable_type]</tt>
                    # * +:dependent+ - behavior for cascading destroy. If set to :destroy, all the
                    #   child objects are destroyed alongside this object by calling their destroy
                    #   method. If set to :delete_all (default), all the child objects are deleted
                    #   without calling their destroy method.
                    # * +:counter_cache+ adds a counter cache for the number of children.
                    #   defaults to false.
                    #   Example: <tt>acts_as_nested_set :counter_cache => :children_count</tt>
                    # * +:order_column+ on which column to do sorting, by default it is the left_column_name
                    #   Example: <tt>acts_as_nested_set :order_column => :position</tt>
                    #
                    # See CollectiveIdea::Acts::NestedSet::Model::ClassMethods for a list of class methods and
                    # CollectiveIdea::Acts::NestedSet::Model for a list of instance methods added
                    # to acts_as_nested_set models
                    def acts_as_nested_set(options = {})
                      acts_as_nested_set_parse_options! options
                      include Model
                      include Columns
                      extend Columns
                      acts_as_nested_set_relate_parent!
                      acts_as_nested_set_relate_children!
                      attr_accessor :skip_before_destroy
                      acts_as_nested_set_prevent_assignment_to_reserved_columns!
                      acts_as_nested_set_define_callbacks!
                    end
                    private
                    def acts_as_nested_set_define_callbacks!
                      # on creation, set automatically lft and rgt to the end of the tree
                      before_create  :set_default_left_and_right
                      before_save    :store_new_parent
                      after_save     :move_to_new_parent, :set_depth!
                      before_destroy :destroy_descendants
                      define_model_callbacks :move
                    end
                    def acts_as_nested_set_relate_children!
                      has_many_children_options = {
                        :class_name => self.base_class.to_s,
                        :foreign_key => parent_column_name,
                        :order => quoted_order_column_name,
                        :inverse_of => (:parent unless acts_as_nested_set_options[:polymorphic]),
                      }
                      # Add callbacks, if they were supplied.. otherwise, we don't want them.
                      [:before_add, :after_add, :before_remove, :after_remove].each do |ar_callback|
                        has_many_children_options.update(ar_callback => acts_as_nested_set_options[ar_callback]) if acts_as_nested_set_options[ar_callback]
                      end
                      has_many :children, has_many_children_options
                    end
                    def acts_as_nested_set_relate_parent!
                      belongs_to :parent, :class_name => self.base_class.to_s,
                                          :foreign_key => parent_column_name,
                                          :counter_cache => acts_as_nested_set_options[:counter_cache],
                                          :inverse_of => (:children unless acts_as_nested_set_options[:polymorphic]),
-                                         :polymorphic => acts_as_nested_set_options[:polymorphic]
+                                         :polymorphic => acts_as_nested_set_options[:polymorphic],
+                                         :touch => acts_as_nested_set_options[:touch]
                    end
                    def acts_as_nested_set_default_options
                      {
                        :parent_column => 'parent_id',
                        :left_column => 'lft',
                        :right_column => 'rgt',
                        :depth_column => 'depth',
                        :dependent => :delete_all, # or :destroy
                        :polymorphic => false,
-                       :counter_cache => false
+                       :counter_cache => false,
+                       :touch => false
                      }.freeze
                    end
                    def acts_as_nested_set_parse_options!(options)
                      options = acts_as_nested_set_default_options.merge(options)
                      if options[:scope].is_a?(Symbol) && options[:scope].to_s !~ /_id$/
                        options[:scope] = "#{options[:scope]}_id".intern
                      end
                      class_attribute :acts_as_nested_set_options
                      self.acts_as_nested_set_options = options
                    end
                    def acts_as_nested_set_prevent_assignment_to_reserved_columns!
                      # no assignment to structure fields
                      [left_column_name, right_column_name, depth_column_name].each do |column|
                        module_eval <<-"end_eval", __FILE__, __LINE__
                          def #{column}=(x)
                            raise ActiveRecord::ActiveRecordError, "Unauthorized assignment to #{column}: it's an internal field handled by acts_as_nested_set code, use move_to_* methods instead."
                          end
                        end_eval
                      end
                    end
                  end
                end
              end

lib/plugins/awesome_nested_set/lib/awesome_nested_set/model/rebuildable.rb +3 -1

              require 'awesome_nested_set/tree'
              module CollectiveIdea
                module Acts
                  module NestedSet
                    module Model
                      module Rebuildable
                        # Rebuilds the left & rights if unset or invalid.
                        # Also very useful for converting from acts_as_tree.
                        def rebuild!(validate_nodes = true)
                          # default_scope with order may break database queries so we do all operation without scope
                          unscoped do
                            Tree.new(self, validate_nodes).rebuild!
                          end
                        end
                        private
                        def scope_for_rebuild
                          scope = proc {}
                          if acts_as_nested_set_options[:scope]
                            scope = proc {|node|
                              scope_column_names.inject("") {|str, column_name|
-                               str << "AND #{connection.quote_column_name(column_name)} = #{connection.quote(node.send(column_name))} "
+                               column_value = node.send(column_name)
+                               cond = column_value.nil? ? "IS NULL" : "= #{connection.quote(column_value)}"
+                               str << "AND #{connection.quote_column_name(column_name)} #{cond} "
                              }
                            }
                          end
                          scope
                        end
                        def order_for_rebuild
                          "#{quoted_left_column_full_name}, #{quoted_right_column_full_name}, #{primary_key}"
                        end
                      end
                    end
                  end
                end
              end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages