rabbit 2.1.9 → 2.2.0

data/lib/rabbit/element/text.rb

@@ -60,6 +60,13 @@ module Rabbit
       include TextContainerElement
 
       attr_accessor :to
+
+      # TODO: This makes paragraph instead of word link.
+      def draw_sub_elements(canvas, x, y, w, h)
+        canvas.draw_link(to) do
+          super
+        end
+      end
     end
 
     class Subscript

data/lib/rabbit/error.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2015  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2004-2017  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
@@ -26,7 +26,8 @@ module Rabbit
     attr_reader :filename
     def initialize(filename)
       @filename = filename
-      super(_("no such file: %s") % filename)
+      utf8_filename = GLib.filename_to_utf8(filename)
+      super(_("no such file: %s") % utf8_filename)
     end
   end
 
@@ -210,7 +211,7 @@ module Rabbit
 
   class UnknownCursorTypeError < Error
     attr_reader :type
-    def intialize(type)
+    def initialize(type)
       @type = type
       super(_("unknown cursor type: %s") % @type)
     end

data/lib/rabbit/frame.rb

@@ -57,14 +57,10 @@ module Rabbit
     end
 
     def fullscreen
-      @fullscreen_toggled = false
-      @fullscreen = true
       @window.fullscreen
     end
 
     def unfullscreen
-      @fullscreen_toggled = false
-      @fullscreen = false
       @window.unfullscreen
     end
 
@@ -77,11 +73,7 @@ module Rabbit
     end
 
     def fullscreen?
-      if @window.respond_to?(:fullscreen?)
-        @window.fullscreen?
-      else
-        @fullscreen
-      end
+      @fullscreen
     end
 
     def main_window?
@@ -94,9 +86,7 @@ module Rabbit
 
     def init_gui(width, height, main_window, window_type=nil)
       init_window(width, height, window_type)
-      @fullscreen_toggled = false
       @fullscreen = false
-      @iconify = false
       @main_window = main_window
       if @main_window
         @window.keep_above = @force_keep_above unless @force_keep_above.nil?
@@ -132,10 +122,10 @@ module Rabbit
       set_window_signal_destroy
     end
 
-    def update_keep_above(keep_above=nil)
+    def update_keep_above(keep_above)
       if @main_window
         keep_above = @force_keep_above unless @force_keep_above.nil?
-        @window.keep_above = keep_above unless keep_above.nil?
+        @window.keep_above = keep_above
       else
         @window.keep_above = true
       end
@@ -144,23 +134,21 @@ module Rabbit
     def set_window_signal_window_state_event
       @window.signal_connect("window_state_event") do |widget, event|
         if event.changed_mask.fullscreen?
-          @fullscreen_toggled = true
-          if fullscreen?
+          @fullscreen = event.new_window_state.fullscreen?
+          if @fullscreen
             @window.keep_above = true
             @canvas.fullscreened
           else
             update_keep_above(false)
             @canvas.unfullscreened
           end
-          @window.present
         elsif event.changed_mask.iconified?
-          if @iconify
-            @iconify = false
-          else
+          if event.new_window_state.iconified?
             @canvas.iconified
-            @iconify = true
           end
         end
+
+        false
       end
     end
 
@@ -233,9 +221,7 @@ module Rabbit
       @window = Gtk::EventBox.new
       @window.set_size_request(width, height)
       @canvas.attach_to(self, @window)
-      @fullscreen_toggled = false
       @fullscreen = false
-      @iconify = false
       @main_window = main_window
       @window.show
       @canvas.post_init_gui

data/lib/rabbit/front.rb

@@ -156,8 +156,8 @@ module Rabbit
     def _check_dirty
       if dirty?
         clean
-        if off_screen_canvas.need_reload_source?
-          off_screen_canvas.reload_source
+        if offscreen_canvas.need_reload_source?
+          offscreen_canvas.reload_source
           synchronize
         end
       end
@@ -171,9 +171,9 @@ module Rabbit
           prev_size = [@previous_width, @previous_height]
           current_size = [@canvas.width, @canvas.height]
           if prev_size != current_size
-            off_screen_canvas.reload_theme
+            offscreen_canvas.reload_theme
           end
-          pixbuf = off_screen_canvas.to_pixbuf(index)
+          pixbuf = offscreen_canvas.to_pixbuf(index)
           @images[index] = pixbuf.save_to_buffer(@image_type)
           synchronize
         end
@@ -183,7 +183,7 @@ module Rabbit
     def dirty?
       @dirty or
         @last_modified < @canvas.last_modified or
-        off_screen_canvas.need_reload_source?
+        offscreen_canvas.need_reload_source?
     end
 
     def synchronize
@@ -233,7 +233,7 @@ module Rabbit
     end
 
     def clean
-      @off_screen_canvas = nil
+      @offscreen_canvas = nil
       @dirty = false
       @images = []
       @last_modified = @canvas.last_modified
@@ -243,8 +243,8 @@ module Rabbit
       @dirty = true
     end
 
-    def off_screen_canvas
-      @off_screen_canvas ||= @canvas.off_screen_canvas
+    def offscreen_canvas
+      @offscreen_canvas ||= @canvas.offscreen_canvas
     end
   end
 end

data/lib/rabbit/gem-pusher.rb

@@ -0,0 +1,66 @@
+# Copyright (C) 2016 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 "rake"
+require "yaml"
+require "open-uri"
+
+require "rabbit/gettext"
+require "rabbit/password-reader"
+
+module Rabbit
+  class GemPusher
+    include GetText
+    include Rake::DSL
+
+    def initialize(gem_path, user)
+      @gem_path = gem_path
+      @user = user
+    end
+
+    def push
+      credentials_path = File.expand_path("~/.gem/credentials")
+      credentials_path_exist = File.exist?(credentials_path)
+      if credentials_path_exist
+        credentials = YAML.load(File.read(credentials_path))
+      else
+        credentials = {}
+      end
+      unless credentials.key?(@user.to_sym)
+        credentials[@user.to_sym] = retrieve_api_key
+        File.open(credentials_path, "w") do |credentials_file|
+          credentials_file.print(credentials.to_yaml)
+        end
+        unless credentials_path_exist
+          File.chmod(0600, credentials_path)
+        end
+      end
+      ruby("-S", "gem", "push", @gem_path,
+           "--key", @user)
+    end
+
+    private
+    def retrieve_api_key
+      prompt = _("Enter password on RubyGems.org [%{user}]: ") % {:user => @user}
+      reader = PasswordReader.new(prompt)
+      password = reader.read
+      open("https://rubygems.org/api/v1/api_key.yaml",
+           :http_basic_authentication => [@user, password]) do |response|
+        YAML.load(response.read)[:rubygems_api_key]
+      end
+    end
+  end
+end

data/lib/rabbit/gtk.rb

@@ -82,6 +82,10 @@ module Gdk
       alias_method :get_monitor_geometry, :monitor_geometry
     end
   end
+
+  unless const_defined?(:ScrollDirection)
+    ScrollDirection = Gdk::EventScroll::Direction
+  end
 end
 
 module Gtk

data/lib/rabbit/image-data-loader.rb

@@ -27,15 +27,15 @@ module Rabbit
     end
 
     def load
-      loader = Gdk::PixbufLoader.new
+      loader = GdkPixbuf::PixbufLoader.new
       id = loader.signal_connect("size_prepared") do |l, width, height|
         @width = width
         @height = height
       end
       begin
         loader.last_write(@data)
-      rescue Gdk::PixbufError => error
-        loader.close rescue Gdk::PixbufError
+      rescue GdkPixbuf::PixbufError => error
+        loader.close rescue GdkPixbuf::PixbufError
         raise ImageLoadError.new(error.message)
       end
       loader.signal_handler_disconnect(id)

data/lib/rabbit/image/dia.rb

@@ -17,13 +17,18 @@ module Rabbit
       class << self
         def match?(filename)
           return true if File.extname(filename).downcase.end_with?(".dia")
+
           File.open(filename) do |f|
-            first_line = f.gets
-            second_line = f.gets
-            return false unless second_line
-            return false unless first_line.start_with?("<?xml")
-            return false unless second_line.start_with?("<dia:diagram")
-            true
+            begin
+              first_line = f.gets
+              second_line = f.gets
+              return false unless second_line
+              return false unless first_line.start_with?("<?xml")
+              return false unless second_line.start_with?("<dia:diagram")
+              true
+            rescue EncodingError
+              false
+            end
           end
         end
       end

data/lib/rabbit/image/eps.rb

@@ -15,20 +15,22 @@ module Rabbit
       class << self
         def match?(filename)
           File.open(filename) do |f|
-            f.each_line do |line|
-              case line
-              when /^%!PS-Adobe-\d+.\d+ EPS/i
-                return true
-              when /^%%/
-                # ignore
-              else
-                return false
+            begin
+              f.each_line do |line|
+                case line
+                when /^%!PS-Adobe-\d+.\d+ EPS/i
+                  return true
+                when /^%%/
+                  # ignore
+                else
+                  return false
+                end
               end
+              false
+            rescue EncodingError, ArgumentError
+              false
             end
           end
-          false
-        rescue ArgumentError
-          false
         end
       end
 

data/lib/rabbit/image/gimp.rb

@@ -15,7 +15,7 @@ module Rabbit
 
       class << self
         def match?(filename)
-          File.open(filename) do |f|
+          File.open(filename, "rb") do |f|
             HEADER == f.read(HEADER_SIZE)
           end
         end

data/lib/rabbit/image/pdf.rb

@@ -14,15 +14,11 @@ module Rabbit
         def match?(filename)
           return true if File.extname(filename) == ".pdf"
 
-          File.open(filename) do |file|
-            line = file.gets
-            return false if line.nil?
+          File.open(filename, "rb") do |file|
+            data = file.read(10)
+            return false if data.nil?
 
-            begin
-              /\A%PDF-1\.\d\z/ =~ line.chomp
-            rescue ArgumentError
-              false
-            end
+            data.start_with?("%PDF-1.")
           end
         end
       end
@@ -70,13 +66,13 @@ module Rabbit
       end
 
       def uri
-        "file://#{filename}"
+        GLib.filename_to_uri(filename)
       end
 
       def to_pixbuf
         w = original_width
         h = original_height
-        pixbuf = Gdk::Pixbuf.new(Gdk::Pixbuf::COLORSPACE_RGB, true, 8, w, h)
+        pixbuf = GdkPixbuf::Pixbuf.new(:rgb, true, 8, w, h)
         page.render(0, 0, w, h, 1.0, 0, pixbuf)
         pixbuf
       end

data/lib/rabbit/image/svg.rb

@@ -12,7 +12,11 @@ module Rabbit
       class << self
         def match?(filename)
           File.open(filename) do |f|
-            /<svg|<!DOCTYPE\s+svg/ =~ f.read(200)
+            begin
+              /<svg|<!DOCTYPE\s+svg/ =~ f.read(200)
+            rescue EncodingError
+              false
+            end
           end
         end
       end

data/lib/rabbit/parser/markdown.rb

@@ -86,6 +86,7 @@ module Kramdown
 
       private
       def fix_location(element, base_location)
+        return unless element.options.key?(:location)
         element.options[:location] += base_location - 1
         element.children.each do |sub_element|
           fix_location(sub_element, base_location)

data/lib/rabbit/parser/markdown/converter.rb

@@ -1,3 +1,19 @@
+# Copyright (C) 2012-2016  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 "English"
 
 require "rabbit/gettext"
@@ -156,7 +172,17 @@ module Rabbit
             if element.options[:transparent] and child_types == [:text]
               element.children.first.value.chomp!
             end
-            create_paragraph(convert_container(element))
+            converted_children = apply_class(convert_container(element),
+                                             element.attr["class"])
+            create_paragraph(converted_children)
+          end
+        end
+
+        def apply_class(children, klass)
+          return children if klass.nil?
+          classes = klass.split
+          classes.inject(children) do |nested_children, klass|
+            CustomTag.new(klass, nested_children)
           end
         end
 
@@ -177,7 +203,10 @@ module Rabbit
           waited_paragraphs = list_item.elements.find_all do |element|
             element.is_a?(Paragraph) and element.have_wait_tag?
           end
-          unless waited_paragraphs.empty?
+          if waited_paragraphs.empty?
+            list_item.default_visible = true
+            list_item.clear_theme
+          else
             waited_paragraphs.each do |paragraph|
               paragraph.default_visible = true
               paragraph.clear_theme
@@ -377,6 +406,18 @@ module Rabbit
           Ext::Inline.note(convert_container(element))
         end
 
+        def convert_tag(element)
+          name = element.attr["name"]
+          if name.nil?
+            raise ParseError, _("tag name is missing.")
+          end
+          if element.children.empty?
+            CustomTag.new(name)
+          else
+            CustomTag.new(name, convert_container(element))
+          end
+        end
+
         def convert_strikethrough(element)
           DeletedText.new(text(element.value))
         end