mireru 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22b77bb1c80d1689e5a322fd152dcff2c97cbac8
-  data.tar.gz: 4630fb60382299880c9609671f0fe7183e362996
+  metadata.gz: 7ebe6191f01182968abdb9fdfb6b3e9f409e7a34
+  data.tar.gz: d64056047895dbf66885ce81b2fdb10ed1a7e905
 SHA512:
-  metadata.gz: e270be9f6d12a4eb7a27a4deca91c48be166f52c51179f22b9b0e1b62f196519e34395badc60d683c5353f6a2730434f93a267904144267fd84c9c1ccf470333
-  data.tar.gz: 2c74d5649333f6470b13c7a3d18ea2ce93096245fc093a3000bcf1872a72e1ed4a40ac7d6ff6aa563d2118c5eae46e047f1b2f62acdc69f734240b291ed708a7
+  metadata.gz: a03ed7b019779753b3eddb07bed3aecc9a4f30cbd96665838909ef1ed3c393d4d81fb91063ccbbcaa5d30c7c571620b5586c076deec62c2cb1fe655b98cc34d2
+  data.tar.gz: 24dd3afe0d6f16091a384cc08db23eeae127daa84ec7b90a69df998bbb31570b9ef2552d00f65197ba74396174f9042c360ec8fb468ac3f453f56ce089523ac0

data/.travis.yml

@@ -3,10 +3,8 @@ env:
     - DISPLAY=":99.0"
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1.0
-  - 2.1.1
+  - 2.1
   - rbx-2
   - ruby-head
 matrix:

data/NEWS.md

@@ -1,5 +1,12 @@
 # NEWS
 
+## 0.2.1: 2014-05-29
+
+### Changes
+
+  * Improvements
+    * Supported SVG file.
+
 ## 0.2.0: 2014-03-10
 
 ### Changes

data/README.md

@@ -7,7 +7,7 @@ A friend of a keyboard.
 ## Requirements
 
 * Ruby/GTK3, Ruby/GtkSourceView3, Ruby/ClutterGTK, Ruby/ClutterGStreamer
-  and Ruby/Poppler in
+  , Ruby/Poppler and Ruby/RSVG2 in
   [Ruby-GNOME2](http://ruby-gnome2.sourceforge.jp/)
 * [hexdump](https://github.com/postmodern/hexdump)
 

data/lib/mireru.rb

@@ -1,5 +1,8 @@
 require "mireru/version"
+require "mireru/container"
+require "mireru/logger"
+require "mireru/widget"
+require "mireru/window"
 
 module Mireru
-  # Your code goes here...
 end

data/lib/mireru/logger.rb

@@ -2,11 +2,11 @@ module Mireru
   class Logger
     def initialize
     end
-  
+
     def info(message)
       puts(message)
     end
-  
+
     def error(message)
       $stderr.puts(message)
     end

data/lib/mireru/version.rb

@@ -1,3 +1,3 @@
 module Mireru
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/mireru/widget.rb

@@ -1,10 +1,10 @@
-require "gtk3"
-require "gtksourceview3"
 require "mireru/widget/image"
 require "mireru/widget/video"
 require "mireru/widget/pdf"
+require "mireru/widget/svg"
 require "mireru/widget/text"
 require "mireru/widget/binary"
+require "mireru/widget/thumbnail"
 
 module Mireru
   module Widget
@@ -16,8 +16,12 @@ module Mireru
         widget = Mireru::Widget::Video.create(file)
       elsif pdf?(file)
         widget = Mireru::Widget::PDF.create(file)
+      elsif svg?(file)
+        widget = Mireru::Widget::SVG.create(file)
       elsif text?(file)
         widget = Mireru::Widget::Text.create(file)
+      elsif file.is_a?(Enumerable)
+        widget = Mireru::Widget::Thumbnail.create(file, width, height)
       else
         widget = Mireru::Widget::Binary.create(file)
       end
@@ -36,6 +40,10 @@ module Mireru
       /\.pdf\z/i =~ file
     end
 
+    def svg?(file)
+      /\.svg\z/i =~ file
+    end
+
     def text?(file)
       File.read(file).valid_encoding?
     end

data/lib/mireru/widget/pdf.rb

@@ -1,11 +1,3 @@
-# TODO: workaround for Ruby/Poppler 2.1.0 or earlier.
-module Kernel
-  alias :__require__ :require
-  def require(feature)
-    return if feature == "gtk2"
-    __require__(feature)
-  end
-end
 require "poppler"
 
 module Mireru

data/lib/mireru/widget/svg.rb

@@ -0,0 +1,27 @@
+require "rsvg2"
+
+module Mireru
+  module Widget
+    class SVG
+      class << self
+        def create(file)
+          drawing_area = Gtk::DrawingArea.new
+
+          handle = RSVG::Handle.new_from_file(file)
+          width, height = handle.dimensions.to_a
+          drawing_area.set_size_request(width, height)
+
+          drawing_area.signal_connect("draw") do |widget, event|
+            context = widget.window.create_cairo_context
+            context.save do
+              context.render_rsvg_handle(handle)
+            end
+            true
+          end
+
+          drawing_area
+        end
+      end
+    end
+  end
+end

data/lib/mireru/widget/text.rb

@@ -1,3 +1,5 @@
+require "gtksourceview3"
+
 module Mireru
   module Widget
     class Text

data/lib/mireru/widget/thumbnail.rb

@@ -1,6 +1,3 @@
-require "gtk3"
-require "mireru/widget"
-
 module Mireru
   module Widget
     class Thumbnail

data/lib/mireru/widget/video.rb

@@ -1,6 +1,5 @@
 require "clutter-gtk"
 require "clutter-gst"
-require "mireru/widget"
 
 module Mireru
   module Widget

data/lib/mireru/window.rb

@@ -1,6 +1,5 @@
 require "gtk3"
 require "mireru/widget"
-require "mireru/widget/thumbnail"
 
 module Mireru
   class Window < Gtk::Window
@@ -9,9 +8,9 @@ module Mireru
       super
       @scroll = Gtk::ScrolledWindow.new
       @scroll.set_policy(:automatic, :automatic)
-      self.add(@scroll)
-      self.set_default_size(640, 640)
-      self.signal_connect("destroy") do
+      add(@scroll)
+      set_default_size(640, 640)
+      signal_connect("destroy") do
         Gtk.main_quit
       end
     end
@@ -20,18 +19,18 @@ module Mireru
       @container = container
 
       @file = @container.shift
-      self.add_from_file(@file)
+      add_from_file(@file)
 
-      self.signal_connect("key_press_event") do |w, e|
-        case e.keyval
+      signal_connect("key-press-event") do |widget, event|
+        case event.keyval
         when Gdk::Keyval::GDK_KEY_n
           @file = @container.shift(@file)
-          self.add_from_file(@file)
+          add_from_file(@file)
         when Gdk::Keyval::GDK_KEY_p
           @file = @container.pop(@file)
-          self.add_from_file(@file)
+          add_from_file(@file)
         when Gdk::Keyval::GDK_KEY_r
-          self.add_from_file(@file)
+          add_from_file(@file)
         when Gdk::Keyval::GDK_KEY_e
           self.title = File.expand_path(@file)
         when Gdk::Keyval::GDK_KEY_f
@@ -50,16 +49,13 @@ module Mireru
           end
         when Gdk::Keyval::GDK_KEY_T
           files = @container.instance_variable_get(:@files)
-          self.add_from_file(files)
+          add_from_file(files)
         when Gdk::Keyval::GDK_KEY_plus
           if Mireru::Widget.image?(@file)
-            width  = @widget.pixbuf.width
-            height = @widget.pixbuf.height
+            pixbuf = @widget.pixbuf
             scale = 1.1
-            pixbuf = Gdk::Pixbuf.new(@file,
-                                     width * scale,
-                                     height * scale)
-            @widget.pixbuf = pixbuf
+            @widget.pixbuf = pixbuf.scale(pixbuf.width  * scale,
+                                          pixbuf.height * scale)
           elsif @widget.is_a?(Gtk::TextView)
             font = @widget.pango_context.font_description.to_s
             font_size = font.scan(/\d+\z/).first.to_i
@@ -68,13 +64,10 @@ module Mireru
           end
         when Gdk::Keyval::GDK_KEY_minus
           if Mireru::Widget.image?(@file)
-            width  = @widget.pixbuf.width
-            height = @widget.pixbuf.height
+            pixbuf = @widget.pixbuf
             scale = 0.9
-            pixbuf = Gdk::Pixbuf.new(@file,
-                                     width * scale,
-                                     height * scale)
-            @widget.pixbuf = pixbuf
+            @widget.pixbuf = pixbuf.scale(pixbuf.width  * scale,
+                                          pixbuf.height * scale)
           elsif @widget.is_a?(Gtk::TextView)
             font = @widget.pango_context.font_description.to_s
             font_size = font.scan(/\d+\z/).first.to_i
@@ -98,7 +91,7 @@ module Mireru
         when Gdk::Keyval::GDK_KEY_L
           @scroll.hadjustment.value += 1000000
         when Gdk::Keyval::GDK_KEY_q
-          Gtk.main_quit
+          destroy
         end
       end
     end
@@ -107,11 +100,10 @@ module Mireru
       @scroll.hadjustment.value = 0
       @scroll.vadjustment.value = 0
       @scroll.each {|child| child.destroy }
-      if file.is_a?(Enumerable)
-        @widget = Mireru::Widget::Thumbnail.create(file, *self.size)
+      @widget = Mireru::Widget.create(file, *self.size)
+      if @widget.is_a?(Mireru::Widget::Thumbnail)
         self.title = "Thumbnails: #{file.size} / #{file.size}"
       else
-        @widget = Mireru::Widget.create(file, *self.size)
         self.title = File.basename(file)
       end
       @widget.override_font(Pango::FontDescription.new(@font)) if @font
@@ -120,7 +112,7 @@ module Mireru
       else
         @scroll.add_with_viewport(@widget)
       end
-      self.show_all
+      show_all
     end
   end
 end

data/mireru.gemspec

@@ -23,11 +23,12 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency("clutter-gtk", "= 2.2.0")
   spec.add_runtime_dependency("clutter-gstreamer", "= 2.2.0")
   spec.add_runtime_dependency("poppler", "= 2.2.0")
+  spec.add_runtime_dependency("rsvg2", "= 2.2.0")
   spec.add_runtime_dependency("hexdump")
 
   spec.add_development_dependency("test-unit")
   spec.add_development_dependency("test-unit-notify")
   spec.add_development_dependency("test-unit-rr")
-  spec.add_development_dependency("bundler", "~> 1.5")
+  spec.add_development_dependency("bundler", "~> 1.6")
   spec.add_development_dependency("rake")
 end

data/test/fixtures/sample.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" standalone="no"?>
+<svg width="200" height="100" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <rect x="10" y="5" width="100" height="50" />
+</svg>

data/test/mireru-test-utils.rb

@@ -0,0 +1,9 @@
+require "test-unit"
+require "test/unit/notify"
+require "test/unit/rr"
+
+module MireruTestUtils
+  def fixtures_dir
+    File.expand_path(File.join(File.dirname(__FILE__), "fixtures"))
+  end
+end

data/test/run-test.rb

@@ -1,13 +1,13 @@
 #!/usr/bin/env ruby
 
-require "test-unit"
-require "test/unit/notify"
-require "test/unit/rr"
-
 base_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-$LOAD_PATH.unshift(File.join(base_dir, "lib"))
-$LOAD_PATH.unshift(File.join(base_dir, "test"))
+lib_dir  = File.join(base_dir, "lib")
+test_dir = File.join(base_dir, "test")
+$LOAD_PATH.unshift(lib_dir)
+$LOAD_PATH.unshift(test_dir)
+
+require "mireru-test-utils"
 
 require "clutter-test-utils"
 
-exit Test::Unit::AutoRunner.run(true)
+exit Test::Unit::AutoRunner.run(true, test_dir)

data/test/test-container.rb

@@ -1,6 +1,8 @@
 require "mireru/container"
 
 class ContainerTest < Test::Unit::TestCase
+  include MireruTestUtils
+
   def setup
     @container = Mireru::Container.new
   end
@@ -25,25 +27,25 @@ class ContainerTest < Test::Unit::TestCase
   end
 
   def test_no_extention_file_type
-    file = File.join(File.dirname(__FILE__), "fixtures", "no-extention")
+    file = File.join(fixtures_dir, "no-extention")
     valid = @container.__send__(:file?, file)
     assert_true(valid)
   end
 
   def test_png_file
-    file = File.join(File.dirname(__FILE__), "fixtures", "nijip.png")
+    file = File.join(fixtures_dir, "nijip.png")
     valid = @container.__send__(:file?, file)
     assert_true(valid)
   end
 
   def test_txt_file
-    file = File.join(File.dirname(__FILE__), "fixtures", "LICENSE.txt")
+    file = File.join(fixtures_dir, "LICENSE.txt")
     valid = @container.__send__(:file?, file)
     assert_true(valid)
   end
 
   def test_rb_file
-    file = File.join(File.dirname(__FILE__), "fixtures", "nijip.rb")
+    file = File.join(fixtures_dir, "nijip.rb")
     valid = @container.__send__(:file?, file)
     assert_true(valid)
   end

data/test/test-logger.rb

@@ -2,6 +2,8 @@ require "mireru/logger"
 require "stringio"
 
 class LoggerTest < Test::Unit::TestCase
+  include MireruTestUtils
+
   def setup
     @logger = Mireru::Logger.new
   end

data/test/test-mireru.rb

@@ -2,6 +2,8 @@ require "mireru/command/mireru"
 require "mireru/container"
 
 class MireruTest < Test::Unit::TestCase
+  include MireruTestUtils
+
   def setup
     @mireru = Mireru::Command::Mireru.new
   end

data/test/test-widget.rb

@@ -1,6 +1,8 @@
 require "mireru/widget"
 
 class WidgetTest < Test::Unit::TestCase
+  include MireruTestUtils
+
   def test_image?
     assert_nil(Mireru::Widget.image?(__FILE__))
     assert_not_nil(Mireru::Widget.image?("test/fixtures/nijip.png"))

data/test/test-window.rb

@@ -1,6 +1,8 @@
 require "mireru/window"
 
 class WindowTest < Test::Unit::TestCase
+  include MireruTestUtils
+
   def setup
     @window = Mireru::Window.new
   end
@@ -12,26 +14,34 @@ class WindowTest < Test::Unit::TestCase
     @window.add_container(container)
   end
 
-  def test_add_from_file_of_scrollable
-    file = __FILE__
-    mock(Mireru::Widget).create(file, *@window.size) do
-      Gtk::TextView.new
+  class AddFromFileTest
+    def test_scrollable
+      file = __FILE__
+      mock(Mireru::Widget).create(file, *@window.size) do
+        Gtk::TextView.new
+      end
+      mock(@window).show_all
+      @window.add_from_file(file)
+      assert_equal(Gtk::ScrolledWindow, @window.child.class)
+      assert_equal(Gtk::TextView, @window.child.child.class)
+    end
+
+    def test_no_scrollable
+      file = File.join(fixtures_dir, "nijip.png")
+      mock(Mireru::Widget).create(file, *@window.size) do
+        Gtk::Image.new
+      end
+      mock(@window).show_all
+      @window.add_from_file(file)
+      assert_equal(Gtk::ScrolledWindow, @window.child.class)
+      assert_equal(Gtk::Viewport, @window.child.child.class)
+      assert_equal(Gtk::Image, @window.child.child.child.class)
     end
-    mock(@window).show_all
-    @window.add_from_file(file)
-    assert_equal(Gtk::ScrolledWindow, @window.child.class)
-    assert_equal(Gtk::TextView, @window.child.child.class)
-  end
 
-  def test_add_from_file_of_no_scrollable
-    file = "fixtures/nijip.png"
-    mock(Mireru::Widget).create(file, *@window.size) do
-      Gtk::Image.new
+    def test_enumable
+      file = [__FILE__]
+      @window.add_from_file(file)
+      assert_equal(Mireru::Widget::Thumbnail, @window.child.child.class)
     end
-    mock(@window).show_all
-    @window.add_from_file(file)
-    assert_equal(Gtk::ScrolledWindow, @window.child.class)
-    assert_equal(Gtk::Viewport, @window.child.child.class)
-    assert_equal(Gtk::Image, @window.child.child.child.class)
   end
 end

data/test/widget/test-binary.rb

@@ -1,8 +1,10 @@
 require "mireru/widget/binary"
 
 class BinaryTest < Test::Unit::TestCase
+  include MireruTestUtils
+
   def test_create
-    file = File.join(File.dirname(__FILE__), "..", "fixtures", "Gemfile.gz")
+    file = File.join(fixtures_dir, "Gemfile.gz")
     widget = Mireru::Widget::Binary.create(file)
     assert_not_nil(widget)
     assert_equal(Gtk::TextView, widget.class)

data/test/widget/test-pdf.rb

@@ -1,8 +1,10 @@
 require "mireru/widget/pdf"
 
 class PDFTest < Test::Unit::TestCase
+  include MireruTestUtils
+
   def test_create
-    file = File.join(File.dirname(__FILE__), "..", "fixtures", "sample.pdf")
+    file = File.join(fixtures_dir, "sample.pdf")
     widget = Mireru::Widget::PDF.create(file)
     assert_not_nil(widget)
     assert_equal(Gtk::DrawingArea, widget.class)

data/test/widget/test-svg.rb

@@ -0,0 +1,13 @@
+require "mireru/widget/svg"
+
+class SVGTest < Test::Unit::TestCase
+  include MireruTestUtils
+
+  def test_create
+    file = File.join(File.dirname(__FILE__), "..", "fixtures", "sample.svg")
+    widget = Mireru::Widget::SVG.create(file)
+    assert_not_nil(widget)
+    assert_equal(Gtk::DrawingArea, widget.class)
+    widget.destroy
+  end
+end

data/test/widget/test-text.rb

@@ -2,6 +2,8 @@
 require "mireru/widget/text"
 
 class TextTest < Test::Unit::TestCase
+  include MireruTestUtils
+
   def test_buffer_from_file_of_text
     widget = Mireru::Widget::Text.__send__(:buffer_from_file, __FILE__)
     assert_equal(GtkSource::Buffer, widget.class)

data/test/widget/test-thumbnail.rb

@@ -1,15 +1,18 @@
 require "mireru/widget/thumbnail"
 
 class ThumbnailTest < Test::Unit::TestCase
+  include MireruTestUtils
+
   def test_image_from_file
     widget = Mireru::Widget::Thumbnail.__send__(:image_from_file,
-                                        "test/fixtures/nijip.png")
+                                                File.join(fixtures_dir,
+                                                          "nijip.png"))
     assert_equal(Gtk::Image, widget.class)
   end
 
   def test_label_from_fil
     widget = Mireru::Widget::Thumbnail.__send__(:label_from_file,
-                                        __FILE__)
+                                                __FILE__)
     assert_equal(Gtk::Label, widget.class)
   end
 end

data/test/widget/test-video.rb

@@ -2,6 +2,7 @@ require "mireru/widget/video"
 require "clutter-gtk"
 
 class VideoTest < Test::Unit::TestCase
+  include MireruTestUtils
   include ClutterTestUtils
 
   def test_create

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mireru
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk3
@@ -80,6 +80,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: rsvg2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: hexdump
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -189,6 +203,7 @@ files:
 - lib/mireru/widget/binary.rb
 - lib/mireru/widget/image.rb
 - lib/mireru/widget/pdf.rb
+- lib/mireru/widget/svg.rb
 - lib/mireru/widget/text.rb
 - lib/mireru/widget/thumbnail.rb
 - lib/mireru/widget/video.rb
@@ -202,6 +217,8 @@ files:
 - test/fixtures/nijip.rb
 - test/fixtures/no-extention
 - test/fixtures/sample.pdf
+- test/fixtures/sample.svg
+- test/mireru-test-utils.rb
 - test/run-test.rb
 - test/test-container.rb
 - test/test-logger.rb
@@ -210,6 +227,7 @@ files:
 - test/test-window.rb
 - test/widget/test-binary.rb
 - test/widget/test-pdf.rb
+- test/widget/test-svg.rb
 - test/widget/test-text.rb
 - test/widget/test-thumbnail.rb
 - test/widget/test-video.rb
@@ -258,6 +276,8 @@ test_files:
 - test/fixtures/nijip.rb
 - test/fixtures/no-extention
 - test/fixtures/sample.pdf
+- test/fixtures/sample.svg
+- test/mireru-test-utils.rb
 - test/run-test.rb
 - test/test-container.rb
 - test/test-logger.rb
@@ -266,6 +286,7 @@ test_files:
 - test/test-window.rb
 - test/widget/test-binary.rb
 - test/widget/test-pdf.rb
+- test/widget/test-svg.rb
 - test/widget/test-text.rb
 - test/widget/test-thumbnail.rb
 - test/widget/test-video.rb