dm-is-tree 0.9.11 → 0.10.0

data/{History.txt → History.rdoc}

@@ -1,3 +1,7 @@
+=== 0.10.0 / 2009-10-15
+
+* Updated to work with dm-core 0.10.0
+
 === 0.9.11 / 2009-03-29
 
 * No changes this version

data/Manifest.txt

@@ -1,7 +1,7 @@
-History.txt
+History.rdoc
 LICENSE
 Manifest.txt
-README.txt
+README.rdoc
 Rakefile
 TODO
 lib/dm-is-tree.rb

data/Rakefile

@@ -1,5 +1,4 @@
 require 'pathname'
-require 'rubygems'
 
 ROOT    = Pathname(__FILE__).dirname.expand_path
 JRUBY   = RUBY_PLATFORM =~ /java/
@@ -14,10 +13,10 @@ GEM_NAME = 'dm-is-tree'
 GEM_VERSION = DataMapper::Is::Tree::VERSION
 GEM_DEPENDENCIES = [['dm-core', GEM_VERSION]]
 GEM_CLEAN = %w[ log pkg coverage ]
-GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO History.txt ] }
+GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.rdoc LICENSE TODO History.rdoc ] }
 
 PROJECT_NAME = 'datamapper'
-PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/#{GEM_NAME}"
+PROJECT_URL  = "http://github.com/datamapper/dm-more/tree/master/#{GEM_NAME}"
 PROJECT_DESCRIPTION = PROJECT_SUMMARY = 'DataMapper plugin allowing the creation of tree structures from data models'
 
 [ ROOT, ROOT.parent ].each do |dir|

data/lib/dm-is-tree.rb

@@ -1,7 +1 @@
-require 'rubygems'
-require 'pathname'
-
-gem 'dm-core', '0.9.11'
-require 'dm-core'
-
-require Pathname(__FILE__).dirname.expand_path / 'dm-is-tree' / 'is' / 'tree.rb'
+require 'dm-is-tree/is/tree'

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

@@ -59,13 +59,19 @@ module DataMapper
       #
       # * <tt>child_key</tt> - specifies the column name to use for tracking of the tree (default: +parent_id+)
       def is_tree(options = {})
-        options = { :class_name => name, :child_key => :parent_id }.merge(options) if Hash === options
+
+        if options[:class_name]
+          warn '+options[:class_name]+ is deprecated, use :model instead'
+          options[:model] = options.delete(:class_name)
+        end
+
+        options = { :model => name, :child_key => :parent_id }.merge(options) if Hash === options
         @tree_options = options
 
         include DataMapper::Is::Tree::InstanceMethods
         extend  DataMapper::Is::Tree::ClassMethods
 
-        assc_options = { :class_name => options[:class_name], :child_key => Array(options[:child_key]) }
+        assc_options = { :model => options[:model], :child_key => Array(options[:child_key]) }
         has_n_options = options[:order] ? { :order => Array(options[:order]) }.merge(assc_options) : assc_options
 
         belongs_to :parent, assc_options
@@ -123,7 +129,7 @@ module DataMapper
         #
         #   grandchild1.siblings # => [grandchild2]
         def siblings
-          generation - [self]
+          generation.reject{|r| r.key == self.key }
         end
 
         # Returns all children of the current node’s parent.

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

@@ -1,7 +1,7 @@
 module DataMapper
   module Is
     module Tree
-      VERSION = '0.9.11'
+      VERSION = '0.10.0'.freeze
     end
   end
 end

data/spec/integration/tree_spec.rb

@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
 
 if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
 
   describe DataMapper::Is::Tree do
 
-    class ::Category
+    class Category
       include DataMapper::Resource
 
       property :id, Serial

data/spec/spec.opts

@@ -1 +1,2 @@
 --colour
+--loadby random

data/spec/spec_helper.rb

@@ -1,10 +1,14 @@
-require 'pathname'
 require 'rubygems'
 
-gem 'rspec', '~>1.2'
-require 'spec'
+# use local dm-core if running from a typical dev checkout.
+lib = File.join('..', '..', 'dm-core', 'lib')
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
+require 'dm-core'
 
-require Pathname(__FILE__).dirname.expand_path.parent + 'lib/dm-is-tree'
+# Support running specs with 'rake spec' and 'spec'
+$LOAD_PATH.unshift('lib') unless $LOAD_PATH.include?('lib')
+
+require 'dm-is-tree'
 
 def load_driver(name, default_uri)
   return false if ENV['ADAPTER'] != name.to_s

data/spec/unit/tree_spec.rb

@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require 'spec_helper'
 
 describe DataMapper::Is::Tree do
 
   before do
-    class Category
+    class ::Category
       include DataMapper::Resource
 
       property :id, Serial
@@ -59,22 +59,26 @@ describe DataMapper::Is::Tree do
 
   describe "parent relationship" do
 
-    it "should set the class_name from the current class" do
+    it "should set the model from the current class" do
+      # Internals of relationships has changed
       Category.is :tree
-      Category.relationships[:parent].options[:class_name].should == Category.name
+      Category.relationships[:parent].child_model.should == Category
     end
 
     it "should use the default child_key of :parent_id if none is supplied in the options" do
+      # Internals of relationships has changed
       Category.is :tree
-      Category.relationships[:parent].options[:child_key].should == Array(:parent_id)
+      Category.relationships[:parent].options[:child_key].should == [ :parent_id ]
     end
 
     it "should use the child_key from the options if it is supplied" do
+      # Internals of relationships has changed
       Category.is :tree, :child_key => :other_id
-      Category.relationships[:parent].options[:child_key].should == Array(:other_id)
+      Category.relationships[:parent].options[:child_key].should == [ :other_id ]
     end
 
     it "should not set any order" do
+      # Internals of relationships has changed
       Category.is :tree, :order => :name
       Category.relationships[:parent].options.should_not have_key(:order)
     end
@@ -83,29 +87,34 @@ describe DataMapper::Is::Tree do
 
   describe "children relationship" do
 
-    it "should set the class_name from the current class" do
+    it "should set the model from the current class" do
+      # Internals of relationships has changed
       Category.is :tree
-      Category.relationships[:children].options[:class_name].should == Category.name
+      Category.relationships[:children].child_model.should == Category
     end
 
     it "should use the default child_key of :parent_id if none is supplied in the options" do
+      # Internals of relationships has changed
       Category.is :tree
-      Category.relationships[:children].options[:child_key].should == Array(:parent_id)
+      Category.relationships[:children].options[:child_key].should == [ :parent_id ]
     end
 
     it "should use the child_key from the options if it is supplied" do
+      # Internals of relationships has changed
       Category.is :tree, :child_key => :other_id
-      Category.relationships[:children].options[:child_key].should == Array(:other_id)
+      Category.relationships[:children].options[:child_key].should == [ :other_id ]
     end
 
     it "should not set any order if none is supplied in the options" do
+      # Internals of relationships has changed
       Category.is :tree
       Category.relationships[:children].options.should_not have_key(:order)
     end
 
     it "should use the order from the options if it is supplied" do
+      # Internals of relationships has changed
       Category.is :tree, :order => :name
-      Category.relationships[:children].options[:order].should == Array(:name)
+      Category.relationships[:children].options[:order].should == [ :name ]
     end
 
   end

data/tasks/install.rb

@@ -4,7 +4,7 @@ end
 
 desc "Install #{GEM_NAME} #{GEM_VERSION}"
 task :install => [ :package ] do
-  sudo_gem "install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
+  sudo_gem "install pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
 end
 
 desc "Uninstall #{GEM_NAME} #{GEM_VERSION}"

data/tasks/spec.rb

@@ -1,6 +1,4 @@
 begin
-  gem 'rspec', '~>1.2'
-  require 'spec'
   require 'spec/rake/spectask'
 
   task :default => [ :spec ]
@@ -8,16 +6,18 @@ begin
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
+    t.libs      << 'lib' << 'spec' # needed for CI rake spec task, duplicated in spec_helper
 
     begin
-      gem 'rcov', '~>0.8'
+      require 'rcov'
       t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
       t.rcov_opts << '--exclude' << 'spec'
       t.rcov_opts << '--text-summary'
       t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
     rescue LoadError
       # rcov not installed
+    rescue SyntaxError
+      # rcov syntax invalid
     end
   end
 rescue LoadError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-is-tree
 version: !ruby/object:Gem::Version 
-  version: 0.9.11
+  version: 0.10.0
 platform: ruby
 authors: 
 - Timothy Bennett
@@ -9,19 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-29 00:00:00 -07:00
+date: 2009-09-16 00:00:00 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.9.11
-    version: 
+dependencies: []
+
 description: DataMapper plugin allowing the creation of tree structures from data models
 email: 
 - leapord729 [a] comcast.net
@@ -30,15 +21,15 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.txt
+- README.rdoc
 - LICENSE
 - TODO
-- History.txt
+- History.rdoc
 files: 
-- History.txt
+- History.rdoc
 - LICENSE
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - TODO
 - lib/dm-is-tree.rb
@@ -51,11 +42,13 @@ files:
 - tasks/install.rb
 - tasks/spec.rb
 has_rdoc: true
-homepage: http://github.com/sam/dm-more/tree/master/dm-is-tree
+homepage: http://github.com/datamapper/dm-more/tree/master/dm-is-tree
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -73,9 +66,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: DataMapper plugin allowing the creation of tree structures from data models
 test_files: []