image_resizer 0.3.0 → 0.4.0

data/Gemfile

@@ -1,4 +1,6 @@
-source :rubygems
+source 'https://rubygems.org'
+
+gem 'cocaine'
 
 group :development, :test do
   gem 'rspec'

data/Gemfile.lock

@@ -1,10 +1,18 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
+    activesupport (3.2.12)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
     binding_of_caller (0.6.7)
+    climate_control (0.0.3)
+      activesupport (>= 3.0)
+    cocaine (0.5.1)
+      climate_control (>= 0.0.3, < 1.0)
     coderay (1.0.6)
     diff-lcs (1.1.3)
     git (1.2.5)
+    i18n (0.6.1)
     jeweler (1.8.3)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -12,6 +20,7 @@ GEM
       rdoc
     json (1.6.6)
     method_source (0.7.1)
+    multi_json (1.6.1)
     pry (0.9.8.4)
       coderay (~> 1.0.5)
       method_source (~> 0.7.1)
@@ -38,6 +47,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  cocaine
   jeweler
   pry
   pry-nav

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/image_resizer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "image_resizer"
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Nelson"]
-  s.date = "2012-04-30"
+  s.date = "2013-02-15"
   s.description = "Image resizing gem (requires ImageMagick)"
   s.email = "daniel@populr.me"
   s.extra_rdoc_files = [
@@ -33,7 +33,6 @@ Gem::Specification.new do |s|
     "lib/image_resizer/has_filename.rb",
     "lib/image_resizer/loggable.rb",
     "lib/image_resizer/processor.rb",
-    "lib/image_resizer/shell.rb",
     "lib/image_resizer/temp_object.rb",
     "lib/image_resizer/utils.rb",
     "samples/DSC02119.JPG",
@@ -52,7 +51,6 @@ Gem::Specification.new do |s|
     "spec/image_resizer/has_filename_spec.rb",
     "spec/image_resizer/loggable_spec.rb",
     "spec/image_resizer/processor_spec.rb",
-    "spec/image_resizer/shell_spec.rb",
     "spec/image_resizer/temp_object_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/argument_matchers.rb",
@@ -70,12 +68,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<cocaine>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<pry>, [">= 0"])
       s.add_development_dependency(%q<pry-nav>, [">= 0"])
       s.add_development_dependency(%q<pry-stack_explorer>, [">= 0"])
     else
+      s.add_dependency(%q<cocaine>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<pry>, [">= 0"])
@@ -83,6 +83,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<pry-stack_explorer>, [">= 0"])
     end
   else
+    s.add_dependency(%q<cocaine>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<pry>, [">= 0"])

data/lib/image_resizer/processor.rb

@@ -46,7 +46,7 @@ module ImageResizer
     end
 
     def _resize(temp_object, geometry, format=nil)
-      convert(temp_object, "-resize #{geometry}", format)
+      convert(temp_object, "-resize '#{geometry}'", format)
     end
 
     def auto_orient(temp_object)
@@ -192,7 +192,7 @@ module ImageResizer
     end
 
     def rotate(temp_object, amount, opts={})
-      convert(temp_object, "-rotate #{amount}#{opts[:qualifier]}")
+      convert(temp_object, "-rotate '#{amount}#{opts[:qualifier]}'")
     end
 
     def strip(temp_object)

data/lib/image_resizer/utils.rb

@@ -1,9 +1,9 @@
 require 'tempfile'
+require 'cocaine'
 
 module ImageResizer
   module Utils
 
-    include Shell
     include Loggable
     include Configurable
     configurable_attr :convert_command, "convert"
@@ -13,13 +13,24 @@ module ImageResizer
 
     def convert(temp_object=nil, args='', format=nil)
       tempfile = new_tempfile(format)
+      interpolation_data = {}
+
       if temp_object.is_a?(Array)
-        paths = temp_object.map { |obj| quote(obj.path) }.join(' ')
-        run convert_command, %(#{paths} #{args} #{quote(tempfile.path)})
+        temp_object.length.times { |index| interpolation_data["input#{index}".to_sym] = temp_object[index].path }
+        keys = interpolation_data.keys.map { |s| ":#{s}" }
+        args = "#{keys.join(' ')} #{args} :output"
+      elsif temp_object
+        interpolation_data[:input] = temp_object.path
+        args = ":input #{args} :output"
       else
-        run convert_command, %(#{quote(temp_object.path) if temp_object} #{args} #{quote(tempfile.path)})
+        args = "#{args} :output"
       end
 
+      interpolation_data[:output] = tempfile.path
+
+      line = Cocaine::CommandLine.new(convert_command, args)
+      line.run(interpolation_data)
+
       tempfile
     end
 
@@ -36,7 +47,8 @@ module ImageResizer
     end
 
     def raw_identify(temp_object, args='')
-      run identify_command, "#{args} #{quote(temp_object.path)}"
+      line = Cocaine::CommandLine.new(identify_command, "#{args} :input")
+      line.run(:input => temp_object.path)
     end
 
     def new_tempfile(ext=nil)

data/lib/image_resizer.rb

@@ -2,7 +2,6 @@
 require 'image_resizer/has_filename'
 require 'image_resizer/loggable'
 require 'image_resizer/configurable'
-require 'image_resizer/shell'
 require 'image_resizer/utils'
 require 'image_resizer/analyzer'
 require 'image_resizer/encoder'

data/spec/image_resizer/processor_spec.rb

@@ -659,7 +659,9 @@ describe ImageResizer::Processor do
       tempfile.stub(:path).and_return('output path')
 
       @processor.stub(:new_tempfile).and_return(tempfile)
-      @processor.should_receive(:run).with('convert', "'hello world' 'goodbye'  'output path'")
+      line = double(:line)
+      Cocaine::CommandLine.should_receive(:new).with('convert', ":input0 :input1  :output").and_return(line)
+      line.should_receive(:run).with(:input0 => 'hello world', :input1 => 'goodbye', :output =>  'output path')
       image = @processor.convert([image1, image2])
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image_resizer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
+date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: cocaine
+  requirement: &2153569580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2153569580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157276080 !ruby/object:Gem::Requirement
+  requirement: &2153568720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157276080
+  version_requirements: *2153568720
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2157274360 !ruby/object:Gem::Requirement
+  requirement: &2153567680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157274360
+  version_requirements: *2153567680
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2157300300 !ruby/object:Gem::Requirement
+  requirement: &2153566740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157300300
+  version_requirements: *2153566740
 - !ruby/object:Gem::Dependency
   name: pry-nav
-  requirement: &2157299680 !ruby/object:Gem::Requirement
+  requirement: &2153565860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157299680
+  version_requirements: *2153565860
 - !ruby/object:Gem::Dependency
   name: pry-stack_explorer
-  requirement: &2157298920 !ruby/object:Gem::Requirement
+  requirement: &2153563600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157298920
+  version_requirements: *2153563600
 description: Image resizing gem (requires ImageMagick)
 email: daniel@populr.me
 executables: []
@@ -90,7 +101,6 @@ files:
 - lib/image_resizer/has_filename.rb
 - lib/image_resizer/loggable.rb
 - lib/image_resizer/processor.rb
-- lib/image_resizer/shell.rb
 - lib/image_resizer/temp_object.rb
 - lib/image_resizer/utils.rb
 - samples/DSC02119.JPG
@@ -109,7 +119,6 @@ files:
 - spec/image_resizer/has_filename_spec.rb
 - spec/image_resizer/loggable_spec.rb
 - spec/image_resizer/processor_spec.rb
-- spec/image_resizer/shell_spec.rb
 - spec/image_resizer/temp_object_spec.rb
 - spec/spec_helper.rb
 - spec/support/argument_matchers.rb
@@ -131,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3748383720531710291
+      hash: -2071369988750528339
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/image_resizer/shell.rb

@@ -1,48 +0,0 @@
-require 'shellwords'
-
-module ImageResizer
-  module Shell
-
-    include Configurable
-    configurable_attr :log_commands, false
-
-    # Exceptions
-    class CommandFailed < RuntimeError; end
-
-    def run(command, args="")
-      full_command = "#{command} #{escape_args(args)}"
-      log.debug("Running command: #{full_command}") if log_commands
-      begin
-        result = `#{full_command}`
-      rescue Errno::ENOENT
-        raise_shell_command_failed(full_command)
-      end
-      if $?.exitstatus == 1
-        throw :unable_to_handle
-      elsif !$?.success?
-        raise_shell_command_failed(full_command)
-      end
-      result
-    end
-
-    def raise_shell_command_failed(command)
-      raise CommandFailed, "Command failed (#{command}) with exit status #{$?.exitstatus}"
-    end
-
-    def escape_args(args)
-      args.shellsplit.map do |arg|
-        quote arg.gsub(/\\?'/, %q('\\\\''))
-      end.join(' ')
-    end
-
-    def quote(string)
-      q = running_on_windows? ? '"' : "'"
-      q + string + q
-    end
-
-    def running_on_windows?
-      ENV['OS'] && ENV['OS'].downcase == 'windows_nt'
-    end
-
-  end
-end

data/spec/image_resizer/shell_spec.rb

@@ -1,34 +0,0 @@
-require 'spec_helper'
-
-describe ImageResizer::Shell do
-
-  include ImageResizer::Shell
-
-  it "should raise an error if the identify command isn't found" do
-    suppressing_stderr do
-      lambda{
-        run "non-existent-command"
-      }.should raise_error(ImageResizer::Shell::CommandFailed)
-    end
-  end
-
-  describe "escaping args" do
-    {
-      %q(hello) => %q('hello'),
-      %q("hello") => %q('hello'),
-      %q('hello') => %q('hello'),
-      %q(he\'llo) => %q('he'\''llo'),
-      %q('he'\''llo') => %q('he'\''llo'),
-      %q("he'llo") => %q('he'\''llo'),
-      %q(hel$(lo)) => %q('hel$(lo)'),
-      %q(hel\$(lo)) => %q('hel$(lo)'),
-      %q('hel\$(lo)') => %q('hel\$(lo)')
-    }.each do |args, escaped_args|
-      it "should escape #{args.inspect} -> #{escaped_args.inspect}" do
-        pending "not applicable to windows" if running_on_windows?
-        escape_args(args).should == escaped_args
-      end
-    end
-  end
-
-end