rabbit 2.0.6 → 2.0.7

data/doc/en/development.rd

@@ -13,7 +13,7 @@ You can stay up to date on the latest development by
 subscribing to the git commit ML. If you want to subscribe
 to the ML, send an e-mail like the following.
 
-  To: rabbit-commit@ml.cozmixng.org
+  To: commit@ml.rabbit-shocker.org
   Cc: null@cozmixng.org
   Subject: Subscribe
 

data/doc/en/news.rd

@@ -3,6 +3,77 @@ layout: en
 title: News
 apply_data: false
 ---
+== 2.0.7: 2013-04-29
+
+Stability improvement release!
+
+=== Improvements
+
+==== Package
+
+  * [GitHub#13] Removed needless files from package.
+    [Reported by Youhei SASAKI]
+  * Removed Ruby/GStreamer from dependency package.
+    [rabbit-shocker:1089] [Reported by znz]
+
+==== rabbit
+
+  * Removed needless executable permission.
+  * Stopped requiring Ruby/GStreamer on initialize because it crashes Rabbit on
+    Mac OS X 10.6.8.
+    [Reported by masa]
+  * Stopped guessing from source content when source has extension to avoid
+    false detection.
+  * Removed needless fallback fullscreen/unfullscreen features because they
+    are needless with latest GTK+.
+    [Reported by Youhei SASAKI]
+  * Supported non-ASCII file name.
+    [GitHub#15][GitHub#16][GitHub#17] [Patch by Masafumi Yokoyama]
+  * Stopped to use iconv when String#encode is available.
+    [GitHub#18] [Patch by Masafumi Yokoyama]
+
+==== Theme
+
+  * lightning-talk-toolkit: Supported as-large-as-possible slide property.
+
+      Force enable:
+
+        = Large Title
+
+        == property
+
+        : as_large_as_possible
+           true
+
+      Force disable:
+
+        = Large Title
+
+        == property
+
+        : as_large_as_possible
+           false
+
+==== Test
+
+  * Added missing load path to $LOAD_PATH.
+    [GitHub#14] [Reported by Masafumi Yokoyama]
+
+==== rabbit-slide
+
+  * Supported multi-paragraph description.
+  * Published to RubyGems.org after publishing to SlideShare.
+    It is for using SlideShare information on RubyGems.org publishing.
+    [Masafumi Yokoyama]
+  * Supported RubyGems 2.0. [Masafumi Yokoyama]
+
+=== Thanks
+
+  * Youhei SASAKI
+  * masa
+  * Masafumi Yokoyama
+  * znz
+
 == 2.0.6: 2012-12-29
 
 Video support release!

data/doc/en/users.rd

@@ -13,14 +13,14 @@ some other active spots.
 
 === Mailing list
 
-There is a rabbit-shocker-en mailing list for Rabbit Shocker.
+There is the shocker-en mailing list for Rabbit Shocker.
 (((<archive|URL:http://www.cozmixng.org/~w3ml/index.rb/rabbit-shocker-en/>)))
 
 
 You can subscribe the mailing list by sending the following
 mail:
 
-  To: rabbit-shocker-en@ml.cozmixng.org
+  To: shocker-en@ml.rabbit-shocker.org
   Cc: kou@cozmixng.org
   Subject: Subscribe
   

data/doc/ja/development.rd

@@ -14,7 +14,7 @@ Rabbitのリポジトリは
 リングリストに参加するには以下のようなメールを送信してくださ
 い。
 
-  To: rabbit-commit@ml.cozmixng.org
+  To: commit@ml.rabbit-shocker.org
   Cc: null@cozmixng.org
   Subject: 登録
 

data/doc/ja/news.rd

@@ -3,6 +3,77 @@ layout: ja
 title: お知らせ
 apply_data: false
 ---
+== 2.0.7: 2013-04-29
+
+安定性向上リリース！
+
+=== 改良
+
+==== パッケージ
+
+  * [GitHub#13] 不要なファイルをパッケージに含めないようにした。
+    [Youhei SASAKIさんが報告]
+  * Ruby/GStreamerを依存パッケージから外した。
+    [rabbit-shocker:1089] [znzさんが報告]
+
+==== rabbit
+
+  * 不必要な実行属性を削除した。
+  * Mac OS X 10.6.8でクラッシュするため、必要なときだけRuby/GStreamerを
+    読みこむようにした。
+    [masaさんが報告]
+  * 拡張子でソースのマークアップが判断できる場合は、誤検出を避けるため
+    ソースの内容から推測しないようにした。
+  * フルスクリーン・フルスクリーン解除のフォールバック機能を削除した。
+    最近のGTK+ではフォールバックが必要なことがないため。
+    [Youhei SASAKIさんが報告]
+  * 非ASCIIのファイル名をサポート。
+    [GitHub#15][GitHub#16][GitHub#17] [Masafumi Yokoyamaさんがパッチ提供]
+  * iconvの代わりにString#encodeを使うようにした。
+    [GitHub#18] [Masafumi Yokoyamaさんがパッチ提供]
+
+==== テーマ
+
+  * lightning-talk-toolkit: as-large-as-possibleスライドプロパティをサ
+    ポート。
+
+      そのスライドだけ有効にする場合:
+
+        = 大きなタイトル
+
+        == プロパティ
+
+        : as_large_as_possible
+           true
+
+      そのスライドだけ無効にする場合:
+
+        = 大きなタイトル
+
+        == プロパティ
+
+        : as_large_as_possible
+           false
+
+==== テスト
+
+  * $LOAD_PATHが足りなかった問題を修正。
+    [GitHub#14] [Masafumi Yokoyamaさんが報告]
+
+==== rabbit-slide
+
+  * 複数段落の説明文に対応。
+  * SlideShareの情報を使うため、RubyGems.orgへの公開を最後にした。
+    [Masafumi Yokoyamaさん]
+  * RubyGems 2.0対応。 [Masafumi Yokoyamaさん]
+
+=== 感謝
+
+  * Youhei SASAKIさん
+  * masaさん
+  * Masafumi Yokoyamaさん
+  * znzさん
+
 == 2.0.6: 2012-12-29
 
 ビデオサポートリリース！2012年最後のリリース！

data/doc/ja/users.rd

@@ -27,13 +27,13 @@ slide.rabbit-shocker.orgへアップロードしましょう。
 
 === メーリングリスト
 
-Rabbitショッカーのためにrabbit-shockerというメーリングリストがあります。
+Rabbitショッカーのためにshocker-jaというメーリングリストがあります。
 （((<アーカイブ
 |URL:http://www.cozmixng.org/~w3ml/index.rb/rabbit-shocker/>))）
 
 以下のようなメールを送るとメーリングリストへ参加できます。
 
-  To: rabbit-shocker@ml.cozmixng.org
+  To: shocker-ja@ml.rabbit-shocker.org
   Cc: kou@cozmixng.org
   Subject: イー
   

data/lib/rabbit/element/video.rb

@@ -3,7 +3,6 @@ require "rabbit/utils"
 require "rabbit/image"
 require "rabbit/element"
 require "rabbit/parser/base"
-require "rabbit/video-window"
 
 module Rabbit
   module Element
@@ -76,6 +75,7 @@ module Rabbit
       def draw_element(canvas, x, y, w, h, simulation)
         unless simulation
           if canvas.display?
+            require "rabbit/video-window"
             @video_window ||= VideoWindow.new(self)
             @video_window.show(canvas.window)
           else

data/lib/rabbit/frame.rb

@@ -12,8 +12,6 @@ module Rabbit
     include ScreenInfo
     extend Forwardable
 
-    FALLBACK_LIMIT = 250
-    
     def_delegators(:@window, :icon, :icon=, :set_icon)
     def_delegators(:@window, :icon_list, :icon_list=, :set_icon_list)
     def_delegators(:@window, :iconify, :show, :hide, :visible?)
@@ -62,14 +60,12 @@ module Rabbit
       @fullscreen_toggled = false
       @fullscreen = true
       @window.fullscreen
-      fallback_fullscreen
     end
 
     def unfullscreen
       @fullscreen_toggled = false
       @fullscreen = false
       @window.unfullscreen
-      fallback_unfullscreen
     end
     
     def toggle_fullscreen
@@ -197,44 +193,6 @@ module Rabbit
         true
       end
     end
-
-    def fallback_fullscreen
-      @prev_width = @prev_height = nil
-      @prev_x = @prev_y = nil
-      Gtk.timeout_add(FALLBACK_LIMIT) do
-        unless @fullscreen_toggled
-          @prev_width, @prev_height = width, height
-          @prev_x, @prev_y = @window.position
-          @window.hide
-          @window.set_size_request(screen_width, screen_height)
-          @window.decorated = false
-          @window.keep_above = true
-          @window.show
-          @window.move(0, 0)
-          @window.present
-          @canvas.fullscreened
-        end
-        false
-      end
-    end
-
-    def fallback_unfullscreen
-      Gtk.timeout_add(FALLBACK_LIMIT) do
-        if !@fullscreen_toggled and
-            @prev_width and @prev_height and
-            @prev_x and @prev_y
-          @window.hide
-          @window.set_size_request(@prev_width, @prev_height)
-          @window.decorated = true
-          @window.keep_above = !@main_window
-          @window.show
-          @window.move(@prev_x, @prev_y)
-          @window.present
-          @canvas.unfullscreened
-        end
-        false
-      end
-    end
   end
 
   class NullFrame

data/lib/rabbit/gem-builder.rb

@@ -0,0 +1,42 @@
+# Copyright (C) 2013 Kouhei Sutou <kou@cozmixng.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+require "rubygems"
+
+module Rabbit
+  class GemBuilder
+    class << self
+      def build(spec)
+        new(spec).build
+      end
+    end
+
+    def initialize(spec)
+      @spec = spec
+    end
+
+    if Gem.const_defined?(:Builder)
+      def build
+        Gem::Builder.new(@spec).build
+      end
+    else
+      require "rubygems/package"
+      def build
+        Gem::Package.build(@spec)
+      end
+    end
+  end
+end

data/lib/rabbit/parser/ext/image.rb

@@ -9,17 +9,11 @@ module Rabbit
   module Parser
     module Ext
       module Image
-        ALLOWED_IMG_URL_SCHEME = ['http', 'https', 'file', '']
-
         module_function
         def make_image(canvas, uri_str, prop={})
-          uri = URI.parse(uri_str)
-          scheme = uri.scheme
-          unless ALLOWED_IMG_URL_SCHEME.include?(scheme.to_s.downcase)
-            return nil
-          end
+          path = Private.uri_string_to_image_filename(canvas, uri_str)
           begin
-            Element::Image.new(Private.image_filename(canvas, uri), prop)
+            Element::Image.new(path, prop)
           rescue Error
             canvas.logger.warn($!.message)
             nil
@@ -45,24 +39,42 @@ module Rabbit
         end
 
         module Private
+          ALLOWED_IMG_URL_SCHEME = ['http', 'https', 'file']
+
           module_function
-          def image_filename(canvas, uri)
+          def uri_string_to_image_filename(canvas, uri_string)
+            if start_with_scheme?(uri_string)
+              uri = URI.parse(uri_string)
+              scheme = uri.scheme
+              unless ALLOWED_IMG_URL_SCHEME.include?(scheme.to_s.downcase)
+                return nil
+              end
+              uri_to_image_filename(canvas, uri)
+            else
+              local_path_to_image_filename(canvas, uri_string)
+            end
+          end
+
+          def uri_to_image_filename(canvas, uri)
             case uri.scheme.to_s.downcase
             when "file"
               GLib.filename_from_utf8(uri.path)
             when "http", "https", "ftp"
               other_uri_filename(canvas, uri)
             else
-              path = Pathname.new(GLib.filename_from_utf8(uri.path))
-              return path.to_s if path.absolute?
+              nil
+            end
+          end
 
-              expanded_path = canvas.full_path(path.to_s)
-              expanded_uri = URI(expanded_path)
-              if expanded_uri.scheme.nil?
-                expanded_path
-              else
-                image_filename(canvas, expanded_uri)
-              end
+          def local_path_to_image_filename(canvas, path)
+            path = Pathname.new(GLib.filename_from_utf8(path))
+            return path.to_s if path.absolute?
+
+            expanded_path = canvas.full_path(path.to_s)
+            if start_with_scheme?(expanded_path)
+              uri_string_to_image_filename(canvas, expanded_path)
+            else
+              expanded_path
             end
           end
 
@@ -89,6 +101,10 @@ module Rabbit
               canvas.logger.warn("#{$!.message}: #{uri}")
             end
           end
+
+          def start_with_scheme?(uri_string)
+            /\A[a-z][a-z\d+\-.]+:/i =~ uri_string
+          end
         end
       end
     end

data/lib/rabbit/parser/pdf.rb

@@ -11,8 +11,12 @@ module Rabbit
       unshift_loader(self)
       class << self
         def match?(source)
-          return true if /\Apdf\z/i =~ source.extension.to_s
-          source.read.start_with?("%PDF-1.")
+          extension = source.extension
+          if extension.nil?
+            source.read.start_with?("%PDF-1.")
+          else
+            /\Apdf\z/i =~ extension
+          end
         end
       end