attachment_on_the_fly 0.0.7 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.1.0

data/attachment_on_the_fly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{attachment_on_the_fly}
-  s.version = "0.0.7"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Sutherland"]
-  s.date = %q{2010-12-21}
+  s.date = %q{2011-02-17}
   s.description = %q{A Paperclip mix-in to allow auto-generation of resized images}
   s.email = %q{jefferey.sutherland@gmail.com}
   s.extra_rdoc_files = [
@@ -27,11 +27,10 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/drpentode/Attachment-on-the-Fly}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{A Paperclip mix-in to allow auto-generation of resized images}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/attachment_on_the_fly.rb

@@ -41,11 +41,12 @@ Paperclip::Attachment.class_eval do
       # if our method string does not match, we kick things back up to super ... this keeps ActiveRecord chugging along happily
       super
     end
-
-  return image_name
+    return image_name
   end
 
   def generate_image(kind, height = 0, width = 0)
+    convert_command_path = (Paperclip.options[:command_path] ? Paperclip.options[:command_path] + "/" : "")
+
     prefix = ""
 
     if kind == "height"
@@ -80,13 +81,16 @@ Paperclip::Attachment.class_eval do
 
     if kind == "height"
       # resize_image infilename, outfilename , 0, height
-      `convert -colorspace RGB -geometry x#{height} -quality 100 -sharpen 1 #{original} #{newfilename} 2>&1 > /dev/null`
+      command = "#{convert_command_path}convert -colorspace RGB -geometry x#{height} -quality 100 -sharpen 1 #{original} #{newfilename} 2>&1 > /dev/null"
+      `#{command}`
     elsif kind == "width"
       # resize_image infilename, outfilename, width
-      `convert -colorspace RGB -geometry #{width} -quality 100 -sharpen 1 #{original} #{newfilename} 2>&1 > /dev/null`
+      command = "#{convert_command_path}convert -colorspace RGB -geometry #{width} -quality 100 -sharpen 1 #{original} #{newfilename} 2>&1 > /dev/null"
+      `#{command}`
     elsif kind == "both"
       # resize_image infilename, outfilename, height, width
-      `convert -colorspace RGB -geometry #{width}x#{height} -quality 100 -sharpen 1 #{original} #{newfilename} 2>&1 > /dev/null`
+      command = "#{convert_command_path}convert -colorspace RGB -geometry #{width}x#{height} -quality 100 -sharpen 1 #{original} #{newfilename} 2>&1 > /dev/null"
+      `#{command}`
     end
 
     return new_path

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: attachment_on_the_fly
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 7
-  version: 0.0.7
+  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors: 
 - Jeff Sutherland
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-21 00:00:00 -07:00
+date: 2011-02-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,8 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -61,21 +55,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: A Paperclip mix-in to allow auto-generation of resized images