imanip 0.1.4 → 0.1.5

data/.gitignore

@@ -0,0 +1,6 @@
+.bundle
+.svn
+.svn/*
+tmp/*
+pkg/*
+doc/*

data/Gemfile

@@ -0,0 +1,2 @@
+source 'http://rubygems.org'
+gemspec

data/Gemfile.lock

@@ -0,0 +1,20 @@
+PATH
+  remote: .
+  specs:
+    imanip (0.1.4)
+      safe_shell (~> 1.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    mocha (0.9.8)
+      rake
+    rake (0.8.7)
+    safe_shell (1.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  imanip!
+  mocha (= 0.9.8)

data/History.txt

@@ -1,15 +1,15 @@
 == 0.1.4 2008-10-16
 
 * minor enhancements
-	* Added Image#ratio
-	* Crop resize is way better based on ratios
+  * Added Image#ratio
+  * Crop resize is way better based on ratios
 
 == 0.1.2 2008-08-27
 
 * minor enhancements
-	* Magick#convert now returns an imanip image
-	* Image#square?
-	* some inline documentation
+  * Magick#convert now returns an imanip image
+  * Image#square?
+  * some inline documentation
 
 == 0.1.1 2008-06-13
 

data/{README.txt → README.rdoc}

@@ -21,80 +21,81 @@ it works really well, and I'm already using it on some very high volume producti
 
 
 First things, first, Tell me where you keep them:
-	
-	
-	# Rails: production|development|etc.rb
-	# or somewhere that gets loaded before you initialize
-	
-	Imanip::Interface::Magick.execute_path = '/path/to/your/bins/' # eg /usr/local/bin/
-	
+
+
+  # Rails: production|development|etc.rb
+  # or somewhere that gets loaded before you initialize
+
+  Imanip::Interface::Magick.execute_path = '/path/to/your/bins/' # eg /usr/local/bin/
+
 
 With an image file at /dir/image.jpg
-	
-	image = Imanip::Image.new('/dir/image.jpg')
-	
+
+  image = Imanip::Image.new('/dir/image.jpg')
+
 This will run identify on the image and make sure its convert-able. If it cant read or interpret it it will raise an Imanip::NotAnImageError.
 
 Once you have the image you can check some properties/attributes
-	
-	image.width #=> 410 (Fixnum)
-	image.height #=> 100 (Fixnum)
-	image.format #=> JPEG (String)
+
+  image.width #=> 410 (Fixnum)
+  image.height #=> 100 (Fixnum)
+  image.format #=> JPEG (String)
 
 There are also some helpers to do some rule based cropping.
-	
-	image.portrait? #=> false
-	image.landscape? #=> true
-	image.orientation #=> :landscape
-	
+
+  image.portrait? #=> false
+  image.landscape? #=> true
+  image.orientation #=> :landscape
+
 After that you can resize and whatever
-	
-	image.resize('outputfile.jpg', :dimensions => [200,100])
-	
+
+  image.resize('outputfile.jpg', :dimensions => [200,100])
+
 I like crop_resize better. It crops AND resizes so you get an image of the exact pixel dimensions you desire.
-	
-	image.crop_resize('/file/to/output.jpg', :width => 50, :height => 50) #=> output file is an exact 50x50 image
+
+  image.crop_resize('/file/to/output.jpg', :width => 50, :height => 50) #=> output file is an exact 50x50 image
 
 You might also want to catch errors, because they will inevitably happen. Possible Errors
 
-	Imanip::Error # the root, the root, the root is on fire
-	Imanip::NotAnImageError # Descends from above, thrown during Imanip#Image.new
-	Imanip::CouldNotConvertError # Also from above, thrown if theres an issue with #resize or #crop_resize (options, etc.)
+  Imanip::Error # the root, the root, the root is on fire
+  Imanip::NotAnImageError # Descends from above, thrown during Imanip#Image.new
+  Imanip::CouldNotConvertError # Also from above, thrown if theres an issue with #resize or #crop_resize (options, etc.)
 
 More examples coming soon.
 
 == REQUIREMENTS:
 
-You need ImageMagick. Really any version will do, but I am developing with ImageMagick 6.3.3. 
+You need ImageMagick. Really any version will do, but I am developing with ImageMagick 6.3.3.
+
+[http://www.imagemagick.org/script/download.php]
 
-http://www.imagemagick.org/script/download.php
-	
 
 == INSTALL:
 
 First, install ImageMagick:
-http://www.imagemagick.org/script/download.php
+
+[http://www.imagemagick.org/script/download.php]
 
 Make sure you get the command line tools:
-		
-	$ which 'convert'
+
+  $ which 'convert'
 
 Imanip works as a gem or a plugin for Rails.
-	
+
 As a gem:
-	
-	$ sudo gem install imanip
-	
+
+  $ sudo gem install imanip
+
 In Rails/environment.rb
-	config.gem 'imanip'
+  config.gem 'imanip'
 
 Or you can get the ABSOLUTE latest from github:
 
-	$ sudo gem install quirkey-imanip -s http://gems.github.com
+  $ sudo gem install quirkey-imanip -s http://gems.github.com
 
 To install as a plugin (you need git):
-	
-	$ git clone git://github.com/quirkey/imanip.git vendor/plugins/imanip
+
+  $ git clone git://github.com/quirkey/imanip.git vendor/plugins/imanip
 
 == LICENSE:
 

data/Rakefile

@@ -1,4 +1,12 @@
-require 'config/requirements'
-require 'config/hoe' # setup Hoe + all gem configuration
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-Dir['tasks/**/*.rake'].each { |rake| load rake }
+require 'rake/testtask'
+Rake::TestTask.new do |test|
+  test.libs      << 'lib' << 'test'
+  test.pattern   = 'test/**/test_*.rb'
+  test.ruby_opts = ['-rubygems']
+  test.verbose   = true
+end
+
+task :default => :test

data/imanip.gemspec

@@ -0,0 +1,21 @@
+# encoding: UTF-8
+require File.expand_path('../lib/imanip/version', __FILE__)
+
+Gem::Specification.new do |s|
+  s.name        = "imanip"
+  s.summary     = "Super-quick image resizing using the ImageMagick command line tools"
+  s.description = "Super-quick image resizing using the ImageMagick command line tools"
+  s.email       = "aaron@quirkey.com"
+  s.homepage    = "http://quirkey.rubyforge.org"
+  s.authors     = ["Aaron Quint"]
+  s.version     = Imanip::Version
+
+  s.add_dependency 'safe_shell', '~> 1.0'
+
+  s.add_development_dependency 'mocha', '0.9.8'
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end

data/lib/imanip.rb

@@ -1,3 +1,5 @@
+require 'safe_shell'
+
 %w{image imanip_magick errors}.each do |lib|
   require File.expand_path(File.dirname(__FILE__)) + "/imanip/#{lib}"
 end

data/lib/imanip/image.rb

@@ -1,19 +1,19 @@
 module Imanip
   class Image
-    
+
     def initialize(path,interface = :magick)
       @image_path = path
       load_interface(interface)
     end
-    
+
     private
     def load_interface(interface)
       @interface = Imanip::Interface.const_get("#{interface.to_s.capitalize}").new(@image_path)
     end
-    
+
     def method_missing(method, *args)
       @interface.send(method,*args)
     end
-    
+
   end
 end

data/lib/imanip/imanip_magick.rb

@@ -13,7 +13,6 @@ module Imanip
         @image_path = path
         identify
       end
-      
 
       alias_method :columns, :width
       alias_method :rows, :height
@@ -22,7 +21,7 @@ module Imanip
       def dimensions
         [width,height]
       end
-      
+
       # Returns true if the image is taller then it is long
       def portrait?
         width < height
@@ -84,7 +83,7 @@ module Imanip
           crop_resize_string << "-resize #{to_geometry_string(:height => crop_height, :width => crop_width)}"
         end
         gravity = @options.delete(:gravity) || 'North'
-        crop_resize_string << " -gravity '#{gravity}'"
+        crop_resize_string << " -gravity #{gravity}"
         crop_resize_string << " -crop #{to_geometry_string(@geometry)}+0+0"
         crop_resize_string << " #{options_to_string(@options)}"
         convert(to_file,crop_resize_string)
@@ -123,7 +122,7 @@ module Imanip
           @geometry = {:width => width, :height => height}
         end
         if @options[:dimensions]
-          width, height = @options.delete(:dimensions) 
+          width, height = @options.delete(:dimensions)
           @geometry = {:width => width, :height => height}
         end
         @geometry = {:width => @options.delete(:width), :height => @options.delete(:height) } if @options[:width] || @options[:height]
@@ -140,7 +139,7 @@ module Imanip
                           else
                             width_height.to_s
                           end
-       "'#{geometry_string}'"
+       "#{geometry_string}"
       end
 
       def options_to_string(options)
@@ -153,13 +152,13 @@ module Imanip
       end
 
       def execute(command)
-        `#{command} 2>&1`
+        pieces = command.split(' ')
+        SafeShell.execute(pieces[0], *pieces[1..-1])
       end
 
       def execute_path
         self.class.execute_path
       end
     end
-
   end
 end

data/lib/imanip/version.rb

@@ -1,9 +1,3 @@
 module Imanip #:nodoc:
-  module VERSION #:nodoc:
-    MAJOR = 0
-    MINOR = 1
-    TINY  = 4
-
-    STRING = [MAJOR, MINOR, TINY].join('.')
-  end
+  Version = '0.1.5'
 end

data/test/test_helper.rb

@@ -1,23 +1,21 @@
+require 'mocha'
 require 'test/unit'
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/imanip'))
 
 class Test::Unit::TestCase
-  
-  protected
   def current_path
     File.expand_path(File.dirname(__FILE__))
   end
-  
+
   def portrait_image_path
     File.join(current_path,'portrait_test.jpg')
   end
-  
+
   def landscape_image_path
     File.join(current_path,'landscape_test.jpg')
   end
-  
+
   def new_image_path
     File.join(current_path, "new_file.jpg")
   end
-  
 end

data/test/test_imanip_magick.rb

@@ -6,7 +6,7 @@ class ImanipMagickTest < Test::Unit::TestCase
     @portrait_image = new_imanip_image(portrait_image_path)
     @landscape_image  = new_imanip_image(landscape_image_path)
   end
-  
+
   def teardown
     File.unlink(new_image_path) if File.readable?(new_image_path)
   end
@@ -16,54 +16,54 @@ class ImanipMagickTest < Test::Unit::TestCase
       new_imanip_image(__FILE__)
     end
   end
-  
+
   def test_should_return_an_imanip_image
-    assert @portrait_image.is_a?(Imanip::Image) 
+    assert @portrait_image.is_a?(Imanip::Image)
   end
-  
+
   def test_should_return_dimensions_as_array
     dimensions = @portrait_image.dimensions
     assert dimensions.is_a?(Array)
     assert_equal [411,519], dimensions
-    
+
     dimensions = @landscape_image.dimensions
     assert dimensions.is_a?(Array)
     assert_equal [400,315], dimensions
   end
-  
+
   def test_portrait_should_return_true_for_portrait_image
     assert @portrait_image.portrait?
   end
-  
+
   def test_portrait_should_return_false_for_landscape_image
     assert !@landscape_image.portrait?
   end
-  
+
   def test_landscape_should_return_true_for_landscape_image
-    assert @landscape_image.landscape? 
+    assert @landscape_image.landscape?
   end
-  
+
   def test_landscape_should_return_false_for_portrait_image
     assert !@portrait_image.landscape?
   end
-  
+
   def test_ratio_should_return_width_over_height
     assert_equal(@landscape_image.width.to_f / @landscape_image.height.to_f, @landscape_image.ratio)
   end
-  
+
   def test_resize_should_save_to_new_file
     assert !File.readable?(new_image_path)
     assert @portrait_image.resize(new_image_path, :width => 50)
     assert File.readable?(new_image_path)
   end
-  
+
   def test_resize_should_resize_image_to_new_image_at_dimensions
     dimensions = [100,126]
     assert @portrait_image.resize(new_image_path, :dimensions => dimensions)
     @new_image = new_imanip_image(new_image_path)
     assert_equal dimensions, @new_image.dimensions
   end
-  
+
   def test_resize_should_resize_image_to_new_image_at_width
     width = 100
     assert @portrait_image.resize(new_image_path, :width => width)
@@ -71,55 +71,59 @@ class ImanipMagickTest < Test::Unit::TestCase
     assert_equal width, @new_image.width
     assert_not_equal @portrait_image.height, @new_image.height
   end
-  
+
   def test_crop_resize_should_crop_and_resize_image_to_exact_dimensions
     dimensions = [200,153]
     assert @portrait_image.crop_resize(new_image_path, :dimensions => dimensions)
     @new_image = new_imanip_image(new_image_path)
     assert_equal dimensions, @new_image.dimensions
-    
+
     dimensions = [200,153]
     assert @landscape_image.crop_resize(new_image_path, :dimensions => dimensions)
     @new_image = new_imanip_image(new_image_path)
     assert_equal dimensions, @new_image.dimensions
-    
+
     dimensions = [100,125]
     assert @portrait_image.crop_resize(new_image_path, :dimensions => dimensions)
     @new_image = new_imanip_image(new_image_path)
     assert_equal dimensions, @new_image.dimensions
-    
+
     dimensions = [100,125]
     assert @landscape_image.crop_resize(new_image_path, :dimensions => dimensions)
     @new_image = new_imanip_image(new_image_path)
     assert_equal dimensions, @new_image.dimensions
   end
-  
+
   def test_crop_resize_should_crop_and_resize_image_to_exact_dimensions_with_square_dimensions
     dimensions = [100,100]
     assert @landscape_image.crop_resize(new_image_path, :dimensions => dimensions)
     @new_image = new_imanip_image(new_image_path)
     assert_equal dimensions, @new_image.dimensions
   end
-  
+
   def test_crop_resize_should_return_a_imanip_image
     dimensions = [100,100]
     @new_image = @landscape_image.crop_resize(new_image_path, :dimensions => dimensions)
     assert @new_image.is_a?(Imanip::Image)
     assert_equal dimensions, @new_image.dimensions
   end
-  
-  
-  
+
   def test_should_throw_errors_if_image_could_not_be_converted
     assert_raise(Imanip::CouldNotConvertError) do
        @portrait_image.resize(new_image_path, :v => "bad option")
     end
   end
-  
-  protected
+
+  def test_should_be_shell_safe
+    dimensions = [100, 100]
+    # exception should be thrown when identifying image
+    # since ; is in path trying to run a second command
+    assert_raises(Imanip::NotAnImageError) do
+      image = Imanip::Image.new("#{landscape_image_path};blah")
+    end
+  end
+
   def new_imanip_image(path,interface = :magick)
     Imanip::Image.new(path,interface)
   end
-  
-  
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: imanip
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  hash: 17
+  prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Aaron Quint
@@ -9,41 +15,56 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-16 00:00:00 -04:00
-default_executable: 
+date: 2011-09-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: safe_shell
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
-    version: 
+        hash: 43
+        segments: 
+        - 0
+        - 9
+        - 8
+        version: 0.9.8
+  type: :development
+  version_requirements: *id002
 description: Super-quick image resizing using the ImageMagick command line tools
-email: 
-- aaron@quirkey.com
+email: aaron@quirkey.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- README.txt
+extra_rdoc_files: []
+
 files: 
+- .gitignore
+- Gemfile
+- Gemfile.lock
 - History.txt
 - License.txt
-- Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
-- config/hoe.rb
-- config/requirements.rb
-- init.rb
-- install.rb
+- imanip.gemspec
 - lib/imanip.rb
 - lib/imanip/errors.rb
 - lib/imanip/image.rb
@@ -53,34 +74,41 @@ files:
 - test/portrait_test.jpg
 - test/test_helper.rb
 - test/test_imanip_magick.rb
-- uninstall.rb
-has_rdoc: true
 homepage: http://quirkey.rubyforge.org
-post_install_message: ""
-rdoc_options: 
-- --main
-- README.txt
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: quirkey
-rubygems_version: 1.2.0
+rubyforge_project: 
+rubygems_version: 1.8.9
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Super-quick image resizing using the ImageMagick command line tools
 test_files: 
+- test/landscape_test.jpg
+- test/portrait_test.jpg
 - test/test_helper.rb
 - test/test_imanip_magick.rb

data/Manifest.txt

@@ -1,19 +0,0 @@
-History.txt
-License.txt
-Manifest.txt
-README.txt
-Rakefile
-config/hoe.rb
-config/requirements.rb
-init.rb
-install.rb
-lib/imanip.rb
-lib/imanip/errors.rb
-lib/imanip/image.rb
-lib/imanip/imanip_magick.rb
-lib/imanip/version.rb
-test/landscape_test.jpg
-test/portrait_test.jpg
-test/test_helper.rb
-test/test_imanip_magick.rb
-uninstall.rb

data/config/hoe.rb

@@ -1,73 +0,0 @@
-require 'imanip/version'
-
-AUTHOR = 'Aaron Quint'  # can also be an array of Authors
-EMAIL = 'aaron@quirkey.com'
-DESCRIPTION = "Super-quick image resizing using the ImageMagick command line tools"
-GEM_NAME = 'imanip' # what ppl will type to install your gem
-RUBYFORGE_PROJECT = 'quirkey' # The unix name for your project
-HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
-DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
-EXTRA_DEPENDENCIES = [
-#  ['activesupport', '>= 1.3.1']
-]    # An array of rubygem dependencies [name, version]
-
-@config_file = "~/.rubyforge/user-config.yml"
-@config = nil
-RUBYFORGE_USERNAME = "unknown"
-def rubyforge_username
-  unless @config
-    begin
-      @config = YAML.load(File.read(File.expand_path(@config_file)))
-    rescue
-      puts <<-EOS
-ERROR: No rubyforge config file found: #{@config_file}
-Run 'rubyforge setup' to prepare your env for access to Rubyforge
- - See http://newgem.rubyforge.org/rubyforge.html for more details
-      EOS
-      exit
-    end
-  end
-  RUBYFORGE_USERNAME.replace @config["username"]
-end
-
-
-REV = nil
-# UNCOMMENT IF REQUIRED:
-# REV = YAML.load(`svn info`)['Revision']
-VERS = Imanip::VERSION::STRING + (REV ? ".#{REV}" : "")
-RDOC_OPTS = ['--quiet', '--title', 'imanip documentation',
-    "--opname", "index.html",
-    "--line-numbers",
-    "--main", "README",
-    "--inline-source"]
-
-class Hoe
-  def extra_deps
-    @extra_deps.reject! { |x| Array(x).first == 'hoe' }
-    @extra_deps
-  end
-end
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new(GEM_NAME, VERS) do |p|
-  p.developer(AUTHOR, EMAIL)
-  p.description = DESCRIPTION
-  p.summary = DESCRIPTION
-  p.url = HOMEPATH
-  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
-  p.test_globs = ["test/**/test_*.rb"]
-  p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']  #An array of file patterns to delete on clean.
-
-  # == Optional
-  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  #p.extra_deps = EXTRA_DEPENDENCIES
-
-    #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
-  end
-
-CHANGES = $hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
-PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
-$hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
-$hoe.rsync_args = '-av --delete --ignore-errors'
-$hoe.spec.post_install_message = File.open(File.dirname(__FILE__) + "/../PostInstall.txt").read rescue ""

data/config/requirements.rb

@@ -1,15 +0,0 @@
-require 'fileutils'
-include FileUtils
-
-require 'rubygems'
-%w[rake hoe newgem rubigen].each do |req_gem|
-  begin
-    require req_gem
-  rescue LoadError
-    puts "This Rakefile requires the '#{req_gem}' RubyGem."
-    puts "Installation: gem install #{req_gem} -y"
-    exit
-  end
-end
-
-$:.unshift(File.join(File.dirname(__FILE__), %w[.. lib]))

data/init.rb

@@ -1,2 +0,0 @@
-# Include hook code here
-require File.expand_path(File.dirname(__FILE__)) + "/lib/imanip"

data/install.rb

@@ -1 +0,0 @@
-# Install hook code here

data/uninstall.rb

@@ -1 +0,0 @@
-# Uninstall hook code here