rabbit 2.2.1 → 3.0.0

data/lib/rabbit/renderer/widget/drawing-area.rb

@@ -0,0 +1,93 @@
+# Copyright (C) 2006-2018  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 "rabbit/renderer/engine/cairo"
+
+module Rabbit
+  module Renderer
+    module Widget
+      class DrawingArea
+        include Engine::Cairo
+
+        def initialize(canvas)
+          @canvas = canvas
+          @area = Gtk::DrawingArea.new
+          clear_compiled_slides
+          set_draw
+        end
+
+        def raw
+          @area
+        end
+
+        def queue_redraw
+          @area.queue_redraw
+        end
+
+        def clear_compiled_slide(slide=nil)
+          @compiled_slides.delete(slide || @canvas.current_slide)
+        end
+
+        def clear_compiled_slides
+          @compiled_slides = {}
+        end
+
+        def width
+          @area.allocation.width
+        end
+
+        def height
+          @area.allocation.height
+        end
+
+        private
+        def set_draw
+          @area.signal_connect(:draw) do |widget, context|
+            init_context(context)
+            draw(widget)
+            finish_renderer
+            Gdk::Event::PROPAGATE
+          end
+        end
+
+        def draw(widget)
+          draw_current_slide
+        end
+
+        def draw_current_slide
+          slide = @canvas.current_slide
+          if slide
+            begin
+              compile_slide(slide) unless compiled_slide?(slide)
+              slide.draw(@canvas, false)
+            rescue
+              @canvas.logger.warn($!)
+            end
+          end
+        end
+
+        def compiled_slide?(slide)
+          @compiled_slides.has_key?(slide)
+        end
+
+        def compile_slide(slide)
+          @compiled_slides[slide] = true
+          slide.draw(@canvas, true)
+        end
+      end
+    end
+  end
+end

data/lib/rabbit/size.rb

@@ -1,7 +1,27 @@
+# Copyright (C) 2015-2019  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 Rabbit
   class Size
+    attr_reader :base_width
+    attr_reader :base_height
     attr_reader :real_width
     attr_reader :real_height
+    attr_reader :real_content_width
+    attr_reader :real_content_height
     attr_reader :logical_width
     attr_reader :logical_height
     attr_reader :logical_margin_left
@@ -9,7 +29,9 @@ module Rabbit
     attr_reader :logical_margin_top
     attr_reader :logical_margin_bottom
     attr_reader :ratio
-    def initialize(width, height, ratio)
+    def initialize(base_width, base_height, width, height, ratio)
+      @base_width = base_width
+      @base_height = base_height
       @real_width = width
       @real_height = height
       @ratio = ratio
@@ -30,36 +52,41 @@ module Rabbit
       have_logical_margin_x? or have_logical_margin_y?
     end
 
+    def logical_scale
+      @logical_scale
+    end
+
     private
     def compute_logical_size
+      @logical_width = @base_width
+      @logical_height = @base_height
+
       real_ratio = @real_width.to_f / @real_height.to_f
       if real_ratio == @ratio
-        @logical_width = @real_width
-        @logical_height = @real_height
-        @logical_margin_left = 0
-        @logical_margin_right = 0
-        @logical_margin_top = 0
-        @logical_margin_bottom = 0
-        return
-      end
-
-      if real_ratio > @ratio
-        @logical_width = @real_width * (@ratio / real_ratio)
-        @logical_height = @real_height
-        width_margin = @real_width - @logical_width
-        @logical_margin_left = width_margin / 2
-        @logical_margin_right = width_margin / 2
-        @logical_margin_top = 0
-        @logical_margin_bottom = 0
+        @real_content_width = @real_width
+        @real_content_height = @real_height
+      elsif real_ratio > @ratio
+        @real_content_width = @real_width * (@ratio / real_ratio)
+        @real_content_height = @real_height
       else
-        @logical_width = @real_width
-        @logical_height = @real_height * (real_ratio / @ratio)
-        height_margin = @real_height - @logical_height
-        @logical_margin_left = 0
-        @logical_margin_right = 0
-        @logical_margin_top = height_margin / 2
-        @logical_margin_bottom = height_margin / 2
+        @real_content_width = @real_width
+        @real_content_height = @real_height * (real_ratio / @ratio)
       end
+
+      logical_scale_x = @real_content_width.to_f / @logical_width.to_f
+      logical_scale_y = @real_content_height.to_f / @logical_height.to_f
+
+      real_margin_width = @real_width - @real_content_width
+      logical_margin_width = real_margin_width / logical_scale_x
+      @logical_margin_left = logical_margin_width / 2
+      @logical_margin_right = logical_margin_width / 2
+
+      real_margin_height = @real_height - @real_content_height
+      logical_margin_height = real_margin_height / logical_scale_y
+      @logical_margin_top = logical_margin_height / 2
+      @logical_margin_bottom = logical_margin_height / 2
+
+      @logical_scale = [logical_scale_x, logical_scale_y]
     end
   end
 end

data/lib/rabbit/slide-configuration.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2012-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
@@ -14,6 +14,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+require "date"
 require "time"
 
 require "yaml"
@@ -31,7 +32,12 @@ module Rabbit
     GEM_NAME_PREFIX = "rabbit-slide"
 
     attr_accessor :logger
-    attr_accessor :id, :base_name, :tags, :presentation_date
+    attr_accessor :id
+    attr_accessor :base_name
+    attr_accessor :tags
+    attr_reader :presentation_date
+    attr_reader :presentation_start_time
+    attr_reader :presentation_end_time
     attr_accessor :licenses
     attr_accessor :slideshare_id
     attr_accessor :speaker_deck_id
@@ -45,6 +51,18 @@ module Rabbit
       clear
     end
 
+    def presentation_date=(value)
+      @presentation_date = ensure_date(value)
+    end
+
+    def presentation_start_time=(value)
+      @presentation_start_time = ensure_time(value)
+    end
+
+    def presentation_end_time=(value)
+      @presentation_end_time = ensure_time(value)
+    end
+
     def load
       return unless File.exist?(path)
       conf = YAML.load(File.read(path))
@@ -70,6 +88,8 @@ module Rabbit
       @base_name         = nil
       @tags              = []
       @presentation_date = nil
+      @presentation_start_time = nil
+      @presentation_end_time = nil
       @version           = nil
       @licenses          = []
       @slideshare_id     = nil
@@ -80,10 +100,16 @@ module Rabbit
       @author            = nil
     end
 
+
     def merge!(conf)
       @id                = conf["id"]                || @id
       @base_name         = conf["base_name"]         || @base_name
-      @presentation_date = conf["presentation_date"] || @presentation_date
+      self.presentation_date =
+        conf["presentation_date"] || @presentation_date
+      self.presentation_start_time =
+        conf["presentation_start_time"] || @presentation_start_time
+      self.presentation_end_time =
+        conf["presentation_end_time"] || @presentation_end_time
       @version           = conf["version"]           || @version
       @slideshare_id     = conf["slideshare_id"]     || @slideshare_id
       @speaker_deck_id   = conf["speaker_deck_id"]   || @speaker_deck_id
@@ -104,6 +130,8 @@ module Rabbit
         "base_name"         => @base_name,
         "tags"              => @tags,
         "presentation_date" => @presentation_date,
+        "presentation_start_time" => @presentation_start_time,
+        "presentation_end_time" => @presentation_end_time,
         "version"           => version,
         "licenses"          => @licenses,
         "slideshare_id"     => @slideshare_id,
@@ -117,7 +145,16 @@ module Rabbit
     end
 
     def to_yaml
-      to_hash.to_yaml
+      hash = to_hash
+      hash.each do |key, value|
+        case value
+        when Date
+          hash[key] = value.strftime("%Y-%m-%d")
+        when Time
+          hash[key] = value.iso8601
+        end
+      end
+      hash.to_yaml
     end
 
     def version
@@ -133,19 +170,26 @@ module Rabbit
     end
 
     private
-    def parsed_presentation_date
-      return nil if @presentation_date.nil?
-      begin
-        Time.parse(@presentation_date)
-      rescue ArgumentError
-        nil
+    def ensure_date(value)
+      if value.is_a?(String)
+        Date.parse(value)
+      else
+        value
+      end
+    end
+
+    def ensure_time(value)
+      if value.is_a?(String)
+        Time.parse(value)
+      else
+        value
       end
     end
 
     def default_version
-      date = parsed_presentation_date
+      date = presentation_date
       if date
-        date.strftime("%Y.%m.%d")
+        "#{date.year}.#{date.month}.#{date.day}.0"
       else
         "1.0.0"
       end

data/lib/rabbit/source.rb

@@ -1,14 +1,30 @@
-require "rabbit/utils"
+# Copyright (C) 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
+# 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 "rabbit/source/argf"
+require "rabbit/source/file"
+require "rabbit/source/memory"
+require "rabbit/source/uri"
 
 module Rabbit
   module Source
-    extend Utils
-
-    dir = ::File.join("rabbit", "source")
-    require_files_under_directory_in_load_path(dir)
-
-    def self.types
-      collect_classes_under_module(self)
+    class << self
+      def types
+        Utils.collect_classes_under_module(self)
+      end
     end
   end
 end

data/lib/rabbit/task/slide.rb

@@ -231,7 +231,7 @@ module Rabbit
 
       def homepage
         rubygems_user = @slide.author.rubygems_user
-        "http://slide.rabbit-shocker.org/authors/#{rubygems_user}/#{@slide.id}/"
+        "https://slide.rabbit-shocker.org/authors/#{rubygems_user}/#{@slide.id}/"
       end
 
       def rabbit(*arguments)

data/lib/rabbit/theme/applier.rb

@@ -241,8 +241,8 @@ module Rabbit
       def_delegators(:canvas, :make_layout)
 
       # Those constants are meaningless. :p
-      NORMALIZED_WIDTH = 91.0 * 96
-      NORMALIZED_HEIGHT = 67.5 * 96
+      NORMALIZED_WIDTH = 130.0 * 96
+      NORMALIZED_HEIGHT = 97.5 * 96
 
       def initialize(theme, &callback)
         super()
@@ -289,7 +289,11 @@ module Rabbit
       end
 
       def normalized_size(s)
-        ((s / canvas.width.to_f) * normalized_width).ceil
+        if wide_aspect_ratio?
+          normalized_y(s)
+        else
+          normalized_x(s)
+        end
       end
 
       def normalized_x(sx)
@@ -300,8 +304,21 @@ module Rabbit
         ((sy / canvas.height.to_f) * normalized_height).ceil
       end
 
+      def font_size(size)
+        # TODO: Convert to point from pixel
+        if wide_aspect_ratio?
+          ((canvas.height * size) / normalized_height)
+        else
+          ((canvas.width * size) / normalized_width)
+        end
+      end
+
       def screen_size(n)
-        ((canvas.width * n) / normalized_width).ceil
+        if wide_aspect_ratio?
+          screen_y(n)
+        else
+          screen_x(n)
+        end
       end
 
       def screen_x(nx)
@@ -317,6 +334,10 @@ module Rabbit
       end
 
       private
+      def wide_aspect_ratio?
+        (canvas.width / 4) > (canvas.height / 3)
+      end
+
       def normalize_source(src)
         src.gsub(/(?=^|\W)@(very_)?huge_(script_)?font_size(?=$|\W)/) do |x|
           x = "x"
@@ -333,10 +354,6 @@ module Rabbit
         end
       end
 
-      def to_attrs(hash)
-        canvas.to_attrs(hash)
-      end
-
       def name
         @theme.name
       end
@@ -619,7 +636,7 @@ module Rabbit
       end
 
       def tag(name, attributes, content)
-        "<#{name} #{to_attrs(attributes)}>#{content}</#{name}>"
+        PangoMarkup.new(name, attributes, content).to_s
       end
 
       def span(attributes, content)