rabbit 1.0.9 → 2.0.0

data/lib/rabbit/image.rb

@@ -28,7 +28,7 @@ module Rabbit
       @loader = Base.find_loader(filename).new(filename, props)
     end
   end
-  
+
   class ImageLoader
     include ImageManipulable
   end

data/lib/rabbit/logger.rb

@@ -7,8 +7,18 @@ module Rabbit
     dir = ::File.join("rabbit", "logger")
     require_files_under_directory_in_load_path(dir)
 
-    def self.types
-      collect_classes_under_module(self)
+    class << self
+      def types
+        collect_classes_under_module(self)
+      end
+
+      def default
+        if Utils.support_console_output? or !Logger.const_defined?(:GUI)
+          Logger::STDERR.new
+        else
+          Logger::GUI.new
+        end
+      end
     end
   end
 end

data/lib/rabbit/logger/base.rb

@@ -4,7 +4,25 @@ module Rabbit
   module Logger
 
     module Severity
-      extend GetText
+      class << self
+        def names
+          MARK_TABLE.sort_by {|key, _| key}.collect {|_, value| value.downcase}
+        end
+
+        def name(level)
+          MARK_TABLE[level].downcase
+        end
+
+        def level(name)
+          MARK_TABLE.find do |key, value|
+            value.downcase == name.downcase
+          end[0]
+        end
+
+        def N_(message)
+          message
+        end
+      end
 
       DEBUG = 0
       INFO = 1
@@ -21,65 +39,48 @@ module Rabbit
         FATAL => N_("FATAL"),
         UNKNOWN => N_("UNKNOWN"),
       }
-
-      class << self
-        def names
-          MARK_TABLE.sort_by {|key, _| key}.collect {|_, value| value.downcase}
-        end
-
-        def name(level)
-          MARK_TABLE[level].downcase
-        end
-
-        def level(name)
-          MARK_TABLE.find do |key, value|
-            value.downcase == name.downcase
-          end[0]
-        end
-      end
     end
 
     module Base
-      include Severity
       include GetText
 
       attr_accessor :level, :webrick_mode
-      def initialize(level=INFO, prog_name=nil)
+      def initialize(level=Severity::INFO, prog_name=nil)
         @level = level
         @prog_name = prog_name
         @webrick_mode = false
       end
       
-      def debug?; @level <= DEBUG; end
-      def info?; @level <= INFO; end
-      def warning?; @level <= WARNING; end
-      def error?; @level <= ERROR; end
-      def fatal?; @level <= FATAL; end
-      def unknown?; @level <= UNKNOWN; end
+      def debug?; @level <= Severity::DEBUG; end
+      def info?; @level <= Severity::INFO; end
+      def warning?; @level <= Severity::WARNING; end
+      def error?; @level <= Severity::ERROR; end
+      def fatal?; @level <= Severity::FATAL; end
+      def unknown?; @level <= Severity::UNKNOWN; end
     
       def debug(message_or_error=nil, &block)
-        log(DEBUG, message_or_error, &block)
+        log(Severity::DEBUG, message_or_error, &block)
       end
       
       def info(message_or_error=nil, &block)
-        log(INFO, message_or_error, &block)
+        log(Severity::INFO, message_or_error, &block)
       end
 
       def warning(message_or_error=nil, &block)
-        log(WARNING, message_or_error, &block)
+        log(Severity::WARNING, message_or_error, &block)
       end
       alias_method :warn, :warning # for backward compatibility
 
       def error(message_or_error=nil, &block)
-        log(ERROR, message_or_error, &block)
+        log(Severity::ERROR, message_or_error, &block)
       end
 
       def fatal(message_or_error=nil, &block)
-        log(FATAL, message_or_error, &block)
+        log(Severity::FATAL, message_or_error, &block)
       end
       
       def unknown(message_or_error=nil, &block)
-        log(UNKNOWN, message_or_error, &block)
+        log(Severity::UNKNOWN, message_or_error, &block)
       end
 
       def <<(message_or_error)
@@ -87,7 +88,7 @@ module Rabbit
       end
       
       def log(severity, message_or_error, prog_name=nil, &block)
-        severity ||= UNKNOWN
+        severity ||= Severity::UNKNOWN
         prog_name ||= @prog_name
         if need_log?(severity)
           if message_or_error.nil? and block_given?

data/lib/rabbit/logger/stderr.rb

@@ -19,7 +19,7 @@ module Rabbit
         ::STDERR.puts(format_severity(severity))
         ::STDERR.print("[#{prog_name}]: ") if prog_name
         ::STDERR.puts(message)
-        exit if severity >= FATAL
+        exit if severity >= Severity::FATAL
       end
       
     end

data/lib/rabbit/menu.rb

@@ -11,8 +11,8 @@ require "rabbit/action"
 
 module Rabbit
   class Menu
-    include GetText
     include ERB::Util
+    include GetText
 
     @@icon = nil
 

data/lib/rabbit/parser.rb

@@ -5,6 +5,8 @@ Rabbit::Utils.require_files_under_directory_in_load_path(dir)
 
 module Rabbit
   module Parser
+    include GetText
+
     module_function
     def parse(canvas, source)
       parser = Base.find_loader(source)

data/lib/rabbit/parser/ext/image.rb

@@ -9,7 +9,7 @@ module Rabbit
   module Parser
     module Ext
       module Image
-        ALLOWED_IMG_URL_SCHEME = ['http', 'file', '']
+        ALLOWED_IMG_URL_SCHEME = ['http', 'https', 'file', '']
 
         module_function
         def make_image(canvas, uri_str, prop={})
@@ -47,13 +47,22 @@ module Rabbit
         module Private
           module_function
           def image_filename(canvas, uri)
-            case uri.scheme
-            when /file/i
+            case uri.scheme.to_s.downcase
+            when "file"
               GLib.filename_from_utf8(uri.path)
-            when /http|ftp/i
+            when "http", "https", "ftp"
               other_uri_filename(canvas, uri)
             else
-              related_path_filename(canvas, uri)
+              path = Pathname.new(GLib.filename_from_utf8(uri.path))
+              return path.to_s if path.absolute?
+
+              expanded_path = canvas.full_path(path.to_s)
+              expanded_uri = URI(expanded_path)
+              if expanded_uri.scheme.nil?
+                expanded_path
+              else
+                image_filename(canvas, expanded_uri)
+              end
             end
           end
 
@@ -63,21 +72,6 @@ module Rabbit
             File.join(dir, CGI.escape(key))
           end
 
-          def related_path_filename(canvas, uri)
-            image_uri = canvas.full_path(GLib.filename_from_utf8(uri.to_s))
-            filename = nil
-
-            begin
-              raise URI::InvalidURIError if URI.parse(image_uri).scheme.nil?
-              filename = tmp_filename(canvas, image_uri)
-              setup_image_file(canvas, image_uri, filename)
-            rescue URI::InvalidURIError
-              filename = image_uri
-            end
-
-            filename
-          end
-
           def other_uri_filename(canvas, uri)
             filename = tmp_filename(canvas, uri.to_s)
             setup_image_file(canvas, uri, filename)

data/lib/rabbit/path-manipulatable.rb

@@ -0,0 +1,40 @@
+# 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 "fileutils"
+require "pathname"
+
+require "rabbit/gettext"
+
+module Rabbit
+  module PathManipulatable
+    include GetText
+
+    private
+    def create_directory(path)
+      @logger.info(_("Creating directory: %s") % path)
+      FileUtils.mkdir_p(path)
+    end
+
+    def create_file(path, &block)
+      unless Pathname(path).absolute?
+        path = File.join(@id, path)
+      end
+      @logger.info(_("Creating file:      %s") % path)
+      File.open(path, "w", &block)
+    end
+  end
+end

data/lib/rabbit/rabbit.rb

@@ -1,15 +1,25 @@
-begin
-  require "rabbit/config"
-rescue LoadError
-  require "rabbit/default-config"
-end
+# Copyright (C) 2004-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/config"
 
 require "rabbit/gettext"
+require "rabbit/version"
 
 module Rabbit
-
-  VERSION = "1.0.9"
-
   TMP_DIR_NAME = ".tmp"
 
   @@gui_init_procs = []

data/lib/rabbit/renderer/base.rb

@@ -3,7 +3,6 @@ require "erb"
 require "gtk2"
 
 require "rabbit/rabbit"
-require "rabbit/gettext"
 require "rabbit/trackball"
 require "rabbit/renderer/color"
 
@@ -18,12 +17,12 @@ end
 module Rabbit
   module Renderer
     module Base
+      extend Forwardable
+
+      include ERB::Util
       include GetText
       include DirtyCount
-      include ERB::Util
 
-      extend Forwardable
-      
       def_delegators(:@canvas, :reload_source)
       
       attr_reader :x_dpi, :y_dpi

data/lib/rabbit/renderer/color.rb

@@ -1,7 +1,6 @@
 require "gtk2"
 
 require "rabbit/rabbit"
-require "rabbit/gettext"
 
 module Rabbit
   module Renderer

data/lib/rabbit/slideshare.rb

@@ -0,0 +1,116 @@
+# 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 "uri"
+require "digest/sha1"
+
+require "nokogiri"
+require "faraday"
+
+require "rabbit/gettext"
+require "rabbit/command/rabbit"
+
+module Rabbit
+  module Task
+    class SlideShare
+      include GetText
+
+      BASE_URL = "https://www.slideshare.net"
+      API_PATH_PREFIX = "/api/2"
+      API_KEY = "NB1B0IzS"
+      SHARED_SECRET = "iuTFlPzU"
+
+      attr_accessor :user, :pdf_path, :title, :description, :tags
+      def initialize(logger)
+        @logger = logger
+        @user = nil
+        @pdf_path = nil
+        @title = nil
+        @description = nil
+        @tags = []
+        @connection = Faraday.new(:url => BASE_URL) do |builder|
+          builder.request  :multipart
+          builder.request  :url_encoded
+          builder.response :logger, @logger
+          builder.adapter  :net_http
+        end
+      end
+
+      def upload
+        payload = {
+          :username              => @user,
+          :password              => password,
+          :slideshow_title       => @title,
+          :slideshow_srcfile     => Faraday::UploadIO.new(@pdf_path,
+                                                          "application/pdf"),
+          :slideshow_description => @description,
+          :tags                  => @tags.join(","),
+        }
+        payload = common_payload.merge(payload)
+        payload.keys.each do |key|
+          payload.delete(key) if payload[key].nil?
+        end
+        parse_response(@connection.post("#{API_PATH_PREFIX}/upload_slideshow",
+                                        payload))
+      end
+
+      private
+      def password
+        @password ||= read_password(_("Enter password on SlideShare"))
+      end
+
+      def read_password(prompt)
+        print("%s [%s]: " % [prompt, @user])
+        system("/bin/stty -echo") if $stdin.tty?
+        $stdin.gets.chomp
+      ensure
+        if $stdin.tty?
+          system("/bin/stty echo")
+          puts
+        end
+      end
+
+      def common_payload
+        timestamp = Time.now.to_i.to_s
+        {
+          :api_key => API_KEY,
+          :ts => timestamp,
+          :hash => Digest::SHA1.hexdigest("#{SHARED_SECRET}#{timestamp}"),
+        }
+      end
+
+      def parse_response(http_response)
+        @logger.debug(http_response.body)
+
+        unless http_response.success?
+          detail = "#{http_response.status}\n#{http_response.body}"
+          @logger.error(_("Failed to upload: %s") % detail)
+          return nil
+        end
+
+        puts http_response.body
+        response = Nokogiri::XML(http_response.body)
+        if response.root.name == "SlideShareServiceError"
+          message = response.root.elements[0]
+          @logger.error("Failed to upload: %s" % message.text)
+          nil
+        else
+          response.xpath("/SlideShowUploaded/SlideShowID").text.to_i
+        end
+      end
+    end
+  end
+end