rabbit 1.0.9 → 2.0.0

data/lib/rabbit/source/base.rb

@@ -10,7 +10,7 @@ module Rabbit
 
       def self.append_features(klass)
         super
-        klass.extend(GetText)
+        klass.send(:include, GetText)
       end
       
       attr_reader :base, :tmp_base

data/lib/rabbit/stock.rb

@@ -4,7 +4,7 @@ require 'rabbit/rabbit'
 
 module Rabbit
   module Stock
-    extend GetText
+    include GetText
     
     RABBIT = :rabbit_rabbit
     

data/lib/rabbit/task.rb

@@ -0,0 +1,18 @@
+# Copyright (C) 2012 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/task/slide"
+require "rabbit/task/theme"

data/lib/rabbit/task/slide.rb

@@ -0,0 +1,162 @@
+# Copyright (C) 2012 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 "rabbit/gettext"
+require "rabbit/logger"
+require "rabbit/command/rabbit"
+
+module Rabbit
+  module Task
+    class Slide
+      include Rake::DSL
+      include GetText
+
+      attr_reader :spec
+      attr_accessor :package_dir, :pdf_dir, :pdf_base_path
+      attr_accessor :tags, :presentation_date
+      attr_accessor :rubygems_user, :slideshare_user, :speaker_deck_user
+      def initialize(spec)
+        @logger = Logger.default
+        @spec = spec
+        @package_dir = "pkg"
+        @pdf_dir = "pdf"
+        @pdf_base_path = nil
+        @tags = []
+        @presentation_date = nil
+        @rubygems_user = nil
+        @slideshare_user = nil
+        @speaker_deck_user = nil
+        yield(self) if block_given?
+        define
+      end
+
+      private
+      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})
+        end
+
+        desc(_("Show slide"))
+        task :run => options_file do
+          rabbit
+        end
+
+        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)
+        end
+
+        namespace :gem do
+          task :validate do
+            errors = []
+            format = _("Write %{item} in %{where}: %{content}")
+            data = {
+              :where => Dir.glob("README*")[0],
+            }
+            [:summary, :description].each do |item|
+              content = @spec.send(item)
+              if /TODO|FIXME/ =~ content
+                data[:item] = item
+                data[:content] = content
+                errors << (format % data)
+              end
+            end
+            unless errors.empty?
+              raise errors.join("\n")
+            end
+          end
+        end
+
+        pdf_path = File.join(@pdf_dir, @pdf_base_path || default_pdf_base_path)
+        file pdf_path => [options_file, *@spec.files] do
+          mkdir_p(@pdf_dir)
+          rabbit("--print",
+                 "--output-filename", pdf_path)
+        end
+
+        desc(_("Generate PDF: %{pdf_path}") % {:pdf_path => pdf_path})
+        task :pdf => pdf_path
+
+        desc(_("Publish the slide to all available targets"))
+        task :publish
+
+        publish_tasks = []
+        namespace :publish do
+          if @rubygems_user
+            desc(_("Publish the slide to RubyGems.org"))
+            task :rubygems => :gem do
+              ruby("-S", "gem", "push", "--verbose", gem_path)
+            end
+            publish_tasks << :rubygems
+          end
+
+          if @slideshare_user
+            desc(_("Publish the slide to 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
+            publish_tasks << :slideshare
+          end
+
+          if @speaker_deck_user
+            desc(_("Publish the slide to Spearker Deck"))
+            task :speaker_deck => :pdf do
+              raise "Not implemented yet."
+            end
+            publish_tasks << :speaker_deck
+          end
+        end
+        task :publish => publish_tasks.collect {|task| "publish:#{task}"}
+      end
+
+      def gem_path
+        File.join(@package_dir, "#{@spec.name}-#{@spec.version}.gem")
+      end
+
+      def default_pdf_base_path
+        user_name_and_slide_id = @spec.name.gsub(/\Arabbit-slide-/, "")
+        escaped_user = Regexp.escape(@rubygems_user)
+        slide_id = user_name_and_slide_id.gsub(/\A#{escaped_user}-/, "")
+        "#{slide_id}.pdf"
+      end
+
+      def rabbit(*arguments)
+        Rabbit::Command::Rabbit.run(*arguments)
+      end
+    end
+  end
+end

data/lib/rabbit/task/theme.rb

@@ -0,0 +1,122 @@
+# Copyright (C) 2012 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 "rabbit/gettext"
+require "rabbit/logger"
+require "rabbit/command/rabbit"
+
+module Rabbit
+  module Task
+    class Theme
+      include Rake::DSL
+      include GetText
+
+      attr_reader :spec
+      attr_accessor :package_dir, :pdf_dir, :pdf_base_path
+      attr_accessor :rubygems_user
+      def initialize(spec)
+        @logger = Logger.default
+        @spec = spec
+        @package_dir = "pkg"
+        @pdf_dir = "pdf"
+        @pdf_base_path = nil
+        @rubygems_user = nil
+        yield(self) if block_given?
+        define
+      end
+
+      private
+      def define
+        task :default => :run
+
+        desc(_("Show theme benchmark slide with this theme"))
+        task :run do
+          rabbit("--theme", ".", _("rabbit-theme-benchmark-en.gem"))
+        end
+
+        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)
+        end
+
+        namespace :gem do
+          task :validate do
+            errors = []
+            format = _("Write %{item} in %{where}: %{content}")
+            data = {
+              :where => Dir.glob("README*")[0],
+            }
+            [:summary, :description].each do |item|
+              content = @spec.send(item)
+              if /TODO|FIXME/ =~ content
+                data[:item] = item
+                data[:content] = content
+                errors << (format % data)
+              end
+            end
+            unless errors.empty?
+              raise errors.join("\n")
+            end
+          end
+        end
+
+        pdf_path = File.join(@pdf_dir, @pdf_base_path || default_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"))
+        end
+
+        desc(_("Generate PDF: %{pdf_path}") % {:pdf_path => pdf_path})
+        task :pdf => pdf_path
+
+        desc(_("Publish the theme to all available targets"))
+        task :publish
+
+        publish_tasks = []
+        namespace :publish do
+          if @rubygems_user
+            desc(_("Publish the theme to %s") % "RubyGems.org")
+            task :rubygems => :gem do
+              ruby("-S", "gem", "push", "--verbose", gem_path)
+            end
+            publish_tasks << :rubygems
+          end
+        end
+        task :publish => publish_tasks.collect {|task| "publish:#{task}"}
+      end
+
+      def gem_path
+        File.join(@package_dir, "#{@spec.name}-#{@spec.version}.gem")
+      end
+
+      def default_pdf_base_path
+        theme_id = @spec.name.gsub(/\Arabbit-theme-/, "")
+        "#{theme_id}.pdf"
+      end
+
+      def rabbit(*arguments)
+        Rabbit::Command::Rabbit.run(*arguments)
+      end
+    end
+  end
+end

data/lib/rabbit/theme-browser/tree.rb

@@ -6,7 +6,7 @@ module Rabbit
   class ThemeBrowser
     class Tree
       include GetText
-      
+
       MODEL = [
         [:name, String],
         [:title, String],

data/lib/rabbit/theme/applier.rb

@@ -217,6 +217,7 @@ module Rabbit
       include Element
       include Searcher
       include DirtyCount
+      include GetText
 
       extend Forwardable
 
@@ -617,6 +618,14 @@ module Rabbit
         Parser::Ext::Entity::TABLE[key]
       end
 
+      def image_element(path, properties={})
+        image = Parser::Ext::Image.make_image(canvas, path, properties)
+        if image.nil?
+          raise ImageFileDoesNotExistError.new(path)
+        end
+        image
+      end
+
       def base_directory
         canvas.full_path(".")
       end

data/lib/rabbit/theme/background-image-toolkit/background-image-toolkit.rb

@@ -8,7 +8,6 @@ def apply_background_image_property(element, options={})
     background_image = options[:file_name]
   else
     background_image = element["background-image"]
-    background_image = canvas.full_path(background_image) if background_image
   end
   return if background_image.nil?
 
@@ -19,7 +18,7 @@ def apply_background_image_property(element, options={})
     end
   end
 
-  image = Image.new(background_image, properties)
+  image = image_element(background_image, properties)
   align = properties["align"] || "center"
   vertical_align = properties["vertical_align"] || "middle"
   assign_box = properties["assign_box"]

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

@@ -31,23 +31,12 @@ bar_gradation_thick_rgb = [0x2d, 0x38, 0x8c].collect {|x| x / 255.0}
 @default_description_item1_mark_color = base_color
 @description_term_line_color = base_color
 
-@slide_number_uninstall = !print?
 include_theme("default")
 
 set_progress_foreground(bar_gradation_middle_rgb)
 set_progress_background(bar_gradation_light_rgb)
 
 
-unless print?
-  @image_slide_number_image = "mini-usa-taro.png"
-  @image_slide_number_show_text = true
-  include_theme("image-slide-number")
-  if canvas.allotted_time
-    @image_timer_image = "mini-kame-taro.png"
-    include_theme("image-timer")
-  end
-end
-
 match(Slide, HeadLine) do |heads|
   name = "head-line"
   heads.delete_post_draw_proc_by_name(name)

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

@@ -47,19 +47,8 @@ add_image_path("rabbit-images")
 
 @margin_bottom = canvas.height * 0.05
 
-@slide_number_uninstall = !print?
 include_theme("default")
 
-unless print?
-  @image_slide_number_image ||= "mini-usa-taro.png"
-  @image_slide_number_show_text = true
-  include_theme("image-slide-number")
-  if canvas.allotted_time
-    @image_timer_image ||= "mini-kame-taro.png"
-    include_theme("image-timer")
-  end
-end
-
 match(TitleSlide, "*") do |elements|
   elements.horizontal_centering = false
   elements.align = :right

data/lib/rabbit/theme/cozmixng/cozmixng.rb

@@ -18,17 +18,6 @@ include_theme("cozmixng-powered-by")
 @title_logo_image = "ruby-pink-polygon-logo.png"
 include_theme("title-logo")
 
-@slide_number_uninstall = true
-include_theme("slide-number")
-
-@image_slide_number_image = "mini-usa-taro.png"
-@image_slide_number_show_text = true
-include_theme("image-slide-number")
-if !print? and canvas.allotted_time
-  @image_timer_image = "mini-kame-taro.png"
-  include_theme("image-timer")
-end
-
 @icon_images = ["cozmixchu.png"]
 include_theme("icon")
 

data/lib/rabbit/theme/day-white/day-white.rb

@@ -1,14 +1,8 @@
 @default_foreground = "#000000"
 @default_background = "#ffffff"
 
-@slide_number_uninstall = true
-
 @default_item1_mark_color = "#a00000"
 @default_item1_mark_type = "circle"
 @default_item2_mark_color = "#a00000"
 @default_item2_mark_type = "circle"
 include_theme("default")
-
-@image_slide_number_show_text = true
-include_theme("image-slide-number")
-include_theme("image-timer")