closure_tree 3.0.3 → 3.0.4

data/README.md

@@ -1,6 +1,4 @@
-# Closure Tree
-
-[![Build Status](https://secure.travis-ci.org/mceachen/closure_tree.png?branch=master)](http://travis-ci.org/mceachen/closure_tree)
+# 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
 acts_as_tree and awesome_nested_set gems, but with much better
@@ -183,32 +181,37 @@ class WhatTag < Tag ; end
 
 ## Change log
 
-### 2.0.0
+### 3.0.4
 
-* Had to increment the major version, as rebuild! will need to be called by prior consumers to support the new ```leaves``` class and instance methods.
-* Tag deletion is supported now along with ```:dependent => :destroy``` and ```:dependent => :delete_all```
-* Switched from default rails plugin directory structure to rspec
-* Support for running specs under different database engines: ```export DB ; for DB in sqlite3 mysql postgresql ; do rake ; done```
+* Merged [pull request](https://github.com/mceachen/closure_tree/pull/8) to fix ```.siblings``` and ```.self_and_siblings```
+  (Thanks, [eljojo](https://github.com/eljojo)!)
 
-### 3.0.0
+### 3.0.3
 
-* Support for polymorphic trees
-* ```find_by_path``` and ```find_or_create_by_path``` signatures changed to support constructor attributes
-* tested against Rails 3.1.3
+* Added support for ActiveRecord's whitelist_attributes
+  (Make sure you read [the Rails Security Guide](http://guides.rubyonrails.org/security.html), and
+  enable ```config.active_record.whitelist_attributes``` in your ```config/application.rb``` ASAP!)
+
+### 3.0.2
+
+* Fix for ancestry-loop detection (performed by a validation, not through raising an exception in before_save)
 
 ### 3.0.1
 
 * Support 3.2.0's fickle deprecation of InstanceMethods (Thanks, [jheiss](https://github.com/mceachen/closure_tree/pull/5))!
 
-### 3.0.2
+### 3.0.0
 
-* Fix for ancestry-loop detection (performed by a validation, not through raising an exception in before_save)
+* Support for polymorphic trees
+* ```find_by_path``` and ```find_or_create_by_path``` signatures changed to support constructor attributes
+* tested against Rails 3.1.3
 
-### 3.0.3
+### 2.0.0
 
-* Added support for ActiveRecord's whitelist_attributes
-  (Make sure you read [the Rails Security Guide](http://guides.rubyonrails.org/security.html), and
-  enable ```config.active_record.whitelist_attributes``` in your ```config/application.rb``` ASAP!)
+* Had to increment the major version, as rebuild! will need to be called by prior consumers to support the new ```leaves``` class and instance methods.
+* Tag deletion is supported now along with ```:dependent => :destroy``` and ```:dependent => :delete_all```
+* Switched from default rails plugin directory structure to rspec
+* Support for running specs under different database engines: ```export DB ; for DB in sqlite3 mysql postgresql ; do rake ; done```
 
 ## Thanks to
 

data/lib/closure_tree/acts_as_tree.rb

@@ -120,7 +120,7 @@ module ClosureTree
     end
 
     def self_and_siblings
-      self.class.scoped.where(:parent => parent)
+      self.class.scoped.where(:parent_id => parent)
     end
 
     def siblings

data/lib/closure_tree/version.rb

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

data/spec/spec_helper.rb

@@ -18,8 +18,9 @@ ActiveRecord::Base.logger = Logger.new(plugin_test_dir + "/debug.log")
 
 require 'yaml'
 require 'erb'
+ENV["DB"] ||= "sqlite3mem"
 ActiveRecord::Base.configurations = YAML::load(ERB.new(IO.read(plugin_test_dir + "/db/database.yml")).result)
-ActiveRecord::Base.establish_connection(ENV["DB"] || "mysql")
+ActiveRecord::Base.establish_connection(ENV["DB"])
 ActiveRecord::Migration.verbose = false
 load(File.join(plugin_test_dir, "db", "schema.rb"))
 

data/spec/tag_spec.rb

@@ -184,7 +184,7 @@ shared_examples_for Tag do
         tags(:d2).ancestry_path.should == %w{a1 b2 c2 d2}
         tags(:b1).add_child(tags(:c2))
         tags(:b2).leaf?.should_not be_nil
-        tags(:b1).children.include?(tags(:c2)).should_not be_nil
+        tags(:b1).children.include?(tags(:c2)).should be_true
         tags(:d2).reload.ancestry_path.should == %w{a1 b1 c2 d2}
       end
 
@@ -227,9 +227,15 @@ shared_examples_for Tag do
       end
 
       it "should have a sane children collection" do
-        tags(:grandparent).children.include? tags(:parent).should_not be_nil
-        tags(:parent).children.include? tags(:child).should_not be_nil
-        tags(:child).children.empty?.should_not be_nil
+        tags(:grandparent).children.include? tags(:parent).should be_true
+        tags(:parent).children.include? tags(:child).should be_true
+        tags(:child).children.should be_empty
+      end
+
+      it "assembles siblings correctly" do
+        tags(:b1).siblings.to_a.should =~ [tags(:b2)]
+        tags(:a1).siblings.to_a.should =~ (Tag.roots.to_a - [tags(:a1)])
+        tags(:a1).self_and_siblings.to_a.should =~ Tag.roots.to_a
       end
 
       it "should assemble ancestors correctly" do

metadata

@@ -1,160 +1,169 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: closure_tree
-version: !ruby/object:Gem::Version 
-  hash: 1
+version: !ruby/object:Gem::Version
+  version: 3.0.4
   prerelease: 
-  segments: 
-  - 3
-  - 0
-  - 3
-  version: 3.0.3
 platform: ruby
-authors: 
+authors:
 - Matthew McEachen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-11 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-  version_requirements: *id001
+date: 2012-06-11 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
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id004
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id005
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id006
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id007
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id008
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: pg
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id009
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-description: "    A mostly-API-compatible replacement for the acts_as_tree and awesome_nested_set gems,\n    but with much better mutation performance thanks to the Closure Tree storage algorithm\n"
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! "    A mostly-API-compatible replacement for the acts_as_tree and awesome_nested_set
+  gems,\n    but with much better mutation performance thanks to the Closure Tree
+  storage algorithm\n"
+email:
 - matthew-github@mceachen.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/closure_tree/acts_as_tree.rb
 - lib/closure_tree/version.rb
 - lib/closure_tree.rb
@@ -171,38 +180,35 @@ files:
 - spec/user_spec.rb
 homepage: http://matthew.mceachen.us/closure_tree
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1662601254141526016
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 1662601254141526016
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Hierarchies for ActiveRecord models using a Closure Tree storage algorithm
-test_files: 
+test_files:
 - spec/db/database.yml
 - spec/db/schema.rb
 - spec/fixtures/tags.yml