rabbit 1.0.8 → 1.0.9

data/Gemfile

@@ -2,22 +2,4 @@
 
 source "http://rubygems.org"
 
-gem 'gtk2'
-gem 'rsvg2'
-gem 'poppler'
-gem 'hikidoc'
-gem 'nokogiri'
-gem "sinatra"
-gem "haml"
-gem "rdtool"
-gem "coderay", ">= 1.0.0"
-gem "kramdown"
-
-group :development, :test do
-  gem 'twitter-stream'
-  gem 'twitter_oauth'
-  gem 'rake'
-  gem 'jeweler'
-  gem 'jekyll'
-  gem 'gettext'
-end
+gemspec

data/Rakefile

@@ -1,9 +1,9 @@
 # -*- ruby -*-
 
-require 'find'
-require 'rubygems'
-require 'rubygems/package_task'
-require 'jeweler'
+require "find"
+require "rubygems"
+require "rubygems/package_task"
+require "bundler/gem_helper"
 
 base_dir = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(base_dir, 'lib'))
@@ -11,33 +11,9 @@ require 'rabbit/rabbit'
 
 rsync_base_path = "rabbit@rabbit-shockers.org:public_html/"
 
-ENV["VERSION"] ||= Rabbit::VERSION
-version = ENV["VERSION"].dup
-spec = nil
-Jeweler::Tasks.new do |_spec|
-  spec = _spec
-  spec.name = "rabbit"
-  spec.version = version.dup
-  spec.rubyforge_project = "rabbit"
-  spec.homepage = "http://rabbit-shockers.org/"
-  spec.authors = ["Kouhei Sutou"]
-  spec.email = ["kou@cozmixng.org"]
-  spec.summary = 'Rabbit is an RD-document-based presentation application.'
-  spec.description = spec.summary # FIXME
-  spec.license = "GPLv2+"
-
-  spec.files = FileList["{lib,data,entities,bin,sample,misc,doc,po}/**/*",
-                        "*.rb",
-                        "Rakefile",
-                        "COPYING",
-                        "GPL",
-                        "README",
-                        "Gemfile"]
-  spec.test_files = FileList["test/**/*.rb"]
-end
-
-Rake::Task["release"].prerequisites.clear
-Jeweler::RubygemsDotOrgTasks.new
+helper = Bundler::GemHelper.new(base_dir)
+helper.install
+spec = helper.gemspec
 
 def force_array(enumerable)
   array = []

data/doc/_layouts/en.html

@@ -22,7 +22,7 @@ country: US
   {{ content }}
   <nav id="sidebar">
     <h3>The Latest Release</h3>
-    <p><a href="en/news.html">1.0.7</a> is the latest release. It had been released at 2012-05-29.</p>
+    <p><a href="en/news.html">1.0.8</a> is the latest release. It had been released at 2012-06-17.</p>
     <h3>Links</h3>
     <ul>
       <li><a href="/en/">README</a></li>

data/doc/_layouts/ja.html

@@ -22,7 +22,7 @@ country: JP
   {{ content }}
   <nav id="sidebar">
     <h3>最新リリース</h3>
-    <p>2012-05-29にリリースされた<a href="/ja/news.html">1.0.7</a>が最新リリースです。</p>
+    <p>2012-06-17にリリースされた<a href="/ja/news.html">1.0.8</a>が最新リリースです。</p>
     <h3>リンク</h3>
     <ul>
       <li><a href="/ja/">はじめに</a></li>

data/doc/en/news.rd

@@ -3,6 +3,37 @@ layout: en
 title: News
 apply_data: false
 ---
+== 1.0.9: 2012-07-21
+
+A bug fix release of 1.0.8.
+
+=== Improvements
+
+==== rabbit-mode.el
+
+  * Changed prefix for insert commands to ((%C-cC-i%)).
+
+==== rabbit
+
+  * Supported numeric character reference in RD and Hiki:
+
+    RD:
+      (('𝄞')) in hex
+      (('𝄞')) in decimal
+
+    Hiki:
+      {{code_point(0x1d11e)}} in hex
+      {{code_point(119070)}} in decimal
+
+==== rabbirack
+
+  * Removed needless encoding change.
+
+==== rabbiter
+
+  * Supported twitter-stream 0.1.16. Earlier versions aren't supported.
+  * Re-implemented connection related codes by Ruby/GIO2.
+
 == 1.0.8: 2012-06-17
 
 A bug fix release of 1.0.7.

data/doc/index.html.en

@@ -5,7 +5,7 @@ lang_suffix: true
 no_sidebar: true
 ---
 <div class="latest-release">
-  <p><a href="/en/news.html">1.0.7</a> is the latest release. It had been released at 2012-05-29.</p>
+  <p><a href="/en/news.html">1.0.8</a> is the latest release. It had been released at 2012-06-17.</p>
 </div>
 
 <section class="screenshots">

data/doc/index.html.ja

@@ -5,7 +5,7 @@ lang_suffix: true
 no_sidebar: true
 ---
 <div class="latest-release">
-  <p>2012-05-29にリリースされた<a href="/ja/news.html">1.0.7</a>が最新リリースです。</p>
+  <p>2012-06-17にリリースされた<a href="/ja/news.html">1.0.8</a>が最新リリースです。</p>
 </div>
 
 <section class="screenshots">

data/doc/ja/news.rd

@@ -3,6 +3,37 @@ layout: ja
 title: お知らせ
 apply_data: false
 ---
+== 1.0.9: 2012-07-21
+
+1.0.8のバグフィックスリリース
+
+=== 改良
+
+==== rabbit-mode.el
+
+  * 挿入系のコマンドはprefixとして((%C-cC-i%))を使うように変更。
+
+==== rabbit
+
+  * RDとHikiで数値文字参照をサポート:
+
+    RD:
+      (('𝄞')) （8進数）
+      (('𝄞')) （16進数）
+
+    Hiki:
+      {{code_point(0x1d11e)}} （8進数）
+      {{code_point(119070)}} （16進数）
+
+==== rabbirack
+
+  * 不必要なエンコーディングの変更をやめた。
+
+==== rabbiter
+
+  * twitter-stream 0.1.16対応。それ以前のバージョンはサポート対象外。
+  * Ruby/GIO2を使って通信するようにした。
+
 == 1.0.8: 2012-06-17
 
 1.0.7のバグフィックスリリース

data/lib/rabbit/middleware/controller.rb

@@ -56,11 +56,7 @@ module Rabbit
       end
 
       def slide_title
-        current_slide_title = @rabbit.slide_title
-        if current_slide_title.respond_to?(:force_encoding)
-          current_slide_title.force_encoding("ASCII-8BIT")
-        end
-        current_slide_title
+        @rabbit.slide_title
       end
     end
   end

data/lib/rabbit/parser/rd/ext/character-reference.rb

@@ -0,0 +1,59 @@
+require 'rabbit/element'
+require 'rabbit/parser/ext/entity'
+
+module Rabbit
+  module Parser
+    class RD
+      module Ext
+        module CharacterReference
+          include Element
+
+          class << self
+            def included(mod)
+              self.instance_methods.each do |meth|
+                mod.method_added(meth)
+              end
+            end
+          end
+
+          TABLE = Parser::Ext::Entity::TABLE
+          def ext_inline_verb_character_entity_reference(label, source, content, visitor)
+            label = label.to_s
+            return nil unless /^&([^;]+);(.*)$/ =~ label
+            return nil unless TABLE.include?($1)
+
+            key = $1
+            rest = $2
+            if rest.empty?
+              Text.new(TABLE[key])
+            else
+              rest = visitor.apply_to_Verb(::RD::Verb.new(rest))
+              TextContainer.new([Text.new(TABLE[key]), rest])
+            end
+          end
+
+          def ext_inline_verb_numeric_character_reference(label, source, content, visitor)
+            label = label.to_s
+            return nil unless /^&#(x?)([a-zA-Z\d]+);(.*)$/ =~ label
+
+            base = $1
+            unicode_code_point_string = $2
+            rest = $3
+            if base == "x"
+              unicode_code_point = unicode_code_point_string.to_i(16)
+            else
+              unicode_code_point = unicode_code_point_string.to_i(10)
+            end
+            character = [unicode_code_point].pack("U")
+            if rest.empty?
+              Text.new(character)
+            else
+              rest = visitor.apply_to_Verb(::RD::Verb.new(rest))
+              TextContainer.new([Text.new(character), rest])
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rabbit/parser/rd/ext/inline-verbatim.rb

@@ -2,7 +2,7 @@ require 'rabbit/utils'
 require 'rabbit/parser/ext/inline'
 require 'rabbit/parser/rd/ext/base'
 require 'rabbit/parser/rd/ext/image'
-require 'rabbit/parser/rd/ext/entity'
+require 'rabbit/parser/rd/ext/character-reference'
 
 module Rabbit
   module Parser
@@ -11,7 +11,7 @@ module Rabbit
         class InlineVerbatim < Base
           extend Utils
           include Image
-          include Entity
+          include CharacterReference
 
           Inline = Parser::Ext::Inline
 

data/lib/rabbit/parser/rd.rb

@@ -47,7 +47,7 @@ module Rabbit
       def add_number(source, around=nil)
         i = 1
         puts source
-        lines = source.to_a[0..-2]
+        lines = source.lines.to_a[0..-2]
         if around
           i = [1, around - SNIPPET_SIZE].max
           lines = lines[i, 2 * SNIPPET_SIZE]

data/lib/rabbit/parser/wiki/output.rb

@@ -368,6 +368,10 @@ module Rabbit
           end
           alias_method :e, :entity
 
+          def code_point(code_point, *rest)
+            @private.pack(Text.new([code_point].pack("U")), *rest)
+          end
+
           def sub(text, *rest)
             super(@private.pack(text, *rest))
           end

data/lib/rabbit/rabbit.rb

@@ -8,7 +8,7 @@ require "rabbit/gettext"
 
 module Rabbit
 
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 
   TMP_DIR_NAME = ".tmp"
 

data/lib/rabbit/twitter.rb

@@ -1,5 +1,6 @@
-require 'shellwords'
-require 'pathname'
+require "shellwords"
+require "pathname"
+require "gio2"
 
 module Rabbit
   class Twitter
@@ -49,8 +50,6 @@ module Rabbit
       register_listener(&block) if block_given?
       setup if @oauth_parameters.nil?
       return if @oauth_parameters.nil?
-      require 'socket'
-      require 'openssl'
       begin
         require 'twitter/json_stream'
       rescue LoadError
@@ -62,15 +61,13 @@ module Rabbit
       stream_options = {
         :oauth => @oauth_parameters,
         :user_agent => "Rabitter #{Rabbit::VERSION}",
-        :host => "stream.twitter.com",
-        :port => 443,
-        :path => "/1/statuses/filter.json",
         :method => "POST",
-        :ssl => true,
         :filters => filters,
       }
-      @stream = ::Twitter::JSONStream.new(:signature, stream_options)
-      @connection = GLibConnection.new(@logger, @stream, stream_options)
+      @stream = ::Twitter::JSONStream.allocate
+      @stream.send(:initialize, stream_options)
+      @stream.send(:reset_state)
+      @connection = GLibConnection.new(@logger, @stream)
 
       @stream.each_item do |item|
         status = JSON.parse(item)
@@ -120,40 +117,32 @@ module Rabbit
     end
 
     class GLibConnection
-      def initialize(logger, handler, options)
+      def initialize(logger, handler)
         @logger = logger
-        @options = options
         @handler = handler
-        @tcp_socket = nil
-        @ssl_socket = nil
-        @channel = nil
+        @options = @handler.instance_variable_get("@options")
+        @client = nil
+        @connection = nil
+        @socket = nil
         @source_ids = []
       end
 
       def connect
         close
-        @tcp_socket = TCPSocket.new(@options[:host], "https")
-        @ssl_socket = OpenSSL::SSL::SSLSocket.new(@tcp_socket)
-        @ssl_socket.sync_close = true
-        @ssl_socket.connect
-        if GLib.const_defined?(:IOChannelWin32Socket)
-          @channel = GLib::IOChannelWin32Socket.new(@tcp_socket.fileno)
-        else
-          @channel = GLib::IOChannel.new(@tcp_socket.fileno)
-        end
-        begin
-          @channel.flags = GLib::IOChannel::FLAG_NONBLOCK
-        rescue GLib::IOChannelError
-          @logger.warn("[twitter][read][error] " +
-                       "failed to set non-blocking mode: " +
-                       "#{$!.message}(#{$!.class})")
-        end
-        reader_id = @channel.add_watch(GLib::IOChannel::IN) do |io, condition|
+        @client = Gio::SocketClient.new
+        @client.tls = @options[:ssl]
+        @connection = @client.connect_to_host(@options[:host], @options[:port])
+        @socket = @connection.socket
+        @socket.blocking = false
+        @input = @connection.input_stream
+        @output = @connection.output_stream
+
+        reader_source = @socket.create_source(:in) do |socket, condition|
           @logger.debug("[twitter][read][start]")
-          data = @ssl_socket.read(8192)
+          data = @input.read(8192) || ""
           @logger.debug("[twitter][read][done] #{data.bytesize}")
           if data.empty?
-            @source_ids.reject! {|id| id == reader_id}
+            @source_ids.reject! {|id| id == reader_source.id}
             @logger.debug("[twitter][read][eof]")
             false
           else
@@ -161,12 +150,14 @@ module Rabbit
             true
           end
         end
-        @source_ids << reader_id
-        error_id = @channel.add_watch(GLib::IOChannel::ERR) do |io, condition|
+        @source_ids << reader_source.attach
+
+        error_source = @socket.create_source(:err) do |socket, condition|
           @handler.receive_error(condition)
           true
         end
-        @source_ids << error_id
+        @source_ids << error_source.attach
+
         @handler.extend(GLibAdapter)
         @handler.connection = self
         @handler.connection_completed
@@ -174,41 +165,37 @@ module Rabbit
 
       def send_data(data)
         rest = data.bytesize
-        writer_id = @channel.add_watch(GLib::IOChannel::OUT) do |io, condition|
+        writer_source = @socket.create_source(:out) do |socket, condition|
           if rest.zero?
             @logger.debug("[twitter][flush][start]")
-            @ssl_socket.flush
+            @output.flush
             @logger.debug("[twitter][flush][done]")
-            @source_ids.reject! {|id| id == writer_id}
+            @source_ids.reject! {|id| id == writer_source.id}
             false
           else
             @logger.debug("[twitter][write][start]")
-            written_size = @ssl_socket.write(data)
-            if written_size.is_a?(Numeric)
-              @logger.debug("[twitter][write][done] #{written_size}")
-              rest -= written_size
-              data[0, written_size] = ""
-            else
-              # for Ruby/GLib2 < 0.90.9
-              rest = 0
-              data.replace("")
-            end
+            written_size = @output.write(data)
+            @logger.debug("[twitter][write][done] #{written_size}")
+            rest -= written_size
+            data[0, written_size] = ""
             true
           end
         end
-        @source_ids << writer_id
+        @source_ids << writer_source.attach
       end
 
       def close
-        return if @ssl_socket.nil?
+        return if @client.nil?
         @source_ids.reject! do |id|
           GLib::Source.remove(id)
           true
         end
-        @channel = nil
-        @ssl_socket.close
-        @tcp_socket = nil
-        @ssl_socket = nil
+        @socket.close
+        @socket = nil
+        @input = nil
+        @output = nil
+        @connection = nil
+        @client = nil
       end
 
       def reconnect(options={})

data/misc/emacs/rabbit-mode.el

@@ -237,10 +237,9 @@
 (defun rabbit-setup-keys ()
   "define default key bindings."
   (define-key rabbit-mode-map "\C-c\C-r" 'rabbit-run-rabbit)
-  (define-key rabbit-mode-map "\C-c\C-t" 'rabbit-insert-title-template)
-  (define-key rabbit-mode-map "\C-c\C-i" 'rabbit-insert-image-template-default)
-  (define-key rabbit-mode-map "\C-ci" 'rabbit-insert-image-template)
-  (define-key rabbit-mode-map "\C-c\C-s" 'rabbit-insert-slide)
+  (define-key rabbit-mode-map "\C-c\C-it" 'rabbit-insert-title-template)
+  (define-key rabbit-mode-map "\C-c\C-ii" 'rabbit-insert-image-template)
+  (define-key rabbit-mode-map "\C-c\C-is" 'rabbit-insert-slide)
   (define-key rabbit-mode-map "\C-c\C-d" 'rabbit-delete-slide)
   (define-key rabbit-mode-map "\M-n" 'rabbit-next-slide)
   (define-key rabbit-mode-map "\M-p" 'rabbit-previous-slide))