xiki 0.5.0a → 0.5.1a

data/Gemfile

@@ -9,3 +9,5 @@ gem 'net-ssh'
 gem 'net-ssh'
 gem 'rspec'
 gem 'memcached'
+gem 'el4r'
+

data/README.markdown

@@ -1,8 +1,29 @@
-## Summary
+# Summary
 This file tells how to install Xiki.  See http://xiki.org for a description of Xiki.
 
+Either install as a gem, or install from github.
 
-__UPDATE DIRECTIONS TO SAY GEM INSTALL BY DEFAULT__
+# Install Xiki
+
+## As a gem
+
+      $ gem install xiki
+
+## From github
+
+      $ git clone git@github.com:trogdoro/xiki.git
+      $ cd xiki
+      $ bundle install --system
+      $ cp <xiki dir>/etc/command/xiki_wrapper /usr/local/bin/xiki
+      $ chmod 755 /usr/local/bin/xiki
+
+# Verify the 'xiki' command works
+
+      $ xiki
+
+# Configure Emacs to use Xiki
+
+If you're going to use Xiki with Emacs, do these steps:
 
 ## Step 1: Download Emacs
 
@@ -18,9 +39,8 @@ __UPDATE DIRECTIONS TO SAY GEM INSTALL BY DEFAULT__
       $ sudo apt-get install emacs
 
 
-## Step 2: Install the EmacsRuby (el4r) gem
+## Step 2: Do extra EmacsRuby (el4r) steps
 
-      $ sudo gem install el4r
       $ gem contents el4r | grep setup.rb   # To see which dir to cd to in the next step
       $ cd /Library/Ruby/Gems/1.8/gems/el4r-1.0.4/
       $ ruby setup.rb
@@ -28,27 +48,16 @@ __UPDATE DIRECTIONS TO SAY GEM INSTALL BY DEFAULT__
       $ ruby -S el4r-rctool -p
       $ sudo ruby -S el4r-rctool -i
 
-## Step 3: Get Xiki from github
-- Option 1: Download as zip
-  - Click on the 'ZIP' button on http://github.com/trogdoro/xiki
-- Option 2: Clone repo
-  - git clone git@github.com:trogdoro/xiki.git
-
-
-## Step 4: Require Xiki in EmacsRuby's config
-- Sample configuration
-  - ~/.el4r/init.rb
-    | $LOAD_PATH.unshift "/projects/xiki/lib"
-    | require 'xiki'
-    | Xiki.init
-    |
-    | KeyBindings.keys   # Use default key bindings
-    | Styles.use_xiki_color_scheme   # Use xiki's color scheme
+## Step 3: Require Xiki in EmacsRuby's config
+Sample configuration:
 
+      ~/.el4r/init.rb:
+        $LOAD_PATH.unshift "/projects/xiki/lib"
+        require 'xiki'
+        Xiki.init
 
-## Step 5: Install dependant packages
-- In the xiki dir, run:
-$ bundle install --system
+        KeyBindings.keys   # Use default key bindings
+        Styles.use_xiki_color_scheme   # Use xiki's color scheme
 
 
 ## Trouble-shooting

data/etc/command/xiki_command.rb

@@ -84,11 +84,7 @@ class XikiCommand
 
         @@initial_request = path
         xiki_process = "#{xiki_root}/etc/command/xiki_process.rb"
-        Daemons.run xiki_process, :ARGV=>['start'], :monitor=>false, :multiple=>false #, :app_name=>'xiki'
-        #         Daemons.run '../etc/command/xiki_process.rb', :ARGV=>['start'], :monitor=>false, :multiple=>false #, :app_name=>'xiki'
-        #         Daemons.run 'etc/process/xiki_process.rb', :ARGV=>['start'], :monitor=>false, :multiple=>false #, :app_name=>'xiki'
-        #         Daemons.run '../etc/process/xiki_process.rb', :ARGV=>['start'], :monitor=>false, :multiple=>false #, :app_name=>'xiki'
-        #         Daemons.run 'xiki_daemon.rb', :ARGV=>['start'], :monitor=>false, :multiple=>false #, :app_name=>'xiki'
+        Daemons.run xiki_process, :ARGV=>['start'], :monitor=>false, :multiple=>false, :dir_mode=>:normal, :dir=>"/tmp/", :log_dir=>"/tmp/", :log_output=>true
 
         # Aparently this line never gets reached
         "- Started the process, I think."
@@ -99,8 +95,6 @@ class XikiCommand
 
       rescue Exception=>e
         puts "- service couldn't start!"
-
-        #rescue ... <Errno::EACCES: Permission denied - /projects/xiki/etc/command/xiki_process.rb.pid>!
       end
     end
 
@@ -177,7 +171,7 @@ class XikiCommand
     require 'daemons'
     xiki_root = File.expand_path "#{File.dirname(__FILE__)}/../.."
     xiki_process = "#{xiki_root}/etc/command/xiki_process.rb"
-    Daemons.run(xiki_process, :ARGV=>[action])
+    Daemons.run xiki_process, :ARGV=>[action], :dir_mode=>:normal, :dir=>"/tmp/", :log_dir=>"/tmp/", :log_output=>true
     ""
   end
 

data/etc/www/index.rb

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+print "Content-type: text/html\n\n";
+
+require "/projects/xiki/lib/ol.rb"
+require "web_server"
+require "cgi"
+WebServer.index

data/etc/www/web_server.rb

@@ -0,0 +1,353 @@
+class WebServer
+
+  def self.htmlify txt, options={}
+
+    return txt if 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"
+      ["lib/core_ext", "lib/line", "lib/tree", "menus/bootstrap"].each{|o| require "#{xiki_dir}/#{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>"
+
+    path = ENV['REQUEST_URI']# =~ /\/$/ ? "" : "#{ENV['REQUEST_URI']}/"   # Use relative links if path ends in slash, otherwise use absolute
+    path = "#{path}/" if path !~ /\/$/
+
+    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>"
+
+    print %`
+    <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;
+      }
+      /* Or type some css here (to run in the browser) */
+      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>
+    `
+
+    puts %`<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.5/jquery.min.js"></script>`
+
+    if ! options[:no_keys]
+      print %`
+      <script>
+        filter_pattern = "";
+        started_searching = false;
+        $(function(){
+
+          $(window).focus(function () {
+            filter_pattern = "";
+
+            $('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
+
+    "<div class='content'>#{txt}</div>"
+  end
+
+
+  def self.usage
+    txt = "
+      > 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(/^      /, '')
+
+    print WebServer.htmlify txt
+
+  end
+
+  def self.index
+
+    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 self.usage if menu == ""
+
+    # Run command...
+
+    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 #{self.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
+
+    # Show this again when I figure out how to recognize server being down!
+
+    #     if txt.empty?
+    #       puts "<pre>Command received no output.  Possibly the xiki process
+    #         isn't running. Run the 'xiki' command in a shell:
+
+    #           $ xiki
+
+    #         </pre>".gsub(/^        /, '')
+    #     end
+
+    # Html-ify and print output...
+
+    txt = self.htmlify txt, :no_keys=>no_keys
+    print txt
+
+    # print "<pre>#{ENV.keys.map{|k| "#{k}: #{ENV[k]}"}.join("\n")}</pre>"
+
+  rescue Exception=>e
+    puts "<pre>#{e.message}\n#{e.backtrace}</pre>"
+  end
+
+  def self.camel_case txt
+    return txt if txt !~ /_/ && txt =~ /[A-Z]+.*/
+    txt.split('_').map{|e| e.capitalize}.join
+  end
+
+end

data/lib/launcher.rb

@@ -1183,11 +1183,9 @@ class Launcher
     path.sub! /\/$/, ''
     Console.run "rake #{path}", :dir=>dir
     nil
-
   end
 
   def self.reload_menu_dirs
-Ol.stack
     MENU_DIRS.each do |dir|
       next unless File.directory? dir
 
@@ -1318,7 +1316,7 @@ def require_menu file, options={}
     raise "File Not Found" if !File.exists?(file)
   end
 
-  stem = file[/(\w+)\./, 1]
+  stem = File.basename(file)[/\A(.*)\.[^.]+\z/, 1]
 
   # As .menu...
 

data/lib/menu.rb

@@ -342,6 +342,7 @@ class Menu
   end
 
   def self.call root, rest=nil
+    root = root.gsub /[ +]/, '_'
     menus = Launcher.menus
     block = menus[0][root] || menus[1][root]
     return if block.nil?

data/lib/xiki.rb

@@ -39,7 +39,7 @@ class Xiki
         | Double-click on these lines to add the executable 'xiki' command to
         | your path:
         |
-        @$ cp _____/xiki_wrapper /usr/local/bin/xiki
+        @$ cp #{Xiki.dir}etc/command/xiki_wrapper /usr/local/bin/xiki
         @$ chmod 755 /usr/local/bin/xiki
         |
         | Then you can type 'xiki' on a command line outside of emacs as a

data/menus/create.rb

@@ -0,0 +1,17 @@
+class Create
+  def self.menu name
+
+    txt = File.read "/tmp/post_tmp"
+
+    extension = txt =~ /^class / ? "rb" : "menu"
+    file_path = File.expand_path("~/menus/#{name}.#{extension}")
+    File.open(file_path, "w") { |f| f << txt }
+
+    require_menu file_path
+
+    "
+    > Your menu was saved! Now go to it:
+    - <a href='/#{name}'>#{name}</a>
+    "
+  end
+end

data/menus/http.rb

@@ -0,0 +1,19 @@
+class Http
+  def self.menu *args
+    url = args.blank? ? nil : args.join('/')
+
+    # If as+open, just jump to the log
+    return View.open Launcher.log_file if Keys.open?
+
+    # If no url's, list them all
+
+    if url.blank?
+      txt = Launcher.last "http", :exclude_path=>1
+      txt.gsub! /^- /, '<< '
+      return txt
+    end
+
+    Keys.prefix == :u ? $el.browse_url(url) : Firefox.url(url)
+    nil
+  end
+end

data/menus/urls.menu

@@ -0,0 +1 @@
+<<< http/

data/xiki.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "xiki"
-  s.version = "0.5.0a"
+  s.version = "0.5.1a"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Craig Muth"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: xiki
 version: !ruby/object:Gem::Version 
-  hash: -348338586
+  hash: -1959472798
   prerelease: 5
   segments: 
   - 0
   - 5
-  - 0
+  - 1
   - a
-  version: 0.5.0a
+  version: 0.5.1a
 platform: ruby
 authors: 
 - Craig Muth
@@ -110,6 +110,8 @@ files:
 - etc/wrappers/wrapper.js
 - etc/wrappers/wrapper.py
 - etc/wrappers/wrapper.rb
+- etc/www/index.rb
+- etc/www/web_server.rb
 - lib/block.rb
 - lib/bookmarks.rb
 - lib/buffers.rb
@@ -196,6 +198,7 @@ files:
 - menus/contacts.rb
 - menus/cookies.rb
 - menus/couch.rb
+- menus/create.rb
 - menus/crop.rb
 - menus/css.rb
 - menus/current.rb
@@ -225,6 +228,7 @@ files:
 - menus/head.rb
 - menus/headings.rb
 - menus/html.rb
+- menus/http.rb
 - menus/icon.rb
 - menus/images.menu
 - menus/img.rb
@@ -269,6 +273,7 @@ files:
 - menus/thesaurus.rb
 - menus/to.rb
 - menus/twitter.rb
+- menus/urls.menu
 - menus/wikipedia.rb
 - menus/words.rb
 - spec/code_tree_spec.rb