mireru 0.2.1 → 0.9.0

data/mireru.gemspec

@@ -8,8 +8,9 @@ Gem::Specification.new do |spec|
   spec.version       = Mireru::VERSION
   spec.authors       = ["Masafumi Yokoyama"]
   spec.email         = ["myokoym@gmail.com"]
-  spec.summary       = %q{Flexible File Viewer Keyboard Friend}
-  spec.description   = %q{A file viewer with a focus on flexibility by Ruby/GTK3. A friend of a keyboard.}
+  spec.summary       = %q{Keyboard friendly multitype file viewer by Ruby/GTK3.}
+  spec.description   = %q{Mireru is a keyboard friendly file viewer by Ruby/GTK3. It can handle a variety of file types (Picture, Text, PDF, Video and etc.).}
+
   spec.homepage      = "https://github.com/myokoym/mireru"
   spec.license       = "GPLv2 or later"
 

data/test/test-logger.rb

@@ -1,4 +1,5 @@
 require "mireru/logger"
+require "mireru/command/mireru"
 require "stringio"
 
 class LoggerTest < Test::Unit::TestCase
@@ -14,7 +15,7 @@ class LoggerTest < Test::Unit::TestCase
     $stdout = io
     message = <<-EOM
 #{Mireru::Command::Mireru::USAGE}
-  If no argument, then search current directory.
+  If no argument, then open the current directory.
 Keybind:
   n: next
   p: prev

data/test/test-mireru.rb

@@ -1,5 +1,4 @@
 require "mireru/command/mireru"
-require "mireru/container"
 
 class MireruTest < Test::Unit::TestCase
   include MireruTestUtils
@@ -32,70 +31,22 @@ class MireruTest < Test::Unit::TestCase
     end
   end
 
-  def test_run_empty
-    arguments = %w(hoge)
-    stub(@mireru).files_from_arguments { arguments }
-    mock.instance_of(Mireru::Container).empty? { true }
-    mock(@mireru).write_empty_message
-    assert_raise SystemExit do
-      @mireru.run(arguments)
-    end
-  end
-
   def test_files_from_arguments_no_argument
     arguments = %w()
-    expected = %w(dir1 file1 dir2)
-    mock(Dir).glob("*") { expected }
-    files = @mireru.__send__(:files_from_arguments, arguments)
-    assert_equal(files, expected)
-  end
-
-  def test_files_from_arguments_recursive_option_only
-    arguments = %w(-R)
-    expected = %w(dir1 file1 dir2 dir1/file1 dir1/file2 dir2/file1)
-    mock(Dir).glob("**/*") { expected }
-    files = @mireru.__send__(:files_from_arguments, arguments)
-    assert_equal(files, expected)
-  end
-
-  def test_files_from_arguments_recursive_option_and_dir
-    arguments = %w(-R dir1 file1 dir2)
-    expected_dir1 = %w(dir1/file1 dir1/file2)
-    expected_dir2 = %w(dir2/file1)
-    expected = [expected_dir1, "file1", expected_dir2].flatten
-    mock(File).directory?("dir1") { true }
-    mock(File).directory?("file1") { false }
-    mock(File).directory?("dir2") { true }
-    mock(Dir).glob("dir1/**/*") { expected_dir1 }
-    mock(Dir).glob("dir2/**/*") { expected_dir2 }
+    expected = [Dir.pwd]
     files = @mireru.__send__(:files_from_arguments, arguments)
     assert_equal(files, expected)
   end
 
-  def test_files_from_arguments_all_dir
+  def test_files_from_arguments
     arguments = %w(dir1 dir2)
-    expected_dir1 = %w(dir1/file1 dir1/file2)
-    expected_dir2 = %w(dir2/file1)
-    expected = [expected_dir1, expected_dir2].flatten
-    mock(File).directory?("dir1") { true }
-    mock(File).directory?("dir2") { true }
-    mock(Dir).glob("dir1/*") { expected_dir1 }
-    mock(Dir).glob("dir2/*") { expected_dir2 }
+    expected = %w(dir1 dir2)
     files = @mireru.__send__(:files_from_arguments, arguments)
     assert_equal(files, expected)
   end
 
-  def test_files_from_arguments_else
-    arguments = %w(dir1 file1 dir2)
-    files = @mireru.__send__(:files_from_arguments, arguments)
-    assert_equal(files, arguments)
-  end
-
   def test_purge_option
-    arguments = %w(-R -f ubuntu dir1 file1 dir2)
-    flag = @mireru.__send__(:purge_option, arguments, /\A(-R|--recursive)\z/)
-    assert_not_nil(flag)
-    assert_equal(%w(-f ubuntu dir1 file1 dir2), arguments)
+    arguments = %w(-f ubuntu dir1 file1 dir2)
     value = @mireru.__send__(:purge_option, arguments, /\A-f\z/, true)
     assert_equal("ubuntu", value)
     assert_equal(%w(dir1 file1 dir2), arguments)

data/test/test-window.rb

@@ -4,20 +4,13 @@ class WindowTest < Test::Unit::TestCase
   include MireruTestUtils
 
   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)
+    @window = Mireru::Window.new([])
   end
 
   class AddFromFileTest
     def test_scrollable
       file = __FILE__
-      mock(Mireru::Widget).create(file, *@window.size) do
+      mock(Mireru::Widget).new(file, *@window.size) do
         Gtk::TextView.new
       end
       mock(@window).show_all
@@ -28,7 +21,7 @@ class WindowTest < Test::Unit::TestCase
 
     def test_no_scrollable
       file = File.join(fixtures_dir, "nijip.png")
-      mock(Mireru::Widget).create(file, *@window.size) do
+      mock(Mireru::Widget).new(file, *@window.size) do
         Gtk::Image.new
       end
       mock(@window).show_all
@@ -37,11 +30,5 @@ class WindowTest < Test::Unit::TestCase
       assert_equal(Gtk::Viewport, @window.child.child.class)
       assert_equal(Gtk::Image, @window.child.child.child.class)
     end
-
-    def test_enumable
-      file = [__FILE__]
-      @window.add_from_file(file)
-      assert_equal(Mireru::Widget::Thumbnail, @window.child.child.class)
-    end
   end
 end

data/test/widget/test-binary.rb

@@ -3,11 +3,11 @@ require "mireru/widget/binary"
 class BinaryTest < Test::Unit::TestCase
   include MireruTestUtils
 
-  def test_create
+  def test_new
     file = File.join(fixtures_dir, "Gemfile.gz")
-    widget = Mireru::Widget::Binary.create(file)
+    widget = Mireru::Widget::Binary.new(file)
     assert_not_nil(widget)
-    assert_equal(Gtk::TextView, widget.class)
+    assert_kind_of(Gtk::TextView, widget)
     widget.destroy
   end
 end

data/test/widget/test-pdf.rb

@@ -3,11 +3,11 @@ require "mireru/widget/pdf"
 class PDFTest < Test::Unit::TestCase
   include MireruTestUtils
 
-  def test_create
+  def test_new
     file = File.join(fixtures_dir, "sample.pdf")
-    widget = Mireru::Widget::PDF.create(file)
+    widget = Mireru::Widget::PDF.new(file)
     assert_not_nil(widget)
-    assert_equal(Gtk::DrawingArea, widget.class)
+    assert_kind_of(Gtk::DrawingArea, widget)
     widget.destroy
   end
 end

data/test/widget/test-svg.rb

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

data/test/widget/test-text.rb

@@ -4,18 +4,22 @@ require "mireru/widget/text"
 class TextTest < Test::Unit::TestCase
   include MireruTestUtils
 
+  def setup
+    @view = Mireru::Widget::Text.new(__FILE__)
+  end
+
   def test_buffer_from_file_of_text
-    widget = Mireru::Widget::Text.__send__(:buffer_from_file, __FILE__)
-    assert_equal(GtkSource::Buffer, widget.class)
+    buffer = @view.__send__(:buffer_from_file, __FILE__)
+    assert_kind_of(GtkSource::Buffer, buffer)
   end
 
   def test_buffer_from_text_of_utf8
-    widget = Mireru::Widget::Text.__send__(:buffer_from_text, "御庭番")
-    assert_equal(GtkSource::Buffer, widget.class)
+    buffer = @view.__send__(:buffer_from_text, "御庭番")
+    assert_kind_of(GtkSource::Buffer, buffer)
   end
 
   def test_buffer_from_text_of_sjis
-    widget = Mireru::Widget::Text.__send__(:buffer_from_text, "御庭番".encode("SJIS"))
-    assert_equal(GtkSource::Buffer, widget.class)
+    buffer = @view.__send__(:buffer_from_text, "御庭番".encode("SJIS"))
+    assert_kind_of(GtkSource::Buffer, buffer)
   end
 end

data/test/widget/test-video.rb

@@ -5,13 +5,13 @@ class VideoTest < Test::Unit::TestCase
   include MireruTestUtils
   include ClutterTestUtils
 
-  def test_create
+  def test_new
     omit_if_clutter_color_hash_expect_arguments
 
     filename = "XXX.ogm"
-    widget = Mireru::Widget::Video.create(filename)
+    widget = Mireru::Widget::Video.new(filename)
     assert_not_nil(widget)
-    assert_equal(ClutterGtk::Embed, widget.class)
+    assert_kind_of(ClutterGtk::Embed, widget)
     widget.destroy
   end
 end

data/website/locales/en.yml

@@ -4,14 +4,14 @@ en:
   Launch: "Launch"
   if_no_argument: "If no argument, then search current directory."
   Options: "Options"
-  recursive_search: "recursive search as “**/*”"
-  set_font: "set font such as “Monospace 16”"
+  show_help_message: "show help message"
+  set_font: "set a font such as “Monospace 16”"
   Keybind: "Keybind"
   Common: "Common"
   next: "next"
   prev: "prev"
   reload: "reload"
-  expand_path: "expand path"
+  expand_path: "expand/collpse"
   quit: "quit"
   Scroll: "Scroll"
   left: "left"
@@ -21,12 +21,13 @@ en:
   Scale: "Scale"
   larger: "larger"
   smaller: "smaller"
-  Special: "Special"
-  thumbnail: "thumbnail"
   Image: "Image"
-  fits_window: "fits window size"
-  original_size: "original size"
+  fits_window: "fit window size"
+  original_size: "scale to the original size"
   Text: "Text"
   change_font: "change font (at random)"
   Video: "Video"
   play_pause: "play/pause"
+  PDF: "PDF"
+  pdf_next: "next page"
+  pdf_prev: "prev page"

data/website/locales/ja.yml

@@ -4,14 +4,14 @@ ja:
   Launch: "起動"
   if_no_argument: "引数が指定されなかった場合、カレントディレクトリを検索します。"
   Options: "オプション"
-  recursive_search: "“**/*”のように、再帰的に検索します。"
+  show_help_message: "ヘルプメッセージを表示します。"
   set_font: "例えば、“Monospace 16”のように指定します。"
   Keybind: "キーバインド"
   Common: "共通"
   next: "次のファイルへ"
   prev: "前のファイルへ"
   reload: "再読み込み"
-  expand_path: "タイトルバーに絶対パスを表示"
+  expand_path: "ツリービューを展開/収縮"
   quit: "終了"
   Scroll: "スクロール"
   left: "左"
@@ -21,8 +21,6 @@ ja:
   Scale: "拡大・縮小"
   larger: "拡大"
   smaller: "縮小"
-  Special: "ファイル種類別のキーバインド"
-  thumbnail: "サムネイルを表示"
   Image: "画像ファイル用"
   fits_window: "ウィンドウサイズ"
   original_size: "オリジナルサイズ"
@@ -30,3 +28,6 @@ ja:
   change_font: "フォントを変更（ランダム）"
   Video: "ビデオファイル用"
   play_pause: "再生／一時停止"
+  PDF: "PDFファイル用"
+  pdf_next: "次のページ"
+  pdf_prev: "前のページ"

data/website/source/localizable/index.haml

@@ -1,5 +1,5 @@
 ---
-title: mireru
+title: Mireru
 ---
 
 %h1 mireru
@@ -12,4 +12,4 @@ title: mireru
         %label(for="#{id}")= link.name
 
 %footer
-  %p (c) 2013 Masafumi Yokoyama
+  %p (c) 2013-2014 Masafumi Yokoyama <myokoym@gmail.com>

data/website/source/localizable/usage.html.erb

@@ -2,13 +2,13 @@
 
 <h3><%= t(:Launch) %></h3>
 
-<pre>    $ mireru [OPTION]... [FILE]...</pre>
+<pre>    $ mireru [OPTION]... [FILE_OR_DIRECTORY]...</pre>
 <%= t(:if_no_argument) %>
 
 <h3><%= t(:Options) %></h3>
 
-<pre>-R, --recursive
-<%= t(:recursive_search) %></pre>
+<pre>-h, --help
+<%= t(:show_help_message) %></pre>
 <pre>-f, --font NAME
 <%= t(:set_font) %></pre>
 
@@ -19,8 +19,8 @@
   <ul>
     <li>n: <%= t(:next) %></li>
     <li>p: <%= t(:prev) %></li>
-    <li>r: <%= t(:reload) %></li>
     <li>e: <%= t(:expand_path) %></li>
+    <li>r: <%= t(:reload) %></li>
     <li>q: <%= t(:quit) %></li>
   </ul>
 </p>
@@ -43,12 +43,6 @@
   </ul>
 </p>
 
-<p><%= t(:Special) %>
-  <ul>
-    <li>T: <%= t(:thumbnail) %></li>
-  </ul>
-</p>
-
 <p><%= t(:Image) %>
   <ul>
     <li>f: <%= t(:fits_window) %></li>
@@ -67,3 +61,10 @@
     <li>space: <%= t(:play_pause) %></li>
   </ul>
 </p>
+
+<p><%= t(:PDF) %>
+  <ul>
+    <li>j: <%= t(:pdf_next) %></li>
+    <li>k: <%= t(:pdf_prev) %></li>
+  </ul>
+</p>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mireru
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk3
@@ -178,8 +178,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A file viewer with a focus on flexibility by Ruby/GTK3. A friend of a
-  keyboard.
+description: Mireru is a keyboard friendly file viewer by Ruby/GTK3. It can handle
+  a variety of file types (Picture, Text, PDF, Video and etc.).
 email:
 - myokoym@gmail.com
 executables:
@@ -196,8 +196,8 @@ files:
 - bin/mireru
 - lib/mireru.rb
 - lib/mireru/command/mireru.rb
-- lib/mireru/container.rb
 - lib/mireru/logger.rb
+- lib/mireru/navigator.rb
 - lib/mireru/version.rb
 - lib/mireru/widget.rb
 - lib/mireru/widget/binary.rb
@@ -205,7 +205,6 @@ files:
 - 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
 - lib/mireru/window.rb
 - license/gpl-2.0.txt
@@ -220,7 +219,6 @@ files:
 - test/fixtures/sample.svg
 - test/mireru-test-utils.rb
 - test/run-test.rb
-- test/test-container.rb
 - test/test-logger.rb
 - test/test-mireru.rb
 - test/test-widget.rb
@@ -229,7 +227,6 @@ files:
 - 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
 - travis-before-script.sh
 - website/.gitignore
@@ -267,7 +264,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Flexible File Viewer Keyboard Friend
+summary: Keyboard friendly multitype file viewer by Ruby/GTK3.
 test_files:
 - test/clutter-test-utils.rb
 - test/fixtures/Gemfile.gz
@@ -279,7 +276,6 @@ test_files:
 - test/fixtures/sample.svg
 - test/mireru-test-utils.rb
 - test/run-test.rb
-- test/test-container.rb
 - test/test-logger.rb
 - test/test-mireru.rb
 - test/test-widget.rb
@@ -288,6 +284,5 @@ test_files:
 - 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
 has_rdoc: