bcms_tools 0.0.13 → 0.1.0

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.homepage = "http://github.com/buzzware/bcms_tools"
     gem.authors = ["buzzware"]
 		gem.add_dependency "buzzcore", ">= 0.3.2"
-		gem.add_dependency "paperclip", "= 2.1.2"
+		gem.add_dependency "paperclip", "= 2.3.1.1"
 		gem.add_dependency "browsercms"
     gem.add_development_dependency "shoulda"
 		gem.files.include %w(

data/VERSION

@@ -1,2 +1,2 @@
-0.0.13
+0.1.0
 

data/bcms_tools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bcms_tools}
-  s.version = "0.0.13"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["buzzware"]
-  s.date = %q{2010-04-21}
+  s.date = %q{2010-04-30}
   s.description = %q{Tools for BrowserCms.}
   s.email = %q{contact@buzzware.com.au}
   s.extra_rdoc_files = [
@@ -57,18 +57,18 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<buzzcore>, [">= 0.3.2"])
-      s.add_runtime_dependency(%q<paperclip>, ["= 2.1.2"])
+      s.add_runtime_dependency(%q<paperclip>, ["= 2.3.1.1"])
       s.add_runtime_dependency(%q<browsercms>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
     else
       s.add_dependency(%q<buzzcore>, [">= 0.3.2"])
-      s.add_dependency(%q<paperclip>, ["= 2.1.2"])
+      s.add_dependency(%q<paperclip>, ["= 2.3.1.1"])
       s.add_dependency(%q<browsercms>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
     end
   else
     s.add_dependency(%q<buzzcore>, [">= 0.3.2"])
-    s.add_dependency(%q<paperclip>, ["= 2.1.2"])
+    s.add_dependency(%q<paperclip>, ["= 2.3.1.1"])
     s.add_dependency(%q<browsercms>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
   end

data/lib/bcms_tools/bcms_thumbnails.rb

@@ -1,8 +1,214 @@
+# BEGIN Paperclip 2.3.1.1 fixes for funky filenames
+
+Paperclip.class_eval do
+
+	def self.run cmd, params = "", expected_outcodes = 0
+		command = %Q[#{path_for_command(cmd)} #{params}]	#.gsub(/\s+/, " ")	# removed unnecessary(?) whitespace eating
+		command = "#{command} 2>#{bit_bucket}" if Paperclip.options[:swallow_stderr]
+		Paperclip.log(command) if Paperclip.options[:log_command]
+		output = `#{command}`
+		unless [expected_outcodes].flatten.include?($?.exitstatus)
+			raise Paperclip::PaperclipCommandLineError, "Error while running #{cmd}"
+		end
+		output
+	end
+
+end
+
+Paperclip::Geometry.class_eval do
+	def self.from_file file
+		file = file.path if file.respond_to? "path"
+		geometry = begin
+								 srcpath = file.gsub('$','\$')	# escaped $, other chars may need to be added here
+								 Paperclip.run("identify", %Q[-format "%wx%h" "#{srcpath}"[0]])
+							 rescue Paperclip::PaperclipCommandLineError
+								 ""
+							 end
+		parse(geometry) ||
+			raise(Paperclip::NotIdentifiedByImageMagickError.new("#{file} is not recognized by the 'identify' command."))
+	end
+end
+
+# !!! must also fix /Library/Ruby/Gems/1.8/gems/paperclip-2.3.1.1/lib/paperclip/thumbnail.rb:54
+# and put in lighthouse
+Paperclip::Thumbnail.class_eval do
+
+	attr_accessor :basename		# need access to basename so we can change it away from bizarre file names that cause problems. could auto generate better names here
+
+	def make
+		src = @file
+		dst = Tempfile.new([@basename, @format].compact.join("."))
+		dst.binmode
+
+		# The original used the following string construction, then removed whitespace ignoring 
+		# the fact that the whitespace may be in a path
+		# Instead we now construct the string normally.
+		#command = <<-end_command
+		#	#{ source_file_options }
+		#	"#{ File.expand_path(src.path) }[0]"
+		#	#{ transformation_command }
+		#	"#{ File.expand_path(dst.path) }"
+		#end_command
+		srcpath = File.expand_path(src.path).gsub('$','\$')	# escape $, more chars may need to be added
+		command = "#{ source_file_options } \"#{ srcpath }[0]\" #{ transformation_command } \"#{ File.expand_path(dst.path) }\""
+
+		begin
+			success = Paperclip.run("convert", command)		#.gsub(/\s+/, " "))
+		rescue Paperclip::PaperclipCommandLineError
+			raise Paperclip::PaperclipError, "There was an error processing the thumbnail for #{@basename}" if @whiny
+		end
+
+		dst
+	end
+
+end
+
+# END Paperclip 2.3.1.1 fixes for funky filenames
+
+module Buzzcore
+	module ImageUtils
+
+		module_function # this makes these methods callable as BcmsTools::PageHelper.method
+
+		def image_file_dimensions(aFilename)
+			if geomImage = Paperclip::Geometry.from_file(aFilename)
+				return geomImage.width,geomImage.height
+			else
+				return nil,nil
+			end
+		end
+
+		#	see http://www.imagemagick.org/script/command-line-processing.php#geometry
+		#
+		#	scale%						Height and width both scaled by specified percentage.
+		#	scale-x%xscale-y%	Height and width individually scaled by specified percentages. (Only one % symbol needed.)
+		#	width							Width given, height automagically selected to preserve aspect ratio.
+		#	xheight						Height given, width automagically selected to preserve aspect ratio.
+		#	widthxheight				Maximum values of height and width given, aspect ratio preserved.
+		#	widthxheight^			Minimum values of width and height given, aspect ratio preserved.
+		#	widthxheight!			Width and height emphatically given, original aspect ratio ignored.
+		#	widthxheight>			Change as per widthxheight but only if an image dimension exceeds a specified dimension.
+		#	widthxheight<			Change dimensions only if both image dimensions exceed specified dimensions.
+		#	area@							Resize image to have specified area in pixels. Aspect ratio is preserved.
+
+		THUMBNAIL_NAMINGS = {}	# store naming methods eg :iarts => Proc {|aSource,aDestFolder,aBaseUrl,aWidth,aHeight,aOptions| ... } NYI
+
+		# resizing :
+		#		to_width,to_height	: 	supply aWidth or aHeight and leave other as nil	(width or xheight)
+		#		no_change						:		aWidth and aHeight as nil (original WidthxHeight)
+		#		fit									:		aOptions[:resize_mode] = :fit, maintain aspect, one axis short (default, no modifier)
+		#		fit_padded					:		aOptions[:resize_mode] = :fit_padded, maintain aspect, fill missing area with aOptions[:background_color] (not yet supported)
+		#		stretch							:		aOptions[:resize_mode] = :stretch, (! modifier)
+		#		cropfill						:		aOptions[:resize_mode] = :cropfill (Paperclip adds # modifier)
+
+		# naming options :
+		# supply a block : return a name given the original parameters (possibly slightly modified)
+		# aOptions[:name] is a string : just return this value
+		# aOptions[:name] is a Proc : call this with the original parameters (possibly slightly modified)
+
+		# aOptions :
+		# 	:resize_mode 	:	see above
+		#		:name					: see above
+		#		:return_details		: returns details hash instead of url. :src contains value normally returned
+		# returns the resulting url
+		def render_thumbnail(
+			aSource,			# source file
+			aDestFolder,	# folder to put new file in
+			aBaseUrl,			# equivalent URL for aDestFolder
+			aWidth,				# width (nil means auto)
+			aHeight,				# height (nil means auto)
+			aOptions = nil
+		)
+			src = ''
+			aOptions ||= {}
+			if aOptions[:return_details]
+				details = {
+					:aSource => aSource,
+					:aDestFolder => aDestFolder,
+					:aBaseUrl => aBaseUrl,
+					:aWidth => aWidth,
+					:aHeight => aHeight,
+					:aOptions => aOptions,
+				}
+			else
+				details = {}
+			end
+			if aSource 
+				begin
+					RAILS_DEFAULT_LOGGER.debug 'render_thumbnail: aSource='+aSource
+					aOptions ||= {}
+					aOptions[:resize_mode] ||= :fit
+					
+					throw RuntimeError.new("file doesn't exist #{aSource}") unless File.exists? aSource
+					extThumb = 'jpg'	#MiscUtils.file_extension(File.basename(aSource),false).downcase
+					throw RuntimeError.new("could not get file geometry #{aSource}") unless geomImage = Paperclip::Geometry.from_file(aSource)
+	
+					if aWidth || aHeight
+						w,h = aWidth,aHeight
+					else
+						w,h = geomImage.width,geomImage.height		# w,h will never be nil,nil
+					end
+	
+					resize_spec = "#{w.to_s}#{h ? 'x'+h.to_s : ''}"
+					resize_mod = ''	# aOptions[:resize_mode]==:fit
+					resize_mod = '#' if aOptions[:resize_mode]==:cropfill
+					resize_mod = '!' if aOptions[:resize_mode]==:stretch
+					resize_char = case aOptions[:resize_mode]
+						when :cropfill: 'C'
+						when :stretch: 'S'
+						else 'F'
+					end
+	
+					if block_given?
+						nameThumb = yield(aSource,aDestFolder,aBaseUrl,aWidth,aHeight,aOptions)
+					elsif aOptions[:name].is_a?(String)
+						nameThumb = aOptions[:name]
+					elsif aOptions[:name].is_a?(Proc)
+						nameThumb = aOptions[:name].call(aSource,aDestFolder,aBaseUrl,aWidth,aHeight,aOptions)
+					else
+						# default naming
+						nameThumb = MiscUtils.file_no_extension(File.basename(aSource),false)
+						nameThumb = nameThumb.urlize unless aOptions[:urlize]==false
+						nameThumb += '-' unless nameThumb.ends_with?('-')
+						nameThumb += resize_spec+resize_char+'.'+extThumb
+					end
+					pathThumb = File.join(aDestFolder,nameThumb)
+	
+					if !File.exists?(pathThumb)
+						throw RuntimeError.new("Failed reading image #{aSource}") unless objThumb = Paperclip::Thumbnail.new(File.new(aSource), :geometry => resize_spec+resize_mod, :format => :jpg)
+						objThumb.basename = MiscUtils.file_no_extension(nameThumb)
+						throw RuntimeError.new("Failed making thumbnail #{aSource}") unless foThumb = objThumb.make
+						FileUtils.cp(foThumb.path,pathThumb)
+						FileUtils.chmod(0644,pathThumb)
+						FileUtils.rm(foThumb.path)
+					end
+					src = File.join(aBaseUrl,nameThumb)
+					details.merge!({
+						:geomImage => geomImage,
+						:w => w,
+						:h => h,
+						:nameThumb => nameThumb,
+						:pathThumb => pathThumb,
+						:objThumb => objThumb
+					}) if aOptions[:return_details]
+				rescue Exception => e
+					RAILS_DEFAULT_LOGGER.warn "thumberize_img error: #{e.inspect}"
+					RAILS_DEFAULT_LOGGER.debug e.backtrace
+					src = ''
+				end
+			end
+			details[:src] = src
+			return aOptions[:return_details] ? details : src
+		end
+
+	end
+end
+
 module BcmsTools
 	module Thumbnails
 			
 		def self.thumbnail_name_from_attachment(aAttachment,aWidth,aHeight)
-			extThumb = aAttachment.file_extension
+			extThumb = 'jpg' #aAttachment.file_extension
 			size = "#{aWidth.to_s}x#{aHeight.to_s}"
 			result = File.basename(aAttachment.file_location)+'-'
 			result += if aWidth && aHeight
@@ -89,29 +295,33 @@ module BcmsTools
 				urlImage = XmlUtils.quick_att_from_tag(img,'src')
 			
 				att = BcmsTools::Thumbnails::attachment_from_url(urlImage)
-				pathImage = att && att.full_file_location
-			
-				throw RuntimeError.new("file doesn't exist #{pathImage}") unless File.exists? pathImage
-				throw RuntimeError.new("could not get file geometry #{pathImage}") unless geomImage = Paperclip::Geometry.from_file(pathImage)
-			
-				aDestWidth,aDestHeight = BcmsTools::Thumbnails::scale_to_fit(geomImage.width,geomImage.height,aWidth,aHeight).map {|i| i.to_i}
-			
-				nameThumb = BcmsTools::Thumbnails::thumbnail_name_from_attachment(att,aWidth,aHeight)		
-	
-				pathThumb = File.join(APP_CONFIG[:thumbs_cache],nameThumb)
-			
-				if !File.exists?(pathThumb)
-					# generate thumbnail at size to fit container
-					throw RuntimeError.new("Failed reading image #{pathImage}") unless objThumb = Paperclip::Thumbnail.new(File.new(pathImage), "#{aDestWidth}x#{aDestHeight}")
-					throw RuntimeError.new("Failed making thumbnail #{pathImage}") unless foThumb = objThumb.make
-					FileUtils.cp(foThumb.path,pathThumb,:preserve => true)
-					FileUtils.chmod(0644,pathThumb)
-					FileUtils.rm(foThumb.path)
-					#POpen4::shell_out("sudo -u tca chgrp www-data	#{pathThumb}; sudo -u tca chmod 644 #{pathThumb}")
-				end
+				return img = framed_attachment_img(att,aWidth,aHeight,img)
+
+				#src = attachment_max_src(aAttachment,aWidth,aHeight,img)
+				#
+				#pathImage = att && att.full_file_location
+        #
+				#throw RuntimeError.new("file doesn't exist #{pathImage}") unless File.exists? pathImage
+				#throw RuntimeError.new("could not get file geometry #{pathImage}") unless geomImage = Paperclip::Geometry.from_file(pathImage)
+        #
+				#aDestWidth,aDestHeight = BcmsTools::Thumbnails::scale_to_fit(geomImage.width,geomImage.height,aWidth,aHeight).map {|i| i.to_i}
+        #
+				#nameThumb = BcmsTools::Thumbnails::thumbnail_name_from_attachment(att,aWidth,aHeight)
+        #
+				#pathThumb = File.join(APP_CONFIG[:thumbs_cache],nameThumb)
+        #
+				#if !File.exists?(pathThumb)
+				#	# generate thumbnail at size to fit container
+				#	throw RuntimeError.new("Failed reading image #{pathImage}") unless objThumb = Paperclip::Thumbnail.new(File.new(pathImage), "#{aDestWidth}x#{aDestHeight}")
+				#	throw RuntimeError.new("Failed making thumbnail #{pathImage}") unless foThumb = objThumb.make
+				#	FileUtils.cp(foThumb.path,pathThumb,:preserve => true)
+				#	FileUtils.chmod(0644,pathThumb)
+				#	FileUtils.rm(foThumb.path)
+				#	#POpen4::shell_out("sudo -u tca chgrp www-data	#{pathThumb}; sudo -u tca chmod 644 #{pathThumb}")
+				#end
 			
-				img = XmlUtils.quick_set_att(img,'src',File.join(APP_CONFIG[:thumbs_url],nameThumb))
-				return HtmlUtils.fixed_frame_image(img,aWidth,aHeight,aDestWidth,aDestHeight)
+				#img = XmlUtils.quick_set_att(img,'src',src)		# File.join(APP_CONFIG[:thumbs_url],nameThumb))
+				#return HtmlUtils.fixed_frame_image(img,aWidth,aHeight,aDestWidth,aDestHeight)
 			rescue Exception => e
 				RAILS_DEFAULT_LOGGER.warn "thumberize_img error: #{e.inspect}"
 				RAILS_DEFAULT_LOGGER.debug e.backtrace      
@@ -121,123 +331,166 @@ module BcmsTools
 		
 		def attachment_cropped_src(aAttachment,aWidth,aHeight)
 			return '' if !aAttachment
-			begin	
-				pathImage = aAttachment.full_file_location
-				throw RuntimeError.new("file doesn't exist #{pathImage}") unless File.exists? pathImage
-				nameThumb = BcmsTools::Thumbnails::thumbnail_name_from_attachment(aAttachment,aWidth,aHeight)		
-				pathThumb = File.join(APP_CONFIG[:thumbs_cache],nameThumb)
-				if !File.exists?(pathThumb)
-					# generate thumbnail at size to fit container
-					throw RuntimeError.new("Failed reading image #{pathImage}") unless objThumb = Paperclip::Thumbnail.new(File.new(pathImage), "#{aWidth}x#{aHeight}#")
-					throw RuntimeError.new("Failed making thumbnail #{pathImage}") unless foThumb = objThumb.make
-					FileUtils.cp(foThumb.path,pathThumb)
-					FileUtils.chmod(0644,pathThumb)
-					FileUtils.rm(foThumb.path)
-				end
-				return File.join(APP_CONFIG[:thumbs_url],nameThumb)
-			rescue Exception => e
-				RAILS_DEFAULT_LOGGER.warn "thumberize_img error: #{e.inspect}"
-				RAILS_DEFAULT_LOGGER.debug e.backtrace      
-				return ''
-			end
+
+			Buzzcore::ImageUtils.render_thumbnail(
+				aAttachment.full_file_location,
+				APP_CONFIG[:thumbs_cache],
+				APP_CONFIG[:thumbs_url],
+				aWidth,
+				aHeight,
+				{
+					:name => BcmsTools::Thumbnails::thumbnail_name_from_attachment(aAttachment,aWidth,aHeight),
+					:resize_mode => :cropfill
+				}
+			)
+
+			#begin
+			#	pathImage = aAttachment.full_file_location
+			#	throw RuntimeError.new("file doesn't exist #{pathImage}") unless File.exists? pathImage
+			#	nameThumb = BcmsTools::Thumbnails::thumbnail_name_from_attachment(aAttachment,aWidth,aHeight)
+			#	pathThumb = File.join(APP_CONFIG[:thumbs_cache],nameThumb)
+			#	if !File.exists?(pathThumb)
+			#		# generate thumbnail at size to fit container
+			#		throw RuntimeError.new("Failed reading image #{pathImage}") unless objThumb = Paperclip::Thumbnail.new(File.new(pathImage), "#{aWidth}x#{aHeight}#")
+			#		throw RuntimeError.new("Failed making thumbnail #{pathImage}") unless foThumb = objThumb.make
+			#		FileUtils.cp(foThumb.path,pathThumb)
+			#		FileUtils.chmod(0644,pathThumb)
+			#		FileUtils.rm(foThumb.path)
+			#	end
+			#	return File.join(APP_CONFIG[:thumbs_url],nameThumb)
+			#rescue Exception => e
+			#	RAILS_DEFAULT_LOGGER.warn "thumberize_img error: #{e.inspect}"
+			#	RAILS_DEFAULT_LOGGER.debug e.backtrace
+			#	return ''
+			#end
 		end
 		
-		def image_max_src(aImagePath,aWidth,aHeight)
-			return '' if !aImagePath
-			begin	
-				pathImage = aImagePath
-				throw RuntimeError.new("file doesn't exist #{pathImage}") unless File.exists? pathImage
-				throw RuntimeError.new("could not get file geometry #{pathImage}") unless geomImage = Paperclip::Geometry.from_file(pathImage)
-				#nameThumb = BcmsTools::Thumbnails::thumbnail_name_from_attachment(aAttachment,aWidth,aHeight)
-				#def self.thumbnail_name_from_attachment(aAttachment,aWidth,aHeight)
-					extThumb = MiscUtils.file_extension(File.basename(aImagePath)).downcase
-					size = "#{aWidth.to_s}x#{aHeight.to_s}"
-					nameThumb = MiscUtils.file_no_extension(File.basename(aImagePath))+'-'
-					nameThumb += if aWidth || aHeight
-						size+'.'+extThumb
-					else
-						'*'
-					end
-					#result
-				#end
-				
-				
-				
+		def shellescape(str)
+			# An empty argument will be skipped, so return empty quotes.
+			return "''" if str.empty?
+	
+			str = str.dup
+	
+			# Process as a single byte sequence because not all shell
+			# implementations are multibyte aware.
+			str.gsub!(/([^A-Za-z0-9_\-.,:\/@\n])/n, "\\\\\\1")
+	
+			# A LF cannot be escaped with a backslash because a backslash + LF
+			# combo is regarded as line continuation and simply ignored.
+			str.gsub!(/\n/, "'\n'")
+	
+			return str
+		end
+		
+		def shellescape2(aString)
+			result = shellescape(aString)
+			result.gsub!('\\','\\\\\\')
+		end
 
 
-				pathThumb = File.join(APP_CONFIG[:thumbs_cache],nameThumb)
-							
-				aDestWidth,aDestHeight = BcmsTools::Thumbnails::scale_to_fit(geomImage.width,geomImage.height,aWidth,aHeight).map {|i| i.to_i}
-				if !File.exists?(pathThumb)
-					# generate thumbnail at size to fit container
-					throw RuntimeError.new("Failed reading image #{pathImage}") unless objThumb = Paperclip::Thumbnail.new(File.new(pathImage), "#{aDestWidth}x#{aDestHeight}")
-					throw RuntimeError.new("Failed making thumbnail #{pathImage}") unless foThumb = objThumb.make
-					FileUtils.cp(foThumb.path,pathThumb)
-					FileUtils.chmod(0644,pathThumb)
-					FileUtils.rm(foThumb.path)
-				end
-				return File.join(APP_CONFIG[:thumbs_url],nameThumb)
-			rescue Exception => e
-				RAILS_DEFAULT_LOGGER.warn "thumberize_img error: #{e.inspect}"
-				RAILS_DEFAULT_LOGGER.debug e.backtrace      
-				return ''
-			end
-		end
+		def image_max_src(aImagePath,aWidth,aHeight)
+			Buzzcore::ImageUtils.render_thumbnail(
+				aImagePath,
+				APP_CONFIG[:thumbs_cache],
+				APP_CONFIG[:thumbs_url],
+				aWidth,
+				aHeight
+			)
+		end			
+    #
+		#	aSource,			# source file
+		#	aDestFolder,	# folder to put new file in
+		#	aBaseUrl,			# equivalent URL for aDestFolder
+		#	aWidth,				# width (nil means auto)
+		#	aHeight,				# height (nil means auto)
+		#	aOptions = nil
+		#)
+    #
+    #
+    #
+		#	return '' if !aImagePath
+		#	begin
+		#		pathImage = aImagePath
+		#		throw RuntimeError.new("file doesn't exist #{pathImage}") unless File.exists? pathImage
+		#		throw RuntimeError.new("could not get file geometry #{pathImage}") unless geomImage = Paperclip::Geometry.from_file(shellescape2(pathImage))
+		#		#nameThumb = BcmsTools::Thumbnails::thumbnail_name_from_attachment(aAttachment,aWidth,aHeight)
+		#		#def self.thumbnail_name_from_attachment(aAttachment,aWidth,aHeight)
+		#			extThumb = MiscUtils.file_extension(File.basename(aImagePath)).downcase
+		#			size = "#{aWidth.to_s}x#{aHeight.to_s}"
+		#			nameThumb = MiscUtils.file_no_extension(File.basename(aImagePath))+'-'
+		#			nameThumb += if aWidth || aHeight
+		#				size+'.'+extThumb
+		#			else
+		#				'*'
+		#			end
+		#			#result
+		#		#end
+    #
+    #
+    #
+    #
+    #
+		#		pathThumb = File.join(APP_CONFIG[:thumbs_cache],nameThumb)
+    #
+		#		aDestWidth,aDestHeight = BcmsTools::Thumbnails::scale_to_fit(geomImage.width,geomImage.height,aWidth,aHeight).map {|i| i.to_i}
+		#		if !File.exists?(pathThumb)
+		#			# generate thumbnail at size to fit container
+		#			throw RuntimeError.new("Failed reading image #{pathImage}") unless objThumb = Paperclip::Thumbnail.new(File.new(shellescape2(pathImage)), "#{aDestWidth}x#{aDestHeight}")
+		#			throw RuntimeError.new("Failed making thumbnail #{pathImage}") unless foThumb = objThumb.make
+		#			FileUtils.cp(foThumb.path,pathThumb)
+		#			FileUtils.chmod(0644,pathThumb)
+		#			FileUtils.rm(foThumb.path)
+		#		end
+		#		return File.join(APP_CONFIG[:thumbs_url],nameThumb)
+		#	rescue Exception => e
+		#		RAILS_DEFAULT_LOGGER.warn "thumberize_img error: #{e.inspect}"
+		#		RAILS_DEFAULT_LOGGER.debug e.backtrace
+		#		return ''
+		#	end
+		#end
 		
 		
 		def attachment_max_src(aAttachment,aWidth,aHeight)
 			return '' if !aAttachment
-			begin	
-				pathImage = aAttachment.full_file_location
-				throw RuntimeError.new("file doesn't exist #{pathImage}") unless File.exists? pathImage
-				throw RuntimeError.new("could not get file geometry #{pathImage}") unless geomImage = Paperclip::Geometry.from_file(pathImage)
-				nameThumb = BcmsTools::Thumbnails::thumbnail_name_from_attachment(aAttachment,aWidth,aHeight)		
-				pathThumb = File.join(APP_CONFIG[:thumbs_cache],nameThumb)
-							
-				aDestWidth,aDestHeight = BcmsTools::Thumbnails::scale_to_fit(geomImage.width,geomImage.height,aWidth,aHeight).map {|i| i.to_i}
-				if !File.exists?(pathThumb)
-					# generate thumbnail at size to fit container
-					throw RuntimeError.new("Failed reading image #{pathImage}") unless objThumb = Paperclip::Thumbnail.new(File.new(pathImage), "#{aDestWidth}x#{aDestHeight}")
-					throw RuntimeError.new("Failed making thumbnail #{pathImage}") unless foThumb = objThumb.make
-					FileUtils.cp(foThumb.path,pathThumb)
-					FileUtils.chmod(0644,pathThumb)
-					FileUtils.rm(foThumb.path)
-				end
-				return File.join(APP_CONFIG[:thumbs_url],nameThumb)
-			rescue Exception => e
-				RAILS_DEFAULT_LOGGER.warn "thumberize_img error: #{e.inspect}"
-				RAILS_DEFAULT_LOGGER.debug e.backtrace      
-				return ''
-			end
+			Buzzcore::ImageUtils.render_thumbnail(
+				aAttachment.full_file_location,
+				APP_CONFIG[:thumbs_cache],
+				APP_CONFIG[:thumbs_url],
+				aWidth,
+				aHeight,
+				{
+					:name => BcmsTools::Thumbnails::thumbnail_name_from_attachment(aAttachment,aWidth,aHeight)
+				}
+			)
 		end
 		
 		
-		def framed_attachment_img(aAttachment,aWidth,aHeight)
+		def framed_attachment_img(aAttachment,aWidth,aHeight,aImg=nil)
+			return '' if !aAttachment
 			begin
-				pathImage = aAttachment.full_file_location
-			
-				throw RuntimeError.new("file doesn't exist #{pathImage}") unless File.exists? pathImage
-				throw RuntimeError.new("could not get file geometry #{pathImage}") unless geomImage = Paperclip::Geometry.from_file(pathImage)
-			
-				aDestWidth,aDestHeight = BcmsTools::Thumbnails::scale_to_fit(geomImage.width,geomImage.height,aWidth,aHeight).map {|i| i.to_i}
-			
-				nameThumb = BcmsTools::Thumbnails::thumbnail_name_from_attachment(aAttachment,aWidth,aHeight)		
-	
-				pathThumb = File.join(APP_CONFIG[:thumbs_cache],nameThumb)
-			
-				if !File.exists?(pathThumb)
-					throw RuntimeError.new("Failed reading image #{pathImage}") unless objThumb = Paperclip::Thumbnail.new(File.new(pathImage), "#{aDestWidth}x#{aDestHeight}")
-					throw RuntimeError.new("Failed making thumbnail #{pathImage}") unless foThumb = objThumb.make
-					FileUtils.cp(foThumb.path,pathThumb)
-					FileUtils.chmod(0644,pathThumb)
-					FileUtils.rm(foThumb.path)
-				end
+				details = Buzzcore::ImageUtils.render_thumbnail(
+					aAttachment.full_file_location,
+					APP_CONFIG[:thumbs_cache],
+					APP_CONFIG[:thumbs_url],
+					aWidth,
+					aHeight,
+					{
+						:return_details => true,
+						:name => BcmsTools::Thumbnails::thumbnail_name_from_attachment(aAttachment,aWidth,aHeight)
+					}
+				)
 				
-				img = "<img src=\"#{File.join(APP_CONFIG[:thumbs_url],nameThumb)}\" width=\"#{aDestWidth}\" height=\"#{aDestHeight}\" />"
-				return HtmlUtils.fixed_frame_image(img,aWidth,aHeight,aDestWidth,aDestHeight)
+				if details[:pathThumb]
+					dw,dh = Buzzcore::ImageUtils.image_file_dimensions(details[:pathThumb])	# might be able to optimize using details[:objThumb]
+				else
+					dw,dh = aWidth,aHeight
+				end
+				aImg ||= "<img width=\"#{dw}\" height=\"#{dh}\" />"
+				aImg = XmlUtils.quick_set_att(aImg,'src',details[:src])
+				return HtmlUtils.fixed_frame_image(aImg,aWidth,aHeight,dw,dh)
 			rescue Exception => e
 				RAILS_DEFAULT_LOGGER.warn "thumberize_img error: #{e.inspect}"
-				RAILS_DEFAULT_LOGGER.debug e.backtrace      
+				RAILS_DEFAULT_LOGGER.debug e.backtrace
 				return ''
 			end
 		end

data/lib/bcms_tools/form_helpers.rb

@@ -89,8 +89,8 @@ Cms::FormBuilder.class_eval do
 		result = StringUtils.split3(result,/<div class="fields file_fields.*?>/) {|h,m,t| XmlUtils.quick_join_att(m,'class','thumbnail_upload',' ') }  
 		unless aOptions[:remove_check_box]==false || object.new_record?
 			checkbox = '<div style="display: block; float: right; width: auto; height: auto;">'+remove_check_box()+'</div>'
-			result = StringUtils.split3(result,/<div.*?>/){|h,m,t| 
-				m+checkbox
+			result = StringUtils.split3(result,/<\/div>\Z/){|h,m,t| 
+				checkbox+'<br clear="all">'+m
 			}
 		end
 		result = StringUtils.split3(result,/<div.*?>/){|h,m,t| m+'<br clear="all" />'}		

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bcms_tools
 version: !ruby/object:Gem::Version 
-  version: 0.0.13
+  version: 0.1.0
 platform: ruby
 authors: 
 - buzzware
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 +08:00
+date: 2010-04-30 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.1.2
+        version: 2.3.1.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: browsercms