syclink 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 757f2615ff72bd3c25ef404172faa9308e2a0c7f
-  data.tar.gz: a0a0ccac857393f6a4beae8a50a0f356e5faf578
+  metadata.gz: e8b94d17803bd5986b8a1d79e647adb2e41bb441
+  data.tar.gz: 69c75dd52d7a5f2876102c868ea3bdf7a54d58fe
 SHA512:
-  metadata.gz: 737469dcc6463c9e13dc21b8cc310c93206bdd18f3a8a9a6ecaf5e164930a48291c4d42ecab3bbee81cc0e7a854cb6a66e27034cf73d14df068b4a16eb9ab48f
-  data.tar.gz: 0dadc454dcba9d28a8b4123a680a109dc860b216274e3800ce6c94259b3f088f3b86e1f6a3e36fb415a8980f2248568b0fbc6607cbdb6af119aaa69a3cd74fe5
+  metadata.gz: ade5ed2673f8b88e1276babe265e339b61a6bcf3bc7b17602cc23a02aeaa999998a29c113d39598b6787371a5e77c5b17b41a9f5b19755b9fbbad597c563b8d2
+  data.tar.gz: 01cefbad2719b7633b572344d14b577e7f1dbbdaed6650eda5e200362bc2c2bcbdd8c1159f3c979a9f37b94fb1ba9d5a3313f5d44e1eed70ae0ac1a4d5ca3a69

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    syclink (0.0.2)
+    syclink (0.1.0)
       gli (= 2.13.1)
       sqlite3 (= 1.3.10)
 

data/README.md

@@ -62,42 +62,60 @@ exist yet the user is asked whether to create it and whether to set it as the
 default website. This is done with commands that require a website to operate
 on.
 
-    $ syclink -w my-new-website add "http://example.com"
+    $ syclink -w my-new-website add link "http://example.com"
 
-Before the command `add` is executed the website is created. In this 
+Before the command `add link` is executed the website is created. In this 
 case a website called 'my-new-website' is created in the default directory at
 `~/.syc/syclink/websites/my-new-website.website
 
-Commands that require a website are `add`, `update`, `delete`, `list`, `find`
-and `website create`.
+If an existing website is specified by the `-w` command and it is different
+to the default command, the user is asked whether to set the selected 
+website as the default one.
+
+Commands that require a website are `add`, `update`, `delete`, `list`, `find`,
+merge, import, export and `website create`.
 
 If no website is specified the default website is used.
 
+Link Commands
+=============
+
 Add a link
 ----------
 A link may have a title, a description and a tag. Title, description and tag
 are optional but a link obviously has to be provided. If no title is given the
 link is used as the title.
   
-    $ syclink add --title "Test page" --tag TEST \
-                  --description 'For testing purposes' http://example.com 
+    $ syclink add link --title "Test page" --tag TEST \
+                       --description 'For testing purposes' http://example.com 
 
 It is also possible to add links from a file
 
-    $ syclink file file-with-links
+    $ syclink add file file-with-links
 
 Update a link
 -------------
 To update a link the URL has to be specified. If more than one link has the 
 same URL only the first link is updated.
 
-    $ syclink update --title "Example" http://example.com 
+    $ syclink update link --title "Example" http://example.com 
+
+It is also possible to update links with links saved to a file
+
+    $ syclink update file file-with-links
 
-Remove a Link
+If many links have to be updated they can be exported to a csv file. Then
+the changes are made in the csv file and finally the update command is called.
+
+    $ syclink export csv > exported-links
+    edit the links
+    $ syclink update file exported-links
+
+Delete a Link
 -------------
-To remove one or more links the URLs have to be provided.
+To delete one or more links the URLs have to be provided.
 
-    $ syclink delete http://example.com,http://challenge.com
+    $ syclink delete http://example.com http://challenge.com
 
 List links
 ----------
@@ -111,12 +129,20 @@ listed. It is possible to specify the columns to print. Possible columns are
     -------------------+---------------------
     http://example.com | For testing purposes
 
+The is a switch `--expand` and a flag `--width`. If no width is specified list
+will print the complete content and probably mess up the table. With a width
+specified the the columns are scaled so the overall width of the table will be
+the size of width specified. The expand switch will expand the table to the 
+specified width if the table would be smaller than width.
+
+    $ syclink list --tag TEST --columns `url,description` --width 70 --expand
+
 Find links
 ----------
 It is also possible to search for links based on a search string. The find
 command searches all attributes of the links and is searching for the occurance
-of the search string within the attributes. So the search is not list only 
-exact matches.
+of the search string within the attributes. So the search does not list exact 
+matches only.
 
     $ syclink find --columns 'url,tag' 'example' 
 
@@ -124,25 +150,146 @@ exact matches.
     -------------------+-----
     http://example.com | TEST
 
-List websites
+The `--expand` switch and the `--width` flag are also available with the 
+`find` command. Details see at [List links](#list-links).
+
+Merge Links
+-----------
+If there are multiple links with the same URL, these links can be merged. During a merge the first link found will be updated with the join of the values of the other links. 
+
+    $ syclink add link --tag "Day" --name "Work" --description "Busy time" \
+                       http://example.com
+    $ syclink add link --tag "Night" --name "Fun" --description "Fun time" \
+                       http://example.com
+    $ syclink merge 
+    $ syclink list
+
+    url                | name      | description        | tag
+    -------------------|-----------|--------------------|---------
+    http://example.com | Day,Night | Busy time,Fun time | Work,Fun
+
+Import Commands
+===============
+Bookmarks can be imported from _Mozilla Firefox_, _Google Chrome_, 
+_Internet Explorer_ and from directories.
+
+The command is `syclink import` followed by a sub-command indicating from which
+web browser to import, or from which directory.
+
+In case of importing from Internet Explorer and from a directory the parent
+directories are used as tags beginning below the path to the Internet Explorer
+directory or the standard directory. To control to which level the directory
+should be used a `level` switch can be used.
+
+    $ syclink import dir --level 2
+
+Will only use two parent directories as tags.
+
+Firefox
+-------
+Firefox stores its bookmarks in a SQLite3 database called places.sqlite. With 
+Ubuntu this database is usually located in 
+
+    '~/.mozilla/firefox/*.default/places.sqlite'. 
+
+If you are on Windows the file is located in the user's home directory 
+
+    '~/AppData/Roaming/Mozilla/Profiles/*.default/places.sqlite'.
+
+The bookmarks on Ubuntu can be imported with 
+
+    $ syclink import mf ~/.mozilla/SOME_CRYPTIC_NAME.default/places.sqlite
+
+Chrome
+------
+Google Chrome stores its bookmarks in a JSON file called Bookmarks. With Ubuntu
+this file is usually located in 
+
+    '~/.config/chromium/Default/Bookmarks'. 
+
+If you are on Windows the file is located in the user's home directory 
+
+    '~/AppData/Local/Google/Chrome/User Data/Bookmarks'.
+
+The bookmarks on Ubuntu can be imported with 
+
+    $ syclink import gc ~/.config/chromium/Default/Bookmarks
+
+Internet Explorer
+-----------------
+Internet Explorer stores its bookmarks in a directory structure. The bookmarks 
+are located in the user's home directory 
+
+    '~/AppData/Favorites'
+
+The bookmarks (of course on Windows) can be imported with
+
+    $ syclink import ie ~/Appdata/Favorites
+
+Directory
+---------
+The PATH\_TO\_DIRECTORY can have patterns that allows to import specific
+files.
+
+Examples:
+
+    PATH_TO_DIRECTORY/**/*.pdf 
+    
+will import all pdf-files in the directories and sub-directory
+
+    PATH_TO_DIRECTORY/**/* 
+    
+will import all files in the specified directory and sub-directories
+
+To import all files from `some-directory` call
+
+    $ syclink import dir ~/some-directory/**/*
+
+If on Windows and the directory contains .URL-files the URL within the .URL-file
+will be used as the link target.
+
+Export Commands
+===============
+If links have to be changed in a buld then it is easier to do so in a file and
+when done updating the links from the file.
+
+The links can be exported with
+
+    $ syclink export csv
+
+This will print to the standard output. To save it to a file can be done as
+follows
+
+    $ syclink export csv > my-links
+
+Now we can edit the links in the file and when done updating them like so
+
+    $ sylinks update file my-links
+
+Website Commands
+================
+
+Show websites
 -------------
 The websites are saved to `~/.syc/syclink/websites/` and the html 
 representations are saved to `~/.syc/syclink/html/`. When listing websites
 both _webstites_ and _html_ files are listed.
 
-The following command will list all websites
+The following command will list all websites indicating the default website
 
-    $ syclink website list
+    $ syclink website show
+    [default] ~/.syc/syclink/website/one.website
+              ~/.syc/syclink/website/two.website
 
 To list websites based on a search string the search string has to be send to
-the list command
+the show command
 
-    $ syclink website list "example"
+    $ syclink website show "example"
 
-If the `--exact` switch is given the command is only listing exact matches of
-the search string
+If the `--exact` switch is given the command is listing exact matches of the 
+search string only
 
-    $ syclink website list -e "http://example.com"
+    $ syclink website find -e "http://example.com"
 
 Remove websites
 ---------------
@@ -200,70 +347,7 @@ To create a website the steps are as follows
 
 Following is showing the above sequence in commands
 
-    $ syclink -w example add "http://example.com" --tag EXAMPLE
-    $ syclink add "http://github.com" --tag DEVELOPMENT
+    $ syclink -w example add link "http://example.com" --tag EXAMPLE
+    $ syclink add link "http://github.com" --tag DEVELOPMENT
     $ syclink website create
 
-Importing Bookmarks from Webrowsers
-===================================
-
-Firefox
--------
-The bookmarks of _Firefox_ are located in the user's home folder in
-`~/.mozilla/SOME_CRYPTIC_NAME.default/places.sqlite`.
-
-The database can be explored with _sqlite3_ from the command line
-
-    $ cd ~/.mozilla/SOME_CRYPTIC_NAME.default/
-    $ sqlite3 places.sqlite
-    >
-
-We want to retrieve url, title, description, tag, key and bookmark. tag, key 
-and bookmark are good candidates for tags for the application.
-
-At the command prompt of SQLite3 We can issue the query
-
-````
-sqlite> select p.id, p.url, p.title, b.id, b.fk, b.parent, b.title, 
-   ...> k.keyword, a.content, b_t.title from moz_bookmarks b 
-   ...> left outer join moz_keywords k on b.keyword_id = k.id 
-   ...> left outer join moz_items_annos a on a.item_id = b.id 
-   ...> left outer join moz_bookmarks b_t on b.parent = b_t.id 
-   ...> join moz_places p on p.id = b.fk where p.url like "http%";
-1|https://www.mozilla.org/en-US/firefox/central/||6|1|3|Getting Started|||\
-Bookmarks Toolbar
-2|http://www.ubuntu.com/||8|2|7|Ubuntu|||Ubuntu and Free Software links
-3|http://wiki.ubuntu.com/||9|3|7|Ubuntu Wiki (community-edited website)|||\
-Ubuntu and Free Software links
-4|https://answers.launchpad.net/ubuntu/+addquestion||10|4|7|Make a Support \
-Request to the Ubuntu Community|||Ubuntu and Free Software links
-5|http://www.debian.org/||11|5|7|Debian (Ubuntu is based on Debian)|||Ubuntu \
-and Free Software links
-6|https://one.ubuntu.com/||12|6|7|Ubuntu One - The personal cloud that brings\
-your digital life together|||Ubuntu and Free Software links
-7|https://www.mozilla.org/en-US/firefox/help/||14|7|13|Help and Tutorials|||\
-Mozilla Firefox
-8|https://www.mozilla.org/en-US/firefox/customize/||15|8|13|Customize \
-Firefox|||Mozilla Firefox
-9|https://www.mozilla.org/en-US/contribute/||16|9|13|Get Involved|||Mozilla \
-Firefox
-10|https://www.mozilla.org/en-US/about/||17|10|13|About Us|||Mozilla Firefox
-4717|http://codekata.com/|CodeKata|30|4717|5|CodeKata|liklo|How do you get \
-to be a great musician? It helps to know the theory,
-and to understand the mechanics of your instrument. It helps to have
-talent. But …|Unsorted Bookmarks
-399|http://localhost:3000/|Secondhand | Home|34|399|2|Secondhand | Home|||\
-Bookmarks Menu
-12870|https://www.sqlite.org/cli.html|Command Line Shell For SQLite|35|12870|\
-5|Command Line Shell For SQLite|dark|What is this sqlite all about?|Unsorted \
-Bookmarks
-4717|http://codekata.com/|CodeKata|37|4717|36||||wenga
-12870|https://www.sqlite.org/cli.html|Command Line Shell For SQLite|39|12870|\
-38||||lite
-12883|http://ruby.bastardsbook.com/chapters/sql/#h-2-5|SQL | The Bastards \
-Book of Ruby|40|12883|5|SQL | The Bastards Book of Ruby|||Unsorted Bookmarks
-12883|http://ruby.bastardsbook.com/chapters/sql/#h-2-5|SQL | The Bastards \
-Book of Ruby|42|12883|41||||Ruby
-sqlite> 
-````
-

data/bin/syclink

@@ -20,7 +20,7 @@ WEBSITE_COMMANDS = [ :create, :link, :file, :update, :delete, :list, :find,
 # syclink's configuration directory
 syclink_directory             = File.expand_path("~/.syc/syclink")
 # syclink's configuration file
-syclink_file                  = File.join(syclink_directory, "syclink.rc")
+@syclink_file                  = File.join(syclink_directory, "syclink.rc")
 # syclink's template directory
 syclink_template_directory    = File.join(syclink_directory, "templates/")
 # syclink's html template"
@@ -53,7 +53,7 @@ copy_file_if_missing(File.join(File.dirname(__FILE__),
                                '../templates/stylesheets/style.css.scss'),
                      syclink_stylesheets_directory)
 
-config = load_config(syclink_file)
+config = load_config(@syclink_file)
 
 program_desc 'Create a link-list and display it as an html page'
 
@@ -228,7 +228,7 @@ end
 
 desc "Operate on websites"
 command :website do |c|
-  c.desc 'Show all websites or search for websites'
+  c.desc 'Show all websites or search for websites with indication of default'
   c.arg_name 'WEBSITE'
   c.skips_pre
   c.skips_post
@@ -238,10 +238,18 @@ command :website do |c|
     s.switch [:e, :exact]
 
     s.action do |global_options,options,args|
-      if options[:e]
-        puts Dir.glob(yaml_file(syclink_website_directory, args[0]))
+      websites = if options[:e]
+        Dir.glob(yaml_file(syclink_website_directory, args[0]))
       else
-        puts Dir.glob(File.join(syclink_website_directory, "*.website"))
+        Dir.glob(File.join(syclink_website_directory, "*.website"))
+      end
+      
+      websites.each do |f|
+          if File.basename(f) =~ /#{config[:default_website]}\.website/
+            puts "[default] #{f}" 
+          else
+            puts "          #{f}"
+        end
       end
     end
   end
@@ -332,6 +340,16 @@ command :import do |c|
   c.arg_name 'PATH_TO_INTERNET_EXPLORER_BOOKMARKS'
   c.command :ie do |s|
 
+    s.desc 'Number of tags to consider'
+    s.long_desc <<-HERE.gsub(/^ {6}/, '')
+      Each parent directory starting at the PATH_TO_INTERNET_EXPLORER_BOOKMARKS
+      is considered a tag. If no level flag is specified all tags are imported.
+      Otherwise only the count of tags are imported that are specified by the
+      level flag. A level of 0 will import no tags.
+    HERE
+    s.arg_name 'LEVEL 0..N'
+    s.flag [:l, :level], :type => Integer
+
     s.action do |global_options,options,args|
       unless File.exists? args[0]
         STDERR.puts <<-HERE.gsub(/^ {10}/, '')
@@ -342,7 +360,8 @@ command :import do |c|
         HERE
         exit(0)
       else
-        @designer.import_links(SycLink::InternetExplorer.new(args.shift))
+        @designer.import_links(SycLink::InternetExplorer.new(args.shift,
+                                                             options))
       end
     end
   end
@@ -363,8 +382,19 @@ command :import do |c|
   c.arg_name 'PATH_TO_DIRECTORY'
   c.command :dir do |s|
 
+    s.desc 'Number of tags to consider'
+    s.long_desc <<-HERE.gsub(/^ {6}/, '')
+      Each parent directory starting at the PATH_TO_DIRECTORY is considered a 
+      tag. If no level flag is specified all tags are imported. Otherwise only 
+      the count of tags are imported that are specified by the level flag. A 
+      level of 0 will import no tags.
+    HERE
+    s.arg_name 'LEVEL 0..N'
+    s.flag [:l, :level], :type => Integer
+
     s.action do |global_options,options,args|
-      @designer.import_links(SycLink::FileImporter.new(args.shift))
+      @designer.import_links(SycLink::FileImporter.new(args.shift,
+                                                       options))
     end
   end
 end
@@ -391,25 +421,19 @@ pre do |global,command,options,args|
     if File.exists? yaml_file(syclink_website_directory, global[:website])
       @designer.load_website(yaml_file(syclink_website_directory, 
                                        global[:website]))
+
+      set_default_website(global[:website], config[:default_website])
+
     else
-      print "Website #{global[:website]} doesn't exist. Create it (y/n)? "
+      print "Website '#{global[:website]}' doesn't exist. Create it (y/n)? "
       if STDIN.gets.chomp =~ /y/i 
-        puts; puts "Creating #{global[:website]}"
+        puts; puts "Creating '#{global[:website]}'"
         @designer.new_website(global[:website])
       else
         exit(0)
       end
 
-      if (global[:website] != config[:default_website])
-        print "Want to make #{global[:website]} the default (y/n)? "
-        if STDIN.gets.chomp =~ /y/i
-          puts; puts "Making #{global[:website]} the default website"
-          File.open(syclink_file, 'w') do |f| 
-            YAML.dump({ default_website: global[:website] }, f) 
-          end
-        end
-      end
-      
+      set_default_website(global[:website], config[:default_website])
     end
     
   end
@@ -431,6 +455,21 @@ on_error do |exception|
   end
 end
 
+# If current website and default website are different ask whether current
+# website should be set as default website
+def set_default_website(current, default)
+  if (current != default)
+    print "Want to make '#{current}' the default (y/n)? "
+    if STDIN.gets.chomp =~ /y/i
+      puts; puts "Making '#{current}' the default website"
+      File.open(@syclink_file, 'w') do |f| 
+        YAML.dump({ default_website: current }, f) 
+      end
+    end
+  end
+end
+
+# Print links in table format
 def print_links(links, columns, opts = {})
   allowed_cols = %w{ url name description tag } 
   cols = columns.delete(' ').downcase.split(',') & allowed_cols

data/lib/syclink/file_importer.rb

@@ -6,12 +6,17 @@ module SycLink
       root_dir = File.dirname(path).scan(/^[^\*|\?]*/).first
       regex = Regexp.new("(?<=#{root_dir}).*")
       Dir.glob(path).map do |file|
-        url = file
-        name = File.basename(file)
+        next if File.directory? file
+        url, name = if File.extname(file).upcase == ".URL"
+                      [File.read(file).scan(/(?<=\nURL=)(.*)$/).flatten.first,
+                       name = File.basename(file, ".*")]
+                    else
+                      [file, File.basename(file)]
+                    end
         description = ""
         tags = extract_tags(File.dirname(file).scan(regex))
         [url, name, description, tags]
-      end
+      end.compact
     end
 
   end

data/lib/syclink/formatter.rb

@@ -49,7 +49,7 @@ module SycLink
     # Creates a formatter string based on the widths and the column separator
     def formatter_string(widhts, separator)
       widhts.map do |width|
-        "%-#{width}s"
+        "%-#{width}.#{width}s"
       end.join(separator)
     end
 

data/lib/syclink/importer.rb

@@ -8,10 +8,14 @@ module SycLink
     
     # Path to bookmarks file
     attr_accessor :path
+    # Options for importing
+    attr_accessor :opts
 
-    # Creates a new Importer and sets the path to the bookmarks file
-    def initialize(path_to_bookmarks)
+    # Creates a new Importer and sets the path to the bookmarks file. Opts may
+    # be :level which indicates to which levels tags should be imported.
+    def initialize(path_to_bookmarks, opts = {})
       @path = path_to_bookmarks
+      @opts = opts
     end
 
     # To be overridden! 
@@ -37,11 +41,16 @@ module SycLink
 
     protected
 
+    # Extracts the tags from a tag string. If a level is provided during 
+    # initialization the level is restricting the count of tags imported based
+    # on the level value
     def extract_tags(tag_string)
-      if tag_string.empty?
-        ""
+      if tag_string.empty? || opts[:level] == 0
+        "Default"
       else
-        tag_string.first.gsub("/", ",")
+        tags = tag_string.first.split('/')
+        level = [opts[:level] || tags.size, tags.size].min
+        tags[-level..-1].join(',')
       end
     end
   end

data/lib/syclink/internet_explorer.rb

@@ -13,9 +13,9 @@ module SycLink
       regex = Regexp.new("(?<=#{path}).*")
 
       files.map do |file|
-        unless File.directory? file
+        unless ((File.directory? file) || (File.extname(file).upcase != ".URL"))
           url = File.read(file).scan(/(?<=\nURL=)(.*)$/).flatten.first
-          name = File.basename(file)
+          name = File.basename(file, ".*")
           description = ""
           tag         = extract_tags(File.dirname(file).scan(regex))
           [url, name, description, tag]

data/lib/syclink/version.rb

@@ -2,6 +2,6 @@
 module SycLink
 
   # Version of the application
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 
 end

data/lib/syclink/website.rb

@@ -65,13 +65,21 @@ module SycLink
             end
     end
 
-    # Groups the links on the provided attribute
-    def links_group_by(attribute)
-      links.map      { |link| { key: link.send(attribute), link: link } }
+    # Groups the links on the provided attribute. If no links array is provided
+    # the links from self are used
+    def links_group_by(attribute, linkz = links)
+      linkz.map      { |link| { key: link.send(attribute), link: link } }
            .group_by { |entry| entry[:key] }
            .each     { |key, link| link.map! { |l| l[:link] }}
     end
 
+    # Groups the links on the provided attribute. If the attribute's value
+    # contains the provided separator, the value is split up and each of the
+    # values is used as group key
+    def links_group_by_separated(attribute, separator)
+      links_group_by(attribute, links_duplicate_on(attribute, separator))
+    end
+
     # Create multiple Links based on the attribute provided. The specified 
     # spearator will splitt the attribute value in distinct values and for each
     # different value a Link will be created
@@ -89,8 +97,8 @@ module SycLink
     end
 
     # List all attributes of the links
-    def link_attribute_list(attribute)
-      links.map { |link| link.send(attribute) }.uniq.sort
+    def link_attribute_list(attribute, separator = nil)
+      links.map {|link| link.send(attribute).split(separator)}.flatten.uniq.sort
     end
   end
 

data/spec/syclink/formatter_spec.rb

@@ -25,7 +25,7 @@ module SycLink
       @scaled_widths   = [ 7, 6, 6, 7 ]
       @expanded_widths = [ 13, 12, 12, 13 ]
 
-      @formatter  = "%-8s | %-7s | %-7s | %-8s"
+      @formatter  = "%-8.8s | %-7.7s | %-7.7s | %-8.8s"
     end
 
     it "should transform the rows to columns" do

data/spec/syclink/ie/ie.url

@@ -0,0 +1,7 @@
+[DEFAULT]
+BASEURL=http://www.example.com/base
+[InternetShortcut]
+URL=http://www.example.com/
+IDList=
+[{000214A0-0000-0000-C000-000000000046}]
+Prop3=19,2

data/spec/syclink/importer_spec.rb

@@ -39,9 +39,9 @@ module SycLink
 
       before do
         ie_directory = File.join(File.dirname(__FILE__), 'ie/')
-        @result = [ [ "http://www.example.com/", "ie.txt", "", "one" ],
-                    [ "http://www.example.com/", "ie.txt", "", "one,two"],
-                    [ "http://www.example.com/", "ie.txt", "", ""] ]
+        @result = [ [ "http://www.example.com/", "ie", "", "one" ],
+                    [ "http://www.example.com/", "ie", "", "one,two"],
+                    [ "http://www.example.com/", "ie", "", "Default"] ]
 
         @ie = InternetExplorer.new(ie_directory)
       end
@@ -115,9 +115,41 @@ module SycLink
                       ["/home/pierre/Work/syclink/spec/syclink/fi/a/two.pdf", 
                        "two.pdf", "", "a"], 
                       ["/home/pierre/Work/syclink/spec/syclink/fi/one.pdf", 
-                       "one.pdf", "", ""]]
+                       "one.pdf", "", "Default"]]
+        @pdf_zero = [["/home/pierre/Work/syclink/spec/syclink/fi/b/three.pdf", 
+                       "three.pdf", "", "Default"], 
+                      ["/home/pierre/Work/syclink/spec/syclink/fi/b/a/four.pdf",
+                       "four.pdf", "", "Default"], 
+                      ["/home/pierre/Work/syclink/spec/syclink/fi/a/two.pdf", 
+                       "two.pdf", "", "Default"], 
+                      ["/home/pierre/Work/syclink/spec/syclink/fi/one.pdf", 
+                       "one.pdf", "", "Default"]]
         @txt_files = [["/home/pierre/Work/syclink/spec/syclink/fi/a.txt",
                        "a.txt", "", ""]]
+        @any_files = [["/home/pierre/Work/syclink/spec/syclink/fi/b/three.pdf",
+                       "three.pdf", "", "b"],
+                      ["/home/pierre/Work/syclink/spec/syclink/fi/b/a/four.pdf",
+                       "four.pdf", "", "b,a"], 
+                      ["/home/pierre/Work/syclink/spec/syclink/fi/a/two.pdf", 
+                       "two.pdf", "", "a"], 
+                      ["/home/pierre/Work/syclink/spec/syclink/fi/a.txt", 
+                       "a.txt", "", "Default"], 
+                      ["/home/pierre/Work/syclink/spec/syclink/fi/one.pdf", 
+                       "one.pdf", "", "Default"], 
+                      ["http://www.example.com/", 
+                       "ie", "", "c"]]     
+        @any_level = [["/home/pierre/Work/syclink/spec/syclink/fi/b/three.pdf",
+                       "three.pdf", "", "b"],
+                      ["/home/pierre/Work/syclink/spec/syclink/fi/b/a/four.pdf",
+                       "four.pdf", "", "a"], 
+                      ["/home/pierre/Work/syclink/spec/syclink/fi/a/two.pdf", 
+                       "two.pdf", "", "a"], 
+                      ["/home/pierre/Work/syclink/spec/syclink/fi/a.txt", 
+                       "a.txt", "", "Default"], 
+                      ["/home/pierre/Work/syclink/spec/syclink/fi/one.pdf", 
+                       "one.pdf", "", "Default"], 
+                      ["http://www.example.com/", 
+                       "ie", "", "c"]]     
       end
 
       it "should import pdf filenames" do
@@ -130,12 +162,17 @@ module SycLink
         expect(fi.read).to eq @txt_files
       end
 
-      it "should read rows" do
+      it "should import any file" do
+        fi = FileImporter.new(File.join(@file_dir, "**/*"))
+        expect(fi.read).to eq @any_files
+      end
+
+      it "should read rows from pdf" do
         fi = FileImporter.new(File.join(@file_dir, "**/*.pdf"))
         expect(fi.rows).to eq @pdf_files
       end
 
-      it "should create links" do
+      it "should create links from pdf" do
         fi = FileImporter.new(File.join(@file_dir, "**/*.pdf"))
         links = fi.links
 
@@ -144,6 +181,16 @@ module SycLink
         expect(links.first.description).to eq @pdf_files.first[2]
         expect(links.first.tag).to         eq @pdf_files.first[3]
       end
+
+      it "should use only the parent directory as the tag" do
+        fi = FileImporter.new(File.join(@file_dir, "**/*"), level: 1)
+        expect(fi.read).to eq @any_level
+      end
+
+      it "should not import tags" do
+        fi = FileImporter.new(File.join(@file_dir, "**/*.pdf"), level: 0)
+        expect(fi.read).to eq @pdf_zero
+      end
     end
 
   end

data/spec/syclink/website_spec.rb

@@ -109,6 +109,12 @@ module SycLink
       expect(links.first.tag).to         eq "One"
     end
 
+    it "should group links on tags and separated multiple tags" do
+      @website.add_link(@link)
+      @website.add_link(@link4)
+      expect(@website.links_group_by_separated(:tag, ',').size).to eq 3
+    end
+
     it "should list all tags" do
       @website.add_link(@link)
       @website.add_link(@link)
@@ -116,6 +122,12 @@ module SycLink
       expect(@website.link_attribute_list(:tag)).to eq target
     end
 
+    it "should list allt tags and multiple tags separated to single tags" do
+      @website.add_link(@link)
+      @website.add_link(@link4)
+      target = [@link.tag, @link4.tag.split(',')].flatten.sort
+      expect(@website.link_attribute_list(:tag, ',')).to eq target
+    end
   end
 
 end

data/templates/syclink.html.erb

@@ -12,7 +12,7 @@
     </header>
     <div class="container">
       <section id="tags">
-        <% links_group_by(:tag).each do |tag, links| %>
+        <% links_group_by_separated(:tag, ',').each do |tag, links| %>
           <article class="tag">
             <header>
               <h2 id="tag_<%= tag %>"><%= tag %></h2>
@@ -41,7 +41,7 @@
             <h2>Tags</h2>
           </header>
           <ul>
-            <% link_attribute_list(:tag).each do |tag| %>
+            <% link_attribute_list(:tag, ',').each do |tag| %>
               <li><a href="#tag_<%= tag %>"><%= tag %></a>
             <% end %>
           </ul>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syclink
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Pierre Sugar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -173,12 +173,13 @@ files:
 - spec/syclink/fi/a/two.pdf
 - spec/syclink/fi/b/a/four.pdf
 - spec/syclink/fi/b/three.pdf
+- spec/syclink/fi/c/ie.url
 - spec/syclink/fi/one.pdf
 - spec/syclink/formatter_spec.rb
 - spec/syclink/gc/Bookmarks
-- spec/syclink/ie/ie.txt
-- spec/syclink/ie/one/ie.txt
-- spec/syclink/ie/one/two/ie.txt
+- spec/syclink/ie/ie.url
+- spec/syclink/ie/one/ie.url
+- spec/syclink/ie/one/two/ie.url
 - spec/syclink/importer_spec.rb
 - spec/syclink/link_spec.rb
 - spec/syclink/website_spec.rb