combine_pdf 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60f4dfc06ecb66c5c876b69028868bbd5bb7cde9
-  data.tar.gz: 5a0944cbfdbc39283fbb62a2205f5897ecbb6dd0
+  metadata.gz: 5d032a7ab4e8768046189f88860518e5de8f977f
+  data.tar.gz: 65c57d46be5f5cb0ec5a0fcbfbcfef207c3336cf
 SHA512:
-  metadata.gz: fea4291167b6d5f0585bba371467e552dafbc32aeb957312a28fda7e0431bac20f35c49ee64bf36fac0b7c18ce5d1c89097db18e3af8170318c6401a56c07af7
-  data.tar.gz: 329afc35c2754b77b77fec6606be4e6938f535bff5e7bc1e0f1b02bf75dbf077174221448ec86cbcf0109a42e77446a9041079a75fc727bc16503b93d5151b8d
+  metadata.gz: 0d9482bb42b38330f701644bdf41461ddf625a55625c7e1073b1e76fd09d9bada40c643c573b6a9c60fd4a6c6b6365642863b0e524100916755918973133820f
+  data.tar.gz: 79f5bc78ccbf0cafcb11a5c38a9bf16ac23d1123d0cfc307397dd42baeb23facc82f015556614f7195cfaf43072d2961fc148e03901661099bb446a8c0a8fb39

data/CHANGELOG.md

@@ -2,15 +2,23 @@
 
 ***
 
+Change log v.0.2.2
+
+**fix**: fixed the default value for the :location attribute of PDF#stamp_pages(String, options). Now, instead of the default stamp being written at [:top, :bottom], it's default location will be set to [:center].
+
+**fix**: fixed the 'center' location in the page numbering, so that it wouldn't enforce a small font on an all page centered number.
+
+***
+
 Change log v.0.2.1
 
 **fix**: better page stamping... or, at least more secure (we hope).
 
-**feature**: added the PDF#stamp shortcut method. Credit to Tania (@taniarv) for the concept.
+**feature**: added the PDF#stamp_pages shortcut method. Credit to Tania (@taniarv) for the concept.
 
 **fix**: possible string encoding issues could have arose when strings were rendered to PDF format. Credit to Tania (@taniarv) for exposing the issue.
 
-**feature**: Metadata is now easiyer to set by allowing fast access to the Information header when using PDF#save and PDF#to_pdf. Credit to Tania (@taniarv) for code.
+**feature**: Metadata is now easier to set by allowing fast access to the Information header when using PDF#save and PDF#to_pdf. Credit to Tania (@taniarv) for code.
 
 ***
 

data/lib/combine_pdf/pdf_public.rb

@@ -350,56 +350,72 @@ module CombinePDF
 			opt = {
 				number_format: ' - %s - ',
 				start_at: 1,
-				font_size: 12,
 				font: :Helvetica,
 				margin_from_height: 45,
 				margin_from_side: 15
 			}
 			opt.update options
-			opt[:number_location] ||= opt[:stamp_location] ||= opt[:location] ||= [:top, :bottom]
+			opt[:location] ||= opt[:number_location] ||= opt[:stamp_location] ||= [:top, :bottom]
+			opt[:location] = [opt[:location]] unless opt[:location].is_a? (Array)
+
 			page_number = opt[:start_at]
 			format_repeater = opt[:number_format].count('%')
+			just_center = [:center]
+			small_font_size = opt[:font_size] || 12
+
 			(opt[:page_range] ? pages[opt[:page_range]] : pages).each do |page|
 				# Get page dimensions
 				mediabox = page[:CropBox] || page[:MediaBox] || [0, 0, 595.3, 841.9]
 				# set stamp text
 				text = opt[:number_format] % (Array.new(format_repeater) {page_number})
-				# text = opt[:number_format] % page_number
-				# compute locations for text boxes
-				text_dimantions = page.dimensions_of( text, opt[:font], opt[:font_size] )
-				box_width = text_dimantions[0] * 1.2
-				box_height = text_dimantions[1] * 2
-				opt[:width] = box_width
-				opt[:height] = box_height
-				from_height = opt[:margin_from_height]
-				from_side = opt[:margin_from_side]
-				page_width = mediabox[2]
-				page_height = mediabox[3]
-				center_position = (page_width - box_width)/2
-				left_position = from_side
-				right_position = page_width - from_side - box_width
-				top_position = page_height - from_height
-				bottom_position = from_height + box_height
-				if opt[:number_location].include? :top
-					 page.textbox text, {x: center_position, y: top_position }.merge(opt)
-				end
-				if opt[:number_location].include? :bottom
-					 page.textbox text, {x: center_position, y: bottom_position }.merge(opt)
-				end
-				if opt[:number_location].include? :top_left
-					 page.textbox text, {x: left_position, y: top_position }.merge(opt)
-				end
-				if opt[:number_location].include? :bottom_left
-					 page.textbox text, {x: left_position, y: bottom_position }.merge(opt)
-				end
-				if opt[:number_location].include? :top_right
-					 page.textbox text, {x: right_position, y: top_position }.merge(opt)
-				end
-				if opt[:number_location].include? :bottom_right
-					 page.textbox text, {x: right_position, y: bottom_position }.merge(opt)
+				if opt[:location].include? :center
+					add_opt = {}
+					if opt[:margin_from_height] && !opt[:height] && !opt[:y]
+						add_opt[:height] = mediabox[3] - mediabox[1] - (2*opt[:margin_from_height].to_f)
+						add_opt[:y] = opt[:margin_from_height]
+					end
+					if opt[:margin_from_side] && !opt[:width] && !opt[:x]
+						add_opt[:width] = mediabox[2] - mediabox[0] - (2*opt[:margin_from_side].to_f)
+						add_opt[:x] = opt[:margin_from_side]
+					end
+					page.textbox text, opt.merge(add_opt)
 				end
-				if opt[:number_location].include? :center
-					 page.textbox text, opt
+				unless opt[:location] == just_center
+					add_opt = { font_size: small_font_size }.merge(opt)
+					# text = opt[:number_format] % page_number
+					# compute locations for text boxes
+					text_dimantions = page.dimensions_of( text, opt[:font], small_font_size )
+					box_width = text_dimantions[0] * 1.2
+					box_height = text_dimantions[1] * 2
+					add_opt[:width] ||= box_width
+					add_opt[:height] ||= box_height
+					from_height = add_opt[:margin_from_height]
+					from_side = add_opt[:margin_from_side]
+					page_width = mediabox[2]
+					page_height = mediabox[3]
+					center_position = (page_width - box_width)/2
+					left_position = from_side
+					right_position = page_width - from_side - box_width
+					top_position = page_height - from_height
+					bottom_position = from_height + box_height
+					if opt[:location].include? :top
+						 page.textbox text, {x: center_position, y: top_position }.merge(add_opt)
+					end
+					if opt[:location].include? :bottom
+						 page.textbox text, {x: center_position, y: bottom_position }.merge(add_opt)
+					end
+					if opt[:location].include? :top_left
+						 page.textbox text, {x: left_position, y: top_position, font_size: small_font_size }.merge(add_opt)
+					end
+					if opt[:location].include? :bottom_left
+						 page.textbox text, {x: left_position, y: bottom_position, font_size: small_font_size }.merge(add_opt)
+					end
+					if opt[:location].include? :top_right
+						 page.textbox text, {x: right_position, y: top_position, font_size: small_font_size }.merge(add_opt)
+					end
+					if opt[:location].include? :bottom_right
+						 page.textbox text, {x: right_position, y: bottom_position, font_size: small_font_size }.merge(add_opt)
+					end
 				end
 				page_number = page_number.succ
 			end
@@ -411,12 +427,15 @@ module CombinePDF
 		# stamp:: either a String or a PDF page. If this is a String, you can add formating to add page numbering (i.e. "page number %i"). otherwise remember to escape any percent ('%') sign (i.e. "page \%number not shown\%").
 		# options:: an options Hash.
 		#
+		# If the stamp is a PDF page, only :page_range and :underlay (to reverse-stamp) are valid options.
+		#
 		# If the stamp is a String, than all the options used by {#number_pages} or {Page_Methods#textbox} can be used.
 		#
-		# If the stamp is a PDF page, only :page_range and :underlay (to reverse-stamp) are valid options.
+		# The default :location option is :center = meaning the stamp will be stamped all across the page unless the :x, :y, :width or :height options are specified.
 		def stamp_pages stamp, options = {}
 			case stamp
 			when String
+				options[:location] ||= [:center]
 				number_pages({number_format: stamp}.merge(options))
 			when Page_Methods
 				# stamp = stamp.copy(true) 

data/lib/combine_pdf/version.rb

@@ -1,3 +1,3 @@
 module CombinePDF
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combine_pdf
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-rc4