mireru 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5b2947adb9a99a12d807c1f0e58d38038448eb3
-  data.tar.gz: 1d9776369ac1a0464740d56299d051fa13c29f73
+  metadata.gz: 49dc2f9847431c7c454e31a51a6fab121a121385
+  data.tar.gz: 1c16885733d833d203b7e341b0c54ba633f317ea
 SHA512:
-  metadata.gz: dba7074a99ee4fff2698f3da1f8fae313b92f136938fba0b1c8841437e13fb656c6ac047f011c5633685410cf48ee28cd77fe07eb72b75e5780543a7ac217dd4
-  data.tar.gz: a352694d1383a69a3953a5ea2826f3e3280ca0cdab381e112604cf497b21cda5a17a9df8980742becfece519cf485eedafa6a71171dbffe58bc1b734628969ab
+  metadata.gz: 573345ab9d63ea7492d9e0fe8c3c904164d9b6621e767f394ff75d4fde896bfc8896a28bc8c4eee1e5b038c892740d6edeaa2975c7a55b4c10bbc017eeec83e4
+  data.tar.gz: d03f11c3e35095921c868cec068215d4a7660eddf5235da61487dc4253386f819239daea24b1e1926dae0e693c944ccd017ba87f906464ff1aed69fcc9671fb4

data/README.md

@@ -12,16 +12,26 @@ A file viewer with a focus on flexibility by Ruby/GTK3.
 
     $ mireru [FILE...]
 
-If no argument then search current directory.
+If no argument, then search current directory.
 
 ### Keybind
 
+#### Common
+
 n: next
 
 p: prev
 
+r: reload
+
 q: quit
 
+#### Image
+
+f: fits window size
+
+o: original size
+
 ## Contributing
 
 1. Fork it

data/lib/mireru/command/mireru.rb

@@ -35,29 +35,8 @@ module Mireru
           exit(false)
         end
 
-        file = file_container.shift
-
         window = ::Mireru::Window.new
-        window.add_from_file(file)
-
-        window.signal_connect("key_press_event") do |w, e|
-          case e.keyval
-          when Gdk::Keyval::GDK_KEY_n
-            file = file_container.shift(file)
-            window.add_from_file(file)
-          when Gdk::Keyval::GDK_KEY_p
-            file = file_container.pop(file)
-            window.add_from_file(file)
-          when Gdk::Keyval::GDK_KEY_r
-            window.add_from_file(file)
-          when Gdk::Keyval::GDK_KEY_q
-            Gtk.main_quit
-          end
-        end
-
-        window.signal_connect("destroy") do
-          Gtk.main_quit
-        end
+        window.add_container(file_container)
 
         Gtk.main
       end
@@ -70,16 +49,21 @@ module Mireru
 Keybind:
   n: next
   p: prev
+  r: reload
   q: quit
+
+  image:
+    f: fits window size
+    o: original size
         EOM
         @logger.info(message)
       end
 
       def write_empty_message
         message = <<-EOM
-Warning: valid file not found.
+Warning: file not found.
 #{USAGE}
-Support file types: png, gif, jpeg(jpg). The others are...yet.
+  If no argument, then search current directory.
         EOM
         @logger.error(message)
       end

data/lib/mireru/version.rb

@@ -1,3 +1,3 @@
 module Mireru
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/mireru/widget.rb

@@ -1,20 +1,24 @@
 require 'gtk3'
+require 'gtksourceview3'
 
 module Mireru
+  class Error < StandardError
+  end
+
   class Widget
     class << self
-      def create(file)
-        case File.extname(file)
-        when /\A\.(png|jpe?g|gif)\z/i
+      def create(file, width=nil, height=nil)
+        if image?(file)
           image = Gtk::Image.new
-          image.file = file
+          pixbuf = Gdk::Pixbuf.new(file, width, height)
+          image.pixbuf = pixbuf
           widget = image
         else
-          require 'gtksourceview3'
-          text = File.open(file).read
-          return sorry unless text.valid_encoding?
-          buffer = GtkSource::Buffer.new
-          buffer.text = text
+          begin
+            buffer = buffer_from_file(file)
+          rescue Mireru::Error
+            return sorry
+          end
           view = GtkSource::View.new(buffer)
           view.show_line_numbers = true
           lang = GtkSource::LanguageManager.new.get_language('ruby')
@@ -27,7 +31,24 @@ module Mireru
         widget
       end
 
+      def image?(file)
+        /\.(png|jpe?g|gif)\z/i =~ file
+      end
+
       private
+      def buffer_from_file(file)
+        text = File.open(file).read
+        buffer_from_text(text)
+      end
+
+      def buffer_from_text(text)
+        raise Mireru::Error unless text.valid_encoding?
+        text.encode!("utf-8") unless text.encoding == "utf-8"
+        buffer = GtkSource::Buffer.new
+        buffer.text = text
+        buffer
+      end
+
       def sorry
         image = Gtk::Image.new
         base_dir = File.join(File.dirname(__FILE__), "..", "..")

data/lib/mireru/window.rb

@@ -3,13 +3,59 @@ require "mireru/widget"
 
 module Mireru
   class Window < Gtk::Window
+    def initialize
+      super
+      @scroll = Gtk::ScrolledWindow.new
+      @scroll.set_policy(:automatic, :automatic)
+      self.add(@scroll)
+      self.set_default_size(640, 640)
+      self.signal_connect("destroy") do
+        Gtk.main_quit
+      end
+    end
+
+    def add_container(container)
+      @container = container
+
+      @file = @container.shift
+      self.add_from_file(@file)
+
+      self.signal_connect("key_press_event") do |w, e|
+        case e.keyval
+        when Gdk::Keyval::GDK_KEY_n
+          @file = @container.shift(@file)
+          self.add_from_file(@file)
+        when Gdk::Keyval::GDK_KEY_p
+          @file = @container.pop(@file)
+          self.add_from_file(@file)
+        when Gdk::Keyval::GDK_KEY_r
+          self.add_from_file(@file)
+        when Gdk::Keyval::GDK_KEY_f
+          if Mireru::Widget.image?(@file)
+            pixbuf = Gdk::Pixbuf.new(@file, *self.size)
+            @widget.pixbuf = pixbuf
+          end
+        when Gdk::Keyval::GDK_KEY_o
+          if Mireru::Widget.image?(@file)
+            pixbuf = Gdk::Pixbuf.new(@file)
+            @widget.pixbuf = pixbuf
+          end
+        when Gdk::Keyval::GDK_KEY_q
+          Gtk.main_quit
+        end
+      end
+    end
+
     def add_from_file(file)
-      self.remove(@widget) if @widget
-      @widget = Mireru::Widget.create(file)
-      self.add(@widget)
-      self.show_all
+      @scroll.each {|child| @scroll.remove(child) }
+      @widget = Mireru::Widget.create(file, *self.size)
+      if @widget.is_a?(Gtk::Scrollable)
+        @scroll.add(@widget)
+      else
+        @scroll.add_with_viewport(@widget)
+      end
       self.title = File.basename(file)
-      self.resize(1, 1)
+      self.show_all
     end
   end
 end

data/test/test-widget.rb

@@ -0,0 +1,29 @@
+require "mireru/widget"
+
+class TestWidget < Test::Unit::TestCase
+  def test_image?
+    assert_nil(Mireru::Widget.image?(__FILE__))
+    assert_not_nil(Mireru::Widget.image?("test/fixtures/nijip.png"))
+  end
+
+  def test_buffer_from_file_of_text
+    widget = Mireru::Widget.__send__(:buffer_from_file, __FILE__)
+    assert_equal(GtkSource::Buffer, widget.class)
+  end
+
+  def test_buffer_from_file_of_binary
+    assert_raise Mireru::Error do
+      Mireru::Widget.__send__(:buffer_from_file, "test/fixtures/nijip.png")
+    end
+  end
+
+  def test_buffer_from_text_of_utf8
+    widget = Mireru::Widget.__send__(:buffer_from_text, "御庭番")
+    assert_equal(GtkSource::Buffer, widget.class)
+  end
+
+  def test_buffer_from_text_of_sjis
+    widget = Mireru::Widget.__send__(:buffer_from_text, "御庭番".encode("SJIS"))
+    assert_equal(GtkSource::Buffer, widget.class)
+  end
+end

data/test/test-window.rb

@@ -0,0 +1,37 @@
+require "mireru/window"
+
+class TestWindow < Test::Unit::TestCase
+  def setup
+    @window = Mireru::Window.new
+  end
+
+  def test_add_container
+    container = %w(a, b, c)
+    mock(container).shift { "a" }
+    mock(@window).add_from_file("a")
+    @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
+    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
+    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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mireru
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-07 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk3
@@ -139,6 +139,8 @@ files:
 - test/test-container.rb
 - test/test-logger.rb
 - test/test-mireru.rb
+- test/test-widget.rb
+- test/test-window.rb
 homepage: https://github.com/myokoym/mireru
 licenses:
 - MIT
@@ -172,4 +174,6 @@ test_files:
 - test/test-container.rb
 - test/test-logger.rb
 - test/test-mireru.rb
+- test/test-widget.rb
+- test/test-window.rb
 has_rdoc: