petit-felix 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8520f2febc5661d5cc6c5be58d294a6a92e03996be301164da8be5c8a2cbfa32
-  data.tar.gz: ee3505a8ed5f1dc356c8b052e95b4eea6332e4e313fe20872cf5a092d35a6211
+  metadata.gz: 43e66d8321092975cf428beebfb0710634396b23b357d349cbb64ea00b86106a
+  data.tar.gz: 3b5c0abbd975e5c3acfe58410034dbbcbf835e0e8e8069fffe924a8376b56c6d
 SHA512:
-  metadata.gz: 403e8b620ea5a35712ccd6ef83cc37e8ceadc05ae1ae1dde46771e016834579f3936f2dd0884716079a251cecda4a8b1e2c394dc3d5951dd339ac78b212da9e4
-  data.tar.gz: 8d69e16b180af01aeee3d81b60fbf3343d655b0933c9970cb2574f2a02d622aa3d7d7975267bae1f8e2c384fbad332603f0ed58d27fce7f619dc70d491a6ae06
+  metadata.gz: 044dc388971b643baf04f35ebd6887b1b244e9837d1552b84381bf7418ca83e0c6286569937501906bc6c273be3145855cf2d028f5fad83b080bdab9718dd109
+  data.tar.gz: 386d6f9d6a400e06a0400195710b995f42fbc660d498a368af7fe08a8370b58508b0f7429d8cf800dec208a88e9ca3acbddc3100231571fe185f99d15bdb7fc6

data/lib/felix/config.rb

@@ -13,9 +13,9 @@ module PetitFelix
 
 		# Global defaults
 		DEFAULT_OPTIONS = {
-			"image_dir" => "./assets/images",
-			"input_files" => "./md/*",
-			"output_dir" => "./output",
+			"image_dir" => (File.join("assets","images")),
+			"input_files" => (File.join("md","*")),
+			"output_dir" => (File.join("output")),
 			"task" => "pdf-single",
 		}
 
@@ -69,9 +69,11 @@ module PetitFelix
 			
 			default_config = {}
 			
-			if File.file? "./default.cfg" 
+			default_file = File.join("default.cfg")
+			
+			if File.file? default_file
 				
-				default_config = metadata.get_metadata(File.read "./default.cfg")
+				default_config = metadata.get_metadata(File.read default_file)
 			end
 			
 			# Loads command line arguments

data/lib/felix/file.rb

@@ -0,0 +1,28 @@
+
+module PetitFelix
+	class FileManager
+	
+		def file_from_string string
+			file_split = file_array_from_string string
+			
+			if file_split.count > 0
+				string = File.join(file_split)
+			end
+			
+			return string
+		end
+		
+		def file_array_from_string string
+			file_split = []
+			
+			if string.include? "/"
+				file_split = string.split("/")
+			elsif  string.include? "\\"
+				file_split = string.split("\\")
+			end
+			
+			return file_split
+		end
+	
+	end
+end

data/lib/felix/metadata.rb

@@ -7,16 +7,8 @@ module PetitFelix
 		## Gets image from path and location
 		def get_image_location img_dir, filename
 		
-			file = "#{img_dir}/#{filename}"
-			
-			if !File.file?(file)
-			
-				file = ".#{img_dir}/#{filename}"
-				
-			end
-			
-			file
-			
+			return File.join(img_dir,filename)
+
 		end
 
 		## Gets metadata from string into paired hashes

data/lib/felix/task_manager.rb

@@ -14,9 +14,11 @@ module PetitFelix
 			@error_printer = PetitFelix::Error.new
 			@task_list = {}
 			
-			load_task "task/template_pdf_task.rb"
-			load_task "task/pdf_single_task.rb"
-			load_task "task/basic_pdf_classic_task.rb"
+			File.join("..","task","template_pdf_task.rb")
+			
+			load_task File.join(File.dirname(__FILE__),"..","task","template_pdf_task.rb")
+			load_task File.join(File.dirname(__FILE__),"..","task","pdf_single_task.rb")
+			load_task File.join(File.dirname(__FILE__),"..","task","basic_pdf_classic_task.rb")
 		
 			task_list = PetitFelix::Task.constants.select {|c| PetitFelix::Task.const_get(c).is_a? Class}
 

data/lib/task/pdf_single_task.rb

@@ -43,7 +43,7 @@ module PetitFelix
 				metadata = @metaoptions.merge(metadata_helper.get_metadata(page_data[0]))
 
 				# Always forces you to use this template
-				@metaoptions["template"] = File.dirname(__FILE__) + "/../../templates/zine-single.json"
+				@metaoptions["template"] = File.join(File.dirname(__FILE__),"..","..", "templates","zine-single.json")
 
 				if metadata["pdf"] == "true"
 					

data/lib/task/template_pdf_task.rb

@@ -17,8 +17,8 @@ module PetitFelix
 			def self.default_options 
 			
 				return {
-					"template" => "./templates/test.json",
-					"output_file" => "./output/test.pdf"
+					"template" => (File.join(File.dirname(__FILE__),"..","..","templates","test.json")),
+					"output_file" => (File.join("output","test.pdf"))
 				}
 				
 			end

data/lib/version.rb

@@ -4,6 +4,6 @@
 
 module PetitFelix
     module Felix
-      VERSION = "0.1.6"
+      VERSION = "0.1.7"
     end
 end

data/lib/worker/basic_pdf_writer_classic.rb

@@ -2,6 +2,7 @@ require "prawn"
 require 'fileutils'
 require "prawndown-ext"
 require "felix/metadata"
+require "felix/file"
 require "worker/pdf_writer"
 
 module PetitFelix
@@ -52,8 +53,15 @@ module PetitFelix
 			end
 		
 			def output
-				FileUtils.mkdir_p @options["output_dir"]
-				render_file("#{@options["output_dir"]}/#{@options["title"].gsub(/[^\w\s]/, '').tr(" ", "_")}.pdf")
+				fileedit = PetitFelix::FileManager.new
+			
+				file_output = fileedit.file_array_from_string(@options["output_dir"]) + [@options["output_file"]]
+
+				file = File.join(file_output)
+			
+				FileUtils.mkdir_p File.dirname(file)
+				
+				render_file(file)
 			end
 		
 			# Draws page numbering

data/lib/worker/pdf_writer.rb

@@ -1,6 +1,7 @@
 require "prawn"
 require 'fileutils'
 require "prawndown-ext"
+require "felix/file"
 require "worker/pdf_writer/column_box"
 require "worker/pdf_writer/bounding_box"
 
@@ -87,9 +88,15 @@ module PetitFelix
 			end
 		
 			def output
+				
+				fileedit = PetitFelix::FileManager.new
+				
+				file_output = fileedit.file_array_from_string(@options["output_dir"]) + [@options["output_file"]]
+
+				file = File.join(file_output)
 
-				FileUtils.mkdir_p File.dirname("#{@options["output_dir"]}/#{@options["output_file"]}")
-				render_file("#{@options["output_dir"]}/#{@options["output_file"]}")
+				FileUtils.mkdir_p File.dirname(file)
+				render_file(file)
 				
 			end
 		

data/lib/worker/templater/font.rb

@@ -8,6 +8,11 @@ module PetitFelix
 			# Adds a font to the pdf document
 			def add_font font, font_name
 
+				args_has_file :normal, font
+				args_has_file :bold, font
+				args_has_file :italic, font
+				args_has_file :bold_italic, font
+
 				if font.key?(:normal)
 				
 					if font.key?(:italic)

data/lib/worker/templater/methods.rb

@@ -225,7 +225,7 @@ module PetitFelix
 			
 			def com_image args, obj
 
-				validate = args_has_string :file, args
+				validate = args_has_file :file, args
 
 				if validate != 0
 					return validate
@@ -925,7 +925,7 @@ module PetitFelix
 				# clears the current markdown file
 				com_clear_markdown args, obj
 				
-				validate = args_has_string :file, args
+				validate = args_has_file :file, args
 				
 				if validate != 0
 					return validate

data/lib/worker/templater/validation.rb

@@ -35,6 +35,24 @@ module PetitFelix
 				
 			end
 			
+			def args_has_file arg_name, args
+			
+				if !args.key? arg_name
+					# text not defined
+					@error_param["arg"] = arg_name.to_s
+					return 7
+				end
+				
+				file = replace_variable args[arg_name].to_s
+				
+
+				
+				args[arg_name] = file
+				
+				return 0
+				
+			end
+			
 			def args_has_int arg_name, args
 			
 				if !args.key? arg_name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: petit-felix
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - PunishedFelix
@@ -67,6 +67,7 @@ extra_rdoc_files: []
 files:
 - lib/felix/config.rb
 - lib/felix/error.rb
+- lib/felix/file.rb
 - lib/felix/generator.rb
 - lib/felix/metadata.rb
 - lib/felix/task_manager.rb