xbel 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/nokogiri/decorators/xbel/folder.rb

@@ -34,27 +34,31 @@ module Nokogiri::Decorators::XBEL
       super
     end
 
+    def build(type, attributes = {}, &block)
+      child = Nokogiri::XML::Node.new(type.to_s, document)
+      assign_to child, attributes, &block
+
+      add_child child
+    end
+
     # Builds a bookmark with given attributes and add it.
     def build_bookmark(title, href, attributes = {}, &block)
-      node = Nokogiri::XML::Node.new('bookmark', document)
-      assign_to node, attributes.merge('title' => title, 'href' => href),
+      build :bookmark,
+          attributes.merge(:title => title, :href => href),
           &block
-
-      add_child node
     end
     # Builds a folder with given attributes and add it.
     def build_folder(title, attributes = {}, &block)
-      node = Nokogiri::XML::Node.new('folder', document)
-      assign_to node, attributes.merge('title' => title), &block
-
-      add_child node
+      build :folder,
+          attributes.merge(:title => title),
+          &block
     end
     # Builds an alias with given attributes and add it.
     def build_alias(ref)
-      node = Nokogiri::XML::Node.new('alias', document)
-      node.ref = (Entry === ref) ? ref.id : ref.to_s
+      child = Nokogiri::XML::Node.new('alias', document)
+      child.ref = (Entry === ref) ? ref.id : ref.to_s
 
-      add_child node
+      add_child child
     end
     # Builds a saperator with given attributes and add it.
     def add_separator
@@ -64,9 +68,16 @@ module Nokogiri::Decorators::XBEL
     protected
 
       def assign_to(node, attributes) #:nodoc:
+        attributes[:id] ||= "#{ id }." << xpath('./bookmark | ./folder').
+            inject(0) { |next_id, child|
+                succ_num_id = child.id[/(\d+)$/, 1].to_i.succ
+                succ_num_id > next_id ? succ_num_id : next_id
+            }.to_s
+
         attributes.each do |key, value|
           node.send "#{ key }=", value
         end
+
         yield node if block_given?
       end
 

data/test/test_xbel.rb

@@ -86,6 +86,7 @@ context 'XBEL' do
 
       asserts('added') { topic.added }.equals Date.today
       asserts('title') { topic.title }.equals 'boof\'s xbel'
+      asserts('next id') { topic.id }.equals 'f0.2'
       asserts('href') { topic.href }.
           equals 'http://www.github.com/boof/xbel'
       asserts('description') { topic.description }.
@@ -93,12 +94,12 @@ context 'XBEL' do
     end
 
     context 'new Folder' do
-      setup { topic.build_folder 'sub', :id => 'id-2', :desc => 'desc' }
+      setup { topic.build_folder 'sub', :desc => 'desc' }
       should('be a folder') { topic.folder? }
 
       asserts('added') { topic.added }.equals Date.today
       asserts('title') { topic.title }.equals 'sub'
-      asserts('id') { topic.id }.equals 'id-2'
+      asserts('next id') { topic.id }.equals 'f0.2'
       asserts('desc') { topic.desc }.equals 'desc'
     end
 

data/xbel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xbel}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian A\303\237mann"]
-  s.date = %q{2009-11-12}
+  s.date = %q{2009-11-16}
   s.description = %q{}
   s.email = %q{florian.assmann@email.de}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: xbel
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - "Florian A\xC3\x9Fmann"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-12 00:00:00 +01:00
+date: 2009-11-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency