Graphiclious 0.1.3 → 0.1.4

data/CHANGES.txt

@@ -1,3 +1,12 @@
+Changes in 0.1.4
+- additional search field possible
+- url format changed
+- Bugfix in masking ' for Javascript
+- Commandline option --javascript/-j
+- Support Bundles in Javascript
+- Bugfixes in difference computation
+  when switching modes
+- Increase count for recent to 25
 Changes in 0.1.3
 - Javascript changes urls
 Changes in 0.1.2

data/doc/screenshots/original/04-basic-style-js.html

@@ -23,7 +23,7 @@ table, td {
 </p>
 <table cellpadding="2" cellspacing="5">
 <tr>
-<td><img src="04-basic-style-js.jpg" alt="04-basic-style-js.jpg" width="537" height="389"></td>
+<td><img src="04-basic-style-js.jpg" alt="04-basic-style-js.jpg" width="569" height="547"></td>
 </tr>
 <tr>
 <td>04-basic-style-js</td>
@@ -34,4 +34,3 @@ table, td {
 </table>
 </body>
 </html>
-

data/doc/screenshots/thumb.html

@@ -29,7 +29,7 @@
 <div>03-sample-graph</div>
 </td>
 <td>
-<a href="original/04-basic-style-js.html"><img src="thumb/t_04-basic-style-js.jpg" alt="04-basic-style-js.jpg" width="100" height="72"></a>
+<a href="original/04-basic-style-js.html"><img src="thumb/t_04-basic-style-js.jpg" alt="04-basic-style-js.jpg" width="100" height="96"></a>
 <div>04-basic-style-js</div>
 </td>
 </tr>

data/javascript/cloud.js

@@ -1,63 +1,74 @@
 // -*-javascript-*-
-// $Id: cloud.js 42 2007-10-08 19:09:22Z wsdng $
+// $Id: cloud.js 57 2008-05-13 18:25:29Z wsdng $
 //
 
 // Cloud constructor computes everything we need
-// @param links is an Array with Link objects
-function Cloud(links, varname, content_id)
+// @param links
+//   is an Array with Link objects
+// @param bundles
+//   is an Array where the keys are
+//   bundle names and each value is an Arrays of tags
+// @param bundle_names
+//   is an Array with all bundle names in the
+//   order in which they should appear
+function Cloud(links, bundles, bundle_names, varname, content_id)
 {
- this.links = links;
- this.links_for_tag = new Array();
- this.num_links_for_tag = new Array();
- this.filter = new Array(); // which tags are filtered?
- this.num_filtered = 0;
- this.max_count = 1;
- this.tags = new Array();
- this.varname = varname;
- this.content_id = content_id;
- this.filtered_links = new Array();
- this.num_filtered_links = 0;
- this.visible_links = new Array();
- this.search="";
- this.change_url = true;
+  this.links = links;
+  this.links_for_tag = new Array();
+  this.num_links_for_tag = new Array();
+  this.filter = new Array(); // which tags are filtered?
+  this.regexp = null; // patterns to search for
+  this.num_filtered = 0;
+  this.max_count = 1;
+  this.tags = new Array();
+  this.varname = varname;
+  this.content_id = content_id;
+  this.filtered_links = new Array();
+  this.num_filtered_links = 0;
+  this.visible_links = new Array();
+  this.search="";
+  this.change_url = true;
+  this.bundles = bundles;
+  this.bundle_names = bundle_names;
+  this.bundle_name = '';
 
- // init hashes
- for(var i in links)
- {
-  var link_tags = links[i].tags;
-  for(var t in link_tags)
+  // init hashes
+  for(var i in links)
   {
-   var tag = link_tags[t];
-   this.links_for_tag[tag] = new Array();
-   this.num_links_for_tag[tag] = 0;
-   this.filter[tag] = false;
-   }
- }
+    var link_tags = links[i].tags;
+    for(var t in link_tags)
+    {
+      var tag = link_tags[t];
+      this.links_for_tag[tag] = new Array();
+      this.num_links_for_tag[tag] = 0;
+      this.filter[tag] = false;
+    }
+  }
 
- // fill hashes
- for(var i in links)
- {
-  var link = links[i];
-  for(var t in link.tags)
+  // fill hashes
+  for(var i in links)
   {
-   var tag = link.tags[t];
-   this.links_for_tag[tag].push(link);
-   this.num_links_for_tag[tag] = this.num_links_for_tag[tag] + 1;
+    var link = links[i];
+    for(var t in link.tags)
+    {
+      var tag = link.tags[t];
+      this.links_for_tag[tag].push(link);
+      this.num_links_for_tag[tag] = this.num_links_for_tag[tag] + 1;
+    }
   }
- }
 
- // order tags and compute max_count
- for(var tag in this.num_links_for_tag)
- {
-  this.tags.push(tag);
-  if(this.num_links_for_tag[tag] > this.max_count)
+  // order tags and compute max_count
+  for(var tag in this.num_links_for_tag)
   {
-   this.max_count = this.num_links_for_tag[tag];
+    this.tags.push(tag);
+    if(this.num_links_for_tag[tag] > this.max_count)
+    {
+      this.max_count = this.num_links_for_tag[tag];
+    }
   }
- }
- this.tags.sort();
+  this.tags.sort();
 }
-new Cloud(new Array());
+new Cloud(new Array(), new Array());
 
 Cloud.prototype.MAX_STYLES = 10;
 
@@ -114,6 +125,31 @@ function Cloud_count_filtered_links_for_tags()
 }
 Cloud.prototype.count_filtered_links_for_tags = Cloud_count_filtered_links_for_tags;
 
+function Cloud_get_bundles_node()
+{
+ var div = document.createElement('div');
+ div.className = 'bundles';
+ for(var i in bundle_names)
+ {
+    var bundle_name = bundle_names[i];
+    var button = document.createElement('span');
+    if(this.bundle_name == bundle_name){
+      button.className = 'bundle-selected';
+      button.appendChild(document.createTextNode(bundle_name));
+    } else {
+      button.className = 'bundle';
+      var ankor = document.createElement('a');
+      ankor.href = "javascript:window.location.search='bundle=" + bundle_name + "'";
+      ankor.appendChild(document.createTextNode(bundle_name));
+      button.appendChild(ankor);
+    }
+    div.appendChild(button);
+    div.appendChild(document.createTextNode(" \n"));
+ }
+ return div;
+}
+Cloud.prototype.get_bundles_node = Cloud_get_bundles_node;
+
 function Cloud_get_cloud_node()
 {
  var div = document.createElement('div');
@@ -123,10 +159,11 @@ function Cloud_get_cloud_node()
  header.className = 'header_cloud';
  div.appendChild(header);
  div.appendChild(document.createTextNode(" \n"));
- for(var i in this.tags)
+ var cloud_tags = this.bundle_name.length > 0 ? this.bundles[this.bundle_name] : this.tags;
+ for(var i in cloud_tags)
  {
-  var tag = this.tags[i];
-  if(this.filter[tag] == false && this.num_links_for_tag[tag] > 0){
+  var tag = cloud_tags[i];
+  if((this.regexp != null && tag.search(this.regexp) >= 0) || (this.filter[tag] == false && this.num_links_for_tag[tag] > 0)){
     var span = document.createElement('span');
     span.className = this.get_style(this.num_links_for_tag[tag]);
     var tag_node = document.createTextNode(tag);
@@ -180,59 +217,81 @@ Cloud.prototype.get_filter_node = Cloud_get_filter_node;
 
 function Cloud_filter_links()
 {
- this.filtered_links = new Array();
- this.num_filtered_links = 0;
- this.visible_links = new Array();
- for(var l in this.links)
- {
-  var link = links[l];
-  var matched = 0;
-  var unmatched = 0;
-  for(t in link.tags){
-    if(this.filter[link.tags[t]]){
-      matched++;
-    } else {
-      unmatched++;
-    }
-  }
-  if(matched == this.num_filtered){
-    this.filtered_links.push(link);
-    this.num_filtered_links++;
-    if(matched > unmatched){
-      this.visible_links.push(link);
+  this.filtered_links = new Array();
+  this.num_filtered_links = 0;
+  this.visible_links = new Array();
+  for(var l in this.links)
+  {
+    var link = links[l];
+    if(this.regexp != null){
+      if(link.matches(this.regexp)){
+        this.filtered_links.push(link);
+        this.num_filtered_links++;
+        this.visible_links.push(link);
+      }
+    } else { /* no regexp => filter with taglist */
+      var matched = 0;
+      var unmatched = 0;
+      for(t in link.tags){
+        if(this.filter[link.tags[t]]){
+          matched++;
+        } else {
+          unmatched++;
+        }
+      }
+      if(matched == this.num_filtered){
+        this.filtered_links.push(link);
+        this.num_filtered_links++;
+        if(matched > unmatched){
+          this.visible_links.push(link);
+        }
+      }
     }
   }
- }
- this.count_filtered_links_for_tags();
+  this.count_filtered_links_for_tags();
 }
 Cloud.prototype.filter_links = Cloud_filter_links;
 
 function Cloud_subst()
 {
- this.filter_links();
- var content = document.getElementById(this.content_id);
- var div = document.createElement('div');
- if(this.num_filtered > 0){
-   div.appendChild(this.get_filter_node());
- }
- var list_to_show = this.visible_links;
- if(this.num_filtered_links <= 10){
-   list_to_show = this.filtered_links;
- } else {
-   div.appendChild(this.get_cloud_node());
- }
- var ul = document.createElement("ul");
- ul.className = 'link_list';
- list_to_show = list_to_show.sort(Link_compare_desc)
- for(var l in list_to_show)
- {
-  var link = list_to_show[l];
-  var li = document.createElement("li");
-  ul.appendChild(li);
-  link.to_html(li);
- }
- div.appendChild(ul);
- content.replaceChild(div, content.firstChild);
+  this.filter_links();
+  var content = document.getElementById(this.content_id);
+  var div = document.createElement('div');
+  if(this.bundle_names.length > 0){
+    div.appendChild(this.get_bundles_node());
+  }
+  if(this.num_filtered > 0){
+    div.appendChild(this.get_filter_node());
+  }
+  var num_visible_links = this.visible_links.length;
+  var num_hidden_links = this.num_filtered_links - num_visible_links;
+  var list_to_show;
+  if(this.regexp == null && (this.num_filtered_links <= 20 || num_visible_links > num_hidden_links)){
+    list_to_show = this.filtered_links;
+  } else {
+    list_to_show = this.visible_links;
+    div.appendChild(this.get_cloud_node());
+  }
+  var ul = document.createElement("ul");
+  ul.className = 'link_list';
+  list_to_show = list_to_show.sort(Link_compare_desc)
+  for(var l in list_to_show)
+  {
+    var link = list_to_show[l];
+    var li = document.createElement("li");
+    ul.appendChild(li);
+    link.to_html(li);
+  }
+  div.appendChild(ul);
+  var stat = document.createElement('p');
+  var statString = list_to_show.length;
+  if(this.regexp == null){
+    statString = statString + "/" + this.num_filtered_links;
+  }
+  statString = statString + " Links shown";
+  stat.appendChild(document.createTextNode(statString));
+  div.appendChild(stat);
+  content.replaceChild(div, content.firstChild);
 }
 Cloud.prototype.subst = Cloud_subst;
 
@@ -240,9 +299,9 @@ function Cloud_get_search_with(tag)
 {
   var new_search = '';
   if(this.num_filtered > 0){
-    new_search = this.search + "+" + tag;
+    new_search = this.search + "," + tag;
   } else {
-    new_search = tag;
+    new_search = 'tags=' + tag;
   }
   return new_search;
 }
@@ -250,7 +309,7 @@ Cloud.prototype.get_search_with = Cloud_get_search_with;
 
 function Cloud_set_filtered(tag)
 {
-  if(this.filter[tag] == false){
+  if(tag != '' && this.filter[tag] == false){
     this.search = this.get_search_with(tag);
     this.num_filtered++;
     this.filter[tag] = true;
@@ -268,15 +327,18 @@ Cloud.prototype.add_filter = Cloud_add_filter;
 function Cloud_get_search_without(tag)
 {
   var new_search = '';
-  var search_tags = this.search.split("+");
-  var first = true;
-  for(var i in search_tags){
-    if(search_tags[i] != tag){
-      if(first){
-        new_search = search_tags[i];
-        first = false;
-      } else {
-        new_search += "+" + search_tags[i];
+  var pass1 = this.search.split("=");
+  if(pass1.length == 2){
+    var search_tags = pass1[1].split(",");
+    var first = true;
+    for(var i in search_tags){
+      if(search_tags[i] != tag){
+        if(first){
+          new_search = "tags=" + search_tags[i];
+          first = false;
+        } else {
+          new_search += "," + search_tags[i];
+        }
       }
     }
   }
@@ -295,18 +357,56 @@ function Cloud_remove_filter(tag)
 }
 Cloud.prototype.remove_filter = Cloud_remove_filter;
 
+/*
+actual:
+http://hinterkattentuffel.de/links.htm?bundle=computer
+http://hinterkattentuffel.de/links.htm?tags=c++,c
+ideas:
+http://hinterkattentuffel.de/links.htm?search=pattern
+http://hinterkattentuffel.de/links.htm?tags=c++,c&tags!=java,ruby
+*/
 function Cloud_jump_to(location)
 {
+  /* precondition: cloud just initialized
+     TODO: reset all filters if not */
   var location_params = location.search;
   var argstr = location_params.substring(1, location_params.length);
-  var args = argstr.split('+');
+  var args = argstr.split('&');
   for(var i = 0; i < args.length; i++){
-    var possible_tag = unescape(args[i])
-    this.set_filtered(possible_tag);
+    var keyAndValue = args[i].split("=");
+    if(keyAndValue.length == 2){
+      var key = keyAndValue[0];
+      var value = keyAndValue[1];
+      if(key == 'tags'){
+        var tags = value.split(",");
+        for(var t = 0; t < tags.length; t++){
+          var possible_tag = unescape(tags[t])
+          this.set_filtered(possible_tag);
+        }
+      } else if(key == 'bundle'){
+          this.bundle_name = unescape(value);
+      } else if(key == 'search'){
+          this.regexp = new RegExp(unescape(value), 'i');
+      }
+    } else if(keyAndValue.length == 1) {
+      /*  backward compatibility:
+          http://hinterkattentuffel.de/links.htm?bundle+computer
+          http://hinterkattentuffel.de/links.htm?c+cpp
+      */
+      var parts = keyAndValue[0].split('+');
+      if(parts.length == 2 && parts[0] == 'bundle'){
+        this.bundle_name = unescape(parts[1]);
+      } else {
+        for(var p = 0; p < parts.length; p++){
+          var possible_tag = unescape(parts[p])
+          this.set_filtered(possible_tag);
+        }
+      }
+    }
+  }
+  if(this.regexp == null && this.bundle_name == '' && this.num_filtered <= 0){
+    this.bundle_name = 'full cloud';
   }
   this.subst();
 }
-Cloud.prototype.jump_to = Cloud_jump_to;
-
-
-
+Cloud.prototype.jump_to = Cloud_jump_to;

data/javascript/index.htm

@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<!-- $Id: index.htm 42 2007-10-08 19:09:22Z wsdng $ -->
+<!-- $Id: index.htm 56 2008-05-09 16:26:13Z wsdng $ -->
 <html>
 <head>
 <link rel="stylesheet" type="text/css" href="style.css">
@@ -9,16 +9,21 @@
 <h1>my bookmarks</h1>
 <div class="main">
   <noscript>Sorry, but this page requires javascript!</noscript>
-  <script src="link.js"></script>
-  <script src="_all.js"></script>
-  <script src="cloud.js"></script>
+  <script type="text/javascript" src="link.js"></script>
+  <script type="text/javascript" src="_all.js"></script>
+  <script type="text/javascript" src="_bundles.js"></script>
+  <script type="text/javascript" src="cloud.js"></script>
+  <form method="get">
+  Search: <input name="search" type="text" size="30" maxlength="30">
+  </form>
+  <br>
   <div id="content">
     <div></div>
   </div>
 </div>
 <script>
 <!--
-cloud = new Cloud(links, 'cloud', 'content');
+cloud = new Cloud(links, bundles, bundle_names, 'cloud', 'content');
 //cloud.dont_change_url();
 cloud.jump_to(document.location);
 //-->

data/javascript/link.js

@@ -1,36 +1,58 @@
 // -*-javascript-*-
-// $Id: link.js 39 2007-01-27 13:36:53Z wsdng $
+// $Id: link.js 55 2008-05-07 22:10:35Z wsdng $
 
 // Representing tagged hyperlink
-function Link(href, tags, desc)
+function Link(href, tags, desc, ext)
 {
- this.href = href;
- this.tags = tags;
- this.desc = desc;
+  this.href = href;
+  this.tags = tags;
+  this.desc = desc;
+  this.ext  = ext;
 }
-new Link('', new Array(), '');
+new Link('', new Array(), '', '');
 
 function Link_to_html(parent)
 {
- var ankor = document.createElement("a");
- ankor.className = "extern"
- ankor.href = this.href;
- ankor.appendChild(document.createTextNode(this.desc));
+  var ankor = document.createElement("a");
+  ankor.className = "extern"
+  ankor.href = this.href;
+  ankor.appendChild(document.createTextNode(this.desc));
 
- parent.appendChild(ankor);
- parent.appendChild(document.createElement("br"));
- parent.appendChild(document.createTextNode('tags: ' + this.tags.join(", ")));
- parent.appendChild(document.createElement("br"));
+  parent.appendChild(ankor);
+  parent.appendChild(document.createElement("br"));
+
+  if(this.ext.length > 0){
+    parent.appendChild(document.createTextNode(this.ext));
+    parent.appendChild(document.createElement("br"));
+  }
+
+  // parent.appendChild(document.createTextNode('tags: ' + this.tags.join(", ")));
+  // parent.appendChild(document.createElement("br"));
 }
 Link.prototype.to_html = Link_to_html;
 
-function Link_compare_desc(x, y)
+function Link_matches(regexp)
 {
-	if(x.desc < y.desc){
-		return -1;
-	}
-	if(x.desc > y.desc){
-		return 1;
-	}
-	return 0;
+  if(this.desc != null && this.desc.search(regexp) >= 0){
+    return true;
+  }
+  if(this.href != null && this.href.search(regexp) >= 0){
+    return true;
+  }
+  if(this.ext != null && this.ext.search(regexp) >= 0){
+    return true;
+  }
+  return false;
 }
+Link.prototype.matches = Link_matches;
+
+function Link_compare_desc(x, y)
+{
+  if(x.desc < y.desc){
+    return -1;
+  }
+  if(x.desc > y.desc){
+    return 1;
+  }
+  return 0;
+}

data/javascript/style.css

@@ -1,3 +1,7 @@
+#content{
+  border:solid 1px;
+}
+
 .filter{
   margin-bottom:1em;
 }
@@ -11,6 +15,20 @@
   margin-bottom:1em;
 }
 
+.bundles{
+  font-weight:bold;
+  margin-bottom:1em;
+}
+
+.bundle-selected{
+  color:white;
+  background-color:gray;
+}
+
+.bundle{
+  background-color:gray;
+}
+
 .header_cloud{
   color:white;
   background-color:black;

data/lib/graphiclious.rb

@@ -6,9 +6,11 @@ require 'getoptlong'
 getOpt = GetoptLong.new(["--user", "-u", GetoptLong::REQUIRED_ARGUMENT],
 			["--password", "-p", GetoptLong::REQUIRED_ARGUMENT],
 			["--gui", "-g", GetoptLong::NO_ARGUMENT],
+			["--all", "-a", GetoptLong::NO_ARGUMENT],
 			["--nomap", "-m", GetoptLong::NO_ARGUMENT],
 			["--noupdate", "-l", GetoptLong::NO_ARGUMENT],
 			["--nohtml", "-o", GetoptLong::NO_ARGUMENT],
+			["--javascript", "-j", GetoptLong::NO_ARGUMENT],
 			["--bundles", "-b", GetoptLong::NO_ARGUMENT],
 			["--version", "-v", GetoptLong::NO_ARGUMENT],
 			["--delicious", "-d", GetoptLong::NO_ARGUMENT],
@@ -50,11 +52,13 @@ if opts["--gui"]
   application = Fox::FXApp.new("Graphiclious", "Sascha D�rdelmann")
   window = GraphicliousMainWindow.new(application, user, password)
   window.setOptionFetch(!opts["--noupdate"])
+  window.setOptionAll(opts["--all"])
   window.setOptionGenerate(!opts["--nohtml"])
   window.setOptionDelicious(opts["--delicious"])
   window.setOptionBundles(opts["--bundles"])
   window.setOptionGraphViews(!opts["--nomap"])
   window.setOptionGraphThumbs(!opts["--nomap"])
+  window.setOptionJavasript(opts["--javascript"])
   application.addSignal("SIGINT", window.method(:onCmdQuit))
   application.create
   application.run
@@ -66,15 +70,24 @@ else
   unless opts["--noupdate"]
     require 'graphiclious/delicious2yaml'
     importer = Delicious2Yaml.new(user, password)
+    mode_keys = Delicious2Yaml::MODES.keys.sort {|m1, m2| m1.to_s <=> m2.to_s}
+    mode = mode_keys[opts["--all"] ? -1 : 0]
+    importer.set_mode(mode)
     importer.run
-    importer.fetch_and_store_bundles if opts["--bundles"]
   end
   unless opts["--nohtml"]
-    require 'graphiclious/yaml-links2html'
-    exporter = YamlLinksToHtml.new
-    exporter.link_to_delicious_if_possible = opts["--delicious"]
-    exporter.build_graph_thumbs = !opts["--nomap"]
-    exporter.include_graph_views = !opts["--nomap"]
+    if(opts["--javascript"])
+      require 'graphiclious/yaml-links2js'
+      exporter = YamlLinksToJavascript.new
+    else 
+      require 'graphiclious/yaml-links2html'
+      exporter = YamlLinksToHtml.new
+      exporter.link_to_delicious_if_possible = opts["--delicious"]
+      exporter.build_graph_thumbs = !opts["--nomap"]
+      exporter.include_graph_views = !opts["--nomap"]
+    end
+    exporter.use_bundles = opts["--bundles"]
+    exporter.set_working_dir(user)
     exporter.run
   end
 end

data/lib/graphiclious/delicious2yaml.rb

@@ -1,81 +1,8 @@
 #!/usr/bin/env ruby
 #$Id: delicious2yaml.rb,v 1.8 2006/03/07 23:39:04 wsdng Exp $
 
-require_gem 'Rubilicious'
-require 'net/https'
-
-if(Rubilicious::VERSION == '0.1.5')
-  class Rubilicious
-    def all(tag = nil)
-      args = [(tag ? "tag=#{tag.uri_escape}" : nil)]
-      get('posts/all?' << args.compact.join('&amp;'), 'post').map do |e|
-        e['time'] = Time::from_iso8601(e['time'])
-        e['tags'] = e['tag'].split(/\s/) # wrong in 1.5
-        e # missing in 1.5
-      end
-    end
-  end
-end
-
-if(Rubilicious::VERSION == '0.2.0')
-  # #all() and #recent() shoult return the same format
-  # therefore I changed 'tag' into 'tags'
-  class Rubilicious
-    def all(tag = nil)
-      args = [(tag ? "tag=#{u(tag)}" : nil)]
-      get('posts/all?' << args.compact.join('&amp;'), 'post').map do |e|
-        e.merge({
-        'time' => Time.iso8601(e['time']),
-        'tags'  => e['tag'].split(/\s+/),
-        })
-      end
-    end
-  end
-end
-
-class Rubilicious
-  #
-  # Low-level HTTPS GET.
-  # SDo used the tip at
-  # http://ruby.about.com/od/tutorials/ss/delicious_tags_4.htm
-  # to get Rubilicious code working
-  def https_get(url)
-    # get proxy info
-    proxy_host, proxy_port = find_http_proxy
-    # $stderr.puts "DEBUG: proxy: host = #{proxy_host}, port = #{proxy_port}"
-    
-    # get host, port, and base URI for API queries
-    uri = URI::parse(@base_uri)
-    base = uri.request_uri
-    
-    # prepend base to url
-    url = "#{base}/#{url}"
-    
-    # connect to delicious
-    http = Net::HTTP.Proxy(proxy_host, proxy_port).new(uri.host, uri.port)
-    http.use_ssl = true
-    http.start
-    
-    # get URL, check for error
-    resp = http.get(url, @headers)
-    unless resp.code =~ /2\d{2}/
-      puts base
-      puts url
-      raise "HTTP #{resp.code}: #{resp.message}"
-    end
-    
-    # close HTTP connection, return response
-    http.finish
-    resp.body
-  end
-  
-  # del.icio.us-API change 08/2006!
-  def http_get(url)
-    https_get(url)
-  end
-end
-
 require 'yaml'
+require 'graphiclious/delicious_api'
 require 'graphiclious/utf8'
 
 class Delicious2Yaml
@@ -86,16 +13,10 @@ class Delicious2Yaml
     @working_dir = Dir.getwd
     @user = user_string
     @password = password_string
-    @interface = create_interface
+    @interface = Delicious_Api.new(@user, @password)
     @mode = :b_all
   end
   
-  def create_interface
-    @interface = Rubilicious.new(@user, @password)
-    @interface.base_uri = 'https://api.del.icio.us/v1'
-    @interface
-  end
-  
   def set_working_dir(new_working_dir)
     @working_dir = new_working_dir
   end
@@ -170,7 +91,7 @@ class Delicious2Yaml
   def update_necessary?
     writeLineOnProtokoll("Check for updates for #{@user} now.")
     
-    @time = @interface.update
+    @time = @interface.timestamp
     if File.exists?("#{file_base}.time")
       last_time = File.open("#{file_base}.time", 'r') { |io|
         YAML.load(io)

data/lib/graphiclious/delicious_api.rb

@@ -0,0 +1,116 @@
+#!/usr/bin/env ruby
+#$Id: delicious2yaml.rb,v 1.8 2006/03/07 23:39:04 wsdng Exp $
+
+require_gem 'Rubilicious'
+require 'net/https'
+
+if(Rubilicious::VERSION == '0.1.5')
+  class Rubilicious
+    def all(tag = nil)
+      args = [(tag ? "tag=#{tag.uri_escape}" : nil)]
+      get('posts/all?' << args.compact.join('&amp;'), 'post').map do |e|
+        e['time'] = Time::from_iso8601(e['time'])
+        e['tags'] = e['tag'].split(/\s/) # wrong in 1.5
+        e # missing in 1.5
+      end
+    end
+  end
+end
+
+if(Rubilicious::VERSION == '0.2.0')
+  # #all() and #recent() shoult return the same format
+  # therefore I changed 'tag' into 'tags'
+  class Rubilicious
+    def all(tag = nil)
+      args = [(tag ? "tag=#{u(tag)}" : nil)]
+      get('posts/all?' << args.compact.join('&amp;'), 'post').map do |e|
+        entry = e.merge({
+        'time' => Time.iso8601(e['time']),
+        'tags'  => e['tag'].split(/\s+/),
+        })
+	entry.delete('tag')
+	entry
+      end
+    end
+  end
+end
+
+class Rubilicious
+  #
+  # Low-level HTTPS GET.
+  # SDo used the tip at
+  # http://ruby.about.com/od/tutorials/ss/delicious_tags_4.htm
+  # to get Rubilicious code working
+  def https_get(url)
+    # get proxy info
+    proxy_host, proxy_port = find_http_proxy
+    # $stderr.puts "DEBUG: proxy: host = #{proxy_host}, port = #{proxy_port}"
+    
+    # get host, port, and base URI for API queries
+    uri = URI::parse(@base_uri)
+    base = uri.request_uri
+    
+    # prepend base to url
+    url = "#{base}/#{url}"
+    
+    # connect to delicious
+    http = Net::HTTP.Proxy(proxy_host, proxy_port).new(uri.host, uri.port)
+    http.use_ssl = true
+    http.start
+    
+    # get URL, check for error
+    resp = http.get(url, @headers)
+    unless resp.code =~ /2\d{2}/
+      puts base
+      puts url
+      raise "HTTP #{resp.code}: #{resp.message}"
+    end
+    
+    # close HTTP connection, return response
+    http.finish
+    resp.body
+  end
+  
+  # del.icio.us-API change 08/2006!
+  def http_get(url)
+    https_get(url)
+  end
+end
+
+# These are the only methods that we actually use within
+# Graphiclious. The current implementation uses
+# Rubilicious to realise them. This might change
+# over time.
+class Delicious_Api
+  def initialize(user, password)
+    @interface = Rubilicious.new(user, password)
+    @interface.base_uri = 'https://api.del.icio.us/v1'
+    @interface
+  end
+
+  # This method should be used before calling #all.
+  # Store this time locally after each call of #all.
+  # Compare the stored time with the time returned
+  # by this method to decide if an update is necessary.
+  def timestamp
+    @interface.update
+  end
+
+  def bundles
+    @interface.bundles
+  end
+
+  def recent
+    links = @interface.recent(nil, 25)
+    return nil unless links
+    # make sure that format is equal to format in #all
+    links.each { |v|
+      v["extended"] = "" unless v["extended"]
+    }
+    links
+  end
+
+  def all
+    @interface.all
+  end
+end

data/lib/graphiclious/gui.rb

@@ -195,6 +195,12 @@ class GraphicliousMainWindow < Fox::FXMainWindow
   
   def setOptionJavasript(bool)
     @checkJs.setCheck(bool ? true : false)
+    checkJsChanged
+  end
+
+  def setOptionAll(bool)
+    modeKeys = Delicious2Yaml::MODES.keys.sort {|m1, m2| m1.to_s <=> m2.to_s}
+    @fetchMode.setText(Delicious2Yaml::MODES[modeKeys[bool ? -1 : 0]])
   end
   
   def create
@@ -266,6 +272,7 @@ class GraphicliousMainWindow < Fox::FXMainWindow
           jsExporter = YamlLinksToJavascript.new
           jsExporter.set_protocol_block(outputBlock)
           jsExporter.set_working_dir(File.join(@workingDir, @user))
+	  jsExporter.use_bundles = @checkBundles.checked?
           jsExporter.write_only_diff_tags = @checkDiff.checked?
           jsExporter.include_private = @checkIncludePrivate.checked? && @checkReallyIncludePrivate.checked?
           jsExporter.run
@@ -295,12 +302,15 @@ class GraphicliousMainWindow < Fox::FXMainWindow
   end
   
   def onCheckJs(sender, sel, ptr)
+    checkJsChanged
+  end
+
+  def checkJsChanged
     dependent_checks = [
-    @checkBundles,
-    @checkDiff,
-    @checkDelicious,
-    @checkGraphThumbs,
-    @checkGraphViews]
+      @checkDiff,
+      @checkDelicious,
+      @checkGraphThumbs,
+      @checkGraphViews]
     if @checkJs.checked?
       dependent_checks.each{ |c| c.disable }
     else

data/lib/graphiclious/help.rb

@@ -6,10 +6,12 @@ module Graphiclious
     h = String.new
     h <<
       "Commandline options:\n" <<
+      "--all/-a fetch all instead of recent" <<
       "--bundles/-b include bundles\n" <<
       "--delicious/-d prefer links to del.icio.us\n" <<
       "--gui/-g will start a graphical user interface\n" <<
       "--help/-h will display this text\n" <<
+      "--javascript/-j allow javascript in output files\n" <<
       "--nomap/-m do not include image map with graph-view" <<
       "--noupdate/-l do not connect to del.icio.us\n" <<
       "--nohtml/-o ommit html generation\n" <<

data/lib/graphiclious/version.rb

@@ -3,6 +3,6 @@
 
 module Graphiclious
   def self.version
-    '0.1.3'
+    '0.1.4'
   end
 end

data/lib/graphiclious/yaml-links2html.rb

@@ -65,6 +65,7 @@ class YamlLinksToHtml
     @use_bundles = false
     @include_graph_views = false
     @build_graph_thumbs = @include_graph_views
+    @num_files_written = 0
   end
   
   def copy_style_to_user
@@ -136,6 +137,7 @@ class YamlLinksToHtml
   
   def write_html_tail_on(fp)
     fp.puts '</body></html>'
+    @num_files_written = @num_files_written + 1
   end
   
   def menuitem(name, id, url)
@@ -202,7 +204,7 @@ class YamlLinksToHtml
   def write_link_on(link, fp, skip_tags = [])
     fp.puts(UrlGraph.ankor(link['href'], link['description']))
     info = link['extended']
-    if info
+    unless info.nil? || info.empty?
       fp.puts('<br>')
       fp.puts("#{info}")
     end
@@ -420,7 +422,7 @@ class YamlLinksToHtml
         end
       end
     end
-    write_line_on_protokol "Wrote one html-file for each tag to directory #{@html_output_path}."
+    write_line_on_protokol "Wrote one html-file for each tag."
   end
   
   def write_double_tag_files
@@ -457,7 +459,7 @@ class YamlLinksToHtml
         end
       end
     end
-    write_line_on_protokol "Wrote one html-file for each combination of two tags to directory #{@html_output_path}."
+    write_line_on_protokol "Wrote one html-file for each combination of two tags."
   end
   
   # make all run-variables garbage collectable
@@ -466,6 +468,7 @@ class YamlLinksToHtml
     @links_by_tag = nil
     @links_by_edge = nil
     @bundles = nil
+    @num_files_written = 0
   end
   
   # run the complete batch
@@ -480,7 +483,8 @@ class YamlLinksToHtml
     load_links
     write_all_overviews
     write_single_tag_files    
-    write_double_tag_files  
+    write_double_tag_files
+    write_line_on_protokol "#{@num_files_written.to_s} Files witten to #{@html_output_path}."
     reset_build_state
     write_line_on_protokol "Finished."
   end

data/lib/graphiclious/yaml-links2js.rb

@@ -7,13 +7,14 @@ require 'graphiclious/environment'
 require 'graphiclious/url_graph'
 
 class YamlLinksToJavascript
-  attr_accessor(:write_only_diff_tags, :include_private)
+  attr_accessor(:write_only_diff_tags, :include_private, :use_bundles)
   
   # differs from working dir in YamlLinksToHtml
   # because we do not need to know the user
   def set_working_dir(new_working_dir)
     @working_dir = new_working_dir
     @input_file = File.join(@working_dir, 'delicious.yaml')
+    @bundles_file = File.join(@working_dir, 'bundles.yaml')
     @diff_file = File.join(@working_dir, 'delicious.diff.yaml')
     @js_output_path = File.join(@working_dir, 'js')
   end
@@ -21,6 +22,7 @@ class YamlLinksToJavascript
   def initialize
     @include_private = false
     @write_only_diff_tags = true
+    @use_bundles = true
     @diff_tags = Set.new
     set_working_dir(Dir.getwd)
   end
@@ -56,16 +58,22 @@ class YamlLinksToJavascript
     fp.puts 'var links = new Array();' 
     fp.puts
   end
+
+  def as_javascript_string(ruby_string)
+    ruby_string ? ruby_string.gsub(/'/, "\\\\'").gsub(/\n/, "\\\\n") : ''
+  end
   
   def write_link_on(link, fp, skip_tags = [])
     fp.puts "links.push(new Link("
     fp.puts "\t'#{link['href']}',"
     other_tags = link['tags'].reject { |t| skip_tags.include?(t) }
     fp.puts "\tnew Array(" + other_tags.collect{|t| "'#{t}'"}.join(", ") + "),"
-    desc = link['description'].gsub(/'/, "\\'")
-    fp.puts "\t'#{desc}'));"
+    desc = as_javascript_string(link['description'])
+    fp.puts "\t'#{desc}', "
+    ext = as_javascript_string(link['extended'])
+    fp.puts "\t'#{ext}'));"
   end
-  
+
   def load_links
     if(@write_only_diff_tags)
       @diff_tags = Set.new
@@ -107,7 +115,17 @@ class YamlLinksToJavascript
     }
     links
   end
-  
+
+  # load bundles file
+  # compute virtual bundles 'full cloud' and 'unbundled'
+  def load_bundles
+    return {} unless @use_bundles
+    bundles = {}
+    bundles = File.open(@bundles_file, 'r') { |io|
+      YAML.load(io)
+    }
+  end
+
   def fatal(msg)
     write_line_on_protokol(msg)
     exit(1)
@@ -139,6 +157,46 @@ class YamlLinksToJavascript
       }
     end
   end
+
+  def with_virtual_bundles bundles
+    set_of_bundled_tags = {}
+    @links_by_tag.keys.each { |tag|
+      set_of_bundled_tags[tag] = tag
+    }
+    bundles['full cloud'] = set_of_bundled_tags.values.sort
+    bundles.keys.each { |bundle|
+      bundles[bundle].each { |tag|
+	set_of_bundled_tags.delete(tag)
+      }
+    }
+    unless set_of_bundled_tags.empty?
+      bundles['unbundled'] = set_of_bundled_tags.values.sort
+    end
+    bundles
+  end
+
+  def write_all_bundles_file bundles
+    unless bundles.empty?
+      bundle_names = bundles.keys.sort
+      bundle_names.unshift('full cloud');
+      bundle_names.push('unbundled') if bundles['unbundled'];
+      all_bundles = with_virtual_bundles bundles
+    else
+      bundle_names = Array.new
+      all_bundles = bundles
+    end
+    File.open(File.join(@js_output_path, "_bundles.js"), 'w') do
+      |fp|
+      fp.puts '/*---javascript generated by graphiclious/yaml-links2js.rb---*/'
+      fp.puts
+      fp.puts "var bundle_names = new Array('#{bundle_names.join("','")}');"
+      fp.puts 'var bundles = new Array();'
+      bundle_names.each { |name|
+	tagstring = "\n'#{bundles[name].join("',\n'")}'\n"
+	fp.puts "bundles['#{name}'] = new Array(#{tagstring});"
+      }
+    end
+  end
   
   # run the complete batch
   def run
@@ -149,7 +207,12 @@ class YamlLinksToJavascript
     copy_scripts
     links = load_links
     write_all_links_file links
-    # write_single_tag_files    
+    if @use_bundles && File.exists?(@bundles_file)
+      bundles = load_bundles
+    else
+      bundles = {}
+    end
+    write_all_bundles_file bundles
     write_line_on_protokol "Finished."
   end
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: Graphiclious
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
-date: 2007-10-08 00:00:00 +02:00
+  version: 0.1.4
+date: 2008-05-13 00:00:00 +02:00
 summary: Create an html image map pointing to generated static html pages from your del.icio.us links.  Uses Rubilicious and Graphviz.  Interface done with FXRuby
 require_paths: 
 - lib
@@ -32,17 +32,7 @@ files:
 - gemspec.rb
 - README.txt
 - styles
-- lib
-- doc
-- bin
-- options.yaml
-- wickie
-- test
-- Rakefile
-- javascript
-- CHANGES.txt
 - styles/cornflower
-- styles/blue-style-1
 - styles/cornflower/cornflower.png
 - styles/cornflower/dot-attributes.yaml
 - styles/cornflower/extern.gif
@@ -51,35 +41,29 @@ files:
 - styles/cornflower/menuselected.png
 - styles/cornflower/style.css
 - styles/cornflower/tr-edge.png
+- styles/blue-style-1
 - styles/blue-style-1/dot-attributes.yaml
 - styles/blue-style-1/extern.gif
 - styles/blue-style-1/style.css
-- lib/graphiclious.rb
+- lib
 - lib/graphiclious
-- lib/graphiclious/delicious2yaml.rb
 - lib/graphiclious/dot_attributes.rb
-- lib/graphiclious/help.rb
 - lib/graphiclious/require_fox.rb
 - lib/graphiclious/url_graph.rb
 - lib/graphiclious/utf8.rb
 - lib/graphiclious/version.rb
-- lib/graphiclious/yaml-links2html.rb
-- lib/graphiclious/gui.rb
 - lib/graphiclious/environment.rb
 - lib/graphiclious/ftp_browser.rb
+- lib/graphiclious/yaml-links2html.rb
+- lib/graphiclious/delicious2yaml.rb
+- lib/graphiclious/delicious_api.rb
+- lib/graphiclious/gui.rb
+- lib/graphiclious/help.rb
 - lib/graphiclious/yaml-links2js.rb
+- lib/graphiclious.rb
+- doc
 - doc/screenshots
-- doc/index.html
-- doc/style.css
-- doc/cloud.jpg
-- doc/extern.gif
-- doc/help.html
-- doc/install.html
-- doc/screenshots-preview.jpg
 - doc/screenshots/original
-- doc/screenshots/thumb
-- doc/screenshots/thumb.html
-- doc/screenshots/default.css
 - doc/screenshots/original/01-blue-style-1.jpg
 - doc/screenshots/original/02-cornflower.jpg
 - doc/screenshots/original/03-sample-graph.jpg
@@ -88,14 +72,15 @@ files:
 - doc/screenshots/original/06-custom-style-js.jpg
 - doc/screenshots/original/07-user-interface.jpg
 - doc/screenshots/original/08-ftp-upload.jpg
-- doc/screenshots/original/01-blue-style-1.html
+- doc/screenshots/original/05-custom-style.html
 - doc/screenshots/original/02-cornflower.html
+- doc/screenshots/original/08-ftp-upload.html
+- doc/screenshots/original/07-user-interface.html
 - doc/screenshots/original/03-sample-graph.html
-- doc/screenshots/original/04-basic-style-js.html
-- doc/screenshots/original/05-custom-style.html
+- doc/screenshots/original/01-blue-style-1.html
 - doc/screenshots/original/06-custom-style-js.html
-- doc/screenshots/original/07-user-interface.html
-- doc/screenshots/original/08-ftp-upload.html
+- doc/screenshots/original/04-basic-style-js.html
+- doc/screenshots/thumb
 - doc/screenshots/thumb/t_01-blue-style-1.jpg
 - doc/screenshots/thumb/t_02-cornflower.jpg
 - doc/screenshots/thumb/t_03-sample-graph.jpg
@@ -104,12 +89,28 @@ files:
 - doc/screenshots/thumb/t_06-custom-style-js.jpg
 - doc/screenshots/thumb/t_07-user-interface.jpg
 - doc/screenshots/thumb/t_08-ftp-upload.jpg
+- doc/screenshots/default.css
+- doc/screenshots/thumb.html
+- doc/index.html
+- doc/style.css
+- doc/cloud.jpg
+- doc/extern.gif
+- doc/help.html
+- doc/install.html
+- doc/screenshots-preview.jpg
+- bin
 - bin/graphiclious
+- options.yaml
+- wickie
+- test
 - test/test_delicious2yaml.rb
+- Rakefile
+- javascript
 - javascript/style.css
 - javascript/link.js
-- javascript/cloud.js
 - javascript/index.htm
+- javascript/cloud.js
+- CHANGES.txt
 test_files: []
 
 rdoc_options: []