xbel 0.1.2 → 0.2.0

data/Rakefile

@@ -5,15 +5,13 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "xbel"
-    gem.summary = %Q{Ruby API for XBEL based on Nokogiri and Watchr.}
+    gem.summary = %Q{Ruby API for XBEL based on Nokogiri.}
     gem.description = %Q{}
     gem.email = "florian.assmann@email.de"
     gem.homepage = "http://xbel.monkey-patch.me"
     gem.authors = ["Florian Aßmann"]
-    gem.add_development_dependency "shoulda", ">= 0"
-    gem.add_dependency 'watchr', '>= 0'
+    gem.add_development_dependency "riot", ">= 0"
     gem.add_dependency 'nokogiri', '>= 0'
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -24,7 +22,7 @@ require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+  test.verbose = false
 end
 
 begin
@@ -40,8 +38,6 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
-
 task :default => :test
 
 require 'rake/rdoctask'

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

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

@@ -3,26 +3,26 @@ module Nokogiri::Decorators::XBEL
     include Entry
 
     def modified
-      if value = attribute('modified') then Date.parse value.content end
+      if value = self['modified'] then Date.parse value end
     end
     def modified=(value)
-      set_attribute 'modified', value.to_s
+      self['modified'] = value.to_s
     end
     def visited
-      if value = attribute('visited') then Date.parse value.content end
+      if value = self['visited'] then Date.parse value end
     end
     def visited=(value)
-      set_attribute 'visited', value.to_s
+      self['visited'] = value.to_s
     end
     def visit
       self.visited = Date.today
     end
     def href
-      if value = attribute('href') then value.content end
+      if value = self['href'] then value end
     end
     def href=(value)
       self.modified = Date.today
-      set_attribute 'href', value
+      self['href'] = value
     end
     def bookmark?
       true

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

@@ -31,16 +31,16 @@ module Nokogiri::Decorators::XBEL
     end
 
     # Builds a bookmark with given attributes and add it.
-    def build_bookmark(attributes = {}, &block)
+    def build_bookmark(title, attributes = {}, &block)
       node = Nokogiri::XML::Node.new('bookmark', document)
-      assign_to node, attributes
+      assign_to node, attributes.merge('title' => title)
 
       add_child node
     end
     # Builds a folder with given attributes and add it.
-    def build_folder(attributes = {}, &block)
+    def build_folder(title, attributes = {}, &block)
       node = Nokogiri::XML::Node.new('folder', document)
-      assign_to node, attributes
+      assign_to node, attributes.merge('title' => title)
 
       add_child node
     end

data/lib/xbel.rb

@@ -3,21 +3,19 @@ require 'forwardable'
 require 'nokogiri'
 require 'nokogiri/decorators/xbel'
 
-require 'watchr'
-
 class XBEL < Nokogiri::XML::Document
   extend Forwardable
   def_delegators :root, :title, :title=, :desc, :desc=
 
-  autoload :Writer, 'xbel/writer'
+  def self.new(major = 1, minor = 0)
+    parse %Q'<!DOCTYPE xbel PUBLIC "+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML" "http://www.python.org/topics/xml/dtds/xbel-1.0.dtd"><xbel version="%i.%i"></xbel>' % [major, minor]
+  end
 
   # Use <tt>XBEL.parse(string)</tt> create an instance.
   def initialize(*args)
     super
     decorators(Nokogiri::XML::Node) << Nokogiri::Decorators::XBEL
     decorate!
-
-#    self.root = '<xbel version="1.0"></xbel>'
   end
 
   # Returns an array of version numbers.
@@ -26,13 +24,7 @@ class XBEL < Nokogiri::XML::Document
   end
   # Sets version numbers.
   def version=(*numbers)
-    root.attribute('version').value = numbers.join '.'
-  end
-
-  # Writes XBEL to path.
-  def write(path)
-    # TODO: should start locking write process
-    Writer.new(self, path).write
+    root.attribute('version').value = numbers * '.'
   end
 
 end

data/test/helper.rb

@@ -1,12 +1,6 @@
 require 'rubygems'
-require 'test/unit'
-require 'shoulda'
+require 'riot'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'xbel'
-
-class Test::Unit::TestCase
-  include Nokogiri::Decorators::XBEL
-  attr_reader :xbel
-end

data/test/test_xbel.rb

@@ -1,35 +1,89 @@
 require 'helper'
 
-class TestXBEL < Test::Unit::TestCase
-  context 'Read XBEL' do
-    setup do
-      @path = Pathname.new("#{ File.dirname __FILE__ }").join "complex.xbel"
-      @xbel = XBEL.parse @path.read
-    end
-    should "have version [1, 0]" do
-      assert_equal [1, 0], xbel.version
-    end
-    should "have title 'Some of David's Bookmarks'" do
-      assert_equal %Q{Some of David's Bookmarks}, xbel.title
+context 'New XBEL' do
+
+  asserts 'version' do
+    XBEL.new.version
+  end.equals [1, 0]
+  asserts 'user defined version' do
+    XBEL.new(2, 2).version
+  end.equals [2, 2]
+  asserts 'set version' do
+    xbel = XBEL.new
+    xbel.version = 1, 1
+
+    xbel.version
+  end.equals [1, 1]
+  should 'be empty' do
+    XBEL.new.root.content.empty?
+  end
+
+end
+
+context 'XBEL' do
+
+  setup do
+    path = File.join "#{ File.dirname __FILE__ }", 'wikipedia.xbel'
+    @xbel = XBEL.parse File.read(path)
+  end
+
+  asserts('version') { @xbel.version }.equals [1, 0]
+
+  asserts("title") { @xbel.title }.equals %q"Lesezeichen!"
+  should('delegate title to root') { @xbel.root.title == @xbel.title }
+
+  context 'Alias' do
+    setup { @alias = @xbel.root.aliases.first }
+    should('be an alias') { @alias.alias? }
+  end
+
+  context 'Folder' do
+    setup { @folder = @xbel.root.folders.first }
+
+    asserts('title') { @folder.title }.equals 'Wiki'
+    asserts('entries') { @folder.entries }.kind_of Nokogiri::XML::NodeSet
+    asserts('bookmarks') { @folder.bookmarks }.kind_of Nokogiri::XML::NodeSet
+    asserts('aliases') { @folder.bookmarks }.kind_of Nokogiri::XML::NodeSet
+    should('be a folder') { @folder.folder? }
+
+    context 'Bookmark' do
+      setup { @bookmark = @folder.bookmarks.first }
+
+      asserts('modified attribute') { @bookmark.modified }.kind_of Date
+      asserts('visited') { @bookmark.visited }.kind_of Date
+      asserts('visit') { @bookmark.visit; @bookmark.visited }.equals Date.today
+      should('be a bookmark') { @bookmark.bookmark? }
     end
-    should "return all root folders" do
-      results = xbel.root.folders
-      results = results.map { |folder| folder.title }
-      expect = ['HTTP Clients', 'Extensible Markup Language (XML)']
-      assert_equal expect, results
+    context 'new Bookmark' do
+      setup do
+        @bookmark = @folder.build_bookmark 'Bookmark',
+            :href => 'http://www.github.com/boof/xbel', :description => 'desc'
+      end
+
+      asserts('added attribute') { @bookmark.added }.equals Date.today
+      asserts('title attribute') { @bookmark.title }.equals 'Bookmark'
+      asserts('href attribute') { @bookmark.href }.
+          equals 'http://www.github.com/boof/xbel'
+      asserts('description attribute') { @bookmark.description }.
+          equals 'desc'
     end
-    should "return all bookmarks of 'HTTP Clients'" do
-      results = xbel.root.folders.first.bookmarks
-      results = results.map { |entry| entry.title }
-      expect = [
-          'Netscape', 'Opera', 'Microsoft Internet Explorer', 'Lynx', 'Amaya'
-      ]
-      assert_equal expect, results
+
+    context 'new Folder' do
+      setup do
+        @subfolder = @folder.build_folder 'subfolder',
+            :id => 'id-2', :desc => 'description'
+      end
+      asserts('added attribute') { @subfolder.added }.equals Date.today
+      asserts('title attribute') { @subfolder.title }.equals 'subfolder'
+      asserts('id attribute') { @subfolder.id }.equals 'id-2'
+      asserts('desc attribute') { @subfolder.desc }.equals 'description'
     end
-    should "return aliased bookmark" do
-      result = xbel.root.folders.first.aliases.first.entry
-      expect = xbel.root.folders.first.bookmarks.last
-      assert_equal expect, result
+
+    context 'new Alias' do
+      setup { @alias = @folder.build_alias @folder }
+      should('reference its folder') { @alias.entry == @folder }
     end
+
   end
+
 end

data/test/wikipedia.xbel

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE xbel
+  PUBLIC "+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML"
+         "http://www.python.org/topics/xml/dtds/xbel-1.0.dtd">
+<xbel version="1.0">
+  <title>Lesezeichen!</title>
+  <desc>Lernen von XBEL am Beispiel von zwei Lesezeichen und einer Verknüpfung</desc>
+  <folder id="f0" added="2007-11-10">
+    <title>Wiki</title>
+    <desc>Webseiten von Autoren-Gemeinschaften</desc>
+    <bookmark href="http://wikimediafoundation.org/" id="b0" added="2007-11-11" modified="2007-11-14" visited="2007-11-14">
+      <title>Wikimedia Foundation</title>
+    </bookmark>
+    <bookmark href="http://de.wikipedia.org/" id="b1" added="2007-11-11" modified="2007-11-14" visited="2007-12-27">
+      <title>Wikipedia</title>
+    </bookmark>
+  </folder>
+  <separator />
+  <alias ref="b1" />
+</xbel>

data/xbel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xbel}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   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-10-28}
+  s.date = %q{2009-11-10}
   s.description = %q{}
   s.email = %q{florian.assmann@email.de}
   s.extra_rdoc_files = [
@@ -30,17 +30,16 @@ Gem::Specification.new do |s|
      "lib/nokogiri/decorators/xbel/folder.rb",
      "lib/nokogiri/decorators/xbel/seperator.rb",
      "lib/xbel.rb",
-     "lib/xbel/writer.rb",
-     "test/complex.xbel",
      "test/helper.rb",
      "test/test_xbel.rb",
+     "test/wikipedia.xbel",
      "xbel.gemspec"
   ]
   s.homepage = %q{http://xbel.monkey-patch.me}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Ruby API for XBEL based on Nokogiri and Watchr.}
+  s.summary = %q{Ruby API for XBEL based on Nokogiri.}
   s.test_files = [
     "test/helper.rb",
      "test/test_xbel.rb"
@@ -51,17 +50,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_runtime_dependency(%q<watchr>, [">= 0"])
+      s.add_development_dependency(%q<riot>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
     else
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<watchr>, [">= 0"])
+      s.add_dependency(%q<riot>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
     end
   else
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<watchr>, [">= 0"])
+    s.add_dependency(%q<riot>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: xbel
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - "Florian A\xC3\x9Fmann"
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-28 00:00:00 +01:00
+date: 2009-11-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: riot
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -22,16 +22,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: watchr
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   type: :runtime
@@ -65,10 +55,9 @@ files:
 - lib/nokogiri/decorators/xbel/folder.rb
 - lib/nokogiri/decorators/xbel/seperator.rb
 - lib/xbel.rb
-- lib/xbel/writer.rb
-- test/complex.xbel
 - test/helper.rb
 - test/test_xbel.rb
+- test/wikipedia.xbel
 - xbel.gemspec
 has_rdoc: true
 homepage: http://xbel.monkey-patch.me
@@ -97,7 +86,7 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Ruby API for XBEL based on Nokogiri and Watchr.
+summary: Ruby API for XBEL based on Nokogiri.
 test_files: 
 - test/helper.rb
 - test/test_xbel.rb

data/lib/xbel/writer.rb

@@ -1,41 +0,0 @@
-class XBEL::Writer #:nodoc:
-  DOCTYPE = '<!DOCTYPE xbel PUBLIC "+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML" "http://www.python.org/topics/xml/dtds/xbel-1.0.dtd">'
-
-  attr_reader :document, :lockfile_path, :path
-  def new(document, path)
-    @document, @path = document, path
-    @lockfile_path = "#{ path }.lock"
-  end
-
-  def write
-    synchronize do
-      File.open path, 'w' do |file|
-        file.puts DOCTYPE
-        file << document
-      end
-    end
-  end
-
-  protected
-
-    def locked?(path)
-      File.exists? lockfile_path
-    end
-    def lock
-      File.open(lockfile_path, 'w') { |*| yield }
-    ensure
-      File.unlink lockfile_path
-    end
-
-    def synchronize
-      current_thread = Thread.current
-
-      while locked?
-        watch(lockfile_path, :delete) { |*| current_thread.run }
-        current_thread.sleep
-      end
-
-      lock { yield }
-    end
-
-end

data/test/complex.xbel

@@ -1,165 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE xbel PUBLIC "+//IDN python.org//DTD XML Bookmark Exchange
-Language 1.0//EN//XML"
-"http://www.python.org/topics/xml/dtds/xbel-1.0.dtd">
-<xbel version="1.0">
-  <title>Some of David's Bookmarks</title>
-
-  <folder>
-    <title>HTTP Clients</title>
-
-    <bookmark href="http://www.netscape.com/download/" id="bookmark-1">
-      <title>Netscape</title>
-
-      <desc>Netscape 6.2 is the latest update to the Internet
-      browsing, email and instant messagin software suite from
-      Netscape.</desc>
-    </bookmark>
-
-    <bookmark href="http://www.opera.com/">
-      <title>Opera</title>
-
-      <desc>Opera -- Simply the Best Internet Experience</desc>
-    </bookmark>
-
-    <alias ref="bookmark-5"></alias>
-
-    <bookmark href="http://www.microsoft.com/ie/">
-      <title>Microsoft Internet Explorer</title>
-
-      <desc>Internet Explorer 6 sets a new standard in privacy,
-      reliability, and flexibility. Come see how Internet Explorer
-      is leading the way on the Web.</desc>
-    </bookmark>
-
-    <bookmark href="http://lynx.browser.org/">
-      <title>Lynx</title>
-
-      <desc>Lynx is a fully-featured World Wide Web (WWW) client
-      for users running cursor-addressable, character-cell display
-      devices (e.g., vt100 terminals, vt100 emulators running on
-      PCs or Macs, or any other character-cell display). It will
-      display Hypertext Markup Language (HTML) documents containing
-      links to files on the local system, as well as files on
-      remote systems running http, gopher, ftp, wais, nntp, finger,
-      or cso/ph/qi servers, and services accessible via logins to
-      telnet, tn3270 or rlogin accounts. Current versions of Lynx
-      run on Unix, VMS, Windows95/NT, 386DOS and OS/2 EMX.</desc>
-    </bookmark>
-
-    <bookmark href="http://www.w3.org/Amaya/" id="bookmark-5">
-      <title>Amaya</title>
-
-      <desc>Amaya is a browser/authoring tool that allows you to
-      publish documents on the Web. It is used to demonstrate and
-      test many of the new developments in Web protocols and data
-      formats. Given the very fast moving nature of Web technology,
-      Amaya has a central role to play. It is versatile and
-      extensible and is available on both Unix and Windows '95/NT
-      platforms.</desc>
-    </bookmark>
-
-    <alias ref="bookmark-1"></alias>
-
-  </folder>
-
-  <folder>
-    <title>Extensible Markup Language (XML)</title>
-
-    <bookmark
-    href="http://www.sciam.com/1999/0599issue/0599bosak.html">
-      <title>Scientific American: Feature Article: XML and the
-      Second Generation Web: May 1999</title>
-
-      <desc>The combination of hypertext and a global Internet
-      started a revolution. A new ingredient, XML, is poised to
-      finish the job. by Jon Bosak and Tim Bray</desc>
-
-    </bookmark>
-
-    <bookmark
-    href="http://www.sciam.com/2001/0501issue/0501berners-lee.html">
-
-      <title>Scientific American: Feature Article: The Semantic
-      Web: May 2001</title>
-
-      <desc>A new form of Web content that is meaningful to
-      computers will unleash a revolution of new possibilities . by
-      TIM BERNERS-LEE, JAMES HENDLER and ORA LASSILA</desc>
-    </bookmark>
-
-    <bookmark href="http://www.w3.org/XML/1999/XML-in-10-points">
-
-      <title>XML in 10 Points</title>
-    </bookmark>
-
-    <folder>
-      <title>Building XML Documents</title>
-
-      <bookmark
-      href="http://www.webreview.com/2000/08_04/webauthors/08_04_00_4.shtml">
-
-        <title>Well-Formed XML Documents (webreview.com)</title>
-
-        <desc>Still trying to tame the XML beast? Begin with this
-        tutorial that will show you in clear terms how to build a
-        simple XML document that is well-formed and valid.</desc>
-      </bookmark>
-    </folder>
-
-    <folder>
-      <title>RSS</title>
-
-      <bookmark
-      href="http://www.webreference.com/authoring/languages/xml/rss/intro/">
-
-        <title>Introduction to RSS - WebReference.com</title>
-
-        <desc>Rich Site Summary (RSS) is a lightweight XML format
-        designed for sharing headlines and other Web
-        content.</desc>
-      </bookmark>
-
-      <bookmark
-      href="http://www.WebReview.com/1999/10_29/webauthors/10_29_99_2a.shtml">
-
-        <title>WebReview.com: RSS Delivers the XML Promise</title>
-
-        <desc>RSS is a content syndication format that uses the
-        power of XML to share data over the Internet.</desc>
-      </bookmark>
-    </folder>
-
-    <folder>
-      <title>Extensible Stylesheet Language (XSL)</title>
-
-      <bookmark
-      href="http://www.webreview.com/2001/08_03/developers/index01.shtml">
-
-        <title>WebReview.com: August 3, 2001: Introduction to
-        XSLT</title>
-
-        <desc>An introduction to XSLT</desc>
-      </bookmark>
-    </folder>
-
-    <folder>
-      <title>Recommended Books</title>
-
-      <bookmark href="http://www.oreilly.com/catalog/learnxml/">
-        <title>Learning XML : (Guide to) Creating Self-Describing
-        Data</title>
-
-        <desc>Eric T. Ray, (O'Reilly)</desc>
-      </bookmark>
-
-      <bookmark
-      href="http://www.amazon.com/exec/obidos/ASIN/0789725045/">
-        <title>XML By Example</title>
-
-        <desc>Benoit Marchal</desc>
-      </bookmark>
-    </folder>
-  </folder>
-</xbel>
-