hierarchy 1.0.0 → 1.0.2

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Tim Morgan
+Copyright (c) 2010 Tim Morgan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.textile

@@ -1,7 +1,7 @@
 h1. Hierarchy -- Use PostgreSQL @LTREE@ columns in ActiveRecord
 
 | *Author* | Tim Morgan |
-| *Version* | 1.0 (Oct 30, 2010) |
+| *Version* | 1.0.2 (Nov 11, 2010) |
 | *License* | Released under the MIT license. |
 
 h2. About

data/Rakefile

@@ -16,8 +16,7 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/riscfuture/hierarchy"
   gem.authors = [ "Tim Morgan" ]
   gem.required_ruby_version = '>= 1.9'
-  gem.add_dependency 'activerecord', '>= 3.0'
-  gem.add_dependency 'activesupport', '>= 3.0'
+  gem.add_dependency 'rails', '>= 3.0'
 end
 Jeweler::GemcutterTasks.new
 

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.2

data/hierarchy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hierarchy}
-  s.version = "1.0.0"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Morgan"]
-  s.date = %q{2010-10-30}
+  s.date = %q{2010-11-11}
   s.description = %q{Adds ActiveRecord support for hierarchial data structures using PostgreSQL's LTREE column type.}
   s.email = %q{git@timothymorgan.info}
   s.extra_rdoc_files = [
@@ -53,15 +53,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 3.0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 3.0"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.0"])
     else
-      s.add_dependency(%q<activerecord>, [">= 3.0"])
-      s.add_dependency(%q<activesupport>, [">= 3.0"])
+      s.add_dependency(%q<rails>, [">= 3.0"])
     end
   else
-    s.add_dependency(%q<activerecord>, [">= 3.0"])
-    s.add_dependency(%q<activesupport>, [">= 3.0"])
+    s.add_dependency(%q<rails>, [">= 3.0"])
   end
 end
 

data/lib/hierarchy.rb

@@ -53,7 +53,7 @@ module Hierarchy
     
     base.scope :parent_of, ->(obj) { obj.top_level? ? base.where('false') : base.where(id: obj.index_path.last) }
     base.scope :children_of, ->(obj) { base.where(path: obj.my_path) }
-    base.scope :ancestors_of, ->(obj) { base.where(id: obj.index_path.to_a) }
+    base.scope :ancestors_of, ->(obj) { obj.top_level? ? base.where('false') : base.where(id: obj.index_path.to_a) }
     base.scope :descendants_of, ->(obj) { base.where([ "path <@ ?", obj.my_path ]) }
     base.scope :siblings_of, ->(obj) { base.where(path: obj.path) }
     base.scope :priority_order, base.order("NLEVEL(path) ASC")
@@ -109,6 +109,7 @@ module Hierarchy
     # @return [Array] The objects above this one in the hierarchy.
 
     def ancestors(options={})
+      return [] if top_level?
       objects = self.class.ancestors_of(self).scoped(options).group_by(&:id)
       index_path.map { |id| objects[id].first }
     end
@@ -143,7 +144,7 @@ module Hierarchy
     # @return [true, false] Whether or not this object has no parents.
 
     def top_level?
-      path == ''
+      path.blank?
     end
 
     # @return [true, false] Whether or not this object has no children. Makes a
@@ -160,7 +161,7 @@ module Hierarchy
 
     # @private
     def index_path
-      IndexPath.from_ltree path
+      IndexPath.from_ltree path.to_s
     end
   end
 end

data/spec/hierarchy_spec.rb

@@ -107,4 +107,10 @@ describe Hierarchy do
       parent.should_not be_bottom_level
     end
   end
+  
+  describe "#ancestors" do
+    it "should return an empty array for a top-level object" do
+      Model.create!.ancestors.should eql([])
+    end
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Tim Morgan
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-30 00:00:00 -07:00
+date: 2010-11-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  name: rails
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,20 +31,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id002
 description: Adds ActiveRecord support for hierarchial data structures using PostgreSQL's LTREE column type.
 email: git@timothymorgan.info
 executables: []