ancestry 1.2.2 → 1.2.3

data/README.rdoc

@@ -6,14 +6,13 @@ Ancestry is a gem/plugin that allows the records of a Ruby on Rails ActiveRecord
 
 To apply Ancestry to any ActiveRecord model, follow these simple steps:
 
-1. Install gem
-   - Install gemcutter gem: <b>sudo gem install gemcutter</b> (maybe you need: gem update --system)
-   - Add gemcutter.org as default gem source: <b>gem tumble</b>
-   - Add to config/environment.rb: <b>config.gem 'ancestry'</b>
-   - Install required gems: <b>sudo rake gems:install</b>
-   - Alternatively: sudo gem install ancestry
-   - If you don't want gemcutter: config.gem 'ancestry', :source => 'gemcutter.org'
-   - Alternatively: sudo gem install ancestry --source gemcutter.org
+1. Install
+   - <b>Rails 2</b>
+     - Add to config/environment.rb: <b>config.gem 'ancestry'</b>
+     - Install required gems: <b>sudo rake gems:install</b>
+   - <b>Rails 3</b>
+     - Add to Gemfile: <b>gem 'ancestry'</b>
+     - Install required gems: <b>bundle install</b>
 
 2. Add ancestry column to your table
    - Create migration: <b>./script/generate migration add_ancestry_to_[table] ancestry:string</b>
@@ -80,6 +79,8 @@ The has_ancestry methods supports the following options:
                          - Migrate: add_column [table], :ancestry_depth, :integer, :default => 0
                          - Build cache: TreeNode.rebuild_depth_cache!
   :depth_cache_column    Pass in a symbol to store depth cache in a different column
+  :primary_key_format    Supply a regular expression that matches the format of your primary key.
+                         By default, primary keys only match integers ([0-9]+).
 
 = (Named) Scopes
 
@@ -229,6 +230,9 @@ The materialised path pattern requires Ancestry to use a 'like' condition in ord
 
 The latest and recommended version of ancestry is 1.2.2. The three numbers of each version numbers are respectively the major, minor and patch versions. We started with major version 1 because it looks so much better and ancestry was already quite mature and complete when it was published. The major version is only bumped when backwards compatibility is broken. The minor version is bumped when new features are added. The patch version is bumped when bugs are fixed.
 
+- Version 1.2.3 (2010-10-28)
+  - Fixed error with determining ActiveRecord version
+  - Added option to specify :primary_key_format (thanks goes to rolftimmermans)
 - Version 1.2.2 (2010-10-24)
   - Fixed all deprecation warnings for rails 3.0.X
   - Added :report option to check_ancestry_integrity!

data/ancestry.gemspec

@@ -3,8 +3,7 @@ Gem::Specification.new do |s|
   s.description = 'Organise ActiveRecord model into a tree structure'
   s.summary     = 'Ancestry allows the records of a ActiveRecord model to be organised in a tree structure, using a single, intuitively formatted database column. It exposes all the standard tree structure relations (ancestors, parent, root, children, siblings, descendants) and all of them can be fetched in a single sql query. Additional features are named_scopes, integrity checking, integrity restoration, arrangement of (sub)tree into hashes and different strategies for dealing with orphaned records.'
 
-  s.version = '1.2.2'
-  s.date    = '2010-10-24'
+  s.version = '1.2.3'
 
   s.author   = 'Stefan Kroes'
   s.email    = 's.a.kroes@gmail.com'
@@ -24,4 +23,4 @@ Gem::Specification.new do |s|
   ]
   
   s.add_dependency 'activerecord', '>= 2.2.2'
-end
+end

data/lib/ancestry/has_ancestry.rb

@@ -7,7 +7,7 @@ class << ActiveRecord::Base
     # Check options
     raise Ancestry::AncestryException.new("Options for has_ancestry must be in a hash.") unless options.is_a? Hash
     options.each do |key, value|
-      unless [:ancestry_column, :orphan_strategy, :cache_depth, :depth_cache_column].include? key
+      unless [:ancestry_column, :orphan_strategy, :cache_depth, :depth_cache_column, :primary_key_format].include? key
         raise Ancestry::AncestryException.new("Unknown option for has_ancestry: #{key.inspect} => #{value.inspect}.")
       end
     end
@@ -31,19 +31,19 @@ class << ActiveRecord::Base
     self.base_class = self
     
     # Validate format of ancestry column value
-    validates_format_of ancestry_column, :with => /\A[0-9]+(\/[0-9]+)*\Z/, :allow_nil => true
+    primary_key_format = options[:primary_key_format] || /[0-9]+/
+    validates_format_of ancestry_column, :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
     
     # Save ActiveRecord version
     self.cattr_accessor :rails_3
-    self.rails_3 = defined?(ActiveRecord::VERSION) and ActiveRecord::VERSION::MAJOR >= 3
+    self.rails_3 = defined?(ActiveRecord::VERSION) && ActiveRecord::VERSION::MAJOR >= 3
     
     # Workaround to support Rails 2
     scope_method = if rails_3 then :scope else :named_scope end
 
-    
     # Named scopes
     send scope_method, :roots, :conditions => {ancestry_column => nil}
     send scope_method, :ancestors_of, lambda { |object| {:conditions => to_node(object).ancestor_conditions} }

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ancestry
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 2
-  - 2
-  version: 1.2.2
+  - 3
+  version: 1.2.3
 platform: ruby
 authors: 
 - Stefan Kroes
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-24 00:00:00 +02:00
+date: 2010-10-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
         - 2
@@ -65,6 +67,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -73,6 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"