mojo_magick 0.4.2 → 0.4.3

data/.rvmrc

@@ -0,0 +1 @@
+rvm --create use ruby-1.9.2-p318@mojo_magick

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gem 'rake'

data/Rakefile

@@ -0,0 +1,17 @@
+require 'rubygems'
+
+task 'default' => :test
+
+desc "Default: run tests"
+task :test do
+  require 'rake/runtest'
+  files = Dir.glob(File.join(File.dirname(__FILE__), 'test/*_test.rb'))
+  files.each do |f|
+    Rake.run_tests f
+  end
+end
+
+task :build do
+  `rm mojo_magick-*.gem`
+  puts `gem build mojo_magick.gemspec`  
+end

data/lib/mojo_magick.rb

@@ -101,11 +101,11 @@ module MojoMagick
   def MojoMagick::resize(source_file, dest_file, options)
     retval = nil
     scale_options = []
-    scale_options << '">"' unless options[:shrink_only].nil?
-    scale_options << '"<"' unless options[:expand_only].nil?
-    scale_options << '"!"' unless options[:absolute_aspect].nil?
-    scale_options << '"^"' unless options[:fill].nil?
-    scale_options = scale_options.join(' ')
+    scale_options << ">" unless options[:shrink_only].nil?
+    scale_options << "<" unless options[:expand_only].nil?
+    scale_options << "!" unless options[:absolute_aspect].nil?
+    scale_options << "^" unless options[:fill].nil?
+    scale_options = scale_options.join
     
     extras = []
     if !options[:width].nil? && !options[:height].nil?
@@ -119,7 +119,7 @@ module MojoMagick
       extras << "-gravity Center"
       extras << "-extent #{geometry}"
     end
-    retval = raw_command("convert", "\"#{source_file}\" -resize #{geometry}#{scale_options} #{extras.join(' ')} \"#{dest_file}\"")
+    retval = raw_command("convert", "\"#{source_file}\" -resize \"#{geometry}#{scale_options}\" #{extras.join(' ')} \"#{dest_file}\"")
     dest_file
   end
 

data/lib/mojo_magick/version.rb

@@ -1,3 +1,3 @@
 module MojoMagick
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

data/test/mojo_magick_test.rb

@@ -18,66 +18,96 @@ class MojoMagickTest < Test::Unit::TestCase
     Dir::glob(File::join(@fixtures_path, '*')).each do |file|
       FileUtils::cp(file, @working_path) if File::file?(file)
     end
+    @test_image = File::join(@working_path, '5742.jpg')
+
   end
 
-  def test_image_management
+  def test_get_image_size
     reset_images
-    test_image = File::join(@working_path, '5742.jpg')
-    orig_image_size = File::size(test_image)
-    retval = MojoMagick::get_image_size(test_image)
-    assert_equal orig_image_size, File::size(test_image)
+    orig_image_size = File::size(@test_image)
+    retval = MojoMagick::get_image_size(@test_image)
+    assert_equal orig_image_size, File::size(@test_image)
     assert_equal 500, retval[:height]
     assert_equal 333, retval[:width]
+  end
 
+  def test_image_resize
     # test basic resizing
+    reset_images
+    orig_image_size = File::size(@test_image)
     size_test_temp = Tempfile::new('mojo_test')
     size_test = size_test_temp.path
-    retval = MojoMagick::resize(test_image, size_test, {:width=>100, :height=>100})
+    retval = MojoMagick::resize(@test_image, size_test, {:width=>100, :height=>100})
     assert_equal size_test, retval
-    assert_equal orig_image_size, File::size(test_image)
+    assert_equal orig_image_size, File::size(@test_image)
     assert_equal retval, size_test
     new_dimensions = MojoMagick::get_image_size(size_test)
     assert_equal 100, new_dimensions[:height]
     assert_equal 67, new_dimensions[:width]
 
     # we should be able to resize image right over itself
-    retval = MojoMagick::resize(test_image, test_image, {:width=>100, :height=>100})
-    assert_equal test_image, retval
-    assert_not_equal orig_image_size, File::size(test_image)
-    new_dimensions = MojoMagick::get_image_size(test_image)
+    retval = MojoMagick::resize(@test_image, @test_image, {:width=>100, :height=>100})
+    assert_equal @test_image, retval
+    assert_not_equal orig_image_size, File::size(@test_image)
+    new_dimensions = MojoMagick::get_image_size(@test_image)
     assert_equal 100, new_dimensions[:height]
     assert_equal 67, new_dimensions[:width]
+  end
 
+  def test_shrink_with_big_dimensions
     # image shouldn't resize if we specify very large dimensions and specify "shrink_only"
     reset_images
-    orig_image_size = File::size(test_image)
-    retval = MojoMagick::shrink(test_image, test_image, {:width=>1000, :height=>1000})
-    assert_equal test_image, retval
-    new_dimensions = MojoMagick::get_image_size(test_image)
+    size_test_temp = Tempfile::new('mojo_test')
+    size_test = size_test_temp.path
+    retval = MojoMagick::shrink(@test_image, size_test, {:width=>1000, :height=>1000})
+    assert_equal size_test, retval
+    new_dimensions = MojoMagick::get_image_size(@test_image)
     assert_equal 500, new_dimensions[:height]
     assert_equal 333, new_dimensions[:width]
+  end
+
+  def test_shrink
+    reset_images
     # image should resize if we specify small dimensions and shrink_only
-    retval = MojoMagick::shrink(test_image, test_image, {:width=>1000, :height=>100})
-    assert_equal test_image, retval
-    new_dimensions = MojoMagick::get_image_size(test_image)
+    retval = MojoMagick::shrink(@test_image, @test_image, {:width=>1000, :height=>100})
+    assert_equal @test_image, retval
+    new_dimensions = MojoMagick::get_image_size(@test_image)
     assert_equal 100, new_dimensions[:height]
     assert_equal 67, new_dimensions[:width]
+  end
+
+  def test_resize_with_shrink_only_options
+    reset_images
+    # image should resize if we specify small dimensions and shrink_only
+    retval = MojoMagick::resize(@test_image, @test_image, {:shrink_only => true, :width=>400, :height=>400})
+    assert_equal @test_image, retval
+    new_dimensions = MojoMagick::get_image_size(@test_image)
+    assert_equal 400, new_dimensions[:height]
+    assert_equal 266, new_dimensions[:width]
+  end
 
+  def test_expand_with_small_dim
     # image shouldn't resize if we specify small dimensions and expand_only
     reset_images
-    orig_image_size = File::size(test_image)
-    retval = MojoMagick::expand(test_image, test_image, {:width=>10, :height=>10})
-    assert_equal test_image, retval
-    new_dimensions = MojoMagick::get_image_size(test_image)
+    orig_image_size = File::size(@test_image)
+    retval = MojoMagick::expand(@test_image, @test_image, {:width=>10, :height=>10})
+    assert_equal @test_image, retval
+    new_dimensions = MojoMagick::get_image_size(@test_image)
     assert_equal 500, new_dimensions[:height]
     assert_equal 333, new_dimensions[:width]
+  end
+
+  def test_expand
+    reset_images
     # image should resize if we specify large dimensions and expand_only
-    retval = MojoMagick::expand(test_image, test_image, {:width=>1000, :height=>1000})
-    assert_equal test_image, retval
-    new_dimensions = MojoMagick::get_image_size(test_image)
+    retval = MojoMagick::expand(@test_image, @test_image, {:width=>1000, :height=>1000})
+    assert_equal @test_image, retval
+    new_dimensions = MojoMagick::get_image_size(@test_image)
     assert_equal 1000, new_dimensions[:height]
     assert_equal 666, new_dimensions[:width]
+  end
 
+  def test_invalid_images
     # test bad images
     bad_image = File::join(@working_path, 'not_an_image.jpg')
     zero_image = File::join(@working_path, 'zero_byte_image.jpg')
@@ -88,20 +118,18 @@ class MojoMagickTest < Test::Unit::TestCase
 
   def test_resize_with_fill
     reset_images
-    test_image = File::join(@working_path, '5742.jpg')
-    orig_image_size = File::size(test_image)
-    MojoMagick::resize(test_image, test_image, {:fill => true, :width => 100, :height => 100})
-    dim = MojoMagick::get_image_size(test_image)
+    @test_image = File::join(@working_path, '5742.jpg')
+    MojoMagick::resize(@test_image, @test_image, {:fill => true, :width => 100, :height => 100})
+    dim = MojoMagick::get_image_size(@test_image)
     assert_equal 100, dim[:width] 
     assert_equal 150, dim[:height] 
   end
 
   def test_resize_with_fill_and_crop
     reset_images
-    test_image = File::join(@working_path, '5742.jpg')
-    orig_image_size = File::size(test_image)
-    MojoMagick::resize(test_image, test_image, {:fill => true, :crop => true, :width => 150, :height => 120})
-    dim = MojoMagick::get_image_size(test_image)
+    @test_image = File::join(@working_path, '5742.jpg')
+    MojoMagick::resize(@test_image, @test_image, {:fill => true, :crop => true, :width => 150, :height => 120})
+    dim = MojoMagick::get_image_size(@test_image)
     assert_equal 150, dim[:width]
     assert_equal 120, dim[:height] 
   end

metadata

@@ -1,52 +1,47 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mojo_magick
-version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 2
-  version: 0.4.2
+version: !ruby/object:Gem::Version
+  version: 0.4.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Steve Midgley
 - Elliot Nelson
 - Jon Rogers
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-18 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple Ruby stateless module interface to imagemagick.
-email: 
+email:
 - public@misuse.org
 - j@2rye.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .rvmrc
+- Gemfile
 - README.md
+- Rakefile
 - init.rb
 - lib/image_resources.rb
 - lib/mojo_magick.rb
@@ -56,41 +51,31 @@ files:
 - test/fixtures/not_an_image.jpg
 - test/fixtures/zero_byte_image.jpg
 - test/mojo_magick_test.rb
-has_rdoc: true
 homepage: http://github.com/bunnymatic/mojo_magick
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: mojo_magick
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: mojo_magick-0.4.2
-test_files: 
+summary: mojo_magick-0.4.3
+test_files:
 - test/fixtures/5742.jpg
 - test/fixtures/not_an_image.jpg
 - test/fixtures/zero_byte_image.jpg