mongoid-ancestry-fixes 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yzc5YjFkNWJjNWM2MDZmNGU3NmY4NWY1NmZlZGEwZGE4MjkyYTI2Mg==
+    ZmM5YTM5MDAwNjg4NmRhYzRlNzEzOTY4YmMzYjgzODhhMTMzYTJkMQ==
   data.tar.gz: !binary |-
-    Y2FlMDMyNWZlM2U2ZWZjNGM0ODU4YjIzYjk2Y2M5ZTIzMzdhOTdmOQ==
+    MjZiMWQ3MTU4NzZkNWExNmU4YTY4NzVkNzI0YzI4MzEwOWRiNjNiOQ==
 SHA512:
   metadata.gz: !binary |-
-    OTljNjA5NDUxODZkYTI2YzZhOTAzZTBkZGE3ZDYyZWU0YmFiODk5OTYwNmJm
-    OWFhZTRiMWE0MmVlMGEwZThiZmY1YTQ3NDg0MGRkMDUyNjBkNzdkYmNjMjRh
-    ZWE4NTk0MzhkNzBkZjY4MzI3MmZlZjRjY2YwZjIwYjc4MTM3YTk=
+    NTdlNmUxYWFkZmNkMTU5ZjkxZWQ5MDM4ZTFkMzk5NDczYjE2NmFmZTJjMWUy
+    OWRiMWQxNzMwMGEwZWNiNGU1N2JhY2IyM2Q3NGNkY2EyMDI1NGVkNzcxMGI5
+    ZDEwZjlhMzgzY2MxNGI5NjZhMWM3YzNmNjhmYWE5MWVjMjJhNGM=
   data.tar.gz: !binary |-
-    ZDBiMDNhYzQ5YzBmZTA2YWVkY2ZhMGFhOTI1ZDMwODFiYWM5ZmZmMjMzOTI4
-    YjYxZjM5ZDIyNmVjYzZlYTM4ZjhkZGRiMDEwZGIyMmM4OWIyYTY0NzY5ODhh
-    NGMwYTg3MjI2YThkMjRmM2Y1ZmU4N2E5YmE3ZjgxNmIzYWM4MjA=
+    YmRjNDQwMjIyMWUyYWM4OWJjZTdhN2VjNzc1YmU1ZDEzMGYwOWMwZjA3YTRi
+    NGFkNDUyOGQ1YTk2MzFkNGVmNzk4YTZkMDQ0YzI2MDQzNWUyMmNmNTFhODg2
+    ZDg0NTM1YTFkNGRmYjJhZTY0ZWJmNTAwY2UxZTdjNzQ3M2E4ZDI=

metadata

@@ -1,11 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-ancestry-fixes
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Stefan Kroes
 - Anton Orel
+- fl00r
+- shilovk
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -47,28 +49,7 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- .gitignore
-- .travis.yml
-- Gemfile
-- Gemfile.lock
-- Guardfile
-- MIT-LICENSE
 - README.md
-- Rakefile
-- init.rb
-- install.rb
-- lib/mongoid-ancestry.rb
-- lib/mongoid-ancestry/class_methods.rb
-- lib/mongoid-ancestry/exceptions.rb
-- lib/mongoid-ancestry/instance_methods.rb
-- lib/mongoid-ancestry/version.rb
-- log/.gitignore
-- mongoid-ancestry.gemspec
-- spec/lib/ancestry_spec.rb
-- spec/lib/mongoid-ancestry/class_methods_spec.rb
-- spec/lib/mongoid-ancestry/instance_methods_spec.rb
-- spec/spec_helper.rb
-- spec/support/models.rb
 homepage: http://github.com/skyeagle/mongoid-ancestry
 licenses:
 - MIT
@@ -92,15 +73,11 @@ rubyforge_project: mongoid-ancestry-fixes
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Ancestry allows the records of a Mongoid model to be organised in a tree
-  structure, using a single, intuitively formatted database field. It exposes all
-  the standard tree structure relations (ancestors, parent, root, children, siblings,
-  descendants) and all of them can be fetched in a single query. Additional features
-  are named_scopes, integrity checking, integrity restoration, arrangement of (sub)tree
-  into hashes and different strategies for dealing with orphaned records.
-test_files:
-- spec/lib/ancestry_spec.rb
-- spec/lib/mongoid-ancestry/class_methods_spec.rb
-- spec/lib/mongoid-ancestry/instance_methods_spec.rb
-- spec/spec_helper.rb
-- spec/support/models.rb
+summary: This is a fork of mongoid-ancestry-0.2.3 with some fixes. Ancestry allows
+  the records of a Mongoid model to be organised in a tree structure, using a single,
+  intuitively formatted database field. It exposes all the standard tree structure
+  relations (ancestors, parent, root, children, siblings, descendants) and all of
+  them can be fetched in a single query. Additional features are named_scopes, integrity
+  checking, integrity restoration, arrangement of (sub)tree into hashes and different
+  strategies for dealing with orphaned records.
+test_files: []

data/.gitignore

@@ -1,42 +0,0 @@
-# rcov generated
-coverage
-
-# rdoc generated
-rdoc
-
-# yard generated
-doc
-.yardoc
-
-# bundler
-.bundle
-
-# jeweler generated
-pkg
-
-# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
-#
-# * Create a file at ~/.gitignore
-# * Include files you want ignored
-# * Run: git config --global core.excludesfile ~/.gitignore
-#
-# After doing this, these files will be ignored in all your git projects,
-# saving you from having to 'pollute' every project you touch with them
-#
-# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
-#
-# For MacOS:
-#
-#.DS_Store
-#
-# For TextMate
-#*.tmproj
-#tmtags
-#
-# For emacs:
-#*~
-#\#*
-#.\#*
-#
-# For vim:
-#*.swp

data/.travis.yml

@@ -1,3 +0,0 @@
-rvm:
-  - 1.9.2
-  - 1.9.3

data/Gemfile

@@ -1,8 +0,0 @@
-source :rubygems
-
-gemspec
-
-group :test do
-  gem 'rake'
-  gem 'rspec', '~> 2.5'
-end

data/Gemfile.lock

@@ -1,47 +0,0 @@
-PATH
-  remote: .
-  specs:
-    mongoid-ancestry (0.2.3)
-      bson_ext (>= 1.3)
-      mongoid (>= 2.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.2.5)
-      activesupport (= 3.2.5)
-      builder (~> 3.0.0)
-    activesupport (3.2.5)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    bson (1.6.4)
-    bson_ext (1.6.4)
-      bson (~> 1.6.4)
-    builder (3.0.0)
-    diff-lcs (1.1.2)
-    i18n (0.6.0)
-    mongo (1.6.2)
-      bson (~> 1.6.2)
-    mongoid (2.4.7)
-      activemodel (~> 3.1)
-      mongo (~> 1.3)
-      tzinfo (~> 0.3.22)
-    multi_json (1.3.6)
-    rake (0.9.2.2)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    tzinfo (0.3.33)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  mongoid-ancestry!
-  rake
-  rspec (~> 2.5)

data/Guardfile

@@ -1,10 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-guard 'rspec', :version => 2, :cli => "--format Fuubar" do
-  watch(%r{^spec/.+_spec\.rb})
-  watch(%r{^lib/mongoid-ancestry/(.+)\.rb})     { |m| "spec/lib/mongoid-ancestry/#{m[1]}_spec.rb" }
-  watch('lib/mongoid-ancestry.rb')      { "spec" }
-  watch(%r{^spec/support/(.+)\.rb})     { "spec" }
-  watch('spec/spec_helper.rb')          { "spec" }
-end

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2009 Stefan Kroes
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,21 +0,0 @@
-require 'bundler'
-Bundler.setup
-Bundler::GemHelper.install_tasks
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
-
-task :default => :spec
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "mongoid-ancestry #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/init.rb

@@ -1 +0,0 @@
-require 'ancestry'

data/install.rb

@@ -1 +0,0 @@
-puts "Thank you for installing Ancestry. You can visit http://github.com/stefankroes/ancestry to read the documentation."

data/lib/mongoid-ancestry.rb

@@ -1,15 +0,0 @@
-module Mongoid
-  module Ancestry
-    extend ActiveSupport::Concern
-
-    autoload :ClassMethods,    'mongoid-ancestry/class_methods'
-    autoload :Error,           'mongoid-ancestry/exceptions'
-
-    included do
-      cattr_accessor :base_class
-      self.base_class = self
-    end
-
-    require 'mongoid-ancestry/instance_methods'
-  end
-end

data/lib/mongoid-ancestry/class_methods.rb

@@ -1,212 +0,0 @@
-module Mongoid
-  module Ancestry
-    module ClassMethods
-      def has_ancestry(opts = {})
-        defaults = {
-          :ancestry_field    => :ancestry,
-          :cache_depth       => false,
-          :depth_cache_field => :ancestry_depth,
-          :orphan_strategy   => :destroy
-        }
-
-        valid_opts = [:ancestry_field, :cache_depth, :depth_cache_field, :orphan_strategy]
-        unless opts.is_a?(Hash) &&  opts.keys.all? {|opt| valid_opts.include?(opt) }
-          raise Error.new("Invalid options for has_ancestry. Only hash is allowed.\n Defaults: #{defaults.inspect}")
-        end
-
-        opts.symbolize_keys!
-
-        opts.reverse_merge!(defaults)
-
-        # Create ancestry field accessor and set to option or default
-        cattr_accessor :ancestry_field
-        self.ancestry_field = opts[:ancestry_field]
-
-        self.field ancestry_field, :type => String
-        self.index ancestry_field
-
-        # Create orphan strategy accessor and set to option or default (writer comes from DynamicClassMethods)
-        cattr_reader :orphan_strategy
-        self.orphan_strategy = opts[:orphan_strategy]
-
-        # Validate format of ancestry column value
-        primary_key_format = opts[:primary_key_format] || /[a-z0-9]+/
-        validates_format_of ancestry_field, :with => /\A#{primary_key_format.source}(\/#{primary_key_format.source})*\Z/, :allow_nil => true
-
-        # Validate that the ancestor ids don't include own id
-        validate :ancestry_exclude_self
-
-        # Create ancestry column accessor and set to option or default
-        if opts[:cache_depth]
-          # Create accessor for column name and set to option or default
-          self.cattr_accessor :depth_cache_field
-          self.depth_cache_field = opts[:depth_cache_field]
-
-          # Cache depth in depth cache column before save
-          before_validation :cache_depth
-
-          # Validate depth column
-          validates_numericality_of depth_cache_field, :greater_than_or_equal_to => 0, :only_integer => true, :allow_nil => false
-        end
-
-        # Create named scopes for depth
-        {:before_depth => 'lt', :to_depth => 'lte', :at_depth => nil, :from_depth => 'gte', :after_depth => 'gt'}.each do |scope_name, operator|
-          scope scope_name, lambda { |depth|
-            raise Error.new("Named scope '#{scope_name}' is only available when depth caching is enabled.") unless opts[:cache_depth]
-            where( (operator ? depth_cache_field.send(operator.to_sym) : depth_cache_field) => depth)
-          }
-        end
-
-        scope :roots, where(ancestry_field => nil)
-        scope :ancestors_of, lambda { |object| where(to_node(object).ancestor_conditions) }
-        scope :children_of, lambda { |object| where(to_node(object).child_conditions) }
-        scope :descendants_of, lambda { |object| any_of(to_node(object).descendant_conditions) }
-        scope :subtree_of, lambda { |object| any_of(to_node(object).subtree_conditions) }
-        scope :siblings_of, lambda { |object| where(to_node(object).sibling_conditions) }
-        scope :ordered_by_ancestry, asc(:"#{self.base_class.ancestry_field}")
-        scope :ordered_by_ancestry_and, lambda {|by| ordered_by_ancestry.order_by([by]) }
-
-        # Update descendants with new ancestry before save
-        before_save :update_descendants_with_new_ancestry
-
-        # Apply orphan strategy before destroy
-        before_destroy :apply_orphan_strategy
-      end
-
-      # Fetch tree node if necessary
-      def to_node object
-        object.is_a?(self.base_class) ? object : find(object)
-      end
-
-      # Scope on relative depth options
-      def scope_depth depth_options, depth
-        depth_options.inject(self.base_class) do |scope, option|
-          scope_name, relative_depth = option
-          if [:before_depth, :to_depth, :at_depth, :from_depth, :after_depth].include? scope_name
-            scope.send scope_name, depth + relative_depth
-          else
-            raise Error.new("Unknown depth option: #{scope_name}.")
-          end
-        end
-      end
-
-      # Orphan strategy writer
-      def orphan_strategy= orphan_strategy
-        # Check value of orphan strategy, only rootify, restrict or destroy is allowed
-        if [:rootify, :restrict, :destroy].include? orphan_strategy
-          class_variable_set :@@orphan_strategy, orphan_strategy
-        else
-          raise Error.new("Invalid orphan strategy, valid ones are :rootify, :restrict and :destroy.")
-        end
-      end
-
-      # Arrangement
-      def arrange options = {}
-        scope =
-          if options[:order].nil?
-            self.base_class.ordered_by_ancestry
-          else
-            self.base_class.ordered_by_ancestry_and options.delete(:order)
-          end
-        # Get all nodes ordered by ancestry and start sorting them into an empty hash
-        scope.all(options).inject(ActiveSupport::OrderedHash.new) do |arranged_nodes, node|
-          # Find the insertion point for that node by going through its ancestors
-          node.ancestor_ids.inject(arranged_nodes) do |insertion_point, ancestor_id|
-            insertion_point.each do |parent, children|
-              # Change the insertion point to children if node is a descendant of this parent
-              insertion_point = children if ancestor_id == parent.id
-            end; insertion_point
-          end[node] = ActiveSupport::OrderedHash.new; arranged_nodes
-        end
-      end
-
-      # Integrity checking
-      def check_ancestry_integrity! options = {}
-        parents = {}
-        exceptions = [] if options[:report] == :list
-        # For each node ...
-        self.base_class.all.each do |node|
-          begin
-            # ... check validity of ancestry column
-            if !node.valid? and !node.errors[node.class.ancestry_field].blank?
-              raise IntegrityError.new "Invalid format for ancestry column of node #{node.id}: #{node.read_attribute node.ancestry_field}."
-            end
-            # ... check that all ancestors exist
-            node.ancestor_ids.each do |ancestor_id|
-              unless where(:_id => ancestor_id).first
-                raise IntegrityError.new "Reference to non-existent node in node #{node.id}: #{ancestor_id}."
-              end
-            end
-            # ... check that all node parents are consistent with values observed earlier
-            node.path_ids.zip([nil] + node.path_ids).each do |node_id, parent_id|
-              parents[node_id] = parent_id unless parents.has_key? node_id
-              unless parents[node_id] == parent_id
-                raise IntegrityError.new "Conflicting parent id found in node #{node.id}: #{parent_id || 'nil'} for node #{node_id} while expecting #{parents[node_id] || 'nil'}"
-              end
-            end
-          rescue IntegrityError => integrity_exception
-            case options[:report]
-            when :list then exceptions << integrity_exception
-            when :echo then puts integrity_exception
-            else raise integrity_exception
-            end
-          end
-        end
-        exceptions if options[:report] == :list
-      end
-
-      # Integrity restoration
-      def restore_ancestry_integrity!
-        parents = {}
-        # For each node ...
-        self.base_class.all.each do |node|
-          # ... set its ancestry to nil if invalid
-          if node.errors[node.class.ancestry_field].blank?
-            node.without_ancestry_callbacks do
-              node.update_attribute node.ancestry_field, nil
-            end
-          end
-          # ... save parent of this node in parents array if it exists
-          parents[node.id] = node.parent_id if exists? node.parent_id
-
-          # Reset parent id in array to nil if it introduces a cycle
-          parent = parents[node.id]
-          until parent.nil? || parent == node.id
-            parent = parents[parent]
-          end
-          parents[node.id] = nil if parent == node.id
-        end
-        # For each node ...
-        self.base_class.all.each do |node|
-          # ... rebuild ancestry from parents array
-          ancestry, parent = nil, parents[node.id]
-          until parent.nil?
-            ancestry, parent = if ancestry.nil? then parent else "#{parent}/#{ancestry}" end, parents[parent]
-          end
-          node.without_ancestry_callbacks do
-            node.update_attribute node.ancestry_field, ancestry
-          end
-        end
-      end
-
-      # Build ancestry from parent id's for migration purposes
-      def build_ancestry_from_parent_ids! parent_id = nil, ancestry = nil
-        self.base_class.where(:parent_id => parent_id).all.each do |node|
-          node.without_ancestry_callbacks do
-            node.update_attribute(self.base_class.ancestry_field, ancestry)
-          end
-          build_ancestry_from_parent_ids! node.id,
-            if ancestry.nil? then node.id.to_s else "#{ancestry}/#{node.id}" end
-        end
-      end
-
-      # Rebuild depth cache if it got corrupted or if depth caching was just turned on
-      def rebuild_depth_cache!
-        raise Error.new("Cannot rebuild depth cache for model without depth caching.") unless respond_to? :depth_cache_field
-        self.base_class.all.each do |node|
-          node.update_attribute depth_cache_field, node.depth
-        end
-      end
-    end
-  end
-end