rabbit 2.0.2 → 2.0.3

data/lib/rabbit/soap/base.rb

@@ -1,6 +1,6 @@
 module Rabbit
   module SOAP
-    NS = "http://rabbit-shockers.org/ns/rabbit/0.0.1/"
+    NS = "http://rabbit-shocker.org/ns/rabbit/0.0.1/"
 
     module_function
     def element_name(name)

data/lib/rabbit/task/slide.rb

@@ -80,24 +80,39 @@ module Rabbit
       def define
         task :default => :run
 
-        options_file = ".rabbit"
-        file options_file do
-          format = _("To run rabbit, create '%{options_file}'!")
-          raise(format % {:options_file => options_file})
+        define_run_task
+        define_gem_task
+        define_pdf_task
+        define_publish_task
+      end
+
+      def define_run_task
+        file options_path do
+          format = _("To run rabbit, create '%{options_path}'!")
+          raise(format % {:options_path => options_path})
         end
 
         desc(_("Show slide"))
-        task :run => options_file do
+        task :run => options_path do
           rabbit
         end
+      end
 
+      def define_gem_task
+        define_gem_create_task
+        define_gem_validate_task
+      end
+
+      def define_gem_create_task
         desc(_("Create gem: %{gem_path}") % {:gem_path => gem_path})
         task :gem => ["gem:validate", :pdf] do
           mkdir_p(@package_dir)
           Gem::Builder.new(spec).build
           mv(File.basename(spec.cache_file), gem_path)
         end
+      end
 
+      def define_gem_validate_task
         namespace :gem do
           task :validate do
             errors = []
@@ -118,8 +133,10 @@ module Rabbit
             end
           end
         end
+      end
 
-        file pdf_path => [options_file, *(spec.files - [pdf_path])] do
+      def define_pdf_task
+        file pdf_path => [options_path, *(spec.files - [pdf_path])] do
           mkdir_p(@pdf_dir)
           rabbit("--print",
                  "--output-filename", pdf_path)
@@ -127,53 +144,74 @@ module Rabbit
 
         desc(_("Generate PDF: %{pdf_path}") % {:pdf_path => pdf_path})
         task :pdf => pdf_path
+      end
 
+      def define_publish_task
         desc(_("Publish the slide to all available targets"))
         task :publish
 
         publish_tasks = []
         namespace :publish do
           if @slide.author.rubygems_user
-            desc(_("Publish the slide to %s" % "RubyGems.org"))
-            task :rubygems => :gem do
-              ruby("-S", "gem", "push", "--verbose", gem_path)
-            end
+            define_publish_rubygems_task
             publish_tasks << :rubygems
           end
 
           slideshare_user = @slide.author.slideshare_user
           if slideshare_user
-            desc(_("Publish the slide to %s" % "SlideShare"))
-            task :slideshare => [:pdf, "gem:validate"] do
-              require "rabbit/slideshare"
-              slideshare = SlideShare.new(@logger)
-              slideshare.user = slideshare_user
-              slideshare.pdf_path = pdf_path
-              slideshare.title = spec.summary
-              slideshare.description = spec.description
-              slideshare.tags = @tags if @tags
-              id = slideshare.upload
-              if id
-                url = "http://www.slideshare.net/#{slideshare_user}/ss-#{id}"
-                @logger.info(_("Uploaded successfully!"))
-                @logger.info(_("See %s") % url)
-                Gtk.show_uri(url) if Gtk.respond_to?(:show_uri)
-              end
-            end
+            define_publish_slideshare_task
             publish_tasks << :slideshare
           end
 
           if @slide.author.speaker_deck_user
-            desc(_("Publish the slide to %s" % "Spearker Deck"))
-            task :speaker_deck => :pdf do
-              raise "Not implemented yet."
-            end
+            define_publish_speaker_deck_task
             publish_tasks << :speaker_deck
           end
         end
         task :publish => publish_tasks.collect {|task| "publish:#{task}"}
       end
 
+      def define_publish_rubygems_task
+        desc(_("Publish the slide to %s" % "RubyGems.org"))
+        task :rubygems => :gem do
+          ruby("-S", "gem", "push", gem_path)
+        end
+      end
+
+      def define_publish_slideshare_task
+        desc(_("Publish the slide to %s" % "SlideShare"))
+        task :slideshare => [:pdf, "gem:validate"] do
+          require "rabbit/slideshare"
+          slideshare = SlideShare.new(@logger)
+          slideshare.user = slideshare_user
+          slideshare.pdf_path = pdf_path
+          slideshare.title = spec.summary
+          slideshare.description = spec.description
+          slideshare.tags = @tags if @tags
+          id = slideshare.upload
+          if id
+            url = "http://www.slideshare.net/#{slideshare_user}/#{id}"
+            @logger.info(_("Uploaded successfully!"))
+            @logger.info(_("See %s") % url)
+            Gtk.show_uri(url) if Gtk.respond_to?(:show_uri)
+
+            @slide.slideshare_id = id
+            @slide.save(".")
+          end
+        end
+      end
+
+      def define_publish_speaker_deck_task
+        desc(_("Publish the slide to %s" % "Spearker Deck"))
+        task :speaker_deck => :pdf do
+          puts "Not implemented yet."
+        end
+      end
+
+      def options_path
+        ".rabbit"
+      end
+
       def gem_path
         File.join(@package_dir, "#{spec.name}-#{spec.version}.gem")
       end
@@ -183,12 +221,12 @@ module Rabbit
       end
 
       def pdf_base_path
-        "#{@slide.id}.pdf"
+        "#{@slide.id}-#{@slide.base_name}.pdf"
       end
 
       def homepage
         rubygems_user = @slide.author.rubygems_user
-        "http://slide.rabbit-shockers.org/#{rubygems_user}/\#{@slide.id}/"
+        "http://slide.rabbit-shocker.org/authors/#{rubygems_user}/#{@slide.id}/"
       end
 
       def rabbit(*arguments)

data/lib/rabbit/task/theme.rb

@@ -28,12 +28,11 @@ module Rabbit
       include Rake::DSL
       include GetText
 
-      attr_reader :spec
       attr_accessor :package_dir, :pdf_dir, :required_rabbit_version
       def initialize
         @logger = Logger.default
         @theme = load_theme_configuration
-        @spec = create_spec
+        @spec = nil
         @package_dir = "pkg"
         @pdf_dir = "pdf"
         @required_rabbit_version = ">= 2.0.2"
@@ -41,6 +40,10 @@ module Rabbit
         define
       end
 
+      def spec
+        @spec ||= create_spec
+      end
+
       private
       def load_theme_configuration
         theme_conf = ThemeConfiguration.new(@logger)
@@ -68,6 +71,9 @@ module Rabbit
           spec.files += Dir.glob("data/**/*.{svg,png,jpg,jpeg,gif,eps,pdf}")
           spec.files += Dir.glob("locale/**/*.mo")
           spec.files += Dir.glob("po/*/*.po")
+          theme_benchmark_locales.each do |locale|
+            spec.files += [theme_benchmark_pdf_path(locale)]
+          end
 
           spec.add_runtime_dependency("rabbit", @required_rabbit_version)
         end
@@ -76,18 +82,34 @@ module Rabbit
       def define
         task :default => :run
 
+        define_run_task
+        define_gem_task
+        define_pdf_task
+        define_publish_task
+      end
+
+      def define_run_task
         desc(_("Show theme benchmark slide with this theme"))
         task :run do
           rabbit("--theme", ".", _("rabbit-theme-benchmark-en.gem"))
         end
+      end
+
+      def define_gem_task
+        define_gem_create_task
+        define_gem_validate_task
+      end
 
+      def define_gem_create_task
         desc(_("Create gem: %{gem_path}") % {:gem_path => gem_path})
         task :gem => "gem:validate" do
           mkdir_p(@package_dir)
-          Gem::Builder.new(@spec).build
-          mv(File.basename(@spec.cache_file), gem_path)
+          Gem::Builder.new(spec).build
+          mv(File.basename(spec.cache_file), gem_path)
         end
+      end
 
+      def define_gem_validate_task
         namespace :gem do
           task :validate do
             errors = []
@@ -96,7 +118,7 @@ module Rabbit
               :where => Dir.glob("README*")[0],
             }
             [:summary, :description].each do |item|
-              content = @spec.send(item)
+              content = spec.send(item)
               if /TODO|FIXME/ =~ content
                 data[:item] = item
                 data[:content] = content
@@ -108,19 +130,35 @@ module Rabbit
             end
           end
         end
+      end
 
-        pdf_path = File.join(@pdf_dir, pdf_base_path)
-        file pdf_path => [*@spec.files] do
-          mkdir_p(@pdf_dir)
-          rabbit("--theme", ".",
-                 "--print",
-                 "--output-filename", pdf_path,
-                 _("rabbit-theme-benchmark-en.gem"))
+      def define_pdf_task
+        desc(_("Generate all PDFs"))
+        task :pdf
+        theme_benchmark_locales.each do |locale|
+          task :pdf => "pdf:#{locale}"
         end
 
-        desc(_("Generate PDF: %{pdf_path}") % {:pdf_path => pdf_path})
-        task :pdf => pdf_path
+        namespace :pdf do
+          theme_benchmark_locales.each do |locale|
+            pdf_path = theme_benchmark_pdf_path(locale)
+            files_without_pdf = spec.files - Dir.glob("#{@pdf_dir}/*/*.pdf")
+            file pdf_path => files_without_pdf do
+              mkdir_p(@pdf_dir)
+              rabbit("--theme", ".",
+                     "--print",
+                     "--output-filename", pdf_path,
+                     "rabbit-theme-benchmark-#{locale}.gem")
+            end
 
+            desc(_("Generate PDF: %{pdf_path}") % {:pdf_path => pdf_path})
+            task locale => pdf_path do
+            end
+          end
+        end
+      end
+
+      def define_publish_task
         desc(_("Publish the theme to all available targets"))
         task :publish
 
@@ -129,7 +167,7 @@ module Rabbit
           if @theme.author.rubygems_user
             desc(_("Publish the theme to %s") % "RubyGems.org")
             task :rubygems => :gem do
-              ruby("-S", "gem", "push", "--verbose", gem_path)
+              ruby("-S", "gem", "push", gem_path)
             end
             publish_tasks << :rubygems
           end
@@ -138,15 +176,19 @@ module Rabbit
       end
 
       def gem_path
-        File.join(@package_dir, "#{@spec.name}-#{@spec.version}.gem")
+        File.join(@package_dir, "#{spec.name}-#{spec.version}.gem")
+      end
+
+      def theme_benchmark_pdf_path(locale)
+        File.join(@pdf_dir, "theme-benchmark-#{locale}.pdf")
       end
 
-      def pdf_base_path
-        "#{@theme.id}.pdf"
+      def theme_benchmark_locales
+        ["en", "ja"]
       end
 
       def homepage
-        "http://theme.rabbit-shockers.org/#{@theme.id}/"
+        "http://theme.rabbit-shocker.org/themes/#{@theme.id}/"
       end
 
       def rabbit(*arguments)

data/lib/rabbit/theme/clear-blue/clear-blue.rb

@@ -45,6 +45,15 @@ add_image_path("rabbit-images")
 @block_quote_open_quote_image = "open-quote-blue.png"
 @block_quote_close_quote_image = "close-quote-blue.png"
 
+@block_quote_frame_width = 0
+@block_quote_fill_color = "#fff0"
+@block_quote_padding_left = 0
+@block_quote_padding_right = 0
+@block_quote_padding_top = 0
+@block_quote_padding_bottom = 0
+@block_quote_image_background_alpha = 0.3
+@block_quote_image_frame = true
+
 @margin_bottom = canvas.height * 0.05
 
 include_theme("default")
@@ -77,6 +86,14 @@ match(Slide, Body) do |bodies|
   end
 end
 
+match("**", BlockQuote) do |quotes|
+  quotes.each do |quote|
+    first_element = quote.elements.first
+    next unless first_element.is_a?(Paragraph)
+    first_element.indent = first_element.prop_get("size")
+  end
+end
+
 @slide_logo_image ||= "clear-blue-headline-background.png"
 include_theme("slide-logo")
 

data/lib/rabbit/theme/color-circle-block-quote/color-circle-block-quote.rb

@@ -5,6 +5,8 @@
 @block_quote_open_quote_image = @color_circle_open_quote_image
 @block_quote_close_quote_image = @color_circle_close_quote_image
 
+@block_quote_image_frame = true
+
 include_theme("default-block-quote")
 
 block_quote = [Slide, Body, BlockQuote]

data/lib/rabbit/theme/default-block-quote/default-block-quote.rb

@@ -3,20 +3,149 @@
 @block_quote_fill_color ||= "#fcfae2"
 
 @block_quote_title_color ||= "#666"
-@block_quote_title_font_size ||= @x_small_font_size
+@block_quote_title_font_size ||= @xx_small_font_size
 
 @block_quote_padding_left ||= screen_x(5)
 @block_quote_padding_right ||= screen_x(5)
 @block_quote_padding_top ||= screen_y(2)
 @block_quote_padding_bottom ||= screen_y(2)
 
-@block_quote_margin_left ||= screen_x(3)
-@block_quote_margin_right ||= screen_x(3)
+@block_quote_margin_left ||= screen_x(1)
+@block_quote_margin_right ||= screen_x(1)
 
 @block_quote_open_quote_image ||= nil
 @block_quote_close_quote_image ||= nil
-@block_quote_image_max_width ||= canvas.width * 0.1
+@block_quote_image_max_width ||= nil # deprecated
+@block_quote_image_width ||= @block_quote_image_max_width
+@block_quote_image_width ||= canvas.width * 0.1
 @block_quote_image_background_alpha ||= nil
+@block_quote_image_frame ||= nil
+
+load_quote = lambda do |file|
+  return nil if file.nil?
+  quote = ImageLoader.new(find_file(file))
+  quote.keep_ratio = true
+  quote.resize(@block_quote_image_width, nil)
+  quote
+end
+
+compute_padding = lambda do |open_quote, close_quote|
+  padding = {
+    :left   => @block_quote_padding_left,
+    :right  => @block_quote_padding_right,
+    :top    => @block_quote_padding_top,
+    :bottom => @block_quote_padding_bottom,
+  }
+  return padding if @block_quote_image_frame
+
+  unless @block_quote_image_background_alpha
+    padding[:left]  += @block_quote_image_width if open_quote
+    padding[:right] += @block_quote_image_width if close_quote
+  end
+  padding
+end
+
+compute_margin = lambda do |open_quote, close_quote|
+  margin = {
+    :left   => @block_quote_margin_left,
+    :right  => @block_quote_margin_right,
+    :bottom => @space,
+  }
+  if @block_quote_image_frame
+    if open_quote
+      margin[:left] += open_quote.width / 2
+      margin[:top] = open_quote.height / 2
+    end
+    if close_quote
+      margin[:right] += close_quote.width / 2
+      margin[:bottom] = close_quote.height / 2
+    end
+  end
+  margin
+end
+
+render_open_quote = lambda do |open_quote, block, canvas, x, y, w, h|
+  return unless open_quote
+  quote_x = x
+  quote_y = y
+  if @block_quote_image_frame
+    quote_x -= block.padding_left
+    quote_x -= open_quote.width / 2
+    quote_y -= block.padding_top
+    quote_y -= open_quote.height / 2
+  else
+    quote_x -= block.padding_left / 2
+    unless @block_quote_image_background_alpha
+      quote_x -= open_quote.width / 2
+    end
+    quote_y -= block.padding_top / 2
+  end
+  open_quote.draw(canvas, quote_x, quote_y,
+                  :alpha => @block_quote_image_background_alpha)
+end
+
+render_close_quote = lambda do |close_quote, block, canvas, x, y, w, h|
+  return unless close_quote
+  quote_x = x + w
+  quote_y = y + block.height
+  if @block_quote_image_frame
+    quote_x += block.padding_right
+    quote_x -= close_quote.width / 2
+    quote_y -= block.padding_bottom
+    quote_y -= close_quote.height / 2
+  else
+    quote_x -= (block.padding_right - close_quote.width) / 2
+    if @block_quote_image_background_alpha
+      quote_x -= close_quote.width
+    else
+      quote_x += close_quote.width / 2
+    end
+    quote_y -= close_quote.height
+    quote_y -= block.padding_bottom
+    quote_y -= block.padding_bottom / 2
+  end
+  close_quote.draw(canvas, quote_x, quote_y,
+                   :alpha => @block_quote_image_background_alpha)
+end
+
+create_title_layout = lambda do |close_quote, block, canvas, x, y, w, h|
+  title = Text.new(_("[cited from `%s']") % block.title)
+  title.font(:size => @block_quote_title_font_size,
+             :style => "italic")
+  title.align = Pango::Layout::ALIGN_RIGHT
+  set_font_family(title)
+  title_w = w + block.padding_left + block.padding_right
+  if @block_quote_image_frame
+    title_w -= close_quote.width / 2 if close_quote
+  end
+  title.compile(canvas, x, y, title_w, h)
+  block.margin_bottom += title.height + @block_quote_frame_width
+  title.layout
+end
+
+render_title_layout = lambda do |layout, block, canvas, x, y, w, h|
+  base_x = (block.ox || x) - block.padding_left
+  base_y = y + block.padding_bottom
+  unless @block_quote_image_frame
+    base_y += @block_quote_frame_width
+  end
+  canvas.draw_layout(layout, base_x, base_y, @block_quote_title_color)
+
+end
+
+load_avatar = lambda do |path|
+  return nil if path.nil?
+  image_element(path,
+                "width" => @block_quote_image_width,
+                "keep_ratio" => true)
+end
+
+render_avatar = lambda do |avatar, block, canvas, x, y, w, h|
+  avatar.image_draw(canvas,
+                    x - block.padding_left - block.margin_left,
+                    y - block.padding_bottom)
+end
+
 
 match("**", BlockQuote) do
   name = "block-quote"
@@ -25,77 +154,29 @@ match("**", BlockQuote) do
 
   params = {
     :proc_name => name,
-    :frame_color => @block_quote_frame_color,
-    :frame_width =>  @block_quote_frame_width,
     :fill_color => @block_quote_fill_color,
   }
-
+  unless @block_quote_image_frame
+    params[:frame_color] = @block_quote_frame_color
+    params[:frame_width] = @block_quote_frame_width
+  end
   draw_frame(params)
 
   each do |block|
     name = "block-quote-image"
 
-    padding_left = @block_quote_padding_left
-    padding_right = @block_quote_padding_right
-
-    open_quote = nil
-    close_quote = nil
-    if @block_quote_open_quote_image
-      open_quote = ImageLoader.new(find_file(@block_quote_open_quote_image))
-      if open_quote.width > @block_quote_image_max_width
-        open_quote.resize(@block_quote_image_max_width, nil)
-      end
-      unless @block_quote_image_background_alpha
-        padding_left += open_quote.width
-      end
-    end
-    if @block_quote_close_quote_image
-      close_quote = ImageLoader.new(find_file(@block_quote_close_quote_image))
-      if close_quote.width > @block_quote_image_max_width
-        close_quote.resize(@block_quote_image_max_width, nil)
-      end
-      unless @block_quote_image_background_alpha
-        padding_right += close_quote.width
-      end
-    end
+    open_quote = load_quote.call(@block_quote_open_quote_image)
+    close_quote = load_quote.call(@block_quote_close_quote_image)
 
-    block.padding_with(:left => padding_left,
-                       :right => padding_right,
-                       :top => @block_quote_padding_top,
-                       :bottom => @block_quote_padding_bottom)
-    block.margin_with(:left => @block_quote_margin_left,
-                      :right => @block_quote_margin_right,
-                      :bottom => @space)
+    block.padding_with(compute_padding.call(open_quote, close_quote))
+    block.margin_with(compute_margin.call(open_quote, close_quote))
 
     block.delete_pre_draw_proc_by_name(name)
     if open_quote or close_quote
       block.add_pre_draw_proc(name) do |canvas, x, y, w, h, simulation|
         unless simulation
-          if open_quote
-            adjust_open_quote_x = @block_quote_padding_left / 2
-            adjust_open_quote_y = @block_quote_padding_top / 2
-            unless @block_quote_image_background_alpha
-              adjust_open_quote_x += open_quote.width
-            end
-            open_quote.draw(canvas,
-                            x - adjust_open_quote_x,
-                            y - adjust_open_quote_y,
-                            :alpha => @block_quote_image_background_alpha)
-          end
-          if close_quote
-            adjust_close_quote_x = -@block_quote_padding_right / 2
-            if @block_quote_image_background_alpha
-              adjust_close_quote_x += close_quote.width
-            end
-            adjust_close_quote_y = block.height
-            adjust_close_quote_y -= close_quote.height
-            adjust_close_quote_y -= @block_quote_padding_bottom / 2
-            adjust_close_quote_y -= block.padding_bottom
-            close_quote.draw(canvas,
-                             x + w - adjust_close_quote_x,
-                             y + adjust_close_quote_y,
-                             :alpha => @block_quote_image_background_alpha)
-          end
+          render_open_quote.call(open_quote, block, canvas, x, y, w, h)
+          render_close_quote.call(close_quote, block, canvas, x, y, w, h)
         end
         [x, y, w, h]
       end
@@ -107,24 +188,30 @@ match("**", BlockQuote) do
     if block.title
       layout = nil
       block.add_post_draw_proc(name) do |canvas, x, y, w, h, simulation|
-        if layout.nil?
-          title = Text.new(_("[cited from `%s']") % block.title)
-          title.font(:size => @block_quote_title_font_size,
-                     :style => "italic")
-          title.align = Pango::Layout::ALIGN_RIGHT
-          set_font_family(title)
-          title_w = w + block.padding_left + block.padding_right
-          title.compile(canvas, x, y, title_w, h)
-          layout = title.layout
-          block.margin_bottom += title.height + @block_quote_frame_width
+        layout ||= create_title_layout.call(close_quote,
+                                            block, canvas, x, y, w, h)
+        unless simulation
+          render_title_layout.call(layout, block, canvas, x, y, w, h)
         end
+        [x, y, w, h]
+      end
+    end
+
+    name = "block-quote-avatar"
+    block.delete_post_draw_proc_by_name(name)
+
+    avatar = load_avatar.call(block.avatar)
+    if avatar
+      block.add_post_draw_proc(name) do |canvas, x, y, w, h, simulation|
         unless simulation
-          base_x = (block.ox || x) - block.padding_left
-          base_y = y + block.padding_bottom + @block_quote_frame_width
-          canvas.draw_layout(layout, base_x, base_y, @block_quote_title_color)
+          render_avatar.call(avatar, block, canvas, x, y, w, h)
         end
         [x, y, w, h]
       end
     end
   end
 end
+
+match("**", BlockQuote, TextContainerElement) do |texts|
+  texts.justify = true
+end