mireru 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c15bcd415d1a41b3c251afb76654223b50a5874
-  data.tar.gz: eeb5d54078f6bbe1cd12b6fa4cc0fcac6d18cbdc
+  metadata.gz: 3092881913c725d4b4f66aaf07ce442427af5909
+  data.tar.gz: 0e0815117616556cf38b6e526b44ccaebedfbfbd
 SHA512:
-  metadata.gz: b39993b1e4524e098ad9f7afe5bd5448f54740193092d804022f951e3d8f2c9f0f16b0c84773aebd02f0a9f445afeeac10202c5d7ffec5acd62d63614cec6b5f
-  data.tar.gz: c72652188dc900e843c31b9e667dfb5edea100c964a9035cf4067016bd14fce169b1b397897f1be1a7f44c0dfb7f068a4f8127f0e66319a31367a4cedf279b43
+  metadata.gz: bc329b923edff0cabd97d4934764c70adb933e7a2941ffcc4247a8559baa1f0b85e35066375db61a96490c974c005219663c4447bccaca8606fd8431bbf0a236
+  data.tar.gz: 124ed5eb488e633a91fa455546c16cec01de2df57060a8dace25adcec8d6f16c426943f5bcc5151ea9352eaf4a23bf00ce6fd28782cc61a55c0502bb0bd34683

data/.travis.yml

@@ -9,11 +9,13 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1
+  - 2.2
 #  - rbx-2
   - ruby-head
 matrix:
   allow_failures:
 #    - rvm: rbx-2
+    - rvm: ruby-head
   fast_finish: true
 before_install:
   - ./travis-before-script.sh

data/NEWS.md

@@ -1,5 +1,14 @@
 # NEWS
 
+## 0.9.3: 2015-05-12
+
+### Improvements
+
+* Use Ruby-GNOME2 2.2.4 or later.
+* Added status bar.
+* Added --width and --height option.
+* Rescue LoadError for extended file types.
+
 ## 0.9.2: 2014-10-19
 
 ### Changes

data/lib/mireru/command.rb

@@ -70,6 +70,14 @@ module Mireru
                 "Hide empty directory") do |boolean|
         options[:compact] = boolean
       end
+      parser.on("--width=WIDTH",
+                "Set window width", Integer) do |width|
+        options[:width] = width
+      end
+      parser.on("--height=HEIGHT",
+                "Set window height", Integer) do |height|
+        options[:height] = height
+      end
       parser.parse!(arguments)
 
       options

data/lib/mireru/status_bar.rb

@@ -0,0 +1,39 @@
+# Copyright (C) 2014  Masafumi Yokoyama <myokoym@gmail.com>
+#
+# 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 "gtk3"
+
+module Mireru
+  class StatusBar < Gtk::Label
+    def initialize
+      super()
+      @file = nil
+    end
+
+    def set_file(file)
+      @file = file
+      self.text = "#{modified_time_info}, #{size_info}"
+    end
+
+    def modified_time_info
+      "updated: #{File.mtime(@file).strftime("%Y-%m-%d %H:%M:%S")}"
+    end
+
+    def size_info
+      "size: #{File.size(@file) / 1024} KiB"
+    end
+  end
+end

data/lib/mireru/version.rb

@@ -15,5 +15,5 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 module Mireru
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

data/lib/mireru/widget.rb

@@ -15,10 +15,6 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 require "mireru/widget/image"
-require "mireru/widget/video"
-require "mireru/widget/pdf"
-require "mireru/widget/svg"
-require "mireru/widget/extracted_text"
 require "mireru/widget/text"
 require "mireru/widget/binary"
 
@@ -27,21 +23,51 @@ module Mireru
     module_function
     def create(file, width, height, chupa=false)
       if chupa
-        widget = Widget::ExtractedText.new(file)
-      elsif image?(file)
-        widget = Widget::Image.new(file, width, height)
-      elsif video?(file) or music?(file)
-        widget = Widget::Video.new(file)
-      elsif pdf?(file)
-        widget = Widget::PDF.new(file)
-      elsif svg?(file)
-        widget = Widget::SVG.new(file)
-      elsif text?(file)
-        widget = Widget::Text.new(file)
-      else
-        widget = Widget::Binary.new(file)
+        check do
+          require "mireru/widget/extracted_text"
+          return Widget::ExtractedText.new(file)
+        end
+      end
+
+      if image?(file)
+        return Widget::Image.new(file, width, height)
+      end
+
+      if video?(file) or music?(file)
+        check do
+          require "mireru/widget/video"
+          return Widget::Video.new(file)
+        end
+      end
+
+      if pdf?(file)
+        check do
+          require "mireru/widget/pdf"
+          return Widget::PDF.new(file)
+        end
+      end
+
+      if svg?(file)
+        check do
+          require "mireru/widget/svg"
+          return Widget::SVG.new(file)
+        end
+      end
+
+      if text?(file)
+        return Widget::Text.new(file)
+      end
+
+      return Widget::Binary.new(file)
+    end
+
+    # TODO: improve
+    def check
+      begin
+        yield
+      rescue LoadError
+        $stderr.puts("Warning: #{$!.message}")
       end
-      widget
     end
 
     def image?(file)

data/lib/mireru/window.rb

@@ -17,6 +17,7 @@
 require "gtk3"
 require "mireru/widget"
 require "mireru/navigator"
+require "mireru/status_bar"
 
 module Mireru
   class Window < Gtk::Window
@@ -32,11 +33,23 @@ module Mireru
       @navigator = Navigator.new(self, files, options)
       @paned.add(@navigator)
 
+      @main_vbox = Gtk::Box.new(:vertical)
+      @paned.add(@main_vbox)
+
       @scroll = Gtk::ScrolledWindow.new
       @scroll.set_policy(:automatic, :automatic)
-      @paned.add(@scroll)
-
-      set_default_size(800, 600)
+      @main_vbox.pack_start(@scroll, :expand  => true,
+                                     :fill    => true,
+                                     :padding => 0)
+
+      @status_bar = StatusBar.new
+      @main_vbox.pack_end(@status_bar, :expand  => false,
+                                       :fill    => false,
+                                       :padding => 0)
+
+      @default_width = options[:width] || 800
+      @default_height = options[:height] || 600
+      set_default_size(@default_width, @default_height)
       signal_connect("destroy") do
         Gtk.main_quit
       end
@@ -60,6 +73,7 @@ module Mireru
       else
         @scroll.add_with_viewport(@widget)
       end
+      @status_bar.set_file(file)
       show_all
     end
 
@@ -142,13 +156,13 @@ module Mireru
       when Gdk::Keyval::KEY_h
         @scroll.hadjustment.value -= 17
       when Gdk::Keyval::KEY_j
-        if @widget.is_a?(Widget::PDF)
+        if @widget.class.name == "PDF"  # TODO: improve
           @widget.next
         else
         @scroll.vadjustment.value += 17
         end
       when Gdk::Keyval::KEY_k
-        if @widget.is_a?(Widget::PDF)
+        if @widget.class.name == "PDF"  # TODO: improve
           @widget.prev
         else
         @scroll.vadjustment.value -= 17

data/mireru.gemspec

@@ -19,12 +19,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency("gtk3", "2.2.2")
-  spec.add_runtime_dependency("gtksourceview3", "2.2.2")
-  spec.add_runtime_dependency("clutter-gtk", "2.2.2")
-  spec.add_runtime_dependency("clutter-gstreamer", "2.2.2")
-  spec.add_runtime_dependency("poppler", "2.2.2")
-  spec.add_runtime_dependency("rsvg2", "2.2.2")
+  spec.add_runtime_dependency("gtksourceview3", ">= 2.2.4")
+  spec.add_runtime_dependency("clutter-gtk", ">= 2.2.4")
+  spec.add_runtime_dependency("clutter-gstreamer", ">= 2.2.4")
+  spec.add_runtime_dependency("poppler", ">= 2.2.4")
+  spec.add_runtime_dependency("rsvg2", ">= 2.2.4")
   spec.add_runtime_dependency("hexdump")
   spec.add_runtime_dependency("chupa-text")
   spec.add_runtime_dependency("chupa-text-decomposer-html")

data/test/test-window.rb

@@ -23,28 +23,35 @@ class WindowTest < Test::Unit::TestCase
     @window = Mireru::Window.new([])
   end
 
-  class AddFromFileTest
-    def test_scrollable
+  class AddFromFileTest < self
+    def test_textview
       file = __FILE__
-      mock(Mireru::Widget).new(file, *@window.size) do
+      stub(Mireru::Widget).create do
         Gtk::TextView.new
       end
-      mock(@window).show_all
+      stub(@window).show_all
       @window.add_from_file(file)
-      assert_equal(Gtk::ScrolledWindow, @window.child.class)
-      assert_equal(Gtk::TextView, @window.child.child.class)
+      pane = @window.child
+      vbox = pane.child2
+      scrolled_window = vbox.children[0]
+      widget = scrolled_window.child
+      assert_kind_of(Gtk::TextView, widget)
     end
 
-    def test_no_scrollable
+    def test_viewport
       file = File.join(fixtures_dir, "nijip.png")
-      mock(Mireru::Widget).new(file, *@window.size) do
+      stub(Mireru::Widget).create do
         Gtk::Image.new
       end
-      mock(@window).show_all
+      stub(@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)
+      pane = @window.child
+      vbox = pane.child2
+      scrolled_window = vbox.children[0]
+      view_port = scrolled_window.child
+      assert_kind_of(Gtk::Viewport, view_port)
+      widget = view_port.child
+      assert_kind_of(Gtk::Image, widget)
     end
   end
 end

metadata

@@ -1,99 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: mireru
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-19 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: gtk3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: gtksourceview3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: clutter-gtk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: clutter-gstreamer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: poppler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: rsvg2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: hexdump
   requirement: !ruby/object:Gem::Requirement
@@ -254,6 +240,7 @@ files:
 - lib/mireru/command.rb
 - lib/mireru/logger.rb
 - lib/mireru/navigator.rb
+- lib/mireru/status_bar.rb
 - lib/mireru/version.rb
 - lib/mireru/widget.rb
 - lib/mireru/widget/binary.rb
@@ -318,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Keyboard friendly multitype file viewer by Ruby/GTK3.
@@ -342,3 +329,4 @@ test_files:
 - test/widget/test-svg.rb
 - test/widget/test-text.rb
 - test/widget/test-video.rb
+has_rdoc: