mireru 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee216063487b526fe0bed9bc27ce8b46c5bdb89b
-  data.tar.gz: 27cbe68ba5678985d175ad8aa2329473a1f68919
+  metadata.gz: b65e126d1a85773d145365c952e72a055e786da6
+  data.tar.gz: 3580c8fb933612f911b1cdf8cdb9aa79ee4c4da3
 SHA512:
-  metadata.gz: 8df06e44085f7137453e05c02b54defd93f1f9b3a16bc3295fbf4de581b98c001bfb6366f59225fa493c13a56875c24fcefb8191dbc0df58bce9dd2cf3b4e78e
-  data.tar.gz: 93259e7fe5584cc5d66841cfecde0b360b5cecd47bcee15af275b5f263cda1688261ceaacc6ace4625bc9d58500bad100bd99df58501ba547ad8d0c99676f3bc
+  metadata.gz: ec845f3882c94f8c88e9e30b9926209ada8fcb7d647692c7a68a5f35c02b20b2a40b445657be20873f99a32330c0d6a335b1c8628986e7c4748d23d61a92f423
+  data.tar.gz: 7e43886fa097f1f5a12f4ed9bb6fbf28288b248635d65d1c5cb1f5fe6d9e0add554f0c3a06d657bcf8ac49b23edd23e8c40bc3effbc0aef5c91e976ca8dbdc60

data/lib/mireru/command/mireru.rb

@@ -1,4 +1,6 @@
 require 'gtk3'
+require "mireru/logger"
+require "mireru/widget"
 
 module Mireru
   module Command
@@ -12,20 +14,22 @@ module Mireru
       end
 
       def initialize
+        @logger = ::Mireru::Logger.new
       end
 
       def run(arguments)
         if arguments.empty?
           file_container = Dir.glob("*")
         elsif /\A(-h|--help)\z/ =~ arguments[0]
-          puts(USAGE)
-          puts <<-EOS
+          message = <<-EOM
+#{USAGE}
   If no argument, then search current directory.
 Keybind:
   n: next
   p: prev
   q: quit
-          EOS
+          EOM
+          @logger.info(message)
           exit(true)
         else
           file_container = arguments
@@ -34,29 +38,46 @@ Keybind:
         file_container.select! {|f| support_file?(f) }
 
         if file_container.empty?
-          puts("Warning: valid file not found.")
-          puts(USAGE)
-          puts("Support file types: png, gif, jpeg(jpg). The others are...yet.")
+          message = <<-EOM
+Warning: valid file not found.
+#{USAGE}
+Support file types: png, gif, jpeg(jpg). The others are...yet.
+          EOM
+          @logger.error(message)
           exit(false)
         end
 
-        image = Gtk::Image.new
-        image.file = file_container.shift
+        file = file_container.shift
+        widget = ::Mireru::Widget.create(file)
 
         window = Gtk::Window.new
-        window.title = File.basename(image.file)
+        window.title = File.basename(file)
 
         window.signal_connect("key_press_event") do |w, e|
           case e.keyval
           when Gdk::Keyval::GDK_KEY_n
-            file_container.push(image.file)
-            image.file = file_container.shift
-            window.title = File.basename(image.file)
+            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)
           when Gdk::Keyval::GDK_KEY_p
-            file_container.unshift(image.file)
-            image.file = file_container.pop
-            window.title = File.basename(image.file)
+            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)
+          when Gdk::Keyval::GDK_KEY_r
+            window.remove(widget)
+            widget = ::Mireru::Widget.create(file)
+            window.add(widget)
+            window.show_all
             window.resize(1, 1)
           when Gdk::Keyval::GDK_KEY_q
             Gtk.main_quit
@@ -67,37 +88,13 @@ Keybind:
           Gtk.main_quit
         end
 
-        window.add(image)
+        window.add(widget)
         window.show_all
 
         Gtk.main
       end
 
       private
-      def valid?(arguments)
-        file = arguments[0]
-
-        unless file
-          puts("Error: no argument.")
-          puts(USAGE)
-          return false
-        end
-
-        unless File.file?(file)
-          puts("Error: missing file.")
-          puts(USAGE)
-          return false
-        end
-
-        unless /\.(png|jpe?g|gif)$/i =~ file
-          puts("Error: this file type is not support as yet.")
-          puts(USAGE)
-          return false
-        end
-
-        true
-      end
-
       def support_file?(file)
         unless file
           return false
@@ -107,7 +104,7 @@ Keybind:
           return false
         end
 
-        unless /\.(png|jpe?g|gif)$/i =~ file
+        unless /\.(png|jpe?g|gif|txt|rb)$/i =~ file
           return false
         end
 

data/lib/mireru/logger.rb

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

data/lib/mireru/version.rb

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

data/lib/mireru/widget.rb

@@ -0,0 +1,23 @@
+require 'gtk3'
+
+module Mireru
+  class Widget
+    def self.create(file)
+      case File.extname(file)
+      when /\A\.(png|jpe?g|gif)\z/i
+        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."
+      end
+      widget
+    end
+  end
+end

data/test/fixtures/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2013 Masafumi Yokoyama
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/test/fixtures/nijip.rb

@@ -0,0 +1,35 @@
+require 'cairo'
+
+w = 400
+h = 400
+
+Cairo::ImageSurface.new(w, h) do |surface|
+  context = Cairo::Context.new(surface)
+
+  # 放射グラデーション
+  pattern = Cairo::RadialPattern.new(w/3, h/3, 330, w/3, h/3, 0)
+  start = 1.0
+  [:white,
+   :red,
+   :orange,
+   :yellow,
+   :green,
+   :aqua,
+   :blue,
+   :purple,
+   :black].each do |c|
+    pattern.add_color_stop(start -= 0.1, c)
+  end
+  context.set_source(pattern)
+
+  # 背景
+  #context.paint(0.1)
+  
+  # 文字
+  context.select_font_face('Ubuntu')
+  context.move_to(60, 350)
+  context.font_size = 250
+  context.show_text("my")
+  
+  surface.write_to_png("nijip.png")
+end

data/test/test-logger.rb

@@ -0,0 +1,39 @@
+require "mireru/logger"
+require "stringio"
+
+class TestLogger < Test::Unit::TestCase
+  def setup
+    @logger = Mireru::Logger.new
+  end
+
+  def test_info
+    s = ""
+    io = StringIO.new(s)
+    $stdout = io
+    message = <<-EOM
+#{Mireru::Command::Mireru::USAGE}
+  If no argument, then search current directory.
+Keybind:
+  n: next
+  p: prev
+  q: quit
+    EOM
+    @logger.info(message)
+    $stdout = STDOUT
+    assert_equal(message, s)
+  end
+
+  def test_error
+    s = ""
+    io = StringIO.new(s)
+    $stderr = io
+    message = <<-EOM
+Warning: valid file not found.
+#{Mireru::Command::Mireru::USAGE}
+Support file types: png, gif, jpeg(jpg). The others are...yet.
+    EOM
+    @logger.error(message)
+    $stderr = STDERR
+    assert_equal(message, s)
+  end
+end

data/test/test-mireru.rb

@@ -1,49 +1,37 @@
 require "mireru/command/mireru"
-require "stringio"
 
 module ValidTests
   def test_no_argument
-    s = ""
-    io = StringIO.new(s)
-    $stdout = io
-    valid = @mireru.__send__(:valid?, [])
-    $stdout = STDOUT
+    valid = @mireru.__send__(:support_file?, nil)
     assert_false(valid)
-    assert_equal(<<-EOT, s)
-Error: no argument.
-#{Mireru::Command::Mireru::USAGE}
-    EOT
   end
 
   def test_missing_file
-    s = ""
-    io = StringIO.new(s)
-    $stdout = io
-    valid = @mireru.__send__(:valid?, ["hoge"])
-    $stdout = STDOUT
+    valid = @mireru.__send__(:support_file?, "hoge")
     assert_false(valid)
-    assert_equal(<<-EOT, s)
-Error: missing file.
-#{Mireru::Command::Mireru::USAGE}
-    EOT
   end
 
   def test_not_support_file_type
-    s = ""
-    io = StringIO.new(s)
-    $stdout = io
-    valid = @mireru.__send__(:valid?, [__FILE__])
-    $stdout = STDOUT
+    file = File.join(File.dirname(__FILE__), "fixtures", "no-extention")
+    valid = @mireru.__send__(:support_file?, file)
     assert_false(valid)
-    assert_equal(<<-EOT, s)
-Error: this file type is not support as yet.
-#{Mireru::Command::Mireru::USAGE}
-    EOT
   end
 
   def test_png_file
     file = File.join(File.dirname(__FILE__), "fixtures", "nijip.png")
-    valid = @mireru.__send__(:valid?, [file])
+    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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mireru
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-05 00:00:00.000000000 Z
+date: 2013-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk3
@@ -110,10 +110,16 @@ files:
 - bin/mireru
 - lib/mireru.rb
 - lib/mireru/command/mireru.rb
+- lib/mireru/logger.rb
 - lib/mireru/version.rb
+- lib/mireru/widget.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-logger.rb
 - test/test-mireru.rb
 homepage: https://github.com/myokoym/mireru
 licenses:
@@ -140,7 +146,11 @@ signing_key:
 specification_version: 4
 summary: Flexible File Viewer
 test_files:
+- test/fixtures/LICENSE.txt
 - test/fixtures/nijip.png
+- test/fixtures/nijip.rb
+- test/fixtures/no-extention
 - test/run-test.rb
+- test/test-logger.rb
 - test/test-mireru.rb
 has_rdoc: