rabbit 1.0.9 → 2.0.0

data/lib/rabbit/theme/default/default.rb

@@ -20,7 +20,13 @@ include_theme("default-description")
 include_theme("image")
 include_theme("table")
 include_theme("newline-in-slides")
-include_theme("slide-number")
+
+unless print?
+  include_theme("image-slide-number")
+  if canvas.allotted_time
+    include_theme("image-timer")
+  end
+end
 
 include_theme("per-slide-background-color")
 

data/lib/rabbit/theme/enishi-green/property.rb

@@ -1,3 +1,3 @@
 @category = N_("Theme")
-@title = N_("mayuco")
-@description = N_("mayuco theme")
+@title = N_("Enishi Green")
+@description = N_("EnishTech green based theme")

data/lib/rabbit/theme/entry.rb

@@ -1,16 +1,34 @@
+# Copyright (C) 2005-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 'erb'
 
 require 'rabbit/rabbit'
+require "rabbit/gem-finder"
 
 module Rabbit
   module Theme
     class Entry
       extend ERB::DefMethod
       
+      include Enumerable
       include ERB::Util
       include GetText
-      include Enumerable
-      
+
+      THEME_BASE_NAME = "theme"
       PROPERTY_BASE_NAME = "property"
 
       class << self
@@ -47,8 +65,8 @@ module Rabbit
       attr_reader :dependencies, :parameters
       attr_accessor :logger
 
-      def initialize(theme_dir, name)
-        @logger = nil
+      def initialize(logger, theme_dir, name)
+        @logger = logger
         @theme_dir = theme_dir
         @name = name
         @title = @name
@@ -68,10 +86,6 @@ module Rabbit
         File.writable?(property_file)
       end
 
-      def theme_file
-        File.join(@theme_dir, "#{@name}.rb")
-      end
-
       def <=>(other)
         @name <=> other.name
       end
@@ -81,7 +95,12 @@ module Rabbit
       end
 
       def full_path(target)
-        File.join(@theme_dir, target)
+        if have_data_dir?
+          File.join(data_dir, target)
+        else
+          # backward compatibility
+          File.join(@theme_dir, target)
+        end
       end
 
       def category
@@ -89,19 +108,28 @@ module Rabbit
       end
 
       def image_theme?
-        false
+        have_data_dir?
+      end
+
+      def data_dir
+        File.join(@theme_dir, "data")
       end
 
       def files
-        rejected_files = [theme_file, property_file]
-        Dir[File.join(@theme_dir, "*")].delete_if do |name|
-          rejected_files.include?(name)
-        end.sort
+        if have_data_dir?
+          Dir.glob(File.join(data_dir, "*")).sort
+        else
+          # backward compatibility
+          rejected_files = [theme_file, property_file]
+          Dir[File.join(@theme_dir, "*")].delete_if do |name|
+            rejected_files.include?(name)
+          end.sort
+        end
       end
 
       private
       def property_file
-         File.join(@theme_dir, "#{PROPERTY_BASE_NAME}.rb")
+        File.join(@theme_dir, "#{PROPERTY_BASE_NAME}.rb")
       end
 
       def parse_property
@@ -115,11 +143,27 @@ module Rabbit
           end
         end
       end
+
+      def have_data_dir?
+        File.directory?(data_dir)
+      end
+    end
+
+    class FileEntry < Entry
+      def theme_file
+        File.join(@theme_dir, "#{@name}.rb")
+      end
+    end
+
+    class ImageFileEntry < FileEntry
+      def image_theme?
+        true
+      end
     end
 
     class DirectoryEntry < Entry
-      def initialize(theme_dir)
-        super(theme_dir, File.basename(theme_dir))
+      def theme_file
+        File.join(@theme_dir, "#{THEME_BASE_NAME}.rb")
       end
     end
 
@@ -129,25 +173,39 @@ module Rabbit
       end
     end
 
-    class SingleFileEntry < Entry
-      def initialize(theme_dir, name)
-        super(theme_dir, name)
+    class GemEntry < Entry
+      def initialize(logger, name)
+        finder = GemFinder.new(logger)
+        @spec = finder.find(name, "rabbit-theme-")
+        theme_dir = nil
+        theme_dir = @spec.gem_dir if @spec
+        super(logger, theme_dir, name)
       end
 
-      def property_editable?
-        false
+      def available?
+        @theme_dir and super
+      end
+
+      def theme_file
+        File.join(@theme_dir, "#{THEME_BASE_NAME}.rb")
+      end
+
+      def full_path(target)
+        File.join(data_dir, target)
       end
 
       def files
-        []
+        Dir.glob(File.join(data_dir, "*")).sort
       end
+    end
 
-      def have_file?(target)
-        name == target
+    class ImageGemEntry < GemEntry
+      def available?
+        @theme_dir and File.directory?(data_dir)
       end
 
-      private
-      def parse_property
+      def image_theme?
+        true
       end
     end
   end

data/lib/rabbit/theme/image-slide-number/image-slide-number.rb

@@ -3,7 +3,10 @@ add_image_path("rabbit-images")
 proc_name = "image-slide-number"
 
 @image_slide_number_image ||= "mini-usa-taro.png"
-@image_slide_number_show_text ||= false
+if !defined?(@image_slide_number_show_text) or
+    @image_slide_number_show_text.nil?
+  @image_slide_number_show_text = true
+end
 @image_slide_number_font_size ||= @xx_small_font_size
 @image_slide_number_text_color ||= "white"
 if !defined?(@image_slide_number_show_flag) or

data/lib/rabbit/theme/lightning-monochrome/lightning-monochrome.rb

@@ -1,4 +1,3 @@
-@slide_number_uninstall = true
 @default_headline_line_color = "black"
 @default_item1_mark_type = "check"
 @default_item2_mark_type = "circle"

data/lib/rabbit/theme/lightning-simple/lightning-simple.rb

@@ -40,7 +40,6 @@ include_theme("powered-by")
 if print?
   include_theme("slide-number")
 else
-  @image_slide_number_show_text = true
   include_theme("image-slide-number")
 
   @image_timer_limit ||= canvas.allotted_time || 5 * 60

data/lib/rabbit/theme/nari/nari.rb

@@ -48,10 +48,12 @@ add_image_path("rabbit-images")
 @font_family = find_font_family("Times")
 @monospace_font_family = find_font_family("Times")
 
-@slide_number_uninstall = !print?
-if print?
-  include_theme("slide-number")
-end
+add_image_path("nari-images")
+@image_slide_number_image ||= "gc_kun.png"
+@image_slide_number_show_text = false
+@image_slide_number_start_image = "nari-start-flag.png"
+@image_slide_number_goal_image = "nari-goal-flag.png"
+@image_timer_image ||= "chibi_nari.png"
 
 include_theme("default")
 include_theme("newline-in-title")
@@ -86,18 +88,6 @@ match(Slide, Body) do |bodies|
   end
 end
 
-add_image_path("nari-images")
-unless print?
-  @image_slide_number_image ||= "gc_kun.png"
-  @image_slide_number_start_image = "nari-start-flag.png"
-  @image_slide_number_goal_image = "nari-goal-flag.png"
-  include_theme("image-slide-number")
-  if canvas.allotted_time
-    @image_timer_image ||= "chibi_nari.png"
-    include_theme("image-timer")
-  end
-end
-
 @slide_footer_info_left_text ||= canvas.title
 @slide_footer_info_right_text ||= "Powered by Rabbit #{Rabbit::VERSION}"
 include_theme("slide-footer-info")

data/lib/rabbit/theme/nari/property.rb

@@ -0,0 +1,3 @@
+@category = N_("Theme")
+@title = N_("Nari")
+@description = N_("Nari's theme")

data/lib/rabbit/theme/night-black/night-black.rb

@@ -4,8 +4,6 @@
 @image_caption_color = @default_foreground
 @table_caption_color = @default_foreground
 
-@slide_number_uninstall = true
-
 @default_item1_mark_color = "#a00000"
 @default_item1_mark_type = "circle"
 @default_item2_mark_color = "#a00000"
@@ -19,7 +17,3 @@
 @table_body_fill_color = "#101010"
 
 include_theme("default")
-
-@image_slide_number_show_text = true
-include_theme("image-slide-number")
-include_theme("image-timer")

data/lib/rabbit/theme/pdf/pdf.rb

@@ -4,15 +4,11 @@ rescue LoadError
 end
 
 if canvas.allotted_time
-  @image_slide_number_image = "mini-usa-taro.png"
-  @image_slide_number_show_text = true
-
   @image_slide_number_margin_left = @margin_left
   @image_slide_number_margin_right = @margin_right
   @image_slide_number_margin_bottom = @margin_bottom
   include_theme("image-slide-number")
 
-  @image_timer_image = "mini-kame-taro.png"
   @image_timer_margin_left = @margin_left
   @image_timer_margin_right = @margin_right
   @image_timer_margin_bottom = @margin_bottom

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

@@ -35,12 +35,6 @@ include_theme("rabbit-headline-logo")
 @title_shadow_color = "#c09090cc"
 include_theme("title-shadow")
 
-@slide_number_uninstall = true
-include_theme("slide-number")
-
-@image_slide_number_show_text = true
-include_theme("image-slide-number")
-
 include_theme("rabbit-powered-by")
 include_theme("rabbit-icon")
 

data/lib/rabbit/theme/ranguba/ranguba.rb

@@ -49,8 +49,6 @@ end
 @default_description_item1_mark_color = ranguba_color
 @default_block_quote_item1_mark_color = ranguba_color
 
-@slide_number_uninstall = !print?
-
 include_theme("default")
 
 @icon_images = ["ranguba-mark.png"]
@@ -65,16 +63,6 @@ end
 end
 include_theme("slide-logo")
 
-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
-
 @slide_footer_info_left_text ||= canvas.title.gsub(/\n+/, ' ')
 @slide_footer_info_right_text ||= "Powered by Rabbit #{Rabbit::VERSION}"
 include_theme("slide-footer-info")

data/lib/rabbit/theme/ruby-gnome2/ruby-gnome2.rb

@@ -34,10 +34,6 @@ match("**", Emphasis) do |ems|
   ems.prop_set("foreground", @ruby_gnome2_emphasis_color)
 end
 
-@image_slide_number_image = "mini-usa-taro.png"
-@image_slide_number_show_text = true
-include_theme("image-slide-number")
-
 if print?
   @powered_by_text = "Powered by Rabbit #{VERSION}, Ruby-GNOME2 and COZMIXNG"
 end
@@ -48,6 +44,13 @@ end
 ]
 include_theme("powered-by")
 
+unless print?
+  include_theme("image-slide-number")
+  if canvas.allotted_time
+    include_theme("image-timer")
+  end
+end
+
 @lightning_talk_proc_name = "lightning-ruby-gnome2"
 @lightning_talk_as_large_as_possible = true
 include_theme("lightning-talk-toolkit")

data/lib/rabbit/theme/rubykaigi2011/rubykaigi2011.rb

@@ -24,7 +24,8 @@ fill_color = "#ffffff4d"
 @table_head_fill_color = dark_color
 @table_header_font_props[:color] = "white"
 
-@slide_number_uninstall = true
+@image_slide_number_start_flag_color = dark_color
+@image_slide_number_goal_flag_color = dark_color
 
 include_theme("default")
 
@@ -45,11 +46,3 @@ background_image = "rubykaigi2011-background-white.jpg"
 @slide_background_image = background_image
 include_theme("title-slide-background-image")
 include_theme("slide-background-image")
-
-if canvas.allotted_time
-  include_theme("image-slide-number")
-  @image_slide_number_show_text = true
-  @image_slide_number_start_flag_color = dark_color
-  @image_slide_number_goal_flag_color = dark_color
-  include_theme("image-timer")
-end

data/lib/rabbit/theme/searcher.rb

@@ -41,17 +41,25 @@ module Rabbit
       end
 
       def find_theme(theme_name=name, only_image=false)
-        if only_image
-          collector = "collect_image_theme"
-        else
-          collector = "collect_all_theme"
+        if theme_name == "."
+          if only_image
+            entry = ImageDirectoryEntry.new(@logger, ".", ".")
+          else
+            entry = DirectoryEntry.new(@logger, ".", ".")
+          end
+          return entry if entry.available?
         end
 
         unless only_image
-          entry = SingleFileEntry.new(base_directory, theme_name)
+          entry = FileEntry.new(@logger, base_directory, theme_name)
           return entry if entry.available?
         end
 
+        if only_image
+          collector = "collect_image_theme"
+        else
+          collector = "collect_all_theme"
+        end
         found_entry = nil
         __send__(collector) do |entry|
           if theme_name == entry.name
@@ -60,7 +68,16 @@ module Rabbit
           end
         end
 
-        raise LoadError, "can't find theme: #{theme_name}." if found_entry.nil?
+        if found_entry.nil?
+          if only_image
+            entry = ImageGemEntry.new(@logger, theme_name)
+          else
+            entry = GemEntry.new(@logger, theme_name)
+          end
+          return entry if entry.available?
+          raise LoadError, "can't find theme: #{theme_name}."
+        end
+
         found_entry
       end
 
@@ -93,11 +110,12 @@ module Rabbit
       end
 
       def collect_theme(&block)
-        _collect_theme(theme_load_path, DirectoryEntry, &block)
+        _collect_theme(theme_load_path, [FileEntry, DirectoryEntry], &block)
       end
 
       def collect_image_theme(&block)
-        _collect_theme(image_load_path, ImageDirectoryEntry, "image_dir", &block)
+        _collect_theme(image_load_path, [ImageFileEntry, ImageDirectoryEntry],
+                       "image_dir", &block)
       end
 
       def theme_load_path
@@ -108,21 +126,25 @@ module Rabbit
         Config::IMAGE_PATH + $LOAD_PATH
       end
 
-      def _collect_theme(path, entry_class, converter=nil, &block)
+      def _collect_theme(path, entry_classes, converter=nil, &block)
         converter ||= "theme_dir"
         themes = []
-        theme_name = {}
+        theme_names = {}
         path.each do |dir|
           base_name = __send__(converter, dir)
           if File.directory?(base_name)
             Dir.foreach(base_name) do |theme|
               next if /\A..?\z/ =~ theme
-              file = File.join(File.expand_path(base_name), theme)
-              entry = entry_class.new(file)
-              if entry.available? and !theme_name.has_key?(theme)
-                block.call(entry) if block
-                themes << entry
-                theme_name[theme] = true
+              next if theme_names.has_key?(theme)
+              theme_dir = File.join(File.expand_path(base_name), theme)
+              entry_classes.each do |entry_class|
+                entry = entry_class.new(@logger, theme_dir, theme)
+                if entry.available?
+                  block.call(entry) if block
+                  themes << entry
+                  theme_names[theme] = true
+                  break
+                end
               end
             end
           end