rabbit 2.1.1 → 2.1.2

data/rabbit.gemspec

@@ -54,7 +54,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency("rttool")
   spec.add_runtime_dependency("coderay", ">= 1.0.0")
   spec.add_runtime_dependency("kramdown")
-  spec.add_runtime_dependency("gettext")
+  spec.add_runtime_dependency("gettext", ">= 3.0.1")
   spec.add_runtime_dependency("faraday")
   # spec.add_runtime_dependency("gstreamer")
 

data/test/parser/test-markdown.rb

@@ -0,0 +1,65 @@
+# Copyright (C) 2014  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-test-utils"
+
+require "rabbit/slide"
+require "rabbit/source/memory"
+require "rabbit/parser/markdown"
+
+class RabbitParserMarkdownTest < Test::Unit::TestCase
+  private
+  def parse(markdown)
+    slide = Rabbit::Slide.new
+    source = Rabbit::Source::Memory.new("UTF-8", nil)
+    source.source = markdown
+    parser = Rabbit::Parser::Markdown.new(slide, source)
+    parser.parse
+    inspect_slide(slide)
+  end
+
+  def inspect_slide(slide)
+    slide.collect do |page|
+      inspect_element(page)
+    end
+  end
+
+  def inspect_element(element)
+    name = element.class.name.split(/::/).last
+    if element.respond_to?(:elements)
+      children = element.elements.collect {|child| inspect_element(child)}
+    else
+      children = [element.text]
+    end
+    [name, *children]
+  end
+
+  class TitlePageTest < self
+    def test_title
+      assert_equal([
+                     [
+                       "TitleSlide", [
+                         "Title", [
+                           "Text",
+                           "Title",
+                         ],
+                       ],
+                     ],
+                   ],
+                   parse("# Title"))
+    end
+  end
+end

data/test/run-test.rb

@@ -17,9 +17,11 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 base_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+test_dir = File.join(base_dir, "test")
+
 $LOAD_PATH.unshift(File.join(base_dir, "lib"))
-$LOAD_PATH.unshift(File.join(base_dir, "test"))
+$LOAD_PATH.unshift(test_dir)
 
 require "rabbit-test-utils"
 
-exit Test::Unit::AutoRunner.run(true)
+exit Test::Unit::AutoRunner.run(true, test_dir)

data/test/test-readme-parser.rb

@@ -19,41 +19,139 @@ require "rabbit/readme-parser"
 class TestREADMEParser < Test::Unit::TestCase
   def setup
     @parser = Rabbit::READMEParser.new
-  end
-
-  def test_rd
-    title = "Theme benchmark"
-    description = <<-EOD.strip
+    @title = "Theme benchmark"
+    @description = <<-DESCRIPTION.strip
 It's a slide for checking a Rabbit's theme. It contains many
 elements. So it's useful for confirming your theme.
 
 Please try to create your original theme!
-EOD
+    DESCRIPTION
+  end
+
+  private
+  def assert_parse(content, extension=nil)
+    readme_path = "README#{extension}"
+    stub(File).read(readme_path) {content}
+    @parser.parse(readme_path)
+    assert_equal({
+                   :title       => @title,
+                   :description => @description,
+                 },
+                 {
+                   :title       => @parser.title,
+                   :description => @parser.description,
+                 })
+  end
 
-    assert_parse(title, description, <<-EOR)
-= #{title}
+  class TestRD < self
+    private
+    def readme_content
+      <<-README
+= #{@title}
 
-#{description}
+#{@description}
 
 == For author
 
 === Show
 
   rake
-EOR
+      README
+    end
+
+    class TestExtension < self
+      def test_no_extension
+        assert_parse(readme_content)
+      end
+
+      def test_rd
+        assert_parse(readme_content, ".rd")
+      end
+
+      def test_rab
+        assert_parse(readme_content, ".rab")
+      end
+    end
   end
 
-  private
-  def assert_parse(title, description, content)
-    stub(File).read("README") {content}
-    @parser.parse("README")
-    assert_equal({
-                   :title       => title,
-                   :description => description,
-                 },
-                 {
-                   :title       => @parser.title,
-                   :description => @parser.description,
-                 })
+  class TestHiki < self
+    private
+    def readme_content
+      <<-README
+! #{@title}
+
+#{@description}
+
+!! For author
+
+!!! Show
+
+  rake
+      README
+    end
+
+    class TestExtension < self
+      def test_no_extension
+        assert_parse(readme_content)
+      end
+
+      def test_hiki
+        assert_parse(readme_content, ".hiki")
+      end
+    end
+  end
+
+  class TestMarkdown < self
+    private
+    def readme_content
+      <<-README
+# #{@title}
+
+#{@description}
+
+## For author
+
+### Show
+
+  rake
+      README
+    end
+
+    class TestExtension < self
+      def test_no_extension
+        assert_parse(readme_content)
+      end
+
+      def test_md
+        assert_parse(readme_content, ".md")
+      end
+    end
+  end
+
+  class TestTextile < self
+    private
+    def readme_content
+      <<-README
+h1. #{@title}
+
+#{@description}
+
+h2. For author
+
+h3. Show
+
+  rake
+      README
+    end
+
+    class TestExtension < self
+      def test_no_extension
+        assert_parse(readme_content)
+      end
+
+      def test_textile
+        assert_parse(readme_content, ".textile")
+      end
+    end
   end
 end

data/test/test-slide-configuration.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2012-2014  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
@@ -41,6 +41,7 @@ class TestSlideConfiguration < Test::Unit::TestCase
       "speaker_deck_id"   => "rabbit-debian",
       "ustream_id"        => "25451894",
       "vimeo_id"          => "00000000",
+      "youtube_id"        => "XXXXX-xxxxx",
       "author"            => author_conf,
     }
     @slide.id = "RubyKaigi2012"

metadata

@@ -1,286 +1,251 @@
 --- !ruby/object:Gem::Specification
 name: rabbit
 version: !ruby/object:Gem::Version
-  version: 2.1.1
-  prerelease: 
+  version: 2.1.2
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2014-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rsvg2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: poppler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hikidoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdtool
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rttool
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gettext
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit-notify
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit-rr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.2
 description: Rabbit is an RD-document-based presentation application.
@@ -351,6 +316,7 @@ files:
 - lib/rabbit/source-generator/hiki.rb
 - lib/rabbit/source-generator/markdown.rb
 - lib/rabbit/source-generator/rd.rb
+- lib/rabbit/slide.rb
 - lib/rabbit/console.rb
 - lib/rabbit/theme/slide-show/slide-show.rb
 - lib/rabbit/theme/slide-show/property.rb
@@ -1059,6 +1025,7 @@ files:
 - test/test-author-configuration.rb
 - test/test-applier.rb
 - test/test-color.rb
+- test/parser/test-markdown.rb
 - bin/rabbit-slide
 - bin/rabbit
 - bin/rabbit-theme
@@ -1067,27 +1034,26 @@ files:
 homepage: http://rabbit-shocker.org/
 licenses:
 - GPLv2+
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rabbit
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rabbit is an RD-document-based presentation application.
 test_files:
 - test/test-element.rb
@@ -1107,4 +1073,5 @@ test_files:
 - test/test-author-configuration.rb
 - test/test-applier.rb
 - test/test-color.rb
+- test/parser/test-markdown.rb
 has_rdoc: