closure_tree 3.6.6 → 3.6.7

data/README.md

@@ -1,9 +1,15 @@
 # Closure Tree [![Build Status](https://secure.travis-ci.org/mceachen/closure_tree.png?branch=master)](http://travis-ci.org/mceachen/closure_tree)
 
-Closure Tree is a mostly-API-compatible replacement for the
+### Closure_tree lets your ActiveRecord models act as nodes in a [tree data structure](http://en.wikipedia.org/wiki/Tree_%28data_structure%29)
+
+Common applications include modeling hierarchical data, like tags, page graphs in CMSes,
+and tracking user referrals.
+
+Mostly API-compatible with other popular nesting gems for Rails, like
 [ancestry](https://github.com/stefankroes/ancestry),
 [acts_as_tree](https://github.com/amerine/acts_as_tree) and
-[awesome_nested_set](https://github.com/collectiveidea/awesome_nested_set/) gems, giving you:
+[awesome_nested_set](https://github.com/collectiveidea/awesome_nested_set/),
+closure_tree has some great features:
 
 * __Best-in-class select performance__:
   * Fetch your whole ancestor lineage in 1 SELECT.
@@ -361,6 +367,12 @@ Closure tree is [tested under every combination](http://travis-ci.org/#!/mceache
 
 ## Change log
 
+### 3.6.7
+
+* Added workaround for ActiveRecord::Observer usage pre-db-creation. Addresses
+  [issue 32](https://github.com/mceachen/closure_tree/issues/32).
+  Thanks, [Don Morrison](https://github.com/elskwid)!
+
 ### 3.6.6
 
 * Added support for Rails 4's [strong parameter](https://github.com/rails/strong_parameters).

data/lib/closure_tree/acts_as_tree.rb

@@ -457,7 +457,8 @@ module ClosureTree
     end
 
     def order_is_numeric
-      return false unless order_option
+      # The table might not exist yet (in the case of ActiveRecord::Observer use, see issue 32)
+      return false if order_option.nil? || !self.table_exists?
       c = ct_class.columns_hash[order_option]
       c && c.type == :integer
     end

data/lib/closure_tree/version.rb

@@ -1,3 +1,3 @@
 module ClosureTree
-  VERSION = "3.6.6" unless defined?(::ClosureTree::VERSION)
+  VERSION = "3.6.7" unless defined?(::ClosureTree::VERSION)
 end

data/spec/label_spec.rb

@@ -1,10 +1,24 @@
 require 'spec_helper'
 
-def nuke_db
+def delete_all_labels
   LabelHierarchy.delete_all
   Label.delete_all
 end
 
+def create_label_hierarchy
+  @d1 = Label.find_or_create_by_path %w(a1 b1 c1 d1)
+  @c1 = @d1.parent
+  @b1 = @c1.parent
+  @a1 = @b1.parent
+  @d2 = Label.find_or_create_by_path %w(a1 b1 c2 d2)
+  @c2 = @d2.parent
+  @d3 = Label.find_or_create_by_path %w(a2 b2 c3 d3)
+  @c3 = @d3.parent
+  @b2 = @c3.parent
+  @a2 = @b2.parent
+  Label.update_all("sort_order = id")
+end
+
 describe Label do
   context "Base Label class" do
     it "should find or create by path" do
@@ -43,7 +57,7 @@ describe Label do
   context "Mixed class tree" do
     it "should support mixed type ancestors" do
       [Label, DateLabel, DirectoryLabel, EventLabel].permutation do |classes|
-        nuke_db
+        delete_all_labels
         classes.each { |c| c.all.should(be_empty, "class #{c} wasn't cleaned out") }
         names = ('A'..'Z').to_a.first(classes.size)
         instances = classes.collect { |clazz| clazz.new(:name => names.shift) }
@@ -66,18 +80,8 @@ describe Label do
   end
   context "find_all_by_generation" do
     before :all do
-      nuke_db
-      @d1 = Label.find_or_create_by_path %w(a1 b1 c1 d1)
-      @c1 = @d1.parent
-      @b1 = @c1.parent
-      @a1 = @b1.parent
-      @d2 = Label.find_or_create_by_path %w(a1 b1 c2 d2)
-      @c2 = @d2.parent
-      @d3 = Label.find_or_create_by_path %w(a2 b2 c3 d3)
-      @c3 = @d3.parent
-      @b2 = @c3.parent
-      @a2 = @b2.parent
-      Label.update_all("sort_order = id")
+      delete_all_labels
+      create_label_hierarchy
     end
 
     it "finds roots from the class method" do
@@ -115,6 +119,27 @@ describe Label do
     end
   end
 
+  context "loading through self_and_ scopes" do
+    before :all do
+      delete_all_labels
+      create_label_hierarchy
+    end
+
+    it "self_and_descendants should result in one select" do
+      DB_QUERIES.clear
+      a1_array = @a1.self_and_descendants
+      a1_array.collect { |ea| ea.name }.should == %w(a1 b1 c1 c2 d1 d2)
+      DB_QUERIES.size.should == 1
+    end
+
+    it "self_and_ancestors should result in one select" do
+      DB_QUERIES.clear
+      d1_array = @d1.self_and_ancestors
+      d1_array.collect { |ea| ea.name }.should == %w(d1 c1 b1 a1)
+      DB_QUERIES.size.should == 1
+    end
+  end
+
   context "deterministically orders with polymorphic siblings" do
     before :each do
       @parent = Label.create!(:name => "parent")
@@ -140,7 +165,7 @@ describe Label do
       @a.reload.sort_order.should be < @c.reload.sort_order
     end
   end
-  
+
   it "behaves like the readme" do
     root = Label.create(:name => "root")
     a = Label.create(:name => "a", :parent => root)
@@ -161,7 +186,7 @@ describe Label do
   end
 
   context "Deterministic siblings sort with custom integer column" do
-    nuke_db
+    delete_all_labels
     fixtures :labels
 
     before :each do

data/spec/spec_helper.rb

@@ -30,9 +30,23 @@ require 'db/schema'
 require 'support/models'
 require 'rspec/rails' # TODO: clean this up-- I don't want to pull the elephant through the mouse hole just for fixture support
 
+DB_QUERIES = []
+
+ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
+  def log_with_query_append(query, *args, &block)
+    DB_QUERIES << query
+    log_without_query_append(query, *args, &block)
+  end
+
+  alias_method_chain :log, :query_append
+end
+
 RSpec.configure do |config|
   config.fixture_path = "#{plugin_test_dir}/fixtures"
   # true runs the tests 1 second faster, but then you can't
   # see what's going on while debuggering with different db connections.
   config.use_transactional_fixtures = false
+  config.after(:each) do
+    DB_QUERIES.clear
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: closure_tree
 version: !ruby/object:Gem::Version
-  version: 3.6.6
+  version: 3.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-24 00:00:00.000000000 Z
+date: 2012-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -208,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2617295587215713218
+      hash: -486781145760134167
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2617295587215713218
+      hash: -486781145760134167
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23