rabbit 3.0.5 → 4.0.0

data/lib/rabbit/searcher.rb

@@ -1,4 +1,18 @@
-require 'rabbit/utils'
+# Copyright (C) 2006-2025  Sutou Kouhei <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 Searcher

data/lib/rabbit/size.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2019  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2015-2025  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
@@ -56,6 +56,14 @@ module Rabbit
       @logical_scale
     end
 
+    def resolve_logical_x(x)
+      x * @logical_scale[0]
+    end
+
+    def resolve_logical_y(y)
+      y * @logical_scale[0]
+    end
+
     private
     def compute_logical_size
       @logical_width = @base_width

data/lib/rabbit/slide-configuration.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2021  Sutou Kouhei <kou@cozmixng.org>
+# Copyright (C) 2012-2025  Sutou Kouhei <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
@@ -17,11 +17,10 @@
 require "date"
 require "time"
 
-require "rabbit/gettext"
-require "rabbit/logger"
-require "rabbit/author-configuration"
-require "rabbit/path-manipulatable"
-require "rabbit/yaml-loader"
+require_relative "author-configuration"
+require_relative "path-manipulatable"
+require_relative "rabbit"
+require_relative "yaml-loader"
 
 module Rabbit
   class SlideConfiguration
@@ -30,7 +29,6 @@ module Rabbit
 
     GEM_NAME_PREFIX = "rabbit-slide"
 
-    attr_accessor :logger
     attr_accessor :id
     attr_accessor :base_name
     attr_accessor :tags
@@ -47,8 +45,7 @@ module Rabbit
     attr_accessor :width
     attr_accessor :height
     attr_accessor :source_code_uri
-    def initialize(logger=nil)
-      @logger = logger || Logger.default
+    def initialize
       clear
     end
 
@@ -71,7 +68,7 @@ module Rabbit
       merge!(conf)
     rescue
       format = _("Failed to read slide configuration: %s: %s")
-      @logger.error(format % [path, $!.message])
+      Rabbit.logger.error(format % [path, $!.message])
     end
 
     def save(base_dir)
@@ -81,7 +78,7 @@ module Rabbit
       end
     rescue
       format = _("Failed to write slide configuration: %s: %s")
-      @logger.error(format % [config_path, $!.message])
+      Rabbit.logger.error(format % [config_path, $!.message])
     end
 
     def clear
@@ -98,8 +95,8 @@ module Rabbit
       @vimeo_id          = nil
       @youtube_id        = nil
       @author            = nil
-      @width             = 800
-      @height            = 600
+      @width             = 1920
+      @height            = 1080
       @source_code_uri   = nil
     end
 
@@ -122,7 +119,7 @@ module Rabbit
       @tags              |=  (conf["tags"] || [])
       @licenses          |=  (conf["licenses"] || [])
 
-      @author ||= AuthorConfiguration.new(@logger)
+      @author ||= AuthorConfiguration.new
       @author.merge!(conf["author"] || {})
 
       @width             = conf["width"]             || @width

data/lib/rabbit/soap/driver.rb

@@ -1,7 +1,23 @@
-require 'soap/rpc/driver'
-
-require 'rabbit/soap/base'
-require 'rabbit/front'
+# Copyright (C) 2005-2025  Sutou Kouhei <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 "soap/rpc/driver"
+
+require_relative "base"
+require_relative "../front"
 
 module Rabbit
   module SOAP

data/lib/rabbit/soap/server.rb

@@ -1,6 +1,22 @@
+# Copyright (C) 2006-2025  Sutou Kouhei <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 "soap/rpc/httpserver"
 
-require "rabbit/soap/base"
+require_relative "base"
 
 module Rabbit
   module SOAP

data/lib/rabbit/source/argf.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2024  Sutou Kouhei <kou@cozmixng.org>
+# Copyright (C) 2004-2025  Sutou Kouhei <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,7 +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 "rabbit/source/base"
+require_relative "base"
 
 module Rabbit
   module Source
@@ -26,8 +26,8 @@ module Rabbit
         N_("none (get from STDIN) or [FILE_NAMES]")
       end
 
-      def initialize(encoding, logger, argf)
-        super(encoding, logger)
+      def initialize(encoding, argf)
+        super(encoding)
         @argf = argf
       end
 
@@ -36,7 +36,7 @@ module Rabbit
         begin
           @argf.read
         rescue
-          @logger.error($!.message)
+          Rabbit.logger.error($!.message)
           +""
         end
       end

data/lib/rabbit/source/base.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2024  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2004-2025  Sutou Kouhei <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,10 +14,10 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require 'fileutils'
-require 'tmpdir'
+require "fileutils"
+require "tmpdir"
 
-require 'rabbit/rabbit'
+require_relative "../rabbit"
 
 module Rabbit
   module Source
@@ -30,9 +30,8 @@ module Rabbit
       attr_reader :base, :tmp_base
       attr_accessor :encoding, :force_modified
 
-      def initialize(encoding, logger)
+      def initialize(encoding)
         @encoding = encoding
-        @logger = logger
         @source = nil
         @force_modified = false
         init_base

data/lib/rabbit/source/file.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2024  Sutou Kouhei <kou@cozmixng.org>
+# Copyright (C) 2004-2025  Sutou Kouhei <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,7 +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 'rabbit/source/base'
+require_relative "base"
 
 module Rabbit
   module Source
@@ -25,9 +25,9 @@ module Rabbit
         N_("[FILENAME]")
       end
 
-      def initialize(encoding, logger, name)
+      def initialize(encoding, name)
         @name = name
-        super(encoding, logger)
+        super(encoding)
         @mtime = nil
       end
 
@@ -39,7 +39,7 @@ module Rabbit
             f.read
           end
         rescue SourceUnreadableError
-          @logger.error($!.message)
+          Rabbit.logger.error($!.message)
           @mtime = Time.now + LimitAccessInterval::MINIMUM_ACCESS_TIME
           +""
         end

data/lib/rabbit/source/memory.rb

@@ -1,4 +1,20 @@
-require 'rabbit/source/base'
+# Copyright (C) 2005-2025  Sutou Kouhei <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_relative "base"
 
 module Rabbit
   module Source
@@ -11,10 +27,10 @@ module Rabbit
 
       attr_accessor :extension
 
-      def initialize(encoding, logger, name=nil)
-        super(encoding, logger)
+      def initialize(encoding, name=nil)
+        super(encoding)
         if name
-          file_source = File.new(encoding, logger, name)
+          file_source = File.new(encoding, name)
           @original_source = file_source.read
           set_base(file_source.base)
           @extension = extract_extension(name)

data/lib/rabbit/source/uri.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2024  Sutou Kouhei <kou@cozmixng.org>
+# Copyright (C) 2004-2025  Sutou Kouhei <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
@@ -17,7 +17,7 @@
 require "uri"
 require "open-uri"
 
-require 'rabbit/source/base'
+require_relative "base"
 
 module Rabbit
   module Source
@@ -27,13 +27,13 @@ module Rabbit
       include LimitAccessInterval
 
       class << self
-        def new(encoding, logger, uri)
+        def new(encoding, uri)
           parsed_uri = ::URI.parse(uri)
           case parsed_uri.scheme
           when nil
-            File.new(encoding, logger, parsed_uri.path)
+            File.new(encoding, parsed_uri.path)
           when /\Afile\z/i
-            File.new(encoding, logger, uri.gsub(/\Afile:\/\//i, ""))
+            File.new(encoding, uri.gsub(/\Afile:\/\//i, ""))
           else
             super
           end
@@ -44,9 +44,9 @@ module Rabbit
         end
       end
 
-      def initialize(encoding, logger, uri)
+      def initialize(encoding, uri)
         @uri = ::URI.parse(uri)
-        super(encoding, logger)
+        super(encoding)
         @last_modified = nil
       end
 
@@ -66,7 +66,7 @@ module Rabbit
             f.read
           end
         rescue
-          @logger.error($!.message)
+          Rabbit.logger.error($!.message)
           @last_modified = Time.now + MINIMUM_ACCESS_TIME
           +""
         end
@@ -84,12 +84,10 @@ module Rabbit
             f.last_modified
           end
         rescue
-          @logger.error($!.message)
+          Rabbit.logger.error($!.message)
           Time.now
         end
       end
-
     end
-
   end
 end

data/lib/rabbit/source-generator/hiki.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2012-2025  Sutou Kouhei <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,7 +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 "rabbit/gettext"
+require_relative "../rabbit"
 
 module Rabbit
   module SourceGenerator
@@ -22,11 +22,6 @@ module Rabbit
       include GetText
       include PathManipulatable
 
-      attr_accessor :logger
-      def initialize(logger=nil)
-        @logger = logger || Logger.default
-      end
-
       def heading(level, title)
         ("!" * level) + " #{title}"
       end

data/lib/rabbit/source-generator/markdown.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2012-2025  Sutou Kouhei <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,7 +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 "rabbit/gettext"
+require_relative "../rabbit"
 
 module Rabbit
   module SourceGenerator
@@ -22,11 +22,6 @@ module Rabbit
       include GetText
       include PathManipulatable
 
-      attr_accessor :logger
-      def initialize(logger=nil)
-        @logger = logger || Logger.default
-      end
-
       def heading(level, title)
         ("#" * level) + " #{title}"
       end

data/lib/rabbit/source-generator/rd.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2012-2025  Sutou Kouhei <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,7 +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 "rabbit/gettext"
+require_relative "../rabbit"
 
 module Rabbit
   module SourceGenerator
@@ -22,11 +22,6 @@ module Rabbit
       include GetText
       include PathManipulatable
 
-      attr_accessor :logger
-      def initialize(logger=nil)
-        @logger = logger || Logger.default
-      end
-
       def heading(level, title)
         ("=" * level) + " #{title}"
       end

data/lib/rabbit/source-generator.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2012-2025  Sutou Kouhei <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
@@ -33,7 +33,7 @@ module Rabbit
   end
 end
 
-require "rabbit/source-generator/rd"
-require "rabbit/source-generator/hiki"
-require "rabbit/source-generator/markdown"
+require_relative "source-generator/rd"
+require_relative "source-generator/hiki"
+require_relative "source-generator/markdown"
 

data/lib/rabbit/source.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2017  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2017-2025  Sutou Kouhei <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,10 +14,10 @@
 # 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"
+require_relative "source/argf"
+require_relative "source/file"
+require_relative "source/memory"
+require_relative "source/uri"
 
 module Rabbit
   module Source

data/lib/rabbit/task/slide.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022  Sutou Kouhei <kou@cozmixng.org>
+# Copyright (C) 2012-2025  Sutou Kouhei <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
@@ -16,13 +16,11 @@
 
 require "rake"
 
-require "rabbit/gettext"
-require "rabbit/logger"
-require "rabbit/command/rabbit"
-require "rabbit/slide-configuration"
-require "rabbit/readme-parser"
-require "rabbit/gem-builder"
-require "rabbit/gem-pusher"
+require_relative "../command/rabbit"
+require_relative "../slide-configuration"
+require_relative "../readme-parser"
+require_relative "../gem-builder"
+require_relative "../gem-pusher"
 
 module Rabbit
   module Task
@@ -32,7 +30,6 @@ module Rabbit
 
       attr_accessor :package_dir, :pdf_dir, :required_rabbit_version
       def initialize
-        @logger = Logger.default
         @slide = load_slide_configuration
         @package_dir = "pkg"
         @pdf_dir = "pdf"
@@ -47,18 +44,19 @@ module Rabbit
 
       private
       def load_slide_configuration
-        slide_conf = SlideConfiguration.new(@logger)
+        slide_conf = SlideConfiguration.new
         slide_conf.load
         slide_conf
       end
 
       def create_spec
-        readme_parser = READMEParser.new(@logger)
+        readme_parser = READMEParser.new
         readme_parser.parse
 
         Gem::Specification.new do |spec|
           spec.name = @slide.gem_name
           spec.version = @slide.version
+          spec.date = @slide.presentation_date
           spec.homepage = homepage
           spec.authors = [@slide.author.name]
           spec.email = [@slide.author.email]
@@ -68,6 +66,10 @@ module Rabbit
           if @slide.source_code_uri
             spec.metadata["source_code_uri"] = @slide.source_code_uri
           end
+          markup_language = @slide.author.markup_language
+          if markup_language
+            spec.metadata["markup_language"] = markup_language.to_s
+          end
 
           slide_conf_path = @slide.path
           spec.files = [".rabbit", slide_conf_path, "Rakefile"]

data/lib/rabbit/task/theme.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2016 Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2012-2025  Sutou Kouhei <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
@@ -16,13 +16,11 @@
 
 require "rake"
 
-require "rabbit/gettext"
-require "rabbit/logger"
-require "rabbit/command/rabbit"
-require "rabbit/theme-configuration"
-require "rabbit/readme-parser"
-require "rabbit/gem-builder"
-require "rabbit/gem-pusher"
+require_relative "../command/rabbit"
+require_relative "../theme-configuration"
+require_relative "../readme-parser"
+require_relative "../gem-builder"
+require_relative "../gem-pusher"
 
 module Rabbit
   module Task
@@ -32,7 +30,6 @@ module Rabbit
 
       attr_accessor :package_dir, :pdf_dir, :required_rabbit_version
       def initialize
-        @logger = Logger.default
         @theme = load_theme_configuration
         @spec = nil
         @package_dir = "pkg"
@@ -48,13 +45,13 @@ module Rabbit
 
       private
       def load_theme_configuration
-        theme_conf = ThemeConfiguration.new(@logger)
+        theme_conf = ThemeConfiguration.new
         theme_conf.load
         theme_conf
       end
 
       def create_spec
-        readme_parser = READMEParser.new(@logger)
+        readme_parser = READMEParser.new
         readme_parser.parse
 
         Gem::Specification.new do |spec|

data/lib/rabbit/task.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012 Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2012-2025  Sutou Kouhei <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,5 +14,5 @@
 # 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"
+require_relative "task/slide"
+require_relative "task/theme"