cuttlebone 0.1.4 → 0.1.5

data/CHANGELOG.md

@@ -1,4 +1,13 @@
-## 0.1.2 / 2011-03-18
+## 0.1.5 / 2011-03-29
+
+* Added some new CSS and JS to improve user experience.
+* Added XMPP driver (without tests).
+
+## 0.1.4 / 2011-03-27
+
+* Added Rack driver and its supporting files.
+
+## 0.1.2-0.1.3 / 2011-03-18
 
 * Changed directory structure to look like a real gem. :)
 * Finalized initial test cases (spec/cucumber).

data/Rakefile

@@ -37,7 +37,7 @@ if defined?(Haml) and defined?(Sass)
               f =~ /\.haml$/ ?
               Haml::Engine.new(File.read(File.expand_path("../public/sources/#{f}",__FILE__)), :format => :html5, :ugly => true) :
               Sass::Engine.new(File.read(File.expand_path("../public/sources/#{f}",__FILE__)))
-          ).render()
+            ).render()
           )
         end
       end
@@ -72,10 +72,10 @@ desc 'Run all cucumber tests.'
 Cucumber::Rake::Task.new do |t|
 end
 
-desc 'Generate documentation for the a4-core plugin.'
+desc 'Generate documentation for cuttlebone.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'A4::Core'
+  rdoc.title    = 'Cuttlebone'
   rdoc.options << '--line-numbers' << '--inline-source' << '--charset=UTF-8'
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('lib/**/*.rb')

data/cuttlebone.gemspec

@@ -11,8 +11,13 @@ Gem::Specification.new do |s|
   s.description = "Cuttlebone helps you creating shell-alike applications."
 
   s.rubyforge_project         = "cuttlebone"
+  #s.required_ruby_version     = ">= 1.9.2"
   s.required_rubygems_version = ">= 1.3.7"
 
+  s.add_runtime_dependency     "rack",     "~> 1.2.2"
+  s.add_runtime_dependency     "json",     "~> 1.5.0"
+  s.add_runtime_dependency     "xmpp4r",   "~> 0.5"
+
   s.add_development_dependency "bundler",  "~> 1.0.0"
   s.add_development_dependency "rspec",    "~> 2.5.0"
   s.add_development_dependency "i18n"

data/lib/cuttlebone.rb

@@ -12,6 +12,7 @@ module Cuttlebone
     autoload :Base,  'cuttlebone/drivers/base'
     autoload :Shell, 'cuttlebone/drivers/shell'
     autoload :Rack,  'cuttlebone/drivers/rack'
+    autoload :XMPP,  'cuttlebone/drivers/xmpp'
   end
 
   @@definitions = []

data/lib/cuttlebone/controller.rb

@@ -50,8 +50,8 @@ class Cuttlebone::Controller
     __save_next_action! :replace, context
   end
 
-  def output text
-    @output << text
+  def output *texts
+    @output += texts.map(&:to_s)
   end
 
   def method_missing method_name, *args, &block

data/lib/cuttlebone/drivers/rack.rb

@@ -1,6 +1,4 @@
 require 'rack'
-require 'haml'
-require 'sass/plugin/rack'
 require 'json'
 
 class Cuttlebone::Drivers::Rack < Cuttlebone::Drivers::Base
@@ -20,45 +18,51 @@ class Cuttlebone::Drivers::Rack < Cuttlebone::Drivers::Base
     end
 
     def call env
-      @request  = Rack::Request.new(env)
+      request = Rack::Request.new(env)
 
-      return(@app.call(env)) unless @request.post?
-      return(@app.call(env)) unless @request.path =~ %r{^/(?:(?:prompt|call)/([0-9a-f]{40}))|init$}
+      return(@app.call(env)) unless request.post?
+      return(@app.call(env)) unless request.path =~ %r{^/(?:(?:prompt|call)/([0-9a-f]{40}))|init$}
       # return(@app.call(env)) unless @request.is_json_request?
 
-      @response = Rack::Response.new
-      @response['Content-Type'] = 'application/json'
-
-      if @request.path == '/init'
-        session = @driver.sessions.create
-        json 'id' => session.id, 'prompt' => session.prompt
-      elsif @request.path =~ %r{/prompt/([0-9a-f]{40})}
-        id      = $1
-        session = @driver.sessions[id]
-        json 'id' => session.id, 'prompt' => session.prompt
-      elsif @request.path =~ %r{/call/([0-9a-f]{40})}
-        id      = $1
-        session = @driver.sessions[id]
-
-        if command=@request.params['command']
-          _, _, output, error = session.call(command.force_encoding("UTF-8"))
-          json 'id' => session.id, 'prompt' => session.prompt, 'output' => output, 'error' => error
-        else
-          @response.status = 409
-          json 'id' => session.id, 'prompt' => session.prompt, 'error' => 'No command was given!'
+      response = Rack::Response.new
+      response['Content-Type'] = 'application/json'
+
+      results = { 'id' => nil, 'prompt' => nil }
+
+      begin
+        session = get_session_for(request.path)
+        raise ArgumentError, "Cannot load cuttlebone-session!" unless session
+
+        case request.path
+        when '/init', %r{^/prompt/}
+          results.merge! 'id' => session.id, 'prompt' => session.prompt
+        when %r{^/call/}
+          if command=request.params['command']
+            _, _, output, error = session.call(command.force_encoding("UTF-8"))
+            results.merge! 'id' => session.id, 'prompt' => session.prompt, 'output' => output, 'error' => error
+          else
+            response.status = 409
+            results.merge! 'id' => session.id, 'prompt' => session.prompt, 'error' => 'No command was given!'
+          end
         end
+      rescue
+        results.merge! 'id' => (session.id rescue nil), 'prompt' => (session.prompt rescue nil), 'error' => $!.message
       end
 
-      return(@response.finish)
-    rescue
-      json 'id' => (session.id rescue nil), 'prompt' => (session.prompt rescue nil), 'error' => $!.message
-      return(@response.finish)
+      response.write(results.to_json)
+
+      return(response.finish)
     end
 
     private
 
-    def json data
-      @response.write(data.to_json)
+    def get_session_for path
+      case path
+      when '/init'
+        @driver.sessions.create
+      when %r{^/(?:prompt|call)/([0-9a-f]{40})$}
+        @driver.sessions[$1]
+      end
     end
   end
 
@@ -78,33 +82,24 @@ class Cuttlebone::Drivers::Rack < Cuttlebone::Drivers::Base
     end
 
     def call(env)
-      @request  = Rack::Request.new(env)
-      @response = Rack::Response.new
-
-      if @request.get? and @request.path == '/'
-        redirect_to '/index.html'
-      elsif @request.get? and STATIC_FILES.include?(@request.path)
-        static @request.path
+      request  = Rack::Request.new(env)
+      response = Rack::Response.new
+
+      if request.get? and request.path == '/'
+        response.redirect('/index.html')
+      elsif request.get? and STATIC_FILES.include?(request.path)
+        response['Content-Type'] = 'application/javascript' if request.path =~ /\.js$/
+        response['Content-Type'] = 'text/css' if request.path =~ /\.css$/
+        response['Content-Type'] = 'image/png' if request.path =~ /\.png$/
+
+        response.write(File.read(File.expand_path("../../../../public#{request.path}", __FILE__)))
+        response.status = 200
       else
-        error 'Not found.', 404
+        response.write(File.read(File.expand_path("../../../../public/error.html", __FILE__)).gsub(/Error happens.  It always does./, 'Not found.'))
+        response.status = 404
       end
 
-      @response.finish
-    end
-
-    private
-
-    def static path
-      @response.write(File.read(File.expand_path("../../../../public#{path}", __FILE__)))
-    end
-
-    def error message, status=500
-      @response.write(File.read(File.expand_path("../../../../public/error.html", __FILE__)).gsub(/Error happens.  It always does./, message))
-      @response.status = status
-    end
-
-    def redirect_to path
-      @response.redirect(path)
+      response.finish
     end
   end
 

data/lib/cuttlebone/drivers/xmpp.rb

@@ -0,0 +1,61 @@
+require 'xmpp4r/client'
+require 'xmpp4r/roster'
+require File.expand_path('../../../../vendor/rexml_utf8_fix', __FILE__)
+
+class Cuttlebone::Drivers::XMPP < Cuttlebone::Drivers::Base
+  @@jid      = 'cuttlebone@localhost'
+  @@password = 'cuttlebone'
+
+  def self.jid= jid
+    @@jid = jid
+  end
+
+  def self.password= password
+    @@password = password
+  end
+
+  def run
+    client = Jabber::Client.new(@@jid)
+    client.connect()
+    client.auth(@@password)
+    client.send(Jabber::Presence.new.set_type(:available))
+
+    roster = Jabber::Roster::Helper.new(client)
+
+    client.add_message_callback do |message|
+      unless message.composing? or message.body.nil?
+        begin
+          session = sessions[message.from]
+        rescue Cuttlebone::Session::NotFound
+          session = sessions.create(:id => message.from)
+        end
+
+        begin
+          _, _, output, error = session.call(message.body.force_encoding("UTF-8"))
+        rescue
+          output, error = nil, $!.message
+        end
+
+        result          = Jabber::Message.new
+        result.to       = message.from
+        result.body     = output.join("\n") if output
+        result.body    += %{<<#{error}>>} if error
+        client.send(result)
+      end
+    end
+
+    roster.add_subscription_request_callback do |item,presence|
+      roster.accept_subscription(presence.from)
+      client.send(Jabber::Presence.new.set_type(:subscribe).set_to(presence.from))
+      
+      m      = Jabber::Message.new
+      m.to   = presence.from
+      m.body = "Registered!"
+      client.send(m)
+    end
+
+    Thread.stop
+
+    client.close
+  end
+end

data/lib/cuttlebone/version.rb

@@ -1,3 +1,3 @@
 module Cuttlebone
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/public/error.html

@@ -2,14 +2,10 @@
 <html>
 <head>
 <title>Cuttlebone - Error</title>
-<link href='/stylesheets/cuttlebone.css?1301248065' rel='stylesheet' type='text/css'>
+<link href='/favicon.png?1301363510' rel='icon' type='image/png'>
+<link href='/stylesheets/cuttlebone.css?1301363510' media='screen' rel='stylesheet' type='text/css'>
 </head>
 <body>
-<div class='output'>
-<ul>
-<li class='error'>Error happens.  It always does.</li>
-</ul>
-</div>
 <div class='actions'>
 <ul>
 <li>
@@ -17,5 +13,10 @@
 </li>
 </ul>
 </div>
+<div class='output'>
+<ul>
+<li class='error'>Error happens.  It always does.</li>
+</ul>
+</div>
 </body>
 </html>

data/public/index.html

@@ -2,19 +2,16 @@
 <html>
 <head>
 <title>Cuttlebone</title>
-<link href='/favicon.png?1301248065' rel='icon' type='image/png'>
-<link href='/stylesheets/cuttlebone.css?1301248065' rel='stylesheet' type='text/css'>
-<script src='/javascripts/jquery.min.js?1301248065' type='text/javascript'></script>
-<script src='/javascripts/cuttlebone.js?1301248065' type='text/javascript'></script>
+<link href='/favicon.png?1301363510' rel='icon' type='image/png'>
+<link href='/stylesheets/cuttlebone.css?1301363510' media='screen' rel='stylesheet' type='text/css'>
+<script src='/javascripts/jquery.min.js?1301363510' type='text/javascript'></script>
+<script src='/javascripts/cuttlebone.js?1301363510' type='text/javascript'></script>
 </head>
 <body>
 <div class='output'>
 <ul></ul>
 </div>
-<div class='input'>
-<span id='prompt'></span>
-<span>&gt;</span>
-<input id='input' name='command' type='text'>
+<div class='input'><span id='prompt'></span><span>&gt;</span><input id='input' name='command' type='text'>
 </div>
 </body>
 </html>

data/public/javascripts/cuttlebone.js

@@ -1,26 +1,47 @@
 // I know that it's ugly, but this is a POC/WIP project.
 // TODO:
-// * get rid of that global variable
 // * #input should determine (with a special html5 attribute) which session
 //   will it talk to
 // * #input should know about the updated output too
 // * create a convenience function that sets up and handles all the magic
 
-var cuttlebone_session_id;
+var cuttlebone = {
+
+  sessionId: null,
+
+  init: function() {
+    jQuery.ajax({
+      type:     'POST',
+      url:      '/init',
+      dataType: 'json',
+      success:  function(d){cuttlebone.updateSessionId(d);cuttlebone.updatePrompt(d);}
+    });
+  },
+
+  updateSessionId: function(results) {
+    cuttlebone.sessionId = results['id'];
+  },
+
+  updatePrompt: function(results) {
+    if (results) {jQuery('#prompt').html(results['prompt']);w=jQuery('div.input').width();jQuery('div.input span').each(function(){w-=jQuery(this).outerWidth();});jQuery('input#input').width(w-6);}
+    else         {jQuery.ajax({type:'POST',url:'/prompt/'+cuttlebone.sessionId,dataType:'json',success:function(d){cuttlebone.updatePrompt(d);}});}
+  }
+
+};
 
 jQuery(document).ready(function(){
-  // updates prompt
-  jQuery.ajax({type:'POST',url:"/init",dataType:"json",success:function(d){if(d['id']){cuttlebone_session_id=d['id'];};if(d['prompt']){jQuery('#prompt').html(d['prompt']);};}});
+  cuttlebone.init();
+  jQuery('#input').focus();
 });
 
 // evaluates input
-jQuery("#input").live("keypress", function(e) {
+jQuery('#input').live('keypress', function(e) {
   if (e.keyCode == 13) {
     jQuery.ajax({
-      type:     "POST",
-      url:      "/call/"+cuttlebone_session_id,
+      type:     'POST',
+      url:      '/call/'+cuttlebone.sessionId,
       data:     {command:jQuery('#input').val()},
-      dataType: "json",
+      dataType: 'json',
       success:  function(d){
         if (d['output']) {
           jQuery.each(d['output'], function(i,v) {
@@ -30,9 +51,7 @@ jQuery("#input").live("keypress", function(e) {
         if (d['error']) {
           jQuery('.output ul').append('<li class="error">'+d['error']+'</li>');
         };
-        if (d['prompt']) {
-          jQuery('#prompt').html(d['prompt']);
-        }
+        cuttlebone.updatePrompt(d);
       }
     });
     $(this).val('');

data/public/sources/cuttlebone.sass

@@ -1,2 +1,44 @@
+*
+  font-family: monospace
+  margin: 0
+  padding: 0
+
 body
-  font-family: "sans serif"
+  width: 900px
+  margin: 0 auto
+  padding: 5px 0 0 0
+
+.actions
+  ul li
+    list-style-type: none
+    padding: 2px 3px
+
+.input
+  background: #ddd
+  width: 100%
+  border-left: 1px solid #aaa
+  border-right: 1px solid #aaa
+  border-bottom: 1px solid #aaa
+
+  span
+    padding: 2px 3px
+
+  input
+    border: 0
+    padding: 2px 3px
+    background: #ddd
+
+.output
+  background: #fff
+  width: 100%
+  border-top: 1px solid #aaa
+  border-left: 1px solid #aaa
+  border-right: 1px solid #aaa
+
+  ul li
+    list-style-type: none
+    padding: 2px 3px
+    border-bottom: 1px solid #aaa
+
+.error
+  background: #f88

data/public/sources/error.html.haml

@@ -1,14 +1,15 @@
-- timestamp ||= Time.now.strftime('%s')
+- def ts(path); @ts ||= Time.now.strftime('%s'); %{#{path}?#{@ts}}; end
 !!!
 %html
   %head
     %title Cuttlebone - Error
-    %link{ :type => 'text/css', :href => "/stylesheets/cuttlebone.css?#{timestamp}", :rel => 'stylesheet' }
+    %link{ :type => 'image/png', :href => ts('/favicon.png'), :rel => 'icon' }
+    %link{ :type => 'text/css', :href => ts('/stylesheets/cuttlebone.css'), :rel => 'stylesheet', :media => 'screen' }
   %body
-    %div.output
-      %ul
-        %li.error Error happens.  It always does.
     %div.actions
       %ul
         %li
           %a{ :href => '/' } back to console
+    %div.output
+      %ul
+        %li.error Error happens.  It always does.

data/public/sources/index.html.haml

@@ -4,13 +4,13 @@
   %head
     %title Cuttlebone
     %link{ :type => 'image/png', :href => ts('/favicon.png'), :rel => 'icon' }
-    %link{ :type => 'text/css', :href => ts('/stylesheets/cuttlebone.css'), :rel => 'stylesheet' }
+    %link{ :type => 'text/css', :href => ts('/stylesheets/cuttlebone.css'), :rel => 'stylesheet', :media => 'screen' }
     %script{ :type => 'text/javascript', :src => ts('/javascripts/jquery.min.js') }
     %script{ :type => 'text/javascript', :src => ts('/javascripts/cuttlebone.js') }
   %body
     %div.output
       %ul
     %div.input
-      %span#prompt
-      %span >
+      %span#prompt>
+      %span> >
       %input#input{ :type => 'text', :name => 'command' }

data/public/stylesheets/cuttlebone.css

@@ -1,2 +1,40 @@
+* {
+  font-family: monospace;
+  margin: 0;
+  padding: 0; }
+
 body {
-  font-family: "sans serif"; }
+  width: 900px;
+  margin: 0 auto;
+  padding: 5px 0 0 0; }
+
+.actions ul li {
+  list-style-type: none;
+  padding: 2px 3px; }
+
+.input {
+  background: #dddddd;
+  width: 100%;
+  border-left: 1px solid #aaaaaa;
+  border-right: 1px solid #aaaaaa;
+  border-bottom: 1px solid #aaaaaa; }
+  .input span {
+    padding: 2px 3px; }
+  .input input {
+    border: 0;
+    padding: 2px 3px;
+    background: #dddddd; }
+
+.output {
+  background: white;
+  width: 100%;
+  border-top: 1px solid #aaaaaa;
+  border-left: 1px solid #aaaaaa;
+  border-right: 1px solid #aaaaaa; }
+  .output ul li {
+    list-style-type: none;
+    padding: 2px 3px;
+    border-bottom: 1px solid #aaaaaa; }
+
+.error {
+  background: #ff8888; }

data/vendor/rexml_utf8_fix.rb

@@ -0,0 +1,304 @@
+# REXML cannot handle UTF-8 characters in XML documents without proper XML
+# header.
+#
+# This might be a workaround:
+#
+# https://github.com/ln/xmpp4r/issues#issue/3 ==>
+# http://pastie.org/1458174
+# http://pastie.org/1454110
+
+class REXML::IOSource < REXML::Source
+  # block_size has been deprecated
+  def initialize(arg, block_size=500, encoding=nil)
+    @er_source = @source = arg
+    @to_utf = false
+
+    # Determining the encoding is a deceptively difficult issue to resolve.
+    # First, we check the first two bytes for UTF-16.  Then we
+    # assume that the encoding is at least ASCII enough for the '>', and
+    # we read until we get one of those.  This gives us the XML declaration,
+    # if there is one.  If there isn't one, the file MUST be UTF-8, as per
+    # the XML spec.  If there is one, we can determine the encoding from
+    # it.
+    @buffer = ""
+    str = @source.read( 2 ) || ''
+    if encoding
+      self.encoding = encoding
+    elsif str[0,2] == "\xfe\xff"
+      @line_break = "\000>"
+    elsif str[0,2] == "\xff\xfe"
+      @line_break = ">\000"
+    elsif str[0,2] == "\xef\xbb"
+      str += @source.read(1)
+      str = '' if (str[2,1] == "\xBF")
+      @line_break = ">"
+    else
+      @line_break = ">"
+    end
+    super( @source.eof? ? str : str+@source.readline( @line_break ) )
+
+    if !@to_utf and
+      @buffer.respond_to?(:force_encoding) and
+      (!@source.respond_to?(:external_encoding) or
+       @source.external_encoding != ::Encoding::UTF_8)
+       @force_utf8 = true
+    else
+      @force_utf8 = false
+    end
+  end
+end
+
+class REXML::Parsers::BaseParser
+  # Returns the next event.  This is a +PullEvent+ object.
+  def pull
+    if @closed
+      x, @closed = @closed, nil
+      return [ :end_element, x ]
+    end
+    return [ :end_document ] if empty?
+    return @stack.shift if @stack.size > 0
+    #STDERR.puts @source.encoding
+    @source.read if @source.buffer.size<2
+    #STDERR.puts "BUFFER = #{@source.buffer.inspect}"
+    if @document_status == nil
+      #@source.consume( /^\s*/um )
+      word = @source.match( /^((?:\s+)|(?:<[^>]*>))/um )
+      word = word[1] unless word.nil?
+      #STDERR.puts "WORD = #{word.inspect}"
+      case word
+      when COMMENT_START
+        return [ :comment, @source.match( COMMENT_PATTERN, true )[1] ]
+      when XMLDECL_START
+        #STDERR.puts "XMLDECL"
+        results = @source.match( XMLDECL_PATTERN, true )[1]
+        version = VERSION.match( results )
+        version = version[1] unless version.nil?
+        encoding = ENCODING.match(results)
+        encoding = encoding[1] unless encoding.nil?
+        @source.encoding = encoding unless encoding.nil?
+        standalone = STANDALONE.match(results)
+        standalone = standalone[1] unless standalone.nil?
+        return [ :xmldecl, version, encoding, standalone ]
+      when INSTRUCTION_START
+        return [ :processing_instruction, *@source.match(INSTRUCTION_PATTERN, true)[1,2] ]
+      when DOCTYPE_START
+        md = @source.match( DOCTYPE_PATTERN, true )
+        @nsstack.unshift(curr_ns=Set.new)
+        identity = md[1]
+        close = md[2]
+        identity =~ IDENTITY
+        name = $1
+        raise REXML::ParseException.new("DOCTYPE is missing a name") if name.nil?
+        pub_sys = $2.nil? ? nil : $2.strip
+        long_name = $4.nil? ? nil : $4.strip
+        uri = $6.nil? ? nil : $6.strip
+        args = [ :start_doctype, name, pub_sys, long_name, uri ]
+        if close == ">"
+          @document_status = :after_doctype
+          @source.read if @source.buffer.size<2
+          md = @source.match(/^\s*/um, true)
+          @stack << [ :end_doctype ]
+        else
+          @document_status = :in_doctype
+        end
+        return args
+      when /^\s+/
+      else
+        @document_status = :after_doctype
+        @source.read if @source.buffer.size<2
+        md = @source.match(/\s*/um, true)
+        if @source.encoding == "UTF-8"
+          if @source.buffer.respond_to? :force_encoding
+            @source.buffer.force_encoding(Encoding::UTF_8)
+          end
+        end
+      end
+    end
+    if @document_status == :in_doctype
+      md = @source.match(/\s*(.*?>)/um)
+      case md[1]
+      when SYSTEMENTITY
+        match = @source.match( SYSTEMENTITY, true )[1]
+        return [ :externalentity, match ]
+
+      when ELEMENTDECL_START
+        return [ :elementdecl, @source.match( ELEMENTDECL_PATTERN, true )[1] ]
+
+      when ENTITY_START
+        match = @source.match( ENTITYDECL, true ).to_a.compact
+        match[0] = :entitydecl
+        ref = false
+        if match[1] == '%'
+          ref = true
+          match.delete_at 1
+        end
+        # Now we have to sort out what kind of entity reference this is
+        if match[2] == 'SYSTEM'
+          # External reference
+          match[3] = match[3][1..-2] # PUBID
+          match.delete_at(4) if match.size > 4 # Chop out NDATA decl
+          # match is [ :entity, name, SYSTEM, pubid(, ndata)? ]
+        elsif match[2] == 'PUBLIC'
+          # External reference
+          match[3] = match[3][1..-2] # PUBID
+          match[4] = match[4][1..-2] # HREF
+          # match is [ :entity, name, PUBLIC, pubid, href ]
+        else
+          match[2] = match[2][1..-2]
+          match.pop if match.size == 4
+          # match is [ :entity, name, value ]
+        end
+        match << '%' if ref
+        return match
+      when ATTLISTDECL_START
+        md = @source.match( ATTLISTDECL_PATTERN, true )
+        raise REXML::ParseException.new( "Bad ATTLIST declaration!", @source ) if md.nil?
+        element = md[1]
+        contents = md[0]
+
+        pairs = {}
+        values = md[0].scan( ATTDEF_RE )
+        values.each do |attdef|
+          unless attdef[3] == "#IMPLIED"
+            attdef.compact!
+            val = attdef[3]
+            val = attdef[4] if val == "#FIXED "
+            pairs[attdef[0]] = val
+            if attdef[0] =~ /^xmlns:(.*)/
+              @nsstack[0] << $1
+            end
+          end
+        end
+        return [ :attlistdecl, element, pairs, contents ]
+      when NOTATIONDECL_START
+        md = nil
+        if @source.match( PUBLIC )
+          md = @source.match( PUBLIC, true )
+          vals = [md[1],md[2],md[4],md[6]]
+        elsif @source.match( SYSTEM )
+          md = @source.match( SYSTEM, true )
+          vals = [md[1],md[2],nil,md[4]]
+        else
+          raise REXML::ParseException.new( "error parsing notation: no matching pattern", @source )
+        end
+        return [ :notationdecl, *vals ]
+      when CDATA_END
+        @document_status = :after_doctype
+        @source.match( CDATA_END, true )
+        return [ :end_doctype ]
+      end
+    end
+    begin
+      if @source.buffer[0] == ?<
+        if @source.buffer[1] == ?/
+          @nsstack.shift
+          last_tag = @tags.pop
+          #md = @source.match_to_consume( '>', CLOSE_MATCH)
+          md = @source.match( CLOSE_MATCH, true )
+          raise REXML::ParseException.new( "Missing end tag for "+
+                                          "'#{last_tag}' (got \"#{md[1]}\")",
+                                          @source) unless last_tag == md[1]
+          return [ :end_element, last_tag ]
+        elsif @source.buffer[1] == ?!
+          md = @source.match(/\A(\s*[^>]*>)/um)
+          #STDERR.puts "SOURCE BUFFER = #{source.buffer}, #{source.buffer.size}"
+          raise REXML::ParseException.new("Malformed node", @source) unless md
+          if md[0][2] == ?-
+            md = @source.match( COMMENT_PATTERN, true )
+
+            case md[1]
+            when /--/, /-$/
+              raise REXML::ParseException.new("Malformed comment", @source)
+            end
+
+            return [ :comment, md[1] ] if md
+          else
+            md = @source.match( CDATA_PATTERN, true )
+            return [ :cdata, md[1] ] if md
+          end
+          raise REXML::ParseException.new( "Declarations can only occur "+
+                                          "in the doctype declaration.", @source)
+        elsif @source.buffer[1] == ??
+          md = @source.match( INSTRUCTION_PATTERN, true )
+          return [ :processing_instruction, md[1], md[2] ] if md
+          raise REXML::ParseException.new( "Bad instruction declaration",
+                                          @source)
+        else
+          # Get the next tag
+          md = @source.match(TAG_MATCH, true)
+          unless md
+            # Check for missing attribute quotes
+            raise REXML::ParseException.new("missing attribute quote", @source) if @source.match(MISSING_ATTRIBUTE_QUOTES )
+            raise REXML::ParseException.new("malformed XML: missing tag start", @source)
+          end
+          attributes = {}
+          prefixes = Set.new
+          prefixes << md[2] if md[2]
+          @nsstack.unshift(curr_ns=Set.new)
+          if md[4].size > 0
+            attrs = md[4].scan( ATTRIBUTE_PATTERN )
+            raise REXML::ParseException.new( "error parsing attributes: [#{attrs.join ', '}], excess = \"#$'\"", @source) if $' and $'.strip.size > 0
+            attrs.each { |a,b,c,d,e|
+              if b == "xmlns"
+                if c == "xml"
+                  if d != "http://www.w3.org/XML/1998/namespace"
+                    msg = "The 'xml' prefix must not be bound to any other namespace "+
+                      "(http://www.w3.org/TR/REC-xml-names/#ns-decl)"
+                    raise REXML::ParseException.new( msg, @source, self )
+                  end
+                elsif c == "xmlns"
+                  msg = "The 'xmlns' prefix must not be declared "+
+                    "(http://www.w3.org/TR/REC-xml-names/#ns-decl)"
+                  raise REXML::ParseException.new( msg, @source, self)
+                end
+                curr_ns << c
+              elsif b
+                prefixes << b unless b == "xml"
+              end
+
+              if attributes.has_key? a
+                msg = "Duplicate attribute #{a.inspect}"
+                raise REXML::ParseException.new( msg, @source, self)
+              end
+
+              attributes[a] = e
+            }
+          end
+
+          # Verify that all of the prefixes have been defined
+          for prefix in prefixes
+            unless @nsstack.find{|k| k.member?(prefix)}
+              raise UndefinedNamespaceException.new(prefix,@source,self)
+            end
+          end
+
+          if md[6]
+            @closed = md[1]
+            @nsstack.shift
+          else
+            @tags.push( md[1] )
+          end
+          return [ :start_element, md[1], attributes ]
+        end
+      else
+        md = @source.match( TEXT_PATTERN, true )
+        if md[0].length == 0
+          @source.match( /(\s+)/, true )
+        end
+        #STDERR.puts "GOT #{md[1].inspect}" unless md[0].length == 0
+        #return [ :text, "" ] if md[0].length == 0
+        # unnormalized = Text::unnormalize( md[1], self )
+        # return PullEvent.new( :text, md[1], unnormalized )
+        return [ :text, md[1] ]
+      end
+    rescue REXML::UndefinedNamespaceException
+      raise
+    rescue REXML::ParseException
+      raise
+    rescue Exception, NameError => error
+      raise REXML::ParseException.new( "Exception parsing",
+                                      @source, self, (error ? error : $!) )
+    end
+    return [ :dummy ]
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: cuttlebone
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Bence Golda
@@ -10,12 +10,45 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-26 23:00:00 +01:00
+date: 2011-03-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: rack
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: xmpp4r
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "0.5"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -23,10 +56,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id001
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -34,10 +67,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *id002
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: i18n
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,10 +78,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -56,10 +89,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -67,10 +100,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: capybara
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,10 +111,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: haml
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -89,7 +122,7 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id010
 description: Cuttlebone helps you creating shell-alike applications.
 email: 
 - bence@golda.me
@@ -120,6 +153,7 @@ files:
 - lib/cuttlebone/drivers/base.rb
 - lib/cuttlebone/drivers/rack.rb
 - lib/cuttlebone/drivers/shell.rb
+- lib/cuttlebone/drivers/xmpp.rb
 - lib/cuttlebone/exceptions.rb
 - lib/cuttlebone/session.rb
 - lib/cuttlebone/version.rb
@@ -145,6 +179,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - vendor/active_support.rb
+- vendor/rexml_utf8_fix.rb
 has_rdoc: true
 homepage: http://github.com/gbence/cuttlebone
 licenses: []
@@ -159,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 836932418591510968
+      hash: 500076729674871657
       segments: 
       - 0
       version: "0"
@@ -172,9 +207,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cuttlebone
-rubygems_version: 1.5.3
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: cuttlebone-0.1.4
+summary: cuttlebone-0.1.5
 test_files: []