petit-felix 0.1.9 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b27bc90c75ccd400918bd89cb8e84a19bf9ac4989ee56815a32847840ac8fca8
-  data.tar.gz: d292ac4f0897f52ce6a0ee6e6379a058798669e8f455f75fbc34c55f67029490
+  metadata.gz: 1d2e8b23995447848c4ca2a9aa1fc32d714d13c103474af97b4de7b15a9b909e
+  data.tar.gz: 7ce09991565bb9129a30f9ed51024d669b41077b8462e1343ab40091f7471f18
 SHA512:
-  metadata.gz: 5bab461e34c67baef516b6dd06f781979232d9f3995efe7c383ba40702a3e5414d99f413006542d71ebb1a36f2b4728fa92db0f36ce95bf8ec5609df70e3a5df
-  data.tar.gz: 65184abf8b04286d3874ae483be3bc17668498d824319ecd353b78ee4c6f3aba5a05d0244e1e0162c10103051b4fbe2cf93b33f092c5b64819851eb4dd6e65b3
+  metadata.gz: 001ade81df3dc72cb4672cea3c295cda649d47a8a55d55290a3e141c68b38faf338a0f6e7f9875aefd1e1ab7f6fb3c58807626fc14bbfa5ac09b8e661718a780
+  data.tar.gz: 86c720c74ecd9181c6b6527187af8511241cb50d67760c8a454142476fce8ab9ae1aaacab0527daece7522be9bc0f4830d8f58ecda3edae5f8ecb6bec76a1772

data/lib/felix/config.rb

@@ -21,29 +21,12 @@ module PetitFelix
 
 		## Hash for custom command line argument calls
 		CL_DATA = {
-			"columns" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args).to_i },
-			"default_font_size" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args).to_i },
-			"header1_size" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args).to_i },
-			"header2_size" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args).to_i },
-			"header3_size" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args).to_i },
-			"header4_size" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args).to_i },
-			"header5_size" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args).to_i },
-			"header6_size" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args).to_i },
-			"margin" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args).to_i },
-			"font_normal" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args) },
-			"font_italic" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args) },
-			"font_bold" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args) },
-			"font_bold_italic" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args) },
-			"page_layout" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args) },
-			"input_files" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args) },
-			"image_dir" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args) },
-			"task" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args) },
-			"template" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args) },
+
 		}
 
 		### Command Line Arguments
 
-		def self.cl_add_config command,args, index, cl_args
+		def cl_add_config command, args, index, cl_args
 			cl_args[command] = args[index + 1]
 		end
 
@@ -155,6 +138,10 @@ module PetitFelix
 						
 							CL_DATA[command].call command, args, index, cl_args
 
+						else
+						
+							cl_add_config command, args, index, cl_args
+
 						end
 						
 						@processed_arguments << command

data/lib/task/template_pdf_task.rb

@@ -18,7 +18,7 @@ module PetitFelix
 			
 				return {
 					"template" => (File.join(File.dirname(__FILE__),"..","..","templates","test.json")),
-					"output_file" => (File.join("output","test.pdf"))
+					"output_file" => "test.pdf"
 				}
 				
 			end
@@ -31,7 +31,7 @@ module PetitFelix
 				pdf = PetitFelix::Worker::TemplatePDFWriter.new(
 					page_layout: @metaoptions["page_layout"],
 					print_scaling: @metaoptions["print_scaling"])
-
+					
 				pdf.set_options @metaoptions
 
 				pdf.init_values @metaoptions, pdf

data/lib/version.rb

@@ -4,6 +4,6 @@
 
 module PetitFelix
     module Felix
-      VERSION = "0.1.9"
+      VERSION = "0.1.11"
     end
 end

data/lib/worker/pdf_writer/bounding_box.rb

@@ -35,7 +35,9 @@ module Prawn
       	@margins = {}
       
       	if @base_margins.count > 0
-      		@margins = @base_margins[@document.page_count % @base_margins.count]
+
+      			@margins = @base_margins[(@document.page_count - 1) % @base_margins.count]
+      			
 				end
       end
       

data/lib/worker/pdf_writer.rb

@@ -12,6 +12,14 @@ module PetitFelix
 
 		class	DefaultPDFWriter < Prawn::Document
 		
+			def alternates_pages
+				return @alternates_pages
+			end
+			
+			def set_alternate_pages
+				@alternates_pages = true
+			end
+		
 			# Initializes fonts
 			def initialize_font
 			
@@ -82,7 +90,8 @@ module PetitFelix
 			end
 		
 			def set_options metaoptions
-			
+				@alternates_pages = false
+				
 				@options = metaoptions
 				
 			end
@@ -99,6 +108,117 @@ module PetitFelix
 				render_file(file)
 				
 			end
+			
+			# Copies the contents of a page.
+			def copy_page index=@page_number-1
+			
+				return false if index.abs > (state.pages.count - 1)
+			
+				# deep copies the page data
+				@page_data = copy_page_data index
+				
+			end
+			
+			# Returns the page data copied
+			def copy_page_data index
+				return false if index.abs > (state.pages.count - 1)
+			
+				# deep copies the page data
+				return Marshal.load(Marshal.dump(state.store.pages.data[:Kids][index]))
+			end
+			
+			# Pastes (overwrites) the content of a page.
+			def paste_page index=@page_number-1
+
+				return false if index.abs > (state.pages.count - 1)
+			
+				if !@page_data.nil?
+				
+					state.store.pages.data[:Kids][index] = @page_data
+
+					# deep copies the page data so its not referencing the same object constantly
+					@page_data = Marshal.load(Marshal.dump(@page_data))
+					
+				end
+				
+			end
+			
+			# Clears copied page data.
+			def clear_copied_page
+			
+				@page_data = nil
+				
+			end
+			
+			# Reorganizes the pages in the given order.
+			
+			def reorder_pages pages
+			
+				if pages.count != state.pages.count
+				
+					return false
+					
+				end
+				
+				initial_content = []
+				
+				state.store.pages.data[:Kids].each_with_index {
+					|item,index| 
+					initial_content.append(state.store.pages.data[:Kids][index])
+				}
+				
+				index = 0
+				
+				while index < initial_content.count
+				
+					return false if pages[index].abs > (state.pages.count - 1)
+				
+					state.store.pages.data[:Kids][index] = initial_content[pages[index]]
+					index +=1
+					
+				end
+			
+			end
+			
+			# Orders the pages properly so they can be printed 2 on a page for stapling
+			def reorder_pages_for_2_page
+			
+				pages = []
+				pairs = []
+				
+				# first test if page count is odd.
+				# if its odd add an extra page before the back cover
+
+				if state.pages.count % 2 == 1
+					go_to_page(-2)
+					start_new_page
+					
+					go_to_page(state.pages.count)
+				end
+				
+				# Now that its even do the algorithm
+				center = (state.pages.count / 2) - 1 
+				center_other = center + 1
+				
+				while center >= 0
+				
+					pairs.unshift [center, center_other]
+					
+					center -= 1
+					center_other += 1
+					
+				end
+				
+				pairs.each do |item|
+				
+					pages.append item[0]
+					pages.append item[1]
+					
+				end
+			
+				reorder_pages pages
+			
+			end
 		
 		end
 	end

data/lib/worker/template_pdf_writer.rb

@@ -256,7 +256,7 @@ module PetitFelix
 									return [4, counter]
 									
 								end
-
+								
 								comm = COMMAND[command].call obj, args
 
 								@counter_stack[-1] = counter

data/lib/worker/templater/methods.rb

@@ -13,6 +13,9 @@ module PetitFelix
 			# List of executable commands
 			
 			COMMAND = {
+				## Comment this one out when releasing
+				#:test => -> (obj, args) { obj.com_test args, obj },
+			
 				:print => -> (obj, args) { obj.com_print args, obj },
 				:call => -> (obj, args) { obj.com_call args, obj },
 				:if => -> (obj, args) { obj.com_if args, obj },
@@ -32,6 +35,8 @@ module PetitFelix
 				:move_down => -> (obj, args) { obj.com_move_down args, obj },
 				:move_to => -> (obj, args) { obj.com_move_to args, obj },
 				:move_cursor_to => -> (obj, args) { obj.com_move_cursor_to args, obj },
+				:copy_page => -> (obj, args) { obj.com_copy_page args, obj },
+				:paste_page => -> (obj, args) { obj.com_paste_page args, obj },
 				:delete_page => -> (obj, args) { obj.com_delete_page args, obj },
 				:start_new_page => -> (obj, args) { obj.com_start_new_page args, obj },
 				:draw_text => -> (obj, args) { obj.com_draw_text args, obj },
@@ -53,8 +58,21 @@ module PetitFelix
 				:span => -> (obj, args) { obj.com_span args, obj },
 				:translate => -> (obj, args) { obj.com_translate args, obj },
 				:transparent => -> (obj, args) { obj.com_transparent args, obj },
+				
+				# special custom functions
+				:alternate_pages => -> (obj, args) { obj.com_alternate_pages args, obj },
+				:set_alternate_pages => -> (obj, args) { obj.com_set_alternate_pages args, obj },
 			}
 			
+			## Debug test command
+			
+			def com_test args, obj
+				#obj.reorder_pages [3,2,0,1]
+				obj.reorder_pages_for_2_page
+				
+				return 0
+			end
+			
 			# Prawn commands
 			
 			def com_bounding_box args, obj
@@ -141,6 +159,33 @@ module PetitFelix
 				return 0
 			end
 			
+			def com_copy_page args, obj
+				args_has_int :val, args
+			
+				if args.key?(:val)
+					obj.copy_page args[:val]
+				else
+					obj.copy_page
+				end
+				
+				return 0
+			
+			end
+			
+			def com_paste_page args, obj
+
+				args_has_int :val, args
+			
+				if args.key?(:val)
+					obj.paste_page args[:val]
+				else
+					obj.paste_page
+				end
+				
+				return 0
+				
+			end
+			
 			def com_delete_page args, obj
 				validate = args_has_int :val, args
 				
@@ -430,8 +475,6 @@ module PetitFelix
 					args_has_int :page_start, args
 					args_has_int :page_finish, args
 					
-					odd_options[:start_count_at] += 1
-					
 					if !args.key?(:page_start)
 						@variables["paginator_start"] = @metaoptions["paginator_start"]
 					else
@@ -440,13 +483,26 @@ module PetitFelix
 					
 					@variables["paginator_end"] = args[:page_finish]
 				
-					if @metaoptions["paginator_switch"]
-						odd_options[:page_filter] = ->(pg) { pg > @variables["paginator_start"] && (pg < @variables["paginator_end"] || @variables["paginator_end"] <= -1) && pg % 2 == 1 }
-						even_options[:page_filter] = ->(pg) { pg > @variables["paginator_start"] && (pg < @variables["paginator_end"] || @variables["paginator_end"] <= -1) && pg % 2 == 0 }
-						
+					if obj.alternates_pages
+						even_options[:start_count_at] = ((obj.page_count - 1) * 0.5).floor
+					
+							even_options[:page_filter] = ->(pg) { pg > @variables["paginator_start"] && (pg < @variables["paginator_end"] || @variables["paginator_end"] <= -1) && pg > obj.page_count * 0.5 }
+							
+							odd_options[:page_filter] = ->(pg) { pg > @variables["paginator_start"] && (pg < @variables["paginator_end"] || @variables["paginator_end"] <= -1) && pg <= obj.page_count * 0.5 }
+							
 					else
-						even_options[:page_filter] = ->(pg) { pg > @variables["paginator_start"] && (pg < @variables["paginator_end"] || @variables["paginator_end"] <= -1) && pg % 2 == 1 }
-						odd_options[:page_filter] = ->(pg) { pg > @variables["paginator_start"] && (pg < @variables["paginator_end"] || @variables["paginator_end"] <= -1) && pg % 2 == 0 }
+				
+						odd_options[:start_count_at] += 1
+				
+						if @metaoptions["paginator_switch"]
+							odd_options[:page_filter] = ->(pg) { pg > @variables["paginator_start"] && (pg < @variables["paginator_end"] || @variables["paginator_end"] <= -1) && pg % 2 == 1 }
+							even_options[:page_filter] = ->(pg) { pg > @variables["paginator_start"] && (pg < @variables["paginator_end"] || @variables["paginator_end"] <= -1) && pg % 2 == 0 }
+							
+						else
+							even_options[:page_filter] = ->(pg) { pg > @variables["paginator_start"] && (pg < @variables["paginator_end"] || @variables["paginator_end"] <= -1) && pg % 2 == 1 }
+							odd_options[:page_filter] = ->(pg) { pg > @variables["paginator_start"] && (pg < @variables["paginator_end"] || @variables["paginator_end"] <= -1) && pg % 2 == 0 }
+						
+						end
 					
 					end
 
@@ -1067,6 +1123,19 @@ module PetitFelix
 				return 0
 			end
 			
+			def com_alternate_pages args, obj
+				#obj.reorder_pages [3,2,0,1]
+				obj.reorder_pages_for_2_page
+				
+				return 0
+			end
+			
+			def com_set_alternate_pages args, obj
+				obj.set_alternate_pages
+				
+				return 0
+			end
+			
 		end
 	end
 end

data/templates/zine-single.json

@@ -189,6 +189,7 @@
     
 		"default_font_size" : 12,
 		"columns" : 1,
+		"alternate_output" : false,
 
 		"front_cover" : false,
 		"front_extra_page" : true,
@@ -723,8 +724,26 @@
       }
     ],
     
+    "alternate_output" : [
+    	{
+    		"cmd" : "alternate_pages"
+    	}
+    ],
+    
+    "set_alternate_output" : [
+    	{
+    		"cmd" : "set_alternate_pages"
+    	}
+    ],
     
     "main": [
+      {
+      	"cmd" : "if",
+      	"args" : {
+      		"exp" : "${alternate_output}",
+      		"func" : "set_alternate_output"
+      	}
+      },
       {
         "cmd": "set",
         "args": {
@@ -768,6 +787,13 @@
         "args": {
           "func": "paginator"
         }
+      },
+      {
+      	"cmd" : "if",
+      	"args" : {
+      		"exp" : "${alternate_output}",
+      		"func" : "alternate_output"
+      	}
       }
     ]
   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: petit-felix
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.11
 platform: ruby
 authors:
 - PunishedFelix