mireru 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b65e126d1a85773d145365c952e72a055e786da6
-  data.tar.gz: 3580c8fb933612f911b1cdf8cdb9aa79ee4c4da3
+  metadata.gz: c5b2947adb9a99a12d807c1f0e58d38038448eb3
+  data.tar.gz: 1d9776369ac1a0464740d56299d051fa13c29f73
 SHA512:
-  metadata.gz: ec845f3882c94f8c88e9e30b9926209ada8fcb7d647692c7a68a5f35c02b20b2a40b445657be20873f99a32330c0d6a335b1c8628986e7c4748d23d61a92f423
-  data.tar.gz: 7e43886fa097f1f5a12f4ed9bb6fbf28288b248635d65d1c5cb1f5fe6d9e0add554f0c3a06d657bcf8ac49b23edd23e8c40bc3effbc0aef5c91e976ca8dbdc60
+  metadata.gz: dba7074a99ee4fff2698f3da1f8fae313b92f136938fba0b1c8841437e13fb656c6ac047f011c5633685410cf48ee28cd77fe07eb72b75e5780543a7ac217dd4
+  data.tar.gz: a352694d1383a69a3953a5ea2826f3e3280ca0cdab381e112604cf497b21cda5a17a9df8980742becfece519cf485eedafa6a71171dbffe58bc1b734628969ab

data/lib/mireru/command/mireru.rb

@@ -1,6 +1,7 @@
 require 'gtk3'
 require "mireru/logger"
-require "mireru/widget"
+require "mireru/window"
+require "mireru/container"
 
 module Mireru
   module Command
@@ -19,66 +20,36 @@ module Mireru
 
       def run(arguments)
         if arguments.empty?
-          file_container = Dir.glob("*")
+          files = Dir.glob("*")
+          file_container = ::Mireru::Container.new(files)
         elsif /\A(-h|--help)\z/ =~ arguments[0]
-          message = <<-EOM
-#{USAGE}
-  If no argument, then search current directory.
-Keybind:
-  n: next
-  p: prev
-  q: quit
-          EOM
-          @logger.info(message)
+          write_help_message
           exit(true)
         else
-          file_container = arguments
+          files = arguments
+          file_container = ::Mireru::Container.new(files)
         end
 
-        file_container.select! {|f| support_file?(f) }
-
         if file_container.empty?
-          message = <<-EOM
-Warning: valid file not found.
-#{USAGE}
-Support file types: png, gif, jpeg(jpg). The others are...yet.
-          EOM
-          @logger.error(message)
+          write_empty_message
           exit(false)
         end
 
         file = file_container.shift
-        widget = ::Mireru::Widget.create(file)
 
-        window = Gtk::Window.new
-        window.title = File.basename(file)
+        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
-            window.remove(widget)
-            file_container.push(file)
-            file = file_container.shift
-            widget = ::Mireru::Widget.create(file)
-            window.add(widget)
-            window.show_all
-            window.title = File.basename(file)
-            window.resize(1, 1)
+            file = file_container.shift(file)
+            window.add_from_file(file)
           when Gdk::Keyval::GDK_KEY_p
-            window.remove(widget)
-            file_container.unshift(file)
-            file = file_container.pop
-            widget = ::Mireru::Widget.create(file)
-            window.add(widget)
-            window.show_all
-            window.title = File.basename(file)
-            window.resize(1, 1)
+            file = file_container.pop(file)
+            window.add_from_file(file)
           when Gdk::Keyval::GDK_KEY_r
-            window.remove(widget)
-            widget = ::Mireru::Widget.create(file)
-            window.add(widget)
-            window.show_all
-            window.resize(1, 1)
+            window.add_from_file(file)
           when Gdk::Keyval::GDK_KEY_q
             Gtk.main_quit
           end
@@ -88,27 +59,29 @@ Support file types: png, gif, jpeg(jpg). The others are...yet.
           Gtk.main_quit
         end
 
-        window.add(widget)
-        window.show_all
-
         Gtk.main
       end
 
       private
-      def support_file?(file)
-        unless file
-          return false
-        end
-
-        unless File.file?(file)
-          return false
-        end
-
-        unless /\.(png|jpe?g|gif|txt|rb)$/i =~ file
-          return false
-        end
+      def write_help_message
+        message = <<-EOM
+#{USAGE}
+  If no argument, then search current directory.
+Keybind:
+  n: next
+  p: prev
+  q: quit
+        EOM
+        @logger.info(message)
+      end
 
-        true
+      def write_empty_message
+        message = <<-EOM
+Warning: valid file not found.
+#{USAGE}
+Support file types: png, gif, jpeg(jpg). The others are...yet.
+        EOM
+        @logger.error(message)
       end
     end
   end

data/lib/mireru/container.rb

@@ -0,0 +1,34 @@
+module Mireru
+  class Container
+    def initialize(files=[])
+      @files = files.select {|file| file?(file) }
+    end
+
+    def empty?
+      @files.empty?
+    end
+
+    def pop(complement_file=nil)
+      @files.unshift(complement_file) if complement_file
+      @files.pop
+    end
+
+    def shift(complement_file=nil)
+      @files.push(complement_file) if complement_file
+      @files.shift
+    end
+
+    private
+    def file?(file)
+      unless file
+        return false
+      end
+
+      unless File.file?(file)
+        return false
+      end
+
+      true
+    end
+  end
+end

data/lib/mireru/version.rb

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

data/lib/mireru/widget.rb

@@ -2,22 +2,40 @@ require 'gtk3'
 
 module Mireru
   class Widget
-    def self.create(file)
-      case File.extname(file)
-      when /\A\.(png|jpe?g|gif)\z/i
+    class << self
+      def create(file)
+        case File.extname(file)
+        when /\A\.(png|jpe?g|gif)\z/i
+          image = Gtk::Image.new
+          image.file = file
+          widget = image
+        else
+          require 'gtksourceview3'
+          text = File.open(file).read
+          return sorry unless text.valid_encoding?
+          buffer = GtkSource::Buffer.new
+          buffer.text = text
+          view = GtkSource::View.new(buffer)
+          view.show_line_numbers = true
+          lang = GtkSource::LanguageManager.new.get_language('ruby')
+          view.buffer.language = lang
+          view.buffer.highlight_syntax = true
+          view.buffer.highlight_matching_brackets = true
+          view.editable = false
+          widget = view
+        end
+        widget
+      end
+
+      private
+      def sorry
         image = Gtk::Image.new
-        image.file = file
-        widget = image
-      when /\A\.(txt|rb)\z/i
-        buffer = Gtk::TextBuffer.new
-        buffer.text = File.open(file).read
-        text = Gtk::TextView.new(buffer)
-        text.editable = false
-        widget = text
-      else
-        raise "coding error: uncheck file type."
+        base_dir = File.join(File.dirname(__FILE__), "..", "..")
+        images_dir = File.join(base_dir, "images")
+        image_path = File.expand_path(File.join(images_dir, "sorry.png"))
+        image.file = image_path
+        image
       end
-      widget
     end
   end
 end

data/lib/mireru/window.rb

@@ -0,0 +1,15 @@
+require 'gtk3'
+require "mireru/widget"
+
+module Mireru
+  class Window < Gtk::Window
+    def add_from_file(file)
+      self.remove(@widget) if @widget
+      @widget = Mireru::Widget.create(file)
+      self.add(@widget)
+      self.show_all
+      self.title = File.basename(file)
+      self.resize(1, 1)
+    end
+  end
+end

data/mireru.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency("gtk3")
+  spec.add_runtime_dependency("gtksourceview3")
 
   spec.add_development_dependency("test-unit")
   spec.add_development_dependency("test-unit-notify")

data/test/test-container.rb

@@ -0,0 +1,41 @@
+require "mireru/container"
+
+class TestContainer< Test::Unit::TestCase
+  def setup
+    @container = Mireru::Container.new
+  end
+
+  def test_no_argument
+    valid = @container.__send__(:file?, nil)
+    assert_false(valid)
+  end
+
+  def test_missing_file
+    valid = @container.__send__(:file?, "hoge")
+    assert_false(valid)
+  end
+
+  def test_no_extention_file_type
+    file = File.join(File.dirname(__FILE__), "fixtures", "no-extention")
+    valid = @container.__send__(:file?, file)
+    assert_true(valid)
+  end
+
+  def test_png_file
+    file = File.join(File.dirname(__FILE__), "fixtures", "nijip.png")
+    valid = @container.__send__(:file?, file)
+    assert_true(valid)
+  end
+
+  def test_txt_file
+    file = File.join(File.dirname(__FILE__), "fixtures", "LICENSE.txt")
+    valid = @container.__send__(:file?, file)
+    assert_true(valid)
+  end
+
+  def test_rb_file
+    file = File.join(File.dirname(__FILE__), "fixtures", "nijip.rb")
+    valid = @container.__send__(:file?, file)
+    assert_true(valid)
+  end
+end

data/test/test-mireru.rb

@@ -1,45 +1,4 @@
 require "mireru/command/mireru"
 
-module ValidTests
-  def test_no_argument
-    valid = @mireru.__send__(:support_file?, nil)
-    assert_false(valid)
-  end
-
-  def test_missing_file
-    valid = @mireru.__send__(:support_file?, "hoge")
-    assert_false(valid)
-  end
-
-  def test_not_support_file_type
-    file = File.join(File.dirname(__FILE__), "fixtures", "no-extention")
-    valid = @mireru.__send__(:support_file?, file)
-    assert_false(valid)
-  end
-
-  def test_png_file
-    file = File.join(File.dirname(__FILE__), "fixtures", "nijip.png")
-    valid = @mireru.__send__(:support_file?, file)
-    assert_true(valid)
-  end
-
-  def test_txt_file
-    file = File.join(File.dirname(__FILE__), "fixtures", "LICENSE.txt")
-    valid = @mireru.__send__(:support_file?, file)
-    assert_true(valid)
-  end
-
-  def test_rb_file
-    file = File.join(File.dirname(__FILE__), "fixtures", "nijip.rb")
-    valid = @mireru.__send__(:support_file?, file)
-    assert_true(valid)
-  end
-end
-
 class TestMireru < Test::Unit::TestCase
-  def setup
-    @mireru = Mireru::Command::Mireru.new
-  end
-
-  include ValidTests
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mireru
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-06 00:00:00.000000000 Z
+date: 2013-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk3
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: gtksourceview3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -108,17 +122,21 @@ files:
 - README.md
 - Rakefile
 - bin/mireru
+- images/sorry.png
 - lib/mireru.rb
 - lib/mireru/command/mireru.rb
+- lib/mireru/container.rb
 - lib/mireru/logger.rb
 - lib/mireru/version.rb
 - lib/mireru/widget.rb
+- lib/mireru/window.rb
 - mireru.gemspec
 - test/fixtures/LICENSE.txt
 - test/fixtures/nijip.png
 - test/fixtures/nijip.rb
 - test/fixtures/no-extention
 - test/run-test.rb
+- test/test-container.rb
 - test/test-logger.rb
 - test/test-mireru.rb
 homepage: https://github.com/myokoym/mireru
@@ -151,6 +169,7 @@ test_files:
 - test/fixtures/nijip.rb
 - test/fixtures/no-extention
 - test/run-test.rb
+- test/test-container.rb
 - test/test-logger.rb
 - test/test-mireru.rb
 has_rdoc: