mireru 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b487538b444efd4c0338a983d8c497314b4f842
-  data.tar.gz: 056e6e0490665009c82c0a4b345783346f50b6f1
+  metadata.gz: de717adbc118c32f4864dec868df30fcf776f14f
+  data.tar.gz: a23cab13d3c32ffc8ad88483970228cdf718719e
 SHA512:
-  metadata.gz: 8c0c370545a91cfbed851113b8bf0c39c00ea1ee3441b5d20849ffe8a05af99cb5585c17fcc6203d46f9d855c3d57aab300b9032f67faf84fb7aa64a42343d0f
-  data.tar.gz: a363a6d984ee976bded96de7f1ed9b456001512fe351636178558615f58465116c7b1f2d57cfcce368a28627b6557c91770a061ab0f462c5207193eb57811508
+  metadata.gz: 7bbbfdd3d3126049269bf5db794641594f795a3144283f2a80357dabcac655c6a5718a4787dbf05f50a3e663123e7b4e33d7fa832dab3a59e70a562772b2034a
+  data.tar.gz: 8742ac1289baf9921e5c322a4e5ea849def9f1d1f745158059edc64cf85567465817744a65774e8fbca4de495ef7ec5759fbcf9c3d04eadb8aa9472b656d9368

data/NEWS.md

@@ -1,5 +1,13 @@
 # NEWS
 
+## 0.1.5: 2013-08-29
+
+### Changes
+
+  * Improvements
+    * Use original-size as default if it is smaller than window-size.
+    * Supported thumbnail view.
+
 ## 0.1.4: 2013-07-09
 
 ### Changes

data/README.md

@@ -46,6 +46,10 @@ l: right<br />
 +: larger<br />
 -: smaller<br />
 
+#### Special
+
+T: thumbnail
+
 #### Image
 
 f: fits window size<br />

data/lib/mireru/command/mireru.rb

@@ -1,4 +1,4 @@
-require 'gtk3'
+require "gtk3"
 require "mireru/logger"
 require "mireru/window"
 require "mireru/container"

data/lib/mireru/container.rb

@@ -8,6 +8,10 @@ module Mireru
       @files.empty?
     end
 
+    def size
+      @files.size
+    end
+
     def pop(complement_file=nil)
       @files.unshift(complement_file) if complement_file
       @files.pop

data/lib/mireru/thumbnail.rb

@@ -0,0 +1,44 @@
+require "gtk3"
+require "mireru/widget"
+
+module Mireru
+  class Thumbnail
+    class << self
+      def create(files, width, height)
+        nums_in_a_row = Math.sqrt(files.size)
+        rows = Gtk::Box.new(:vertical)
+        files.each_slice(nums_in_a_row) do |a_row_files|
+          row = Gtk::Box.new(:horizontal)
+          a_row_files.each do |file|
+            cell_width  = width  / nums_in_a_row
+            cell_height = height / nums_in_a_row
+            if Widget.image?(file)
+              image = image_from_file(file, cell_width, cell_height)
+              row.add(image)
+            else
+              label = label_from_file(file, cell_width, cell_height)
+              row.add(label)
+            end
+          end
+          rows.add(row)
+        end
+        rows
+      end
+
+      private
+      def image_from_file(file, width=100, height=100)
+        image = Gtk::Image.new
+        pixbuf = Gdk::Pixbuf.new(file, width, height)
+        image.pixbuf = pixbuf
+        image
+      end
+
+      def label_from_file(file, width=100, height=100)
+        label = Gtk::Label.new(File.basename(file))
+        label.set_size_request(width, height)
+        label.wrap = true
+        label
+      end
+    end
+  end
+end

data/lib/mireru/version.rb

@@ -1,3 +1,3 @@
 module Mireru
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/mireru/widget.rb

@@ -1,5 +1,5 @@
-require 'gtk3'
-require 'gtksourceview3'
+require "gtk3"
+require "gtksourceview3"
 
 module Mireru
   class Error < StandardError
@@ -7,10 +7,13 @@ module Mireru
 
   class Widget
     class << self
-      def create(file, width=nil, height=nil)
+      def create(file, width=10000, height=10000)
         if image?(file)
           image = Gtk::Image.new
+          pixbuf = Gdk::Pixbuf.new(file)
+          if pixbuf.width > width || pixbuf.height > height
           pixbuf = Gdk::Pixbuf.new(file, width, height)
+          end
           image.pixbuf = pixbuf
           widget = image
         else
@@ -21,7 +24,7 @@ module Mireru
           end
           view = GtkSource::View.new(buffer)
           view.show_line_numbers = true
-          lang = GtkSource::LanguageManager.new.get_language('ruby')
+          lang = GtkSource::LanguageManager.new.get_language("ruby")
           view.buffer.language = lang
           view.buffer.highlight_syntax = true
           view.buffer.highlight_matching_brackets = true

data/lib/mireru/window.rb

@@ -1,5 +1,6 @@
-require 'gtk3'
+require "gtk3"
 require "mireru/widget"
+require "mireru/thumbnail"
 
 module Mireru
   class Window < Gtk::Window
@@ -47,6 +48,9 @@ module Mireru
             pixbuf = Gdk::Pixbuf.new(@file)
             @widget.pixbuf = pixbuf
           end
+        when Gdk::Keyval::GDK_KEY_T
+          files = @container.instance_variable_get(:@files)
+          self.add_from_file(files)
         when Gdk::Keyval::GDK_KEY_plus
           if Mireru::Widget.image?(@file)
             width  = @widget.pixbuf.width
@@ -103,14 +107,19 @@ module Mireru
       @scroll.hadjustment.value = 0
       @scroll.vadjustment.value = 0
       @scroll.each {|child| @scroll.remove(child) }
-      @widget = Mireru::Widget.create(file, *self.size)
+      if file.is_a?(Enumerable)
+        @widget = Mireru::Thumbnail.create(file, *self.size)
+        self.title = "Thumbnails: #{file.size} / #{file.size}"
+      else
+        @widget = Mireru::Widget.create(file, *self.size)
+        self.title = File.basename(file)
+      end
       @widget.override_font(Pango::FontDescription.new(@font)) if @font
       if @widget.is_a?(Gtk::Scrollable)
         @scroll.add(@widget)
       else
         @scroll.add_with_viewport(@widget)
       end
-      self.title = File.basename(file)
       self.show_all
     end
   end

data/test/test-container.rb

@@ -5,6 +5,15 @@ class ContainerTest < Test::Unit::TestCase
     @container = Mireru::Container.new
   end
 
+  def test_size
+    assert_equal(0, @container.size)
+    files = @container.instance_variable_get(:@files)
+    files << __FILE__
+    assert_equal(1, @container.size)
+    files << __FILE__
+    assert_equal(2, @container.size)
+  end
+
   def test_no_argument
     valid = @container.__send__(:file?, nil)
     assert_false(valid)

data/test/test-thumbnail.rb

@@ -0,0 +1,15 @@
+require "mireru/thumbnail"
+
+class ThumbnailTest < Test::Unit::TestCase
+  def test_image_from_file
+    widget = Mireru::Thumbnail.__send__(:image_from_file,
+                                        "test/fixtures/nijip.png")
+    assert_equal(Gtk::Image, widget.class)
+  end
+
+  def test_label_from_fil
+    widget = Mireru::Thumbnail.__send__(:label_from_file,
+                                        __FILE__)
+    assert_equal(Gtk::Label, widget.class)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mireru
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk3
@@ -130,6 +130,7 @@ files:
 - lib/mireru/command/mireru.rb
 - lib/mireru/container.rb
 - lib/mireru/logger.rb
+- lib/mireru/thumbnail.rb
 - lib/mireru/version.rb
 - lib/mireru/widget.rb
 - lib/mireru/window.rb
@@ -142,6 +143,7 @@ files:
 - test/test-container.rb
 - test/test-logger.rb
 - test/test-mireru.rb
+- test/test-thumbnail.rb
 - test/test-widget.rb
 - test/test-window.rb
 homepage: https://github.com/myokoym/mireru
@@ -177,6 +179,7 @@ test_files:
 - test/test-container.rb
 - test/test-logger.rb
 - test/test-mireru.rb
+- test/test-thumbnail.rb
 - test/test-widget.rb
 - test/test-window.rb
 has_rdoc: