dm-is-tree 1.0.2 → 1.1.0.rc1

data/Gemfile

@@ -1,110 +1,42 @@
-# If you're working on more than one datamapper gem at a time, then it's
-# recommended to create a local Gemfile and use this instead of the git
-# sources. This will make sure that you are  developing against your
-# other local datamapper sources that you currently work on. Gemfile.local
-# will behave identically to the standard Gemfile apart from the fact that
-# it fetches the datamapper gems from local paths. This means that you can use
-# the same environment variables, like ADAPTER(S) or PLUGIN(S) when running
-# bundle commands. Gemfile.local is added to .gitignore, so you don't need to
-# worry about accidentally checking local development paths into git.
-# In order to create a local Gemfile, all you need to do is run:
-#
-#   bundle exec rake local_gemfile
-#
-# This will give you a Gemfile.local file that points to your local clones of
-# the various datamapper gems. It's assumed that all datamapper repo clones
-# reside in the same directory. You can use the Gemfile.local like so for
-# running any bundle command:
-#
-#   BUNDLE_GEMFILE=Gemfile.local bundle foo
-#
-# You can also specify which adapter(s) should be part of the bundle by setting
-# an environment variable. This of course also works when using the Gemfile.local
-#
-#   bundle foo                        # dm-sqlite-adapter
-#   ADAPTER=mysql bundle foo          # dm-mysql-adapter
-#   ADAPTERS=sqlite,mysql bundle foo  # dm-sqlite-adapter and dm-mysql-adapter
-#
-# Of course you can also use the ADAPTER(S) variable when using the Gemfile.local
-# and running specs against selected adapters.
-#
-# For easily working with adapters supported on your machine, it's recommended
-# that you first install all adapters that you are planning to use or work on
-# by doing something like
-#
-#   ADAPTERS=sqlite,mysql,postgres bundle install
-#
-# This will clone the various repositories and make them available to bundler.
-# Once you have them installed you can easily switch between adapters for the
-# various development tasks. Running something like
-#
-#   ADAPTER=mysql bundle exec rake spec
-#
-# will make sure that the dm-mysql-adapter is part of the bundle, and will be used
-# when running the specs.
-#
-# You can also specify which plugin(s) should be part of the bundle by setting
-# an environment variable. This also works when using the Gemfile.local
-#
-#   bundle foo                                 # dm-migrations
-#   PLUGINS=dm-validations bundle foo          # dm-migrations and dm-validations
-#   PLUGINS=dm-validations,dm-types bundle foo # dm-migrations, dm-validations and dm-types
-#
-# Of course you can combine the PLUGIN(S) and ADAPTER(S) env vars to run specs
-# for certain adapter/plugin combinations.
-#
-# Finally, to speed up running specs and other tasks, it's recommended to run
-#
-#   bundle lock
-#
-# after running 'bundle install' for the first time. This will make 'bundle exec' run
-# a lot faster compared to the unlocked version. With an unlocked bundle you would
-# typically just run 'bundle install' from time to time to fetch the latest sources from
-# upstream. When you locked your bundle, you need to run
-#
-#   bundle install --relock
-#
-# to make sure to fetch the latest updates and then lock the bundle again. Gemfile.lock
-# is added to the .gitignore file, so you don't need to worry about accidentally checking
-# it into version control.
+require 'pathname'
 
 source 'http://rubygems.org'
 
-DATAMAPPER = 'git://github.com/datamapper'
-DM_VERSION = '~> 1.0.2'
+SOURCE       = ENV.fetch('SOURCE', :git).to_sym
+REPO_POSTFIX = SOURCE == :path ? ''                                : '.git'
+DATAMAPPER   = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
+DM_VERSION   = '~> 1.1.0.rc1'
 
-group :runtime do # Runtime dependencies (as in the gemspec)
+group :runtime do
 
   if ENV['EXTLIB']
-    gem 'extlib',        '~> 0.9.15', :git => "#{DATAMAPPER}/extlib.git"
+    gem 'extlib', '~> 0.9.15', SOURCE => "#{DATAMAPPER}/extlib#{REPO_POSTFIX}", :require => nil
   else
-    gem 'activesupport', '~> 3.0.0',  :git => 'git://github.com/rails/rails.git', :branch => '3-0-stable', :require => nil
+    gem 'activesupport', '~> 3.0.4', :require => nil
+    gem 'i18n',          '~> 0.5.0'
   end
 
-  gem 'dm-core',         DM_VERSION, :git => "#{DATAMAPPER}/dm-core.git"
+  gem 'dm-core', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}"
 
 end
 
-group(:development) do # Development dependencies (as in the gemspec)
+group :development do
 
-  gem 'rake',           '~> 0.8.7'
-  gem 'rspec',          '~> 1.3', :git => 'git://github.com/snusnu/rspec', :branch => 'heckle_fix_plus_gemfile'
-  gem 'jeweler',        '~> 1.4'
+  gem 'jeweler', '~> 1.5.2'
+  gem 'rake',    '~> 0.8.7'
+  gem 'rspec',   '~> 1.3.1'
 
 end
 
-group :quality do # These gems contain rake tasks that check the quality of the source code
+group :quality do
 
-  gem 'metric_fu',      '~> 1.3'
-  gem 'rcov',           '~> 0.9.8'
-  gem 'reek',           '~> 1.2.8'
-  gem 'roodi',          '~> 2.1'
-  gem 'yard',           '~> 0.5'
-  gem 'yardstick',      '~> 0.1'
+  gem 'rcov',      '~> 0.9.9', :platforms => :mri_18
+  gem 'yard',      '~> 0.6'
+  gem 'yardstick', '~> 0.2'
 
 end
 
-group :datamapper do # We need this because we want to pin these dependencies to their git master sources
+group :datamapper do
 
   adapters = ENV['ADAPTER'] || ENV['ADAPTERS']
   adapters = adapters.to_s.tr(',', ' ').split.uniq - %w[ in_memory ]
@@ -114,27 +46,27 @@ group :datamapper do # We need this because we want to pin these dependencies to
 
   if (do_adapters = DM_DO_ADAPTERS & adapters).any?
     options = {}
-    options[:git] = "#{DATAMAPPER}/do.git" if ENV['DO_GIT'] == 'true'
+    options[:git] = "#{DATAMAPPER}/do#{REPO_POSTFIX}" if ENV['DO_GIT'] == 'true'
 
-    gem 'data_objects',  DO_VERSION, options.dup
+    gem 'data_objects', DO_VERSION, options.dup
 
     do_adapters.each do |adapter|
       adapter = 'sqlite3' if adapter == 'sqlite'
       gem "do_#{adapter}", DO_VERSION, options.dup
     end
 
-    gem 'dm-do-adapter', DM_VERSION, :git => "#{DATAMAPPER}/dm-do-adapter.git"
+    gem 'dm-do-adapter', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-do-adapter#{REPO_POSTFIX}"
   end
 
   adapters.each do |adapter|
-    gem "dm-#{adapter}-adapter", DM_VERSION, :git => "#{DATAMAPPER}/dm-#{adapter}-adapter.git"
+    gem "dm-#{adapter}-adapter", DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-#{adapter}-adapter#{REPO_POSTFIX}"
   end
 
   plugins = ENV['PLUGINS'] || ENV['PLUGIN']
   plugins = plugins.to_s.tr(',', ' ').split.push('dm-migrations').uniq
 
   plugins.each do |plugin|
-    gem plugin, DM_VERSION, :git => "#{DATAMAPPER}/#{plugin}.git"
+    gem plugin, DM_VERSION, SOURCE => "#{DATAMAPPER}/#{plugin}#{REPO_POSTFIX}"
   end
 
 end

data/LICENSE

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

data/README.rdoc

@@ -1,35 +1,387 @@
 = dm-is-tree
 
-DataMapper plugin allowing the creation of tree structures from data models.
+DataMapper plugin enabling easy creation of tree structures from your DM models.
 
-Example:
+This requires <b>a foreign key property</b> for your model, which by default would be called <tt>:parent_id</tt>.
 
-class Category
-  include DataMapper::Resource
 
-  property :id, Serial
-  property :parent_id, Integer
-  property :name, String
+== Installation
 
-  is :tree, :order => :name
-end
+=== Stable
 
-root
-  +- child
-    +- grandchild1
-    +- grandchild2
+Install the <tt>dm-is-tree</tt> gem.
 
-root = Category.create(:name => "root")
-child = root.children.create(:name => "child")
-grandchild1 = child1.children.create(:name => "grandchild1")
-grandchild2 = child2.children.create(:name => "grandchild2")
+  $ (sudo)? gem install dm-is-tree
 
-root.parent  # => nil
-child.parent  # => root
-root.children  # => [child]
-root.children.first.children.first  # => grandchild1
-Category.first_root  # => root
-Category.roots  # => [root]
+=== Edge
 
-Original Author:: Timothy Bennett (http://lanaer.com)
-Current Maintainer:: Garrett Heaver (http://www.linkedin.com/pub/dir/garrett/heaver)
+Download or clone <tt>dm-is-versioned</tt> from Github[http://github.com/datamapper/dm-is-tree/].
+
+  $ cd /path/to/dm-is-tree
+
+  $ rake install            # will install dm-is-tree
+
+
+
+== Getting started
+
+To start using this gem, just...
+
+  require 'dm-is-tree'
+
+
+Lets say we have a Category model...
+
+  class Category
+    include DataMapper::Resource
+    property :id,         Serial
+    property :name,       String
+  end
+
+
+...and we want to have a tree structure within it, something like this:
+
+  the_parent
+    +- child
+        +- grandchild1
+        +- grandchild2
+
+
+To achieve this we just add the following to the model:
+
+  class Category
+    <snip...>
+
+    is :tree, :order => :name
+
+  end
+
+  # No need to define the :parent_id property, it will be added automatically
+  property :parent_id,  Integer
+
+
+This will automatically add the following to your model:
+
+=== Instance Methods
+
+* <tt>#parent</tt> / <tt>#parent=</tt>
+* <tt>#children</tt> / <tt>#children=</tt>
+* <tt>#siblings</tt>
+* <tt>#generation</tt>
+* <tt>#ancestors</tt>
+  - also aliased as <tt>#self_and_siblings</tt> for those used to AR's :acts_as_tree
+* <tt>#root</tt>
+  - also aliased as <tt>#first_root</tt> for those used to AR's :acts_as_tree
+
+=== Class Methods
+
+* <tt>#first_root</tt>
+* <tt>#roots</tt>
+
+
+== Configuration Options
+
+Before we go onto the usage examples, a few quick words about configuration options available:
+
+=== <tt>:child_key</tt>
+
+Specifies the column name to use for tracking of the tree (default: <tt>#parent_id</tt>).
+
+  class Category
+    <snip...>
+
+    is :tree, :child_key => :some_other_foreign_key_id
+
+  end
+
+
+=== <tt>:model</tt>
+
+Specifies the name of the Model to use for the tree (default: Model class name defined in)
+
+  class Category
+    <snip...>
+
+    is :tree, :model => 'SomeStrangeModelName'
+
+  end
+
+
+=== <tt>:order</tt> [Optional]
+
+Specifies the sort order of the children when retrieving them (default: not present)
+
+  class Category
+    <snip...>
+
+    is :tree, :order => [:updated_at, :name]
+
+  end
+
+
+
+== Usage
+
+To create the above structure, we would start with:
+
+  the_parent = Category.create(:name => "the_parent")
+
+
+=== <tt>#parent</tt> & <tt>#parent=</tt>
+
+The <tt>#parent</tt> instance method returns the node referenced by the foreign key - <tt>:parent_id</tt>
+or the defined <tt>:child_key</tt>.
+
+  # by default #parent and #parent_id return nil when there is no parent
+  the_parent.parent  # => nil
+
+
+The <tt>#parent=</tt> instance method sets the <tt>:parent_id</tt> foreign key to the parent's id attribute value.
+
+To define a parent you can use either of these syntaxes:
+
+  a_child = Category.create(:name => "a_child", :parent => the_parent)
+
+  a_child = Category.create(:name => "a_child", :parent_id => the_parent.id)
+
+  a_child = Category.create(:name => "a_child")
+  a_child.parent = the_parent
+
+
+When retrieving the parent, you will receive the full parent object ( or <tt>nil</tt> if none was declared )
+
+  a_child.parent  # => the_parent
+
+
+=== <tt>#children</tt> & <tt>#children=</tt>
+
+The <tt>#children</tt> instance method <b>returns all nodes with the current node as their parent</b>,
+in the order specified by the <tt>:order</tt> configuration option.
+
+  # by default #children return an empty Array when there are no children
+  a_child.children # => []
+
+  # or an Array with child objects when there are children
+  the_parent.children # => [a_child]
+
+
+The <tt>#children=</tt> instance method adds children by setting the <tt>:parent_id</tt> foreign key
+to the parent's id attribute value.
+
+To add a child you can use either of these syntaxes:
+
+  child = the_parent.children.create(:name => "child")
+
+  grandchild1 = Category.create(:name => "grandchild1")
+  child.children < grandchild1
+
+  grandchild2 = child.children.create(:name => "grandchild2")
+
+
+When retrieving children, or a child, you will receive an Array of child objects.
+
+  child.children # => [grandchild1, grandchild2,...]
+
+  # just retrieve the first child
+  child.children.first # => grandchild1
+
+
+
+=== <tt>#siblings</tt>
+
+The <tt>#siblings</tt> instance method <b>returns all the children of the parent, excluding the current node</b>.
+
+  # by default #siblings return an empty Array when there are no siblings
+  the_parent.siblings # => []
+
+  grandchild1.siblings # => [grandchild2]
+
+
+
+=== <tt>#generation</tt>
+
+The <tt>#generation</tt> instance method returns all the children of the parent, <b>including the current node</b>.
+
+  # by default #generation return an Array with itself only when it's a 'lonely child'
+  the_parent.generation # => [the_parent]
+
+  #
+  grandchild1.generation # => [grandchild1, grandchild2]
+
+
+
+=== <tt>#ancestors</tt>
+
+The <tt>#ancestors</tt> instance method returns all the ancestors of the current node.
+
+  # by default it returns an empty Array when born through immaculate conception (is root)
+  the_parent.ancestors # => []
+
+  grandchild2.ancestors # => [the_parent, a_child]
+
+
+
+=== <tt>#root</tt>
+
+The <tt>#root</tt> instance method returns the root (parent) of the current node.
+
+  # by default returns itself only when it's the root node
+  the_parent.root # =>  the_parent
+
+  a_child.root # => the_parent
+
+  grandchild2.root # => the_parent
+
+
+
+=== <tt>self.#first_root</tt>
+
+The <tt>#first_root</tt> class method returns the first root declared in the model.
+
+  Category.first_root # =>  the_parent
+
+
+=== <tt>self.#roots</tt>
+
+The <tt>#roots</tt> class method returns an Array of the roots declared in the model.
+
+  Category.roots # =>  [the_parent]
+
+  parent2 = Category.create(:name => 'parent2')
+
+
+  Category.roots # =>  [the_parent, parent2]
+
+
+=== Summary
+
+  parent = Category.create(:name => "parent")
+
+  child = parent.children.create(:name => "child")
+
+  grandchild1 = child.children.create(:name => "grandchild1")
+  grandchild2 = child.children.create(:name => "grandchild2")
+
+  parent.parent  # => nil
+  child.parent  # => parent
+
+  parent.children  # => [child]
+  parent.children.first.children.first  # => grandchild1
+
+  parent.siblings # => []
+  grandchild1.siblings # => [grandchild2]
+
+  parent.generation # => [parent]
+  grandchild1.generation # => [grandchild1, grandchild2]
+
+  parent.ancestors # => []
+  grandchild2.ancestors # => [parent, child]
+
+  parent.root # =>  parent
+  parent.root # => parent
+  grandchild2.root # => parent
+
+
+  Category.first_root  # => parent
+  Category.roots  # => [parent]
+
+
+
+== Gotchas
+
+Now there are some gotcha's that might not be entirely obvious to everyone, so let's clarify
+them here.
+
+=== Prevent a node being made a child of it self
+
+By default dm-is-tree allows you to save a record as a child of it self, which is quite unnatural.
+To prevent this, I would humbly suggest adding this custom validation code to your model(s).
+
+  class Category
+    <snip...>
+
+    # prevent saving Category as child of self, except when new?
+    validates_with_method :parent_id,
+                          :method => :category_cannot_be_made_a_child_of_self,
+                          :unless => :new?
+
+    protected
+
+      def category_cannot_be_made_a_child_of_self
+        if self.id === self.parent_id
+          return [
+            false,
+            "A Category [ #{self.name} ] cannot be made a child of it self [ #{self.name} ]"
+          ]
+        else
+          return true
+        end
+      end
+
+  end
+
+An example:
+
+  parent = Category.create(:name => "parent")
+  child = parent.children.create(:name => 'child')
+
+  child.parent = child
+
+  child.save  # => return false
+
+  child.errors.on(:parent_id)
+    # => ["A Category [ child ] cannot be made a child of it self [ child ]"]
+
+
+=== Sorting order within nodes
+
+By default the sorting order is alphabetic, but this spans the entire table (with all nodes),
+which might not be what you want.
+
+To prevent this, order the results by <tt>:parent_id</tt> first, and secondly by <tt>:name</tt>
+or whatever you wish to sort by.
+
+  class Category
+    <snip...>
+
+    is :tree, :order => [:parent_id, :name]
+
+  end
+
+
+That's about it.
+
+
+== Errors / Bugs
+
+If something is not behaving intuitively, it is a bug, and should be reported.
+Report it here: http://datamapper.lighthouseapp.com/
+
+
+== TODOs
+
+* Make it automatically prevent saving self as child of self.
+* Anything else missing?
+
+
+== Note on Patches/Pull Requests
+
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so we don't break it in a future version unintentionally.
+* Commit, do not mess with rakefile, version, or history.
+  * (if you want to have your own version, that is fine but bump version in a commit by itself we can ignore when we pull)
+* Send us a pull request. Bonus points for topic branches.
+
+
+== Copyright
+
+Copyright (c) 2011 Timothy Bennett. Released under the MIT License.
+
+See LICENSE for details.
+
+=== Credits
+
+Credit also goes to these contributors[http://github.com/datamapper/dm-is-tree/contributors].
+
+Current Maintainer: Garrett Heaver (http://www.linkedin.com/pub/dir/garrett/heaver)

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'jeweler', '~> 1.4'
+  gem 'jeweler', '~> 1.5.2'
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|
@@ -15,10 +15,6 @@ begin
     gem.has_rdoc    = 'yard'
 
     gem.rubyforge_project = 'datamapper'
-
-    gem.add_dependency 'dm-core', '~> 1.0.2'
-
-    gem.add_development_dependency 'rspec', '~> 1.3'
   end
 
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.0.rc1

data/dm-is-tree.gemspec

@@ -1,70 +1,75 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{dm-is-tree}
-  s.version = "1.0.2"
+  s.version = "1.1.0.rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Timothy Bennett"]
-  s.date = %q{2010-09-07}
+  s.date = %q{2011-02-28}
   s.description = %q{DataMapper plugin allowing the creation of tree structures from data models}
   s.email = %q{leapord729 [a] comcast.net}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "Gemfile",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "dm-is-tree.gemspec",
-     "lib/dm-is-tree.rb",
-     "lib/dm-is-tree/is/tree.rb",
-     "spec/integration/tree_spec.rb",
-     "spec/rcov.opts",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "spec/unit/tree_spec.rb",
-     "tasks/ci.rake",
-     "tasks/local_gemfile.rake",
-     "tasks/metrics.rake",
-     "tasks/spec.rake",
-     "tasks/yard.rake",
-     "tasks/yardstick.rake"
+    "Gemfile",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "dm-is-tree.gemspec",
+    "lib/dm-is-tree.rb",
+    "lib/dm-is-tree/is/tree.rb",
+    "spec/integration/tree_spec.rb",
+    "spec/rcov.opts",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "spec/unit/tree_spec.rb",
+    "tasks/spec.rake",
+    "tasks/yard.rake",
+    "tasks/yardstick.rake"
   ]
-  s.has_rdoc = %q{yard}
   s.homepage = %q{http://github.com/datamapper/dm-is-tree}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{DataMapper plugin allowing the creation of tree structures from data models}
   s.test_files = [
     "spec/integration/tree_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/unit/tree_spec.rb"
+    "spec/spec_helper.rb",
+    "spec/unit/tree_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.2"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.4"])
+      s.add_runtime_dependency(%q<i18n>, ["~> 0.5.0"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.1.0.rc1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3.1"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.0.2"])
-      s.add_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_dependency(%q<activesupport>, ["~> 3.0.4"])
+      s.add_dependency(%q<i18n>, ["~> 0.5.0"])
+      s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc1"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rake>, ["~> 0.8.7"])
+      s.add_dependency(%q<rspec>, ["~> 1.3.1"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.0.2"])
-    s.add_dependency(%q<rspec>, ["~> 1.3"])
+    s.add_dependency(%q<activesupport>, ["~> 3.0.4"])
+    s.add_dependency(%q<i18n>, ["~> 0.5.0"])
+    s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc1"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rake>, ["~> 0.8.7"])
+    s.add_dependency(%q<rspec>, ["~> 1.3.1"])
   end
 end
 

data/lib/dm-is-tree/is/tree.rb

@@ -17,7 +17,7 @@ module DataMapper
       #   class Category
       #     include DataMapper::Resource
       #
-      #     property :id, Integer
+      #     property :id, Serial
       #     property :parent_id, Integer
       #     property :name, String
       #

data/tasks/spec.rake

@@ -35,7 +35,4 @@ rescue LoadError
   end
 end
 
-task :spec => :check_dependencies
-task :rcov => :check_dependencies
-
 task :default => :spec

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: dm-is-tree
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
+  prerelease: 6
+  version: 1.1.0.rc1
 platform: ruby
 authors: 
 - Timothy Bennett
@@ -14,38 +10,75 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 -07:00
+date: 2011-02-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: dm-core
-  prerelease: false
+  name: activesupport
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 2
-        version: 1.0.2
+        version: 3.0.4
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
+  name: i18n
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
-  type: :development
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: dm-core
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.1.0.rc1
+  type: :runtime
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rake
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.3.1
+  type: :development
+  prerelease: false
+  version_requirements: *id006
 description: DataMapper plugin allowing the creation of tree structures from data models
 email: leapord729 [a] comcast.net
 executables: []
@@ -56,7 +89,6 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .gitignore
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -70,19 +102,16 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/unit/tree_spec.rb
-- tasks/ci.rake
-- tasks/local_gemfile.rake
-- tasks/metrics.rake
 - tasks/spec.rake
 - tasks/yard.rake
 - tasks/yardstick.rake
-has_rdoc: yard
+has_rdoc: true
 homepage: http://github.com/datamapper/dm-is-tree
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -90,21 +119,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: DataMapper plugin allowing the creation of tree structures from data models

data/.gitignore

@@ -1,37 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## Rubinius
-*.rbc
-
-## PROJECT::GENERAL
-*.gem
-coverage
-rdoc
-pkg
-tmp
-doc
-log
-.yardoc
-measurements
-
-## BUNDLER
-.bundle
-Gemfile.local
-Gemfile.lock
-Gemfile.local.lock
-
-## PROJECT::SPECIFIC
-spec/db/

data/tasks/ci.rake

@@ -1 +0,0 @@
-task :ci => [ :verify_measurements, 'metrics:all' ]

data/tasks/local_gemfile.rake

@@ -1,16 +0,0 @@
-desc "Support bundling from local source code (allows BUNDLE_GEMFILE=Gemfile.local bundle foo)"
-task :local_gemfile do |t|
-
-  root       = Pathname(__FILE__).dirname.parent
-  datamapper = root.parent
-
-  root.join('Gemfile.local').open('w') do |f|
-    root.join('Gemfile').open.each do |line|
-      line.sub!(/DATAMAPPER = 'git:\/\/github.com\/datamapper'/, "DATAMAPPER = '#{datamapper}'")
-      line.sub!(/:git => \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/,  ':path => "#{DATAMAPPER}/\1"')
-      line.sub!(/do_options\[:git\] = \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/,  'do_options[:path] = "#{DATAMAPPER}/\1"')
-      f.puts line
-    end
-  end
-
-end

data/tasks/metrics.rake

@@ -1,36 +0,0 @@
-begin
-  require 'metric_fu'
-rescue LoadError
-  namespace :metrics do
-    task :all do
-      abort 'metric_fu is not available. In order to run metrics:all, you must: gem install metric_fu'
-    end
-  end
-end
-
-begin
-  require 'reek/adapters/rake_task'
-
-  Reek::RakeTask.new do |t|
-    t.fail_on_error = true
-    t.verbose       = false
-    t.source_files  = 'lib/**/*.rb'
-  end
-rescue LoadError
-  task :reek do
-    abort 'Reek is not available. In order to run reek, you must: gem install reek'
-  end
-end
-
-begin
-  require 'roodi'
-  require 'roodi_task'
-
-  RoodiTask.new do |t|
-    t.verbose = false
-  end
-rescue LoadError
-  task :roodi do
-    abort 'Roodi is not available. In order to run roodi, you must: gem install roodi'
-  end
-end