bcms_tools 0.2.4 → 0.2.5

data/VERSION

@@ -1,2 +1,2 @@
-0.2.4
+0.2.5
 

data/bcms_tools.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{bcms_tools}
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["buzzware"]
-  s.date = %q{2010-08-02}
+  s.date = %q{2011-03-28}
   s.description = %q{Tools for BrowserCms.}
   s.email = %q{contact@buzzware.com.au}
   s.extra_rdoc_files = [
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
      "bcms_tools.vpw",
      "lib/bcms_tools.rb",
      "lib/bcms_tools/bcms_thumbnails.rb",
+     "lib/bcms_tools/category_utils.rb",
      "lib/bcms_tools/form_helpers.rb",
      "lib/bcms_tools/migration_helpers.rb",
      "lib/bcms_tools/view_helpers.rb",

data/lib/bcms_tools/bcms_thumbnails.rb

@@ -191,8 +191,12 @@ module Buzzcore
 					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, :convert_options => '-quality 85')
 						objThumb.basename = MiscUtils.file_no_extension(nameThumb)
+						RAILS_DEFAULT_LOGGER.debug 'render_thumbnail: generating '+pathThumb
+						
 						throw RuntimeError.new("Failed making thumbnail #{aSource}") unless objThumb.make_custom(pathThumb)
 						FileUtils.chmod(0644,pathThumb)
+					else
+						RAILS_DEFAULT_LOGGER.debug 'render_thumbnail: using cached '+pathThumb
 					end
 					src = File.join(aBaseUrl,nameThumb)
 					details.merge!({
@@ -222,7 +226,7 @@ module BcmsTools
 		def self.thumbnail_name_from_attachment(aAttachment,aWidth,aHeight)
 			extThumb = 'jpg' #aAttachment.file_extension
 			size = "#{aWidth.to_s}x#{aHeight.to_s}"
-			result = File.basename(aAttachment.file_location)+'-'
+			result = MiscUtils.file_no_extension(aAttachment.file_path).bite('/').gsub('/','--')+'-'+aAttachment.file_location[-4,4]+'-'
 			result += if aWidth && aHeight
 				size+'.'+extThumb
 			else
@@ -231,6 +235,10 @@ module BcmsTools
 			result
 		end
 		
+		def self.thumbnail_path_from_attachment(aAttachment,aWidth,aHeight)
+			File.join(APP_CONFIG[:thumbs_cache],thumbnail_name_from_attachment(aAttachment,aWidth,aHeight))
+		end
+		
 		def self.remove_attachment_thumbnails(aAttachment)
 			nameThumb = thumbnail_name_from_attachment(aAttachment,nil,nil)		
 			pathThumbWildcard = File.join(APP_CONFIG[:thumbs_cache],nameThumb)
@@ -308,29 +316,6 @@ module BcmsTools
 			
 				att = BcmsTools::Thumbnails::attachment_from_url(urlImage)
 				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',src)		# File.join(APP_CONFIG[:thumbs_url],nameThumb))
 				#return HtmlUtils.fixed_frame_image(img,aWidth,aHeight,aDestWidth,aDestHeight)
@@ -341,42 +326,6 @@ module BcmsTools
 			end
 		end
 		
-		def attachment_cropped_src(aAttachment,aWidth,aHeight)
-			return '' if !aAttachment
-
-			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 shellescape(str)
 			# An empty argument will be skipped, so return empty quotes.
 			return "''" if str.empty?
@@ -398,70 +347,27 @@ module BcmsTools
 			result = shellescape(aString)
 			result.gsub!('\\','\\\\\\')
 		end
+		
+		
+		# resizes and crops to fill given size completely, probably losing part of the image
+		def attachment_cropped_src(aAttachment,aWidth,aHeight)
+			return '' if !aAttachment || !aAttachment.file_location
 
-
-		def image_max_src(aImagePath,aWidth,aHeight)
 			Buzzcore::ImageUtils.render_thumbnail(
-				aImagePath,
+				aAttachment.full_file_location,
 				APP_CONFIG[:thumbs_cache],
 				APP_CONFIG[:thumbs_url],
 				aWidth,
-				aHeight
+				aHeight,
+				{
+					:name => BcmsTools::Thumbnails::thumbnail_name_from_attachment(aAttachment,aWidth,aHeight),
+					:resize_mode => :cropfill
+				}
 			)
-		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
-		
+
+		end
 		
+		# fits entire image within available space, maintaining aspect, probably not filling the space
 		def attachment_max_src(aAttachment,aWidth,aHeight)
 			return '' if !aAttachment
 			Buzzcore::ImageUtils.render_thumbnail(
@@ -471,11 +377,21 @@ module BcmsTools
 				aWidth,
 				aHeight,
 				{
-					:name => BcmsTools::Thumbnails::thumbnail_name_from_attachment(aAttachment,aWidth,aHeight)
+					:name => BcmsTools::Thumbnails::thumbnail_name_from_attachment(aAttachment,aWidth,aHeight),
+					:resize_mode => :fit
 				}
 			)
 		end
-		
+
+		def image_max_src(aImagePath,aWidth,aHeight)
+			Buzzcore::ImageUtils.render_thumbnail(
+				aImagePath,
+				APP_CONFIG[:thumbs_cache],
+				APP_CONFIG[:thumbs_url],
+				aWidth,
+				aHeight
+			)
+		end			
 		
 		def framed_attachment_img(aAttachment,aWidth,aHeight,aImg=nil)
 			return '' if !aAttachment

data/lib/bcms_tools/category_utils.rb

@@ -0,0 +1,17 @@
+Category.class_eval do
+
+	def self.create_chain(
+		aChain,		# an array of names from leaf to root
+		aCatType		# an object or id of CategoryRoot
+	)
+		aCatType = CategoryType.find_by_id(aCatType) if aCatType.is_a? Fixnum
+		parent = nil
+		aChain.each do |name|
+			currCat = Category.find_by_name(name) || aCatType.categories.create!(:name => name,:parent => parent)
+			parent = currCat
+		end
+		parent
+	end
+
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bcms_tools
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - buzzware
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-02 00:00:00 +08:00
+date: 2011-03-28 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,6 +100,7 @@ files:
 - bcms_tools.vpw
 - lib/bcms_tools.rb
 - lib/bcms_tools/bcms_thumbnails.rb
+- lib/bcms_tools/category_utils.rb
 - lib/bcms_tools/form_helpers.rb
 - lib/bcms_tools/migration_helpers.rb
 - lib/bcms_tools/view_helpers.rb