bookmarks 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1acd471211b5b01a6e945024f0e10b02cc77806
-  data.tar.gz: 5185cbdecb61e615dd7a60057f501da7dce2deb4
+  metadata.gz: 3245aeebe26e88b088bd079680022e2c07a12d85
+  data.tar.gz: a5bd9fd6a42e87f1dc9b7a491ff3f3aff0092480
 SHA512:
-  metadata.gz: e569b43275e5bd2164831c2d5ef903941733a2afcfd329a99c9019be5b84ee79d3b9f69468debfa3736cf88b4161d9e996c455dc4741f4ea54fd8839e8cbab52
-  data.tar.gz: 39f01ad2fb07b0fba6429a193db8310bbc21a860e058f6ea5483aa95996b91f7eff01b387e06016ca17e6f11c3360944fbd7de14619273e1f2616eb40a163a39
+  metadata.gz: b8732c82641f01aeb904e5b663c486d6aaab591db2567f3361bcc2672456be031752db176c08efef73894b91d2066d3e19754afee7d6c573ffe74d8c86e5f1bc
+  data.tar.gz: a88867e39a47bc0d48a17999ec69ad862eca64ffcb396b80817ef25564a23215f7aec5cb51dfe9ffa5bb878fb78a67d853326f793a1ccbb540bfa68c584deb2c

data/Changelog.markdown

@@ -1,3 +1,9 @@
+version 0.2.0  (2013-07-25)
+===========================
+
+* Support for H3 tags.
+
+
 version 0.1.1  (2013-07-09)
 ===========================
 

data/Gemfile

@@ -3,4 +3,3 @@ source "https://rubygems.org"
 gemspec
 
 gem 'rake'
-gem 'rspec'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bookmarks (0.1.0)
+    bookmarks (0.2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -9,11 +9,11 @@ GEM
     coco (0.7.1)
     diff-lcs (1.2.4)
     rake (10.1.0)
-    rspec (2.14.0)
+    rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.1)
+    rspec-core (2.14.4)
     rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.1)

data/README.markdown

@@ -5,7 +5,8 @@ Description
 -----------
 
 Bookmarks is a library to parse or build a file of bookmarks, currently
-only files in netscape format, like the ones exported by Delicious.
+only files in netscape format, like the ones exported by Delicious or
+Firefox.
 
 Install
 -------------------------

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/bookmarks/document.rb

@@ -20,6 +20,7 @@ module Bookmarks
       @document = ""
       @bookmarks = []
       @total = 0
+      @h3_tags = []
     end
 
     # Public: Returns the Symbol format of the document. Currently
@@ -75,14 +76,34 @@ module Bookmarks
     # line - String.
     #
     # Returns nothing.
+    # TODO This should have its own parser class.
     def parse_a_bookmark line
-      if line =~ /^<DT>/
+      line = line.strip
+      if line =~ /^<DT><H3>/
+        @h3_tags << h3_tags(line)
+      elsif line =~ /^<\/DL>/
+        @h3_tags.pop
+      elsif line =~ /<DT><A/
         @bookmarks << NetscapeBookmark.from_string(line)
+        if (not @h3_tags.empty?) && (not @bookmarks.last.nil?)
+          @bookmarks.last.add_tags @h3_tags
+        end
       elsif line =~ /^<DD>/
         @bookmarks.last.description = line[4..-1].chomp
       end
     end
 
+    # Get the h3's content of a line. H3 could be use as a tag in
+    # a netscape bookmark's file.
+    #
+    # line - String.
+    #
+    # Returns String h3 content or empty string.
+    def h3_tags line
+      md = /<H3>(.*?)<\/H3>/.match(line)
+      md ? md[1] : ""
+    end
+
 
 # First part of a bookmark's file in netscape format.
 FIRST_PART = <<CODE

data/lib/bookmarks/netscape_bookmark.rb

@@ -3,6 +3,8 @@
 module Bookmarks
 
   # Public: A single bookmark in netscape format.
+  #
+  # REVIEW Should we extract some of the class methods?
   class NetscapeBookmark
 
     # Public: Init a new NetscapeBookmark.
@@ -20,23 +22,18 @@ module Bookmarks
       @description = description
     end
 
-    # Public: Initialize a new NetscapeBookmark object from a line from
-    # a bookmarks file.
+    # Public: Add some tags to this bookmark.
     #
-    # line - String line from a bookmarks file.
+    # list - An Array of String tags.
     #
-    # Returns a new NetscapeBookmark object.
-    def self.from_string line
-      url = /HREF="(.*?)"/.match(line)[1]
-      title = /HREF=.*>(.*)<\/A>$/.match(line)[1]
-      date = /ADD_DATE="(.*?)"/.match(line)[1]
-      date = Time.at(date.to_i).to_s
-      tags = /TAGS="(.*?)"/.match(line)[1]
-      title = prettify_title title, url
-      new url: url, title: title, date: date, tags: tags
+    # Returns nothing.
+    def add_tags list
+      unless @tags.empty?
+        @tags += ','
+      end
+      @tags += list.join(',')
     end
 
-
     # Public: Set/get the String url.
     attr_accessor :url
 
@@ -65,6 +62,32 @@ module Bookmarks
       end
     end
 
+    # Public: Initialize a new NetscapeBookmark object from a line from
+    # a bookmarks file.
+    #
+    # line - String line from a bookmarks file.
+    #
+    # Returns a new NetscapeBookmark object.
+    def self.from_string line
+      url = /HREF="(.*?)"/.match(line)[1]
+      title = /HREF=.*>(.*)<\/A>$/.match(line)[1]
+      date = /ADD_DATE="(.*?)"/.match(line)[1]
+      date = Time.at(date.to_i).to_s
+      tags = self.extract_tags(line)
+      title = prettify_title title, url
+      new url: url, title: title, date: date, tags: tags
+    end
+
+    # Public: Get tags from a line from a bookmarks file.
+    #
+    # line - String line from a bookmarks file.
+    #
+    # Returns a String with tags or an empty string.
+    def self.extract_tags line
+      md = /TAGS="(.*?)"/.match(line)
+      md ? md[1] : ""
+    end
+
     # In some case (which?) Delicious miss the title and we have a crapy
     # 'None' instead of the original title. Bad news is the original title
     # is lost. And there is no good news :) In such case, we build a new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bookmarks
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Xavier Nayrac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec