bcms_tools 0.0.6 → 0.0.7

data/VERSION

@@ -1,2 +1,2 @@
-0.0.6
+0.0.7
 

data/bcms_tools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bcms_tools}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["buzzware"]
-  s.date = %q{2010-03-01}
+  s.date = %q{2010-03-08}
   s.description = %q{Tools for BrowserCms.}
   s.email = %q{contact@buzzware.com.au}
   s.extra_rdoc_files = [

data/lib/bcms_tools/bcms_thumbnails.rb

@@ -34,6 +34,7 @@ module BcmsTools
 		# Scale given aWidth,aHeight up to fit within aDestWidth,aDestHeight
 		# return original width and height if nil given for both aDestWidth & aDestHeight
 		# If either aDestWidth or aDestHeight are nil, it will scale to fit the other dimension
+		# If both are non-nil, the maximum scaled size that will fit inside the given width and height will be returned.
 		def self.scale_to_fit(aWidth,aHeight,aDestWidth,aDestHeight)
 			if aDestWidth.nil? && aDestHeight.nil?
 				wRatio = 1
@@ -51,6 +52,8 @@ module BcmsTools
 	end
 	
 	module PageHelper
+	
+		module_function # this makes these methods callable as BcmsTools::PageHelper.method
 
 		def container_sized(aName,aWidth,aHeight)
 			StringUtils.split3(container(aName),/<img.*?>/,-1) do |head,img,tail|
@@ -117,6 +120,7 @@ module BcmsTools
 		end
 		
 		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
@@ -138,6 +142,33 @@ module BcmsTools
 			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
+		end
+		
+		
 		def framed_attachment_img(aAttachment,aWidth,aHeight)
 			begin
 				pathImage = aAttachment.full_file_location

data/lib/bcms_tools/form_helpers.rb

@@ -5,7 +5,7 @@ Cms::FormBuilder.class_eval do
 	# ensure the related css is included
 	def ensure_css
 		template.content_for :html_head do
-			template.stylesheet_link_tag("for_bcms_tools.css")
+			template.stylesheet_link_tag("bcms_tools.css")
 		end	
 	end
 
@@ -52,10 +52,14 @@ Cms::FormBuilder.class_eval do
 	def thumbnail_upload_field(aOptions)
 		ensure_css
 		aOptions[:label] ||= "Upload Image"
-		result = cms_file_field(:attachment_file, aOptions) + '<br clear="all" />'
-		method = 'attachment_file'
+		method = (aOptions.delete(:method) || :attachment)
+		method_file = (method.to_s + '_file').to_sym
+		_attachment = object.send(method)
+		result = cms_file_field(method_file.to_sym, aOptions) + '<br clear="all" />'
 		
-		underscore_id = object_name+'_'+options[:index].to_s+'_'+method
+		underscore_id = object_name
+		underscore_id += '_'+options[:index].to_s if options[:index]
+		underscore_id += '_'+method_file.to_s
 		underscore_id_esc = jquery_escape(underscore_id)
 		underscore_id_nobrac = underscore_id.gsub('[','_').gsub(']','')
 
@@ -75,13 +79,13 @@ Cms::FormBuilder.class_eval do
 			end
 		end
 				
-		thumbnail = if object.attachment
-			"<img class=\"thumbnail\" src=\"#{Cms::PageHelper.attachment_cropped_src(object.attachment,64,64)}\" width=\"64\" height=\"64\"/>"
+		thumbnail = if _attachment
+			"<img class=\"thumbnail\" src=\"#{Cms::PageHelper.attachment_cropped_src(_attachment,64,64)}\" width=\"64\" height=\"64\"/>"
 		else
 			'<div style="width: 64px; height: 64px; position:static; display: block; float: left; border-style: solid; border-width: 1px; border-color: gray"></div>'
 		end
 		result = result.sub('</label>','</label>'+thumbnail)
-		result = result.gsub(object_name+'_'+method,underscore_id)
+		result = result.gsub(object_name+'_'+method_file.to_s,underscore_id)
 		result = StringUtils.split3(result,/<div class="fields file_fields.*?>/) {|h,m,t| XmlUtils.quick_join_att(m,'class','thumbnail_upload',' ') }  
 		result = '<div style="display: block; float: right; width: auto; height: auto;">'+remove_check_box()+'</div>' + result unless aOptions[:remove_check_box]==false || object.new_record?
 		return result
@@ -102,6 +106,20 @@ Cms::FormBuilder.class_eval do
 		template.concat("</div>")
 	end
 
+	def text_display_field(aField,aOptions={})
+		template.concat('<div class="fields text_fields">')
+		if aOptions[:label]
+			label aField, aOptions[:label]
+		else
+			label aField
+		end
+		template.concat("<div id=\"artist_#{aField}\" class=\"text_display\">#{object.send(aField.to_sym)}</div>")
+		
+		template.concat("<div class=\"instructions\">#{aOptions[:instructions]}</div>") if aOptions[:instructions]
+		template.concat("<br clear=\"all\" />") # Fixes issue with bad line wrapping
+		template.concat("</div>")
+	end
+
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bcms_tools
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - buzzware
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-01 00:00:00 +08:00
+date: 2010-03-08 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency