rabbit 2.1.6 → 2.1.7

data/test/rabbit-test-utils.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2012  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2004-2015  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
@@ -18,9 +18,5 @@ require "test-unit"
 require "test/unit/notify"
 require "test/unit/rr"
 
-module RabbitTestUtils
-  private
-  def fixture_path(*components)
-    File.join(File.dirname(__FILE__), "fixtures", *components)
-  end
-end
+require "rabbit-test-utils/fixture"
+require "rabbit-test-utils/parser"

data/test/rabbit-test-utils/fixture.rb

@@ -0,0 +1,24 @@
+# Copyright (C) 2012-2015  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.
+
+module RabbitTestUtils
+  module Fixture
+    private
+    def fixture_path(*components)
+      File.join(File.dirname(__FILE__), "..", "fixtures", *components)
+    end
+  end
+end

data/test/rabbit-test-utils/parser.rb

@@ -0,0 +1,48 @@
+# Copyright (C) 2014-2015  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.
+
+module RabbitTestUtils
+  module Parser
+    private
+    def parse(parser_class, text)
+      canvas = []
+      def canvas.logger
+        Rabbit::Logger.default
+      end
+      source = Rabbit::Source::Memory.new("UTF-8", nil)
+      source.source = text
+      parser = parser_class.new(canvas, source)
+      parser.parse
+      canvas
+    end
+
+    def inspect_canvas(canvas)
+      canvas.collect do |page|
+        inspect_element(page)
+      end
+    end
+
+    def inspect_element(element)
+      name = element.class.name.split(/::/).last
+      if element.respond_to?(:elements)
+        children = element.elements.collect {|child| inspect_element(child)}
+      else
+        children = [element.text]
+      end
+      [name, *children]
+    end
+  end
+end

data/test/source-generator/test-markdown.rb

@@ -41,7 +41,7 @@ class TestSourceGeneratorMarkdown < Test::Unit::TestCase
                                            "The presentation tool for Rubyist")
     assert_equal(<<-EOM.rstrip, item)
 Rabbit
-   The presentation tool for Rubyist
+:   The presentation tool for Rubyist
 EOM
   end
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rabbit
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.7
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-09-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: gio2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gtk2
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: gtk3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -263,7 +291,6 @@ files:
 - COPYING
 - GPL
 - Gemfile
-- README
 - Rakefile
 - bin/rabbirc
 - bin/rabbit
@@ -406,7 +433,6 @@ files:
 - doc/images/background.svg
 - doc/images/hare-and-tortoise.png
 - doc/images/hare-and-tortoise.svg
-- doc/images/jp.png
 - doc/images/lavie-icon.png
 - doc/images/lavie.png
 - doc/images/rabbit-slide-show-logo.png
@@ -463,7 +489,6 @@ files:
 - doc/images/screenshots/ja/ruby-gnome2.png
 - doc/images/screenshots/ja/rubykaigi2011-raw.png
 - doc/images/screenshots/ja/rubykaigi2011.png
-- doc/images/us.png
 - doc/index.html.en
 - doc/index.html.ja
 - doc/ja/about.rd
@@ -564,6 +589,7 @@ files:
 - lib/rabbit/element/text.rb
 - lib/rabbit/element/title-slide.rb
 - lib/rabbit/element/video.rb
+- lib/rabbit/error.rb
 - lib/rabbit/formatter.rb
 - lib/rabbit/frame.rb
 - lib/rabbit/front.rb
@@ -655,13 +681,11 @@ files:
 - lib/rabbit/renderer/display/spotlight.rb
 - lib/rabbit/renderer/engine.rb
 - lib/rabbit/renderer/engine/cairo.rb
-- lib/rabbit/renderer/engine/gdk.rb
 - lib/rabbit/renderer/gl.rb
 - lib/rabbit/renderer/kernel.rb
 - lib/rabbit/renderer/pixmap.rb
 - lib/rabbit/renderer/pixmap/base.rb
 - lib/rabbit/renderer/pixmap/cairo.rb
-- lib/rabbit/renderer/pixmap/gdk.rb
 - lib/rabbit/renderer/pixmap/gl.rb
 - lib/rabbit/renderer/print.rb
 - lib/rabbit/renderer/print/base.rb
@@ -1027,7 +1051,10 @@ files:
 - test/image/test-eps.rb
 - test/parser/test-markdown.rb
 - test/parser/test-rd.rb
+- test/parser/test-wiki.rb
 - test/rabbit-test-utils.rb
+- test/rabbit-test-utils/fixture.rb
+- test/rabbit-test-utils/parser.rb
 - test/run-test.rb
 - test/source-generator/test-hiki.rb
 - test/source-generator/test-markdown.rb
@@ -1076,6 +1103,8 @@ test_files:
 - test/rabbit-test-utils.rb
 - test/test-readme-parser.rb
 - test/test-author-configuration.rb
+- test/rabbit-test-utils/parser.rb
+- test/rabbit-test-utils/fixture.rb
 - test/source-generator/test-rd.rb
 - test/source-generator/test-markdown.rb
 - test/source-generator/test-hiki.rb
@@ -1084,6 +1113,7 @@ test_files:
 - test/test-size.rb
 - test/test-element.rb
 - test/test-applier.rb
+- test/parser/test-wiki.rb
 - test/parser/test-rd.rb
 - test/parser/test-markdown.rb
 - test/test-source.rb

data/README

@@ -1 +0,0 @@
-See doc/ or http://rabbit-shocker.org/.

data/lib/rabbit/renderer/engine/gdk.rb

@@ -1,230 +0,0 @@
-require 'rabbit/gtk'
-
-require 'rabbit/renderer/kernel'
-
-module Rabbit
-  module Renderer
-    module Engine
-      module GDK
-        include Kernel
-
-        class << self
-          def priority
-            0
-          end
-        end
-
-        def prepare_renderer(drawable)
-          @gdk_drawables ||= []
-          @gdk_drawable = drawable
-          @gdk_drawables.push(@gdk_drawable)
-        end
-
-        def init_renderer(drawable)
-          prepare_renderer(drawable)
-        end
-
-        def finish_renderer
-          @gdk_drawables.pop
-          @gdk_drawable = @gdk_drawables.pop
-        end
-
-        def alpha_available?
-          false
-        end
-
-        def foreground=(color)
-          @foreground.set_rgb_fg_color(color.to_gdk_color)
-        end
-
-        def background=(color)
-          @background.set_rgb_fg_color(color.to_gdk_color)
-        end
-
-        def background_image=(pixbuf)
-          w, h = pixbuf.width, pixbuf.height
-          pixmap = Gdk::Pixmap.new(nil, w, h, depth)
-          pixmap.draw_rectangle(@background, true, 0, 0, w, h)
-          args = [
-                  @foreground, pixbuf,
-                  0, 0, 0, 0, w, h,
-                  Gdk::RGB::DITHER_NORMAL, 0, 0,
-                 ]
-          pixmap.draw_pixbuf(*args)
-          @background.set_tile(pixmap)
-          @background.fill = Gdk::GC::Fill::TILED
-        end
-
-        def draw_line(x1, y1, x2, y2, color=nil, params={})
-          gc = make_gc(color, params)
-          return if gc.nil?
-          @gdk_drawable.draw_line(gc, x1, y1, x2, y2)
-        end
-
-        def draw_lines(points, color=nil, params={})
-          gc = make_gc(color, params)
-          return if gc.nil?
-          @gdk_drawable.draw_lines(gc, points)
-        end
-
-        def draw_rectangle(filled, x, y, w, h, color=nil, params={})
-          gc = make_gc(color, params)
-          return if gc.nil?
-          @gdk_drawable.draw_rectangle(gc, filled, x, y, w, h)
-        end
-
-        def draw_rounded_rectangle(filled, x, y, w, h, radius, color=nil, params={})
-          x_radius = params[:x_radius] || radius
-          y_radius = params[:y_radius] || radius
-          x_diameter = x_radius * 2
-          y_diameter = y_radius * 2
-
-          line_width = params[:line_width]
-
-          inner_x = x + x_radius
-          inner_y = y + y_radius
-          inner_w = w - x_diameter
-          inner_h = h - y_diameter
-
-          if filled
-            draw_rectangle(true, inner_x, inner_y, inner_w, inner_h, color)
-          end
-
-          if filled
-            top = [inner_x, y, inner_w, y_radius]
-            left = [x, inner_y, x_radius, inner_h]
-            bottom = [inner_x, inner_y + inner_h, inner_w, y_radius]
-            right = [inner_x + inner_w, inner_y, x_radius, inner_h]
-
-            [top, left, bottom, right].each do |rx, ry, rw, rh|
-              draw_rectangle(true, rx, ry, rw, rh, color)
-            end
-          else
-            top = [inner_x, y, inner_x + inner_w, y]
-            left = [x, inner_y, x, inner_y + inner_h]
-            bottom = [inner_x, y + h, inner_x + inner_w, y + h]
-            right = [x + w, inner_y, x + w, inner_y + inner_h]
-            [top, left, bottom, right].each do |start_x, start_y, end_x, end_y|
-              draw_line(start_x, start_y, end_x, end_y, color,
-                        {:line_width => line_width})
-            end
-          end
-
-          upper_left = [x, y, 90]
-          lower_left = [x, y + inner_h, 180]
-          lower_right = [x + inner_w, y + inner_h, 270]
-          upper_right = [x + inner_w, y, 0]
-          [
-           upper_left, lower_left,
-           lower_right, upper_right
-          ].each do |ax, ay, start_angle|
-            draw_arc(filled, ax, ay, x_diameter, y_diameter,
-                     start_angle, 90, color, {:line_width => line_width})
-          end
-        end
-
-        def draw_arc(filled, x, y, w, h, a1, a2, color=nil, params={})
-          gc = make_gc(color, params)
-          return if gc.nil?
-          a1 *= 64
-          a2 *= 64
-          @gdk_drawable.draw_arc(gc, filled, x, y, w, h, a1, a2)
-        end
-
-        def draw_arc_by_radius(filled, x, y, r, a1, a2, color=nil, params={})
-          sx = x - r
-          sy = y - r
-          w = r * 2
-          h = r * 2
-          draw_arc(filled, sx, sy, w, h, a1, a2, color, params)
-        end
-
-        def draw_polygon(filled, points, color=nil, params={})
-          gc = make_gc(color, params)
-          return if gc.nil?
-          @gdk_drawable.draw_polygon(gc, filled, points)
-        end
-
-        def draw_layout(layout, x, y, color=nil, params={})
-          gc = make_gc(color, params)
-          return if gc.nil?
-          @gdk_drawable.draw_layout(gc, x, y, layout)
-        end
-
-        def draw_pixbuf(pixbuf, x, y, params={})
-          gc = make_gc(params[:color], params)
-          return if gc.nil?
-
-          draw_scaled_pixbuf = params[:draw_scaled_pixbuf]
-          draw_scaled_pixbuf = @draw_scaled_image if draw_scaled_pixbuf.nil?
-          width = params[:width] || pixbuf.width
-          height = params[:height] || pixbuf.height
-          if draw_scaled_pixbuf and
-              [width, height] != [pixbuf.width, pixbuf.height]
-            pixbuf = pixbuf.scale(width, height)
-          end
-          args = [0, 0, x, y,
-                  width, height,
-                  params[:dither_mode] || Gdk::RGB::DITHER_NORMAL,
-                  params[:x_dither] || 0,
-                  params[:y_dither] || 0]
-          @gdk_drawable.draw_pixbuf(gc, pixbuf, *args)
-        end
-
-        private
-        def init_engine_color
-          @foreground = Gdk::GC.new(@gdk_drawable)
-          @background = make_gc_from_string(@background_color)
-        end
-
-        # this method is no longer need. the reason that
-        # this isn't removed is only for my memo.
-        def set_mask(gc, x, y, mask)
-          clip_mask = gc.clip_mask
-          clip_origin = gc.clip_origin
-          gc.clip_mask = mask
-          gc.set_clip_origin(x, y)
-          result = yield(gc)
-          gc.clip_mask = clip_mask
-          gc.set_clip_origin(*clip_origin)
-          result
-        end
-
-        def internal_make_gc(color)
-          if color.nil?
-            Gdk::GC.new(@gdk_drawable)
-          elsif color.is_a?(String)
-            make_gc_from_string(color)
-          elsif color.is_a?(Gdk::Color)
-            make_gc_from_gdk_color(color)
-          elsif color.is_a?(Renderer::Color)
-            make_gc_from_gdk_color(color.to_gdk_color)
-          else
-            color
-          end
-        end
-
-        def make_gc_from_gdk_color(color)
-          gc = Gdk::GC.new(@gdk_drawable)
-          gc.set_rgb_fg_color(color)
-          gc
-        end
-
-        def make_gc_from_string(str)
-          color = Color.parse(str).to_gdk_color
-          make_gc_from_gdk_color(color)
-        end
-
-        def make_gc(color, params={})
-          return nil if params[:pattern] and color.nil?
-          gc = internal_make_gc(color)
-          gc.set_line_attributes(get_line_width(params, 1),
-                                 Gdk::GC::LINE_SOLID,
-                                 Gdk::GC::CAP_ROUND,
-                                 Gdk::GC::JOIN_ROUND)
-          gc
-        end
-      end
-    end
-  end
-end