Graphiclious 0.1.0 → 0.1.1

data/lib/graphiclious/environment.rb

@@ -23,14 +23,27 @@ begin
   # Try to find lib directory of this specific Graphiclious gem version
   def findGraphicliousDirectory
     graphicliousGemDir = "Graphiclious-#{Graphiclious.version}"
+    puts "Gempath: " + Gem::path.to_s
     all = Gem::path.collect { |gempath|
       File.join(gempath, 'gems', graphicliousGemDir)
     }.select { |f|
       File.directory?(f)
     }
-    all.empty? ? '.' : all.first
+    return all.first unless all.empty?
+    puts "Checking $LOAD_PATH"
+    $LOAD_PATH.each do
+      |d|
+      if /graphiclious.lib$/ =~ d
+        return d[0..-5].gsub(/\\/, '/');
+      end
+    end
+    return '.'
   end
   GRAPHICLIOUS_PATH = findGraphicliousDirectory
 rescue LoadError
   GRAPHICLIOUS_PATH = '.'
 end
+puts "Set GRAPHICLIOUS_PATH to : #{GRAPHICLIOUS_PATH}"
+
+STYLES_FOLDER = File.join(GRAPHICLIOUS_PATH, "styles")
+JS_TEMPLATES_FOLDER = File.join(GRAPHICLIOUS_PATH, "javascript") 

data/lib/graphiclious/ftp_browser.rb

@@ -0,0 +1,53 @@
+#!/usr/bin/ruby
+## $Id: ftp_browser.rb 73 2004-12-17 16:22:13Z Sascha $
+
+require 'piggy-core/options'
+require 'piggy-gui/ftp_browser_widget'
+
+class FtpBrowserApi
+  def initialize(options_file, subdir)
+    @options_file = options_file
+    @options = load_options
+    @options.localDestinationPath = File.join(File.dirname(@options_file), subdir)
+    @options.ftpConnectionTimeout = 600 unless @options.ftpConnectionTimeout > 600
+    @options.ftpTransferTimeout = 2000 unless @options.ftpTransferTimeout > 2000
+  end
+
+  def run main_win
+    uploadDialog = FtpBrowserDialog.new(main_win, @options)
+    uploadDialog.execute
+    save_options
+  end
+   
+  def load_options
+    return PiggyOptions.new unless File.exists?(@options_file)
+    begin
+      config = File.open(@options_file) { |io| YAML.load(io) }
+      if config.class == Array
+        options = config.detect{ |entry| entry.class == PiggyOptions }
+      else 
+        options = config
+      end
+      options.initializeNilsWithDefault
+    rescue StandardError => ex
+      puts('Configuration error, options.yaml ignored: ' + ex.message)
+      options = PiggyOptions.new
+    end
+    return options
+  end
+
+  def save_options
+    begin
+      if File.exists?(@options_file)
+        File.rename(@options_file, "#{@options_file}.bak")
+      end
+      File.open(@options_file, 'w') { |out|
+        YAML.dump(@options, out)
+      }
+      puts "Options saved to #{@options_file}"
+    rescue StandardError => ex
+      puts "Options could not be saved to #{@options_file}: " + ex.message
+    end
+  end
+end
+

data/lib/graphiclious/gui.rb

@@ -3,7 +3,8 @@
 
 require 'graphiclious/require_fox'
 require 'graphiclious/delicious2yaml'
-require 'graphiclious/yaml-links2html' 
+require 'graphiclious/yaml-links2html'
+require 'graphiclious/yaml-links2js' 
 
 class GraphicliousMainWindow < Fox::FXMainWindow
   include Fox
@@ -16,6 +17,13 @@ class GraphicliousMainWindow < Fox::FXMainWindow
     @style = style
     @stylesFolder = YamlLinksToHtml::STYLES_FOLDER
     @workingDir = Dir.getwd
+    @is_ftp_enabled = false
+    begin
+      require 'graphiclious/ftp_browser'
+      @is_ftp_enabled = true
+    rescue LoadError => bang
+      puts("Ftp browser not installed: " + bang + "\n-\n")
+    end
     initView
     updateUserList
     updateStylesList
@@ -63,8 +71,8 @@ class GraphicliousMainWindow < Fox::FXMainWindow
     wdFrame.setLayoutHints(LAYOUT_LEFT|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
     noPaddingForFrame(wdFrame)
     @workingDirTextField = FXTextField.new(wdFrame,
-                                           32, nil, 0,
-                                           TEXTFIELD_NORMAL)
+    32, nil, 0,
+    TEXTFIELD_NORMAL)
     @workingDirTextField.setLayoutHints(LAYOUT_LEFT|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
     @workingDirTextField.setText(@workingDir)
     wdChooseButton = newButton(wdFrame, '..')
@@ -72,24 +80,24 @@ class GraphicliousMainWindow < Fox::FXMainWindow
     
     FXLabel.new(userAndPasswordFrame, "Enter User:")
     @userTextField = newCombobox(userAndPasswordFrame, 32,
-                                 10.size,
-                                 nil, 0, COMBOBOX_INSERT_LAST)
+    10.size,
+    nil, 0, COMBOBOX_INSERT_LAST)
     @userTextField.setFrameStyle(FRAME_SUNKEN|FRAME_THICK)
     @userTextField.setLayoutHints(LAYOUT_LEFT|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
     
     # input password
     FXLabel.new(userAndPasswordFrame, "Password:")
     @passwordTextField = FXTextField.new(userAndPasswordFrame,
-                                         32, nil, 0,
-                                         TEXTFIELD_NORMAL|TEXTFIELD_PASSWD)
+    32, nil, 0,
+    TEXTFIELD_NORMAL|TEXTFIELD_PASSWD)
     @passwordTextField.setLayoutHints(LAYOUT_LEFT|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
     @passwordTextField.setText(@password) if @password
     
     # input style
     FXLabel.new(userAndPasswordFrame, "Style:")
     @styleTextField = newCombobox(userAndPasswordFrame, 32,
-                                  10,
-                                  nil, 0, COMBOBOX_INSERT_LAST)
+    10,
+    nil, 0, COMBOBOX_INSERT_LAST)
     @styleTextField.setFrameStyle(FRAME_SUNKEN|FRAME_THICK)
     @styleTextField.setLayoutHints(LAYOUT_LEFT|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
     
@@ -104,8 +112,8 @@ class GraphicliousMainWindow < Fox::FXMainWindow
     fetchFrame.setLayoutHints(LAYOUT_LEFT|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
     
     @fetchMode = newCombobox(fetchFrame, 10,
-                             Delicious2Yaml::MODES.size,
-                             nil, 0, COMBOBOX_STATIC)
+    Delicious2Yaml::MODES.size,
+    nil, 0, COMBOBOX_STATIC)
     @fetchMode.setFrameStyle(FRAME_SUNKEN|FRAME_THICK)
     modeKeys = Delicious2Yaml::MODES.keys.sort {|m1, m2| m1.to_s <=> m2.to_s}
     modeKeys.each { |m| @fetchMode.appendItem(Delicious2Yaml::MODES[m]) }
@@ -117,6 +125,7 @@ class GraphicliousMainWindow < Fox::FXMainWindow
     noPaddingForFrame(generateFrame)
     generateFrame.setLayoutHints(LAYOUT_LEFT|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
     
+    @checkDiff = newCheckBox(generateFrame, 'restrict to difference')
     @checkDelicious = newCheckBox(generateFrame, 'Link to del.icio.us')
     @checkBundles = newCheckBox(generateFrame, 'Include bundles')
     @checkGraphViews = newCheckBox(generateFrame, 'Include graph views')
@@ -129,16 +138,24 @@ class GraphicliousMainWindow < Fox::FXMainWindow
     @checkIncludePrivate.setCheck(false)
     @checkReallyIncludePrivate.setCheck(false)
     
+    @checkJs = newCheckBox(generateFrame, 'javascript')
+    @checkJs.setCheck(false)
+    @checkJs.connect(SEL_COMMAND, method(:onCheckJs))
+    
     # buttons
     buttonFrame = newFrame(FXHorizontalFrame.new(basicFrame))
     buttonFrame.setPackingHints(PACK_UNIFORM_WIDTH)
     okButton = newButton(buttonFrame, 'Ok')
     okButton.connect(SEL_COMMAND, method(:onCmdOk))
+    if @is_ftp_enabled
+      ftpButton = newButton(buttonFrame, 'Upload')
+      ftpButton.connect(SEL_COMMAND, method(:onUpload))
+    end
     cancelButton = newButton(buttonFrame, 'Cancel')
     cancelButton.connect(SEL_COMMAND, method(:onCmdQuit))
     
     @cmdOutput = FXText.new(basicFrame, nil, 0,
-                            TEXT_READONLY|TEXT_WORDWRAP|TEXT_SHOWACTIVE)
+    TEXT_READONLY|TEXT_WORDWRAP|TEXT_SHOWACTIVE)
     @cmdOutput.setLayoutHints(LAYOUT_LEFT|LAYOUT_FILL_X|LAYOUT_FILL_Y)
   end
   
@@ -150,6 +167,10 @@ class GraphicliousMainWindow < Fox::FXMainWindow
     @checkGenerate.setCheck(bool ? true : false)
   end
   
+  def setOptionCheckDiff(bool)
+    @checkDiff.setCheck(bool ? true : false)
+  end
+  
   def setOptionDelicious(bool)
     @checkDelicious.setCheck(bool ? true : false)
   end
@@ -166,6 +187,10 @@ class GraphicliousMainWindow < Fox::FXMainWindow
     @checkGraphThumbs.setCheck(bool ? true : false)
   end
   
+  def setOptionJavasript(bool)
+    @checkJs.setCheck(bool ? true : false)
+  end
+  
   def create
     resize(340, 400)
     place(PLACEMENT_SCREEN)
@@ -184,7 +209,6 @@ class GraphicliousMainWindow < Fox::FXMainWindow
       |userDir|
       File.basename(userDir)
     }
-    @userTextField
     cachedUsers.each { |m| @userTextField.appendItem(m) }
     @userTextField.setText(@user ? @user : cachedUsers.first)
   end
@@ -232,17 +256,27 @@ class GraphicliousMainWindow < Fox::FXMainWindow
       end
       if @checkGenerate.checked?
         appendText("-Start generation-\n")
-        exporter = YamlLinksToHtml.new
-        exporter.set_protocol_block(outputBlock)
-        exporter.set_working_dir(@workingDir)
-        exporter.set_user(@user)
-        exporter.set_style(@style)
-        exporter.link_to_delicious_if_possible = @checkDelicious.checked?
-        exporter.use_bundles = @checkBundles.checked?
-        exporter.build_graph_thumbs = @checkGraphThumbs.checked?
-        exporter.include_graph_views = @checkGraphViews.checked?
-        exporter.include_private = @checkIncludePrivate.checked? && @checkReallyIncludePrivate.checked?
-        exporter.run
+        if @checkJs.checked?
+          jsExporter = YamlLinksToJavascript.new
+          jsExporter.set_protocol_block(outputBlock)
+          jsExporter.set_working_dir(File.join(@workingDir, @user))
+          jsExporter.write_only_diff_tags = @checkDiff.checked?
+          jsExporter.include_private = @checkIncludePrivate.checked? && @checkReallyIncludePrivate.checked?
+          jsExporter.run
+        else
+          exporter = YamlLinksToHtml.new
+          exporter.set_protocol_block(outputBlock)
+          exporter.set_working_dir(@workingDir)
+          exporter.set_user(@user)
+          exporter.set_style(@style)
+          exporter.link_to_delicious_if_possible = @checkDelicious.checked?
+          exporter.use_bundles = @checkBundles.checked?
+          exporter.build_graph_thumbs = @checkGraphThumbs.checked?
+          exporter.include_graph_views = @checkGraphViews.checked?
+          exporter.write_only_diff_tags = @checkDiff.checked?
+          exporter.include_private = @checkIncludePrivate.checked? && @checkReallyIncludePrivate.checked?
+          exporter.run
+        end
         appendText("-Done generation-\n")
       end
       appendText("-Done-\n")
@@ -254,6 +288,26 @@ class GraphicliousMainWindow < Fox::FXMainWindow
     
   end
   
+  def onCheckJs(sender, sel, ptr)
+    dependent_checks = [
+    @checkBundles,
+    @checkDiff,
+    @checkDelicious,
+    @checkGraphThumbs,
+    @checkGraphViews]
+    if @checkJs.checked?
+      dependent_checks.each{ |c| c.disable }
+    else
+      dependent_checks.each{ |c| c.enable }
+    end
+  end
+  
+  def onUpload(sender, sel, ptr)
+    return unless @is_ftp_enabled
+    option_file = File.join(@workingDir, @user, 'ftp.yaml')
+    FtpBrowserApi.new(option_file, @checkJs.checked? ? 'js' : 'html').run(self)
+  end
+  
   def onCmdQuit(sender, sel, ptr)
     getApp.exit(0)
   end

data/lib/graphiclious/help.rb

@@ -10,6 +10,7 @@ module Graphiclious
       "--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" <<
+      "--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" <<
       "--password/-p specify password for given user\n" <<

data/lib/graphiclious/version.rb

@@ -3,6 +3,6 @@
 
 module Graphiclious
   def self.version
-    '0.1.0'
+    '0.1.1'
   end
 end

data/lib/graphiclious/yaml-links2html.rb

@@ -8,11 +8,10 @@ require 'graphiclious/url_graph'
 
 class YamlLinksToHtml
   DEL_ICIO_US_URL = "http://del.icio.us"
-  STYLES_FOLDER = File.join(GRAPHICLIOUS_PATH, "styles")
   MAX_STYLES_IN_CLOUD = 10
   CLOUD_STYLES = (1..MAX_STYLES_IN_CLOUD).collect{ |size| 'cloud-' + size.to_s }
   
-  attr_accessor(:link_to_delicious_if_possible, :use_bundles, :include_graph_views, :build_graph_thumbs, :include_private) 
+  attr_accessor(:write_only_diff_tags, :link_to_delicious_if_possible, :use_bundles, :include_graph_views, :build_graph_thumbs, :include_private) 
   
   # Lazy require things which some users won't use
   def check_prerequisites
@@ -45,6 +44,7 @@ class YamlLinksToHtml
   def set_user(user)
     @user = user
     @input_file = File.join(@working_dir, @user, 'delicious.yaml')
+    @diff_file = File.join(@working_dir, @user, 'delicious.diff.yaml')
     @html_output_path = File.join(@working_dir, @user, 'html')
     @bundles_file = File.join(@working_dir, @user, 'bundles.yaml')
   end
@@ -56,6 +56,8 @@ class YamlLinksToHtml
   
   def initialize
     @include_private = false
+    @write_only_diff_tags = true
+    @diff_tags = Set.new
     @working_dir = Dir.getwd
     set_style(YamlLinksToHtml.guess_styles[0])
     set_user(YamlLinksToHtml.guess_users_within(@working_dir)[0])
@@ -98,7 +100,7 @@ class YamlLinksToHtml
   end
   
   def downscale(val)
-   (2 * Math.log(val)).round
+    (2 * Math.log(val)).round
   end
   
   def get_cloud_style(val, maxval)
@@ -232,6 +234,14 @@ class YamlLinksToHtml
   end
   
   def load_links
+    if(@write_only_diff_tags)
+      @diff_tags = Set.new
+      diff = File.open(@diff_file, 'r') { |io| YAML.load(io) }
+      diff.keys.each { |k|
+        diff[k]['tags'].each {|t| @diff_tags.add(t) }
+      }
+    end
+    
     # load yaml-file containing links as a hash
     cache = File.open(@input_file, 'r') { |io|
       YAML.load(io)
@@ -244,9 +254,10 @@ class YamlLinksToHtml
     @links_by_edge = Hash.new
     links.each do
       |link|
-      tagsOfLink = link['tags']
+      tagsOfLink = link['tags'].reject { |t| t =~ /^for:/ }
+      link['tags'] = tagsOfLink
       n = tagsOfLink.size - 1
-       (0..n).each do
+      (0..n).each do
         |i|
         tag = tagsOfLink[i]
         unless @links_by_tag.has_key?(tag)
@@ -254,7 +265,7 @@ class YamlLinksToHtml
           @tag_graph.add_vertex(tag)
         end
         @links_by_tag[tag].push(link)
-         (i+1..n).each do
+        (i+1..n).each do
           |j|
           otherTag = tagsOfLink[j]
           # write_line_on_protokol "\t#{tag}<->#{otherTag}"
@@ -370,41 +381,43 @@ class YamlLinksToHtml
   def write_single_tag_files
     @links_by_tag.keys.sort.each do
       |tag|
-      File.open(File.join(@html_output_path, UrlGraph.node_url(tag)), 'w') do
-        |fp|
-        write_html_head_on(fp)
-        fp.puts "<h1>Tag: #{tag}</h1>"
-        link_index_on(fp, 'none', @bundles)
-        fp.puts '<div class="main">'
-        fp.puts "<h3>Subcategories for tag #{tag}</h3>"
-        subcloud = @tag_graph.adjacent_vertices(tag).sort
-        max_num_links = subcloud.collect{ |n| @links_by_edge[UrlGraph.edge_name(tag, n)].size }.max
-        subcloud.each do
-          |neighbor|
-          edge_name = UrlGraph.edge_name(tag, neighbor)
-          edgePage = UrlGraph.edge_url(tag, neighbor)
-          style = get_cloud_style(@links_by_edge[edge_name].size, max_num_links)
-          fp.puts(UrlGraph.intern_ankor(UrlGraph.edge_url(tag, neighbor), neighbor, style))
-        end
-        list = @links_by_tag[tag].select { |l| l['tags'].size == 1 }
-        unless list.empty?
-          fp.puts("<h3>Links with the single tag #{tag}</h3>")
-          fp.puts('<ul>')
-          sorted_links(list).each do
-            |link|
-            fp.puts('<li>')
-            write_link_on(link, fp, [tag])
-            fp.puts('</li>')
+      if !@write_only_diff_tags or @diff_tags.include?(tag)
+        File.open(File.join(@html_output_path, UrlGraph.node_url(tag)), 'w') do
+          |fp|
+          write_html_head_on(fp)
+          fp.puts "<h1>Tag: #{tag}</h1>"
+          link_index_on(fp, 'none', @bundles)
+          fp.puts '<div class="main">'
+          fp.puts "<h3>Subcategories for tag #{tag}</h3>"
+          subcloud = @tag_graph.adjacent_vertices(tag).sort
+          max_num_links = subcloud.collect{ |n| @links_by_edge[UrlGraph.edge_name(tag, n)].size }.max
+          subcloud.each do
+            |neighbor|
+            edge_name = UrlGraph.edge_name(tag, neighbor)
+            edgePage = UrlGraph.edge_url(tag, neighbor)
+            style = get_cloud_style(@links_by_edge[edge_name].size, max_num_links)
+            fp.puts(UrlGraph.intern_ankor(UrlGraph.edge_url(tag, neighbor), neighbor, style))
           end
-          fp.puts('</ul>')
-        end
-        if @link_to_delicious_if_possible
-          fp.puts("<h3>#{UrlGraph.ankor(DEL_ICIO_US_URL, 'del.icio.us')} links with tag #{tag}</h3>")
-          fp.puts(UrlGraph.ankor(delicious_user_url(tag), "#{@user}"))
-          fp.puts(UrlGraph.ankor(delicious_tag_url(tag), "all"))
+          list = @links_by_tag[tag].select { |l| l['tags'].size == 1 }
+          unless list.empty?
+            fp.puts("<h3>Links with the single tag #{tag}</h3>")
+            fp.puts('<ul>')
+            sorted_links(list).each do
+              |link|
+              fp.puts('<li>')
+              write_link_on(link, fp, [tag])
+              fp.puts('</li>')
+            end
+            fp.puts('</ul>')
+          end
+          if @link_to_delicious_if_possible
+            fp.puts("<h3>#{UrlGraph.ankor(DEL_ICIO_US_URL, 'del.icio.us')} links with tag #{tag}</h3>")
+            fp.puts(UrlGraph.ankor(delicious_user_url(tag), "#{@user}"))
+            fp.puts(UrlGraph.ankor(delicious_tag_url(tag), "all"))
+          end
+          fp.puts '</div>'
+          write_html_tail_on(fp)
         end
-        fp.puts '</div>'
-        write_html_tail_on(fp)
       end
     end
     write_line_on_protokol "Wrote one html-file for each tag to directory #{@html_output_path}."
@@ -414,32 +427,34 @@ class YamlLinksToHtml
     # Create one Html-File for each edge between two tags
     @tag_graph.each_edge do
       |tag1,tag2|
-      edge_name = UrlGraph.edge_name(tag1, tag2)
-      edge_url = UrlGraph.edge_url(tag1, tag2)
-      File.open(File.join(@html_output_path, edge_url), 'w') do
-        |fp|
-        write_html_head_on(fp)
-        fp.puts "<h1>Tags: #{tag1} AND #{tag2}</h1>"
-        link_index_on(fp, 'none', @bundles)
-        fp.puts '<div class="main">'
-        ankor1 = UrlGraph.node_ankor(tag1)
-        ankor2 = UrlGraph.node_ankor(tag2)
-        fp.puts "<h3>Links for tag combination #{ankor1}/#{ankor2}</h3>"
-        fp.puts '<ul>'
-        sorted_links(@links_by_edge[edge_name]).each do
-          |link|
-          fp.puts('<li>')
-          write_link_on(link, fp, [tag1, tag2])
-          fp.puts('<br></li>')
-        end
-        fp.puts '</ul>'
-        if @link_to_delicious_if_possible
-          fp.puts("<h3>#{UrlGraph.ankor(DEL_ICIO_US_URL, 'del.icio.us')} links with tag combination #{ankor1}/#{ankor2}</h3>")
-          fp.puts(UrlGraph.ankor(delicious_user_url(tag1, tag2), @user))
-          fp.puts(UrlGraph.ankor(delicious_tag_url(tag1, tag2), 'all'))
+      if !@write_only_diff_tags or (@diff_tags.include?(tag1) and @diff_tags.include?(tag2))
+        edge_name = UrlGraph.edge_name(tag1, tag2)
+        edge_url = UrlGraph.edge_url(tag1, tag2)
+        File.open(File.join(@html_output_path, edge_url), 'w') do
+          |fp|
+          write_html_head_on(fp)
+          fp.puts "<h1>Tags: #{tag1} AND #{tag2}</h1>"
+          link_index_on(fp, 'none', @bundles)
+          fp.puts '<div class="main">'
+          ankor1 = UrlGraph.node_ankor(tag1)
+          ankor2 = UrlGraph.node_ankor(tag2)
+          fp.puts "<h3>Links for tag combination #{ankor1}/#{ankor2}</h3>"
+          fp.puts '<ul>'
+          sorted_links(@links_by_edge[edge_name]).each do
+            |link|
+            fp.puts('<li>')
+            write_link_on(link, fp, [tag1, tag2])
+            fp.puts('<br></li>')
+          end
+          fp.puts '</ul>'
+          if @link_to_delicious_if_possible
+            fp.puts("<h3>#{UrlGraph.ankor(DEL_ICIO_US_URL, 'del.icio.us')} links with tag combination #{ankor1}/#{ankor2}</h3>")
+            fp.puts(UrlGraph.ankor(delicious_user_url(tag1, tag2), @user))
+            fp.puts(UrlGraph.ankor(delicious_tag_url(tag1, tag2), 'all'))
+          end
+          fp.puts '</div>'
+          write_html_tail_on(fp)
         end
-        fp.puts '</div>'
-        write_html_tail_on(fp)
       end
     end
     write_line_on_protokol "Wrote one html-file for each combination of two tags to directory #{@html_output_path}."