xiki 0.5.1a → 0.5.3a

data/etc/themes/Dark_Metal.notes

@@ -14,12 +14,6 @@ Styles.mode_line_inactive(
   :bold=>false,
   :fg=>'000'
   )
-Styles.mode_line_dir(
-  :fg=>"777",
-  :size=>"0",
-  :face=>"arial",
-  :bold=>false
-  )
 Styles.mode_line_file(
   :fg=>"fff",
   :size=>"0",

data/etc/themes/Default.notes

@@ -0,0 +1,24 @@
+Themes.use "Black BG"
+Themes.use "Shiny Blue"
+Themes.use "Path Mode Line"
+
+$el.el4r_lisp_eval %`
+  (progn
+    (tool-bar-mode -1)   ; Turn off the toolbar
+
+    (custom-set-variables
+      '(tabbar-mode nil)   ; No tabs
+      '(cua-rectangle-mark-key (kbd "<C-S-return>"))   ; No tabs
+      ;;   '(tabbar-mode t)   ; No tabs
+      ;;   '(show-paren-mode nil)
+      )
+
+    (set-face-attribute 'region nil :background "#333333" :foreground "#ffffff") ;; More mac-like selection color
+
+    (setq-default
+     frame-title-format
+     '("%b"))
+
+    (setq frame-title-format '("%b" ))
+  )
+  `

data/etc/themes/Fall_Fonts.notes

@@ -0,0 +1,6 @@
+Styles.define :font_lock_comment_face, :fg=>'65614E'   # gray
+Styles.define :font_lock_function_name_face, :fg=>'f32'   # red
+Styles.define :font_lock_type_face, :fg=>'c21'   # red
+Styles.define :font_lock_variable_name_face, :fg=>'fd0'   # yellow
+Styles.define :font_lock_string_face, :fg=>'E6DB74'   # red
+Styles.define :font_lock_keyword_face, :fg=>'A5A18E'

data/etc/themes/Light_Gray_BG_Theme.notes

@@ -0,0 +1,6 @@
+Styles.define :default, :bg=>'ddd', :fg=>'333'
+Styles.define :fringe, :bg=>'ddd', :fg=>'ddd'
+
+# Adjust light colors
+Styles.define :font_lock_variable_name_face, :fg=>'c90'   # yellow
+Styles.define :font_lock_comment_face, :fg=>'aaa'   # gray

data/etc/themes/Orange_Path.notes

@@ -1,4 +1,4 @@
-if Styles.inverse   # Black bg
+if Styles.dark_bg?   # Black bg
 
   Styles.mode_line :bg=>'333', :border=>['666', -1], :face=>'Lucida Grande', :size=>'3', :bold=>false, :fg=>'fff'
   Styles.mode_line_inactive :bg=>'666', :border=>['888', -1], :face=>'Lucida Grande', :size=>'3', :bold=>false, :fg=>'fff'

data/etc/themes/Pastel_Fonts.notes

@@ -0,0 +1,6 @@
+Styles.define :font_lock_comment_face, :fg=>'555'   # gray
+Styles.define :font_lock_function_name_face, :fg=>'f95'   # orange
+Styles.define :font_lock_type_face, :fg=>'6c7'   # green
+Styles.define :font_lock_variable_name_face, :fg=>'ff6'   # yellow
+Styles.define :font_lock_string_face, :fg=>'e76'   # red
+Styles.define :font_lock_keyword_face, :fg=>'999'

data/etc/themes/Path_Mode_Line.notes

@@ -0,0 +1,36 @@
+$el.el4r_lisp_eval %`
+  (progn
+
+    (setq-default xiki-status3 nil) (setq-default xiki-status2 nil) (setq-default xiki-status1 nil)
+    (setq-default mode-line-format
+      (quote
+       (
+
+        " "   ; Apparently required
+
+       (:eval
+          (cond
+            ((buffer-modified-p)
+             (propertize "* " 'face 'mode-line-file))
+            (t " ")))
+
+        mode-line-frame-identification
+        "    "
+        "   "
+
+        (:eval (replace-regexp-in-string "^/projects/memorize/memorize.merb/" "$m/" default-directory)
+                             )
+        (:propertize "%b" face mode-line-file)
+
+        ":%l"   ;; Line number
+        "               "
+
+        ;; status1, status2, etc. (in mode line)
+        (:propertize xiki-status1 face quote-heading-small)
+        (:propertize xiki-status2 face quote-heading-small)
+        (:propertize xiki-status3 face dotsies-white)
+        )))
+  )
+  `
+
+

data/etc/themes/Rainbow_Fonts.notes

@@ -0,0 +1,20 @@
+if Styles.dark_bg?
+
+  Styles.define :font_lock_comment_face, :fg=>'555'   # gray
+  Styles.define :font_lock_function_name_face, :fg=>'f50'   # orange
+  Styles.define :font_lock_type_face, :fg=>'0a1'   # green
+  Styles.define :font_lock_variable_name_face, :fg=>'fd0'   # yellow
+  Styles.define :font_lock_string_face, :fg=>'e10'   # red
+  Styles.define :font_lock_keyword_face, :fg=>'999'
+
+else
+
+  Styles.define :font_lock_comment_face, :fg=>'aaa'   # gray
+  Styles.define :font_lock_function_name_face, :fg=>'f50'   # orange
+  Styles.define :font_lock_type_face, :fg=>'090', :bold=>nil   # green
+  Styles.define :font_lock_variable_name_face, :fg=>'00c', :bold=>1   # yellow
+  Styles.define :font_lock_string_face, :fg=>'e10', :bold=>nil   # red
+  Styles.define :font_lock_keyword_face, :fg=>'888', :bold=>1   # blue
+
+end
+

data/etc/themes/Shiny_Blue.notes

@@ -1,27 +1,23 @@
 Styles.mode_line(
-  :bg=>'5483bf',
-  :border=>['6593b3', -5, 'released-button'],
-  :face=>'Lucida Grande',
-  :size=>'3',
-  :bold=>false,
-  :fg=>'fff'
+  :bg=>'6483af',
+  :border=>['6483af', 3],
+  :face=>"arial",
+  :bold=>true,
+  :size=>'1',
+  :fg=>'001122'
   )
+
 Styles.mode_line_inactive(
-  :bg=>'bbb',
-  :border=>['bbbbbb', -1],
-  :face=>'Lucida Grande',
-  :bold=>false,
-  :fg=>'000'
-  )
-Styles.mode_line_dir(
-  :fg=>"222222",
-  :size=>"0",
+  :bg=>'bbbbbb',
+  :border=>['bbbbbb', 3],
   :face=>"arial",
-  :bold=>false
+  :bold=>true,
+  :size=>'1',
+  :fg=>'555555'
   )
+
 Styles.mode_line_file(
   :fg=>"fff",
-  :size=>"0",
   :face=>"arial",
-  :bold=>false
+  :bold=>true
   )

data/etc/themes/Shiny_Green.notes

@@ -13,12 +13,6 @@ Styles.mode_line_inactive(
   :bold=>false,
   :fg=>'000'
   )
-Styles.mode_line_dir(
-  :fg=>"222222",
-  :size=>"0",
-  :face=>"arial",
-  :bold=>false
-  )
 Styles.mode_line_file(
   :fg=>"fff",
   :size=>"0",

data/etc/themes/White_BG.notes

@@ -0,0 +1,5 @@
+$el.set_face_background :trailing_whitespace, "#aaaaaa"
+
+Styles.define :default, :bg=>'f8f8f8', :fg=>'000'
+Styles.define :fringe, :bg=>'f8f8f8', :fg=>'f8f8f8'
+

data/etc/vim/vim_status.notes

@@ -0,0 +1,32 @@
+> Try it out
+- 1) Add this line, and then restart vim
+  ~/.vimrc
+    | let $XIKI_DIR = "[xiki dir]"
+    | source [xiki dir]/etc/vim/xiki.vim
+
+- 2) Type "ip" on a blank line and double-click on it
+
+
+> If your vim version doesn't have ruby enabled
+The standard macvim download has the ruby.  Compile vim with the --enable-rubyinterp flag installed.
+
+
+> What's implemented
+Just double-clicking on one line and shelling out to 'xiki'
+and inserting the results
+
+
+> What needs to be implemented
+- Making this work for nested paths, like:
+docs/
+  - faq/
+- It needs to climb the path and pass it in to the command
+- Making it collapse when the line underneath it is indented lower
+- Making it incrementally search after commands are inserted
+  - is there a command in vim to read 1 char from the user?
+
+
+> Help out
+Join the xiki google group if you want to help implement this.
+
+If you're in the bay area, hit me up and we can meet at a coffee shop and pair on wraping it up!

data/etc/vim/xiki.vim

@@ -0,0 +1,16 @@
+function! XikiLaunch()
+  ruby << EOF
+    xiki_dir = ENV['XIKI_DIR']
+    ['ol', 'vim/line', 'vim/tree'].each {|o| require "#{xiki_dir}/lib/xiki/#{o}"}
+    line = Line.value
+    indent = line[/^ +/]
+    command = "xiki #{line}"
+    result = `#{command}`
+    Tree << result
+EOF
+endfunction
+
+nmap <silent> <2-LeftMouse> :call XikiLaunch()<CR>
+imap <silent> <2-LeftMouse> <C-c>:call XikiLaunch()<CR>i
+imap <silent> <C-CR> <C-c>:call XikiLaunch()<CR>i
+nmap <silent> <C-CR> :call XikiLaunch()<CR>

data/etc/wrappers/wrapper.rb

@@ -1,8 +1,8 @@
 # Gets shelled out to by xiki to delegate call to a no-dependency .rb file.
 # Just gets the args passed in and requires and invokes.
 
-# TODO Don't hard-code path
-require "/projects/xiki/lib/ol.rb"
+# TODO Don't hard-code path - use __FILE__?
+# require "/projects/xiki/lib/xiki/ol.rb"
 
 file = ARGV.shift
 path = ARGV.shift

data/etc/www/index.rb

@@ -2,7 +2,7 @@
 
 print "Content-type: text/html\n\n";
 
-require "/projects/xiki/lib/ol.rb"
+require "../../lib/xiki/ol.rb"
 require "web_server"
 require "cgi"
 WebServer.index

data/etc/www/public/error.html

@@ -0,0 +1,47 @@
+<style>
+  a {
+    text-decoration: none;
+  }
+
+  body {
+    font-family: arial;
+    margin: 50px;
+    font-size: 15px;
+    color: #666;
+    line-height: 21px;
+    background-color: #f8f8f8;
+  }
+  p {
+    margin: 0;
+  }
+  .blank {
+    line-height: 12px;
+  }
+  h1 {
+    color: #000;
+    font-family: arial;
+    font-size: 16px;
+    font-weight: bold;
+    margin: 11px 0 7px;
+  }
+  .info {
+    margin: 0 0 6px;
+  }
+  pre {
+    font-weight: bold;
+  }
+</style>
+
+<div class='content'>
+  <h1>Start the Xiki sinatra server!</h1>
+
+  <p class='info'>
+    Use the <b>web interface</b> Xiki menu to start it (or install it if necessary).
+  </p>
+  <p class='blank'>&nbsp;</p>
+  <p class='info'>
+    (Type <b>web interface</b> on a blank line in your Xiki-enabled
+    editor, and double-click on it.)
+  </p>
+
+</div>

data/etc/www/sinatra_server.rb

@@ -0,0 +1,353 @@
+require 'sinatra'
+require "/projects/xiki/lib/xiki/ol.rb"
+
+set :port, 8161
+set :bind, '127.0.0.1'
+
+# TODO: Enable basic auth for security
+  # Add menu to let users create a password
+# use Rack::Auth::Basic, "Nope" do |u, p|
+#   u == 'foo' && p == 'bar'
+# end
+
+get %r{/(.*)} do |path|
+  index path
+end
+
+def htmlify txt, options={}
+
+  return txt if request.env['HTTP_ACCEPT'] !~ /\Atext\/html/   # Only process if request wants html
+
+  # If starts with <foo or @bootstrap, just render it as html or bootstrap...
+
+  if txt =~ /\A<\w/
+    return txt
+  elsif txt =~ /\A@bootstrap\/\n  /
+
+    xiki_dir = File.expand_path "#{File.dirname(__FILE__)}/../.."
+
+    $:.unshift "#{xiki_dir}/lib"
+    ["xiki/ol", "xiki/core_ext", "xiki/line", "xiki/tree", "../../menus/bootstrap"].each{|o| require o}
+
+    txt.slice! /.+\n/
+    txt = txt.unindent
+
+    txt = Bootstrap.process txt
+
+    return txt
+  end
+
+  # Turn menu text into html...
+
+  # TODO: should probably maintain indenting?
+  txt.gsub! /^ *\| ?/, ''
+
+  txt.gsub! /^( *)[+-]+ /, "\\1"   # Get rid of bullets
+  txt.gsub! /> (.+)/, "<h1>\\1</h1>"
+
+  # Use relative links if path ends in slash, otherwise use absolute
+  path = request.env['REQUEST_PATH']
+
+  path = "#{path}/" if path !~ /\/$/
+
+  # Make path be "/foo/bar/", if no slash ("/foo/bar")
+
+  txt.gsub!(/^( *)(.+?)(\/?)$/){
+    all = $&
+    indent, item, slash = $1, $2, $3
+    next all if all =~ /<h/ || all !~ /\/$/
+    my_path = path
+    my_path = "/" if item.slice!(/^<< /)
+    my_path = "/" if item.slice!(/^@ ?/)
+    "#{indent}<a href=\"#{my_path}#{item}\">#{item.gsub '_', ' '}</a>"
+  } # no slash
+
+  txt.gsub!(/^ +/){"&nbsp; " * $&.length}   # Get rid of bullets
+
+  txt.gsub!(/.+/){
+    all = $&
+    next all if all =~ /<h/
+    next "<p class='info'>#{all}</p>" if all !~ /^<a/   # Don't end in "/" - just informational
+    all
+  }
+  txt.gsub! /^$/, "<p class='blank'>&nbsp;</p>"
+  output = ""
+  output <<  %`
+  <style>
+    a {
+      text-decoration: none;
+    }
+
+    .content a.selected {
+      background: -moz-linear-gradient(center top, #58b, #7ad) repeat scroll 0 0 transparent;
+    }
+    .content a {
+      color: #666;
+      display: block;
+
+      border-radius: 2px;
+      border: solid 1px;
+      border-color: #eee #ddd #bbb #ddd;
+      background: -moz-linear-gradient(center top, #fff, #f1f1f1) repeat scroll 0 0 transparent;
+      background: -webkit-gradient(linear,center bottom,center top,from(#f1f1f1),to(#fff));
+      display: block;
+      padding: 10px 16px;
+      text-shadow: 0 1px 0 #fff;
+      font-weight: bold;
+    }
+    a:hover {
+      background: -moz-linear-gradient(center top, #f8f8f8, #e1e1e1) repeat scroll 0 0 transparent;
+      background: -webkit-gradient(linear,center bottom,center top,from(#e1e1e1),to(#f8f8f8));
+    }
+    body {
+      font-family: arial;
+      margin: 50px;
+      font-size: 15px;
+      color: #666;
+      line-height: 21px;
+      background-color: #f8f8f8;
+    }
+    p {
+      margin: 0;
+    }
+    .blank {
+      line-height: 12px;
+    }
+    h1 {
+      color: #000;
+      font-family: arial;
+      font-size: 16px;
+      font-weight: bold;
+      margin: 11px 0 7px;
+    }
+    .save {
+      margin: 0 20px 10px 20px;
+      font-size: 15px;
+    }
+    form {
+      margin: 0;
+    }
+    textarea {
+      border: solid #ccc 1px;
+      margin: 2px 20px 13px 20px;
+      padding: 7px;
+      width: 80%;
+      font-size: 15px;
+      color: #555;
+      height: 150px;
+      line-height: 20px;
+    }
+    .toggle {
+      font-size: 13px;
+      margin: 15px 20px 0px 20px;
+      font-weight: bold;
+    }
+    .toggle a {
+      color: #aaa;
+    }
+    .info {
+      margin: 0 0 6px;
+    }
+    pre {
+      font-weight: bold;
+    }
+
+  </style>
+  `
+
+  output <<  %`<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.5/jquery.min.js"></script>`
+
+  if ! options[:no_keys]
+    output <<  %`
+    <script>
+      filter_pattern = "";
+      started_searching = false;
+      $(function(){
+
+        $(window).focus(function () {
+          filter_pattern = "";
+          started_searching = false;
+
+          $('body').css("opacity", 1.0);
+          $('p, h1, a').show();
+          $('a').removeClass("selected");
+        });
+
+        $('body').keypress(function(e){
+          if(e.ctrlKey || e.altKey || e.metaKey) return;
+          var char = e.which;
+          var letter = String.fromCharCode(char).toLowerCase();
+          //console.log(char)
+          if(char == 13){
+            $("a:visible:eq(0)").click();
+            e.stopPropagation();
+            return false;
+          }
+
+          if(letter == " "){
+            if(started_searching) filter_pattern = "";
+            else window.location = "/";
+            e.stopPropagation();
+            return false;
+          }
+
+          if(! letter.match(/[0-9a-z]/)) return true;
+
+          started_searching = true;
+          filter_pattern += letter;
+
+          //console.log(filter_pattern);
+
+          // If more than 100, don't use fade
+          var count = $('p, h1, a').filter(':visible').length;
+          var fade = count < 50;
+
+          $('p, h1, a').each(function(i, e){
+            e = $(e);
+            if(e.is(":hidden")) return;
+            var html = e.html().replace(/<.+?>/g, '');
+            //console.log(html);
+            if(html.toLowerCase().indexOf(filter_pattern) == -1)
+              fade ? e.slideUp(400) : e.hide();
+            // Get content
+              // Remove tags
+                // Hide if remaining doesn't match regex (/on/)
+          })
+
+        });
+
+        $('a').click(function(e){
+          var target = $(e.target);
+          target.toggleClass("selected");
+
+          $('body').animate({opacity: 0.0}, {easing: 'swing', duration: 150});
+          window.setTimeout(function(){ window.location = target.attr('href'); }, 150);
+          return false;
+        });
+
+      })
+    </script>
+    `
+  end
+
+  "#{output}<div class='content'>#{txt}</div>"
+
+end
+
+
+def usage
+  htmlify "
+    > Summary
+    This url displays xiki menus, which come from simple files found in ~/menus/.
+
+    > Show all menus
+    all/
+
+    > Examples
+    ip/
+    animals/
+    sharks/
+    tables/
+
+    > Create menu
+    Just go to the url of a menu that doesn't exist yet:
+    unicorn/
+
+    > Docs
+    docs/
+    ".sub("\n", '').gsub(/^    /, '')
+end
+
+
+def index menu
+  no_keys = false
+
+  if ENV['REQUEST_METHOD'] == "POST"
+    cgi = CGI.new
+    post_txt = cgi['txt']
+
+    # Temporary hack
+    File.open("/tmp/post_tmp", "w") { |f| f << post_txt }
+
+    # What's a better way to do this?
+    # Pass in pipe, and send to shell command via STDIN
+
+  end
+
+  #     menu = ENV['QUERY_STRING']
+
+  return usage if menu == ""
+
+  # Run command...
+
+  #     command = "/usr/local/bin/xiki #{menu}"
+  command = "xiki #{menu}"
+  txt = `#{command}`
+
+  #   rescue e=>Exception
+  #     puts "<pre>#{e.message}\n#{e.backtrace}</pre>"
+  #     Ol << "e: #{e.message}"
+  #     Ol << "e: #{e.backtrace}"
+  #     Ol << "If we get the permission problem, provide .notes file that will run command to run xiki command once (message explaining it first)!"
+  #   end
+
+  # TODO: return different string when the service is down
+
+  # Ol << "Extract to new method: suggest_creating!!"
+  if txt.empty?
+    menu = menu.sub /\/$/, ''
+
+    no_keys = true
+
+    if menu =~ /\/./   # If slash that's not at end
+      puts "<pre>Nothing returned.  Maybe service is down, or maybe menu\njust returned nothing, run xiki command\n\n  $ xiki\n"
+    else
+      puts %`
+        <h1>Menu '#{menu}' doesn't exist yet.  Create it?</h1>
+
+        <form action="/create/#{menu}" method="post" id="as_menu">
+        <div class='toggle'>
+          <span>as text</span>
+          | <a href="#" onclick="$('#as_class, #as_menu').toggle(); return false;">as class</a>
+        </div>
+        <textarea name="txt">
+        - Sample item/
+          - Another sample item/
+        - Yet another/
+        </textarea>
+        <br>
+        <input type="submit" value="save" class="save">
+        </form>
+
+        <form action="/create/#{menu}" method="post" id="as_class" style="display:none;">
+        <div class='toggle'>
+          <a href="#" onclick="$('#as_class, #as_menu').toggle(); return false;">as text</a>
+          | <span>as class</span>
+        </div>
+        <textarea name="txt">
+        class #{camel_case menu}
+          def self.menu *args
+            "Menu was called, with params \#{args.inspect}"
+          end
+        end
+        </textarea>
+        <br>
+        <input type="submit" value="save" class="save">
+        </form>
+
+        `.gsub(/^        /, '')
+    end
+  end
+
+  # Html-ify and print output...
+
+  htmlify txt, :no_keys=>no_keys
+
+rescue Exception=>e
+  "<pre>#{e.message}\n#{e.backtrace}</pre>"
+end
+
+def camel_case txt
+  return txt if txt !~ /_/ && txt =~ /[A-Z]+.*/
+  txt.split('_').map{|e| e.capitalize}.join
+end