pix_scale 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d73a45dd39fc7155e6de8aa14e07b11da3cffb1
-  data.tar.gz: e7e4111dae8d43d96d7be3304e30b83e2f59c23d
+  metadata.gz: 3b969d5d5f7aa5de29c297dbd8e98c5d6a020d68
+  data.tar.gz: 9baf4d771fec21f8bab5d0a3e3b48c93fe2ca30e
 SHA512:
-  metadata.gz: 76292d7776f8a3b388758369f6b76706a04a83825ac24b1ca557e0b50291f2a29d23c2e06d039fa2298da46ade6d521c44ef02059d9f5b8987baa33c60d3c3b7
-  data.tar.gz: d3de833422624841bc88e3d69df3666f59ff7901de3fa95fa8dc420f34ccd81df15f20919aa123d9a70a1d0a0be4f8cd5d72ebb9a3fab9b993cd6d053552c08c
+  metadata.gz: 8f32fb05f7e477d24b491a57512c5461ac23d44a76f409b61cce943e740c87ce13c617d6a463a9b910826ad47e0347d817c694acbdb5c6fcae64f8d175d416cd
+  data.tar.gz: 7a0d320513997a7fec07e4e480ecff59ff9c4f3b29f33cbd167ababbe25ac86b2ffb5f5a627e39740b7a523e15a042eac2c9215cfa337e7efbc0bd1523184ec5

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+notifications:
+  recipients:
+    - myokoym@gmail.com

data/NEWS.md

@@ -1,5 +1,15 @@
 # NEWS
 
+## 0.1.0: 2013-06-29
+
+Supported absolute length release!
+
+### Changes
+
+  * Improvements
+    * Supported absolute length for width and height
+    * Supported upper case for extension name
+
 ## 0.0.2: 2013-06-27
 
 Fix a typo release!

data/README.md

@@ -1,4 +1,4 @@
-# PixScale
+# pix\_scale
 
 A command line tool for scale of pix.
 
@@ -11,19 +11,48 @@ A command line tool for scale of pix.
 
     gem install pix_scale
 
+## Official supported format
+
+* PNG
+* JPEG
+
 ## Usage
 
+### rate
+
+    % ls -l
+    -rw-rw-r-- 1 you you 46643 2013-06-27 20:00 foo.png
+
+    % pix_scale foo.png 0.5
+
+    % ls -l
+    -rw-rw-r-- 1 you you 46643 2013-06-27 20:00 foo.png
+    -rw-rw-r-- 1 you you 18539 2013-06-27 20:01 foo-0.5.png
+
+### width,height
+
+    % ls -l
+    -rw-rw-r-- 1 you you 46643 2013-06-27 20:00 foo.png
+
+    % pix_scale foo.png 200,200
+
+    % ls -l
+    -rw-rw-r-- 1 you you 46643 2013-06-27 20:00 foo.png
+    -rw-rw-r-- 1 you you 18539 2013-06-27 20:01 foo-200_200.png
+
+### multiple files
+
     % ls -l
-    -rw-rw-r-- 1 you you 46643  6 27 20:00 foo.png
-    -rw-rw-r-- 1 you you 31438  6 27 20:00 bar.png
+    -rw-rw-r-- 1 you you 46643 2013-06-27 20:00 foo.png
+    -rw-rw-r-- 1 you you 31438 2013-06-27 20:00 bar.png
 
     % pix_scale *.png 0.5
 
     % ls -l
-    -rw-rw-r-- 1 you you 46643  6 27 20:00 foo.png
-    -rw-rw-r-- 1 you you 18539  6 27 20:01 foo-0.5.png
-    -rw-rw-r-- 1 you you 31438  6 27 20:00 bar.png
-    -rw-rw-r-- 1 you you 16462  6 27 20:01 bar-0.5.png
+    -rw-rw-r-- 1 you you 46643 2013-06-27 20:00 foo.png
+    -rw-rw-r-- 1 you you 18539 2013-06-27 20:01 foo-0.5.png
+    -rw-rw-r-- 1 you you 31438 2013-06-27 20:00 bar.png
+    -rw-rw-r-- 1 you you 16462 2013-06-27 20:01 bar-0.5.png
 
 ## Contributing
 

data/Rakefile

@@ -1 +1,9 @@
 require "bundler/gem_tasks"
+
+desc "Run test"
+task :test do
+  Bundler::GemHelper.install_tasks
+  ruby("test/run-test.rb")
+end
+
+task :default => :test

data/lib/pix_scale/command.rb

@@ -1,4 +1,4 @@
-require "gdk_pixbuf2"
+require "pix_scale/pic"
 require "pix_scale/version"
 
 module PixScale
@@ -15,19 +15,10 @@ Example: pix_scale foo.png 0.5
         exit(true)
       end
 
-      scale = arguments.pop.to_f
+      scale = arguments.pop
 
       arguments.each do |pic_path|
-        dirname  = File.dirname(pic_path)
-        basename = File.basename(pic_path, ".*")
-        extname  = File.extname(pic_path).sub(/^\./, "")
-
-        pic = Gdk::Pixbuf.new(pic_path)
-        scaled_pic = pic.scale(pic.width * scale, pic.height * scale)
-
-        output_path = "#{dirname}/#{basename}-#{scale.to_s}.#{extname}"
-        type = (/\Ajpg\z/ =~ extname) ? "jpeg" : extname
-        scaled_pic.save(output_path, type)
+        Pic.scale_and_save(pic_path, scale)
       end
     end
   end

data/lib/pix_scale/pic.rb

@@ -0,0 +1,68 @@
+require "gdk_pixbuf2"
+
+module PixScale
+  class Pic
+    def self.scale_and_save(path, scale)
+      new(path).scale_and_save(scale)
+    end
+
+    attr_reader :path, :type
+    def initialize(path)
+      @path = path
+      @pic = Gdk::Pixbuf.new(path)
+      @type = (/\A\.jpg\z/i =~ extname) ? "jpeg" : extname.sub(/^\./, "").downcase
+    end
+
+    def scale_and_save(scale)
+      scale_string = scale.to_s.sub(/[^\.0-9]/, "_")
+      output_path = "#{dirname}/#{basename}-#{scale_string}#{extname}"
+      scale(scale).save(output_path)
+    end
+
+    def scale(scale)
+      new_pic = self.dup
+      new_pic.scale!(scale)
+      new_pic
+    end
+
+    def scale!(scale)
+      if scale.is_a?(Float)
+        width = @pic.width * scale
+        height = @pic.height * scale
+      elsif scale.is_a?(Integer)
+        width = scale
+        height = @pic.height * (scale.to_f / @pic.width)
+      elsif /\A[0-9]+\.[0-9]+\z/ =~ scale
+        width = @pic.width * scale.to_f
+        height = @pic.height * scale.to_f
+      elsif /\A[0-9]+[^\.0-9][0-9]+\z/ =~ scale
+        width, height = scale.split(/[^\.0-9]/).map(&:to_i)
+      elsif /\A[0-9]+\z/ =~ scale
+        width = scale.to_i
+        height = @pic.height * (scale.to_f / @pic.width)
+      elsif /\A[^\.0-9]([0-9]+)\z/ =~ scale
+        width = @pic.width * ($1.to_f / @pic.height)
+        height = $1.to_i
+      end
+
+      @pic = @pic.scale(width, height)
+    end
+
+    def save(output_path)
+      @pic.save(output_path, @type)
+    end
+
+    private
+    def dirname
+      File.dirname(@path)
+    end
+
+    def basename
+      File.basename(@path, ".*")
+    end
+
+    def extname
+      File.extname(@path)
+    end
+  end
+end

data/lib/pix_scale/version.rb

@@ -1,3 +1,3 @@
 module PixScale
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/pix_scale.rb

@@ -1 +1,2 @@
 require "pix_scale/version"
+require "pix_scale/pic"

data/pix_scale.gemspec

@@ -20,6 +20,9 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency("gdk_pixbuf2")
 
+  spec.add_development_dependency("test-unit")
+  spec.add_development_dependency("test-unit-notify")
+  spec.add_development_dependency("test-unit-rr")
   spec.add_development_dependency("bundler", "~> 1.3")
   spec.add_development_dependency("rake")
 end

data/test/run-test.rb

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+require "test-unit"
+require "test/unit/notify"
+require "test/unit/rr"
+
+base_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+$LOAD_PATH.unshift(File.join(base_dir, "lib"))
+$LOAD_PATH.unshift(File.join(base_dir, "test"))
+
+exit Test::Unit::AutoRunner.run(true)

data/test/test-pic.rb

@@ -0,0 +1,127 @@
+require "pix_scale/pic"
+
+class PicTest < Test::Unit::TestCase
+  def test_static_scale_and_save
+    path = "test/fixtures/nijip.png"
+    scaled_path = "test/fixtures/nijip-0.5.png"
+    File.delete(scaled_path) if File.exist?(scaled_path)
+    PixScale::Pic.scale_and_save(path, 0.5)
+    assert_true(File.file?(scaled_path))
+    assert_true(File.size(path) > File.size(scaled_path))
+    assert_true(File.size(scaled_path) > 0)
+    File.delete(scaled_path)
+  end
+
+  class ScaleAndSaveTest < self
+    def test_scale_and_save_rate
+      path = "test/fixtures/nijip.png"
+      scale = 0.5
+      scaled_path = "test/fixtures/nijip-0.5.png"
+      assert_scale_and_save(path, scale, scaled_path)
+    end
+
+    def test_scale_and_save_width_and_height
+      path = "test/fixtures/nijip.png"
+      scale = "240,180"
+      scaled_path = "test/fixtures/nijip-240_180.png"
+      assert_scale_and_save(path, scale, scaled_path)
+    end
+
+    def test_scale_and_save_upcase_PNG
+      path = "test/fixtures/nyanko.PNG"
+      scale = 0.66
+      scaled_path = "test/fixtures/nyanko-0.66.PNG"
+      assert_scale_and_save(path, scale, scaled_path)
+    end
+
+    def test_scale_and_save_jpg
+      path = "test/fixtures/teabreak.jpg"
+      scale = 0.09
+      scaled_path = "test/fixtures/teabreak-0.09.jpg"
+      assert_scale_and_save(path, scale, scaled_path)
+    end
+
+    def test_scale_and_save_jpeg
+      path = "test/fixtures/teabreak.jpeg"
+      scale = 0.09
+      scaled_path = "test/fixtures/teabreak-0.09.jpeg"
+      assert_scale_and_save(path, scale, scaled_path)
+    end
+
+    def test_scale_and_save_upcase_JPG
+      path = "test/fixtures/teabreak.JPG"
+      scale = 0.09
+      scaled_path = "test/fixtures/teabreak-0.09.JPG"
+      assert_scale_and_save(path, scale, scaled_path)
+    end
+
+    def test_scale_and_save_upcase_JPEG
+      path = "test/fixtures/teabreak.JPEG"
+      scale = 0.09
+      scaled_path = "test/fixtures/teabreak-0.09.JPEG"
+      assert_scale_and_save(path, scale, scaled_path)
+    end
+
+    private
+    def assert_scale_and_save(path, scale, scaled_path)
+      File.delete(scaled_path) if File.exist?(scaled_path)
+      pic = PixScale::Pic.new(path)
+      pic.scale_and_save(scale)
+      assert_true(File.file?(scaled_path))
+      assert_true(File.size(path) > File.size(scaled_path))
+      assert_true(File.size(scaled_path) > 0)
+      File.delete(scaled_path)
+    end
+  end
+
+  class ScaleTest < self
+    def setup
+      @path = "test/fixtures/nijip.png"
+      @pic = PixScale::Pic.new(@path)
+      @before_pic = @pic.instance_variable_get(:@pic).dup
+    end
+
+    def test_float
+      scale = 0.5
+      scaled_pic = @pic.scale(scale).instance_variable_get(:@pic)
+      assert_equal(@before_pic.width * scale, scaled_pic.width)
+      assert_equal(@before_pic.height * scale, scaled_pic.height)
+    end
+
+    def test_string_like_float
+      scale = "0.5"
+      scaled_pic = @pic.scale(scale).instance_variable_get(:@pic)
+      assert_equal(@before_pic.width * scale.to_f, scaled_pic.width)
+      assert_equal(@before_pic.height * scale.to_f, scaled_pic.height)
+    end
+
+    def test_integer_as_width
+      width = 240
+      scaled_pic = @pic.scale(width).instance_variable_get(:@pic)
+      assert_equal(width, scaled_pic.width)
+      assert_equal(@before_pic.height * (width.to_f / @before_pic.width), scaled_pic.height)
+    end
+
+    def test_string_as_width
+      width = "240"
+      scaled_pic = @pic.scale(width).instance_variable_get(:@pic)
+      assert_equal(width.to_i, scaled_pic.width)
+      assert_equal(@before_pic.height * (width.to_f / @before_pic.width), scaled_pic.height)
+    end
+
+    def test_string_as_height
+      height = "180"
+      scaled_pic = @pic.scale(",#{height}").instance_variable_get(:@pic)
+      assert_equal(@before_pic.width * (height.to_f / @before_pic.height), scaled_pic.width)
+      assert_equal(height.to_i, scaled_pic.height)
+    end
+
+    def test_string_width_and_height
+      width = 240
+      height = 180
+      scaled_pic = @pic.scale("#{width},#{height}").instance_variable_get(:@pic)
+      assert_equal(width, scaled_pic.width)
+      assert_equal(height, scaled_pic.height)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pix_scale
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gdk_pixbuf2
@@ -24,6 +24,48 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit-notify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit-rr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -61,6 +103,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - NEWS.md
@@ -69,8 +112,17 @@ files:
 - bin/pix_scale
 - lib/pix_scale.rb
 - lib/pix_scale/command.rb
+- lib/pix_scale/pic.rb
 - lib/pix_scale/version.rb
 - pix_scale.gemspec
+- test/fixtures/nijip.png
+- test/fixtures/nyanko.PNG
+- test/fixtures/teabreak.JPEG
+- test/fixtures/teabreak.JPG
+- test/fixtures/teabreak.jpeg
+- test/fixtures/teabreak.jpg
+- test/run-test.rb
+- test/test-pic.rb
 homepage: https://github.com/myokoym/pix_scale
 licenses:
 - MIT
@@ -95,5 +147,13 @@ rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A command line tool for scale of pix.
-test_files: []
+test_files:
+- test/fixtures/nijip.png
+- test/fixtures/nyanko.PNG
+- test/fixtures/teabreak.JPEG
+- test/fixtures/teabreak.JPG
+- test/fixtures/teabreak.jpeg
+- test/fixtures/teabreak.jpg
+- test/run-test.rb
+- test/test-pic.rb
 has_rdoc: