resumetools 0.2.7.0 → 0.2.7.6

data/lib/resumetools/resume/json.rb

@@ -1,5 +1,3 @@
-require 'json/pure'
-
 module ResumeTools
   module Renderer
     class JSON

data/lib/resumetools/resume/pdf.rb

@@ -25,26 +25,6 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-gems = [
-  ['prawn', '>= 0.5.1'],
-  ['prawn-core', '>= 0.5.1'],
-  ['prawn-layout', '>= 0.2.1'],
-  ['prawn-format', '>= 0.2.1']
-]
-
-gems.each do |name, version|
-  if version
-    gem name, version
-  else
-    gem name
-  end
-end
-
-require "prawn"
-require "prawn/format"
-require "prawn/layout"
-require "prawn/measurement_extensions"
-
 module ResumeTools
   module Renderer
     module PDF
@@ -55,10 +35,10 @@ module ResumeTools
         :default => 9,
         :header => 14,
         :contact => 9,
-        :section => 10,
+        :section => 11,
         :para => 9,
         :item => 9,
-        :period => 12
+        :period => 10
       }
       DATE_FORMAT = "%B, %Y"
       
@@ -121,28 +101,26 @@ module ResumeTools
             end
             
             # Periods
-            section.periods.each do |period|
-              pdf.span(pdf.bounds.width - 10, :position => 10) do
+            section.periods.each do |period|              
+              pdf.pad_top(5) do
+                # Period title
+                pdf.pad_top(5) { pdf.text period.title, :style => :bold, :size => FONT_SIZES[:period] }
+                
+                # Period details
                 pdf.pad_top(5) do
-                  # Period title
-                  pdf.pad_top(5) { pdf.text period.title, :style => :bold, :size => FONT_SIZES[:period] }
-                  
-                  # Period details
-                  pdf.span(pdf.bounds.width - 10, :position => 10) do
-                    pdf.text(period.line, :size => FONT_SIZES[:default])
-                  end
-                  
-                  # Period items
-                  unless period.items.empty?
-                    pdf.table period.items.map { |item| [" •", item.text] },
-                      :font_size => FONT_SIZES[:item],
-                      :column_widths => { 0 => 20, 1 => 420 },
-                      :border_style => :none,
-                      :border_color => "ffffff",
-                      :vertical_padding => 4,
-                      :horizontal_padding => 0,
-                      :align => { 0 => :center, 1 => :left }
-                  end
+                  pdf.text(period.line, :size => FONT_SIZES[:default])
+                end
+                
+                # Period items
+                unless period.items.empty?
+                  pdf.table period.items.map { |item| [" •", item.text] },
+                    :font_size => FONT_SIZES[:item],
+                    :column_widths => { 0 => 20, 1 => 420 },
+                    :border_style => :none,
+                    :border_color => "ffffff",
+                    :vertical_padding => 4,
+                    :horizontal_padding => 0,
+                    :align => { 0 => :center, 1 => :left }
                 end
               end
             end

data/lib/resumetools/resume/plain_text.rb

@@ -1,5 +1,3 @@
-require 'text/format'
-
 module ResumeTools
   module Renderer
     class PlainText
@@ -19,7 +17,7 @@ module ResumeTools
           :lined_headers => true
         }
         @opts.merge!(opts)
-        @format = Text::Format.new
+        @format = ::Text::Format.new
         @format.first_indent = @opts[:first_indent]
         @format.columns = @opts[:columns]
         

data/lib/resumetools/resume/resume.rb

@@ -117,11 +117,12 @@ module ResumeTools
     # Returns an array of lines that has the contact info
     def header_lines
       elements = []
-      [:address1, :address2, :telephone, :email, :url].each do |element|
+      [:address1, :address2, :telephone, :email].each do |element|
         elements << self.send(element) unless self.send(element).blank?
       end
       lines = []
       elements.each_slice(2) { |pair| lines << pair.join(" • ") }
+      lines << self.url unless self.url.blank?
       lines
     end
     

data/lib/resumetools/resume/text_reader.rb

@@ -35,7 +35,7 @@ module ResumeTools
       
       # Builds a new Resume instance from text
       def from_text(text)
-        parser = ::ResumeParser.new
+        parser = ResumeTools::ResumeGrammarParser.new
         result = parser.parse(text)
         
         if result.nil?

data/lib/resumetools/version.rb

@@ -25,12 +25,6 @@
 
 unless defined? ResumeTools::VERSION
   module ResumeTools
-    module VERSION
-      MAJOR = 0
-      MINOR = 2
-      TINY  = 7
-      BITSY = 0
-      STRING = [MAJOR, MINOR, TINY, BITSY].join('.')
-    end
+    VERSION = "0.2.7.6"
   end
 end

data/lib/resumetools.rb

@@ -23,15 +23,23 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 #++
 
+require "prawn"
+require "prawn/layout"
+require "prawn/measurement_extensions"
 require "extlib"
 require "uuidtools"
+require "json"
+require "treetop"
 
-$:.unshift File.dirname(__FILE__)
+unless defined?(Text::Format)
+  require File.expand_path(File.dirname(__FILE__) + "/text/format")
+end
+
+require File.expand_path(File.dirname(__FILE__) + "/resumetools/version")
+require File.expand_path(File.dirname(__FILE__) + "/resumetools/resume/resume")
+require File.expand_path(File.dirname(__FILE__) + "/resumetools/resume/text_reader")
+require File.expand_path(File.dirname(__FILE__) + "/resumetools/resume/pdf")
+require File.expand_path(File.dirname(__FILE__) + "/resumetools/resume/plain_text")
+require File.expand_path(File.dirname(__FILE__) + "/resumetools/resume/json")
+require File.expand_path(File.dirname(__FILE__) + "/resumetools/resume/export")
 
-require "resumetools/version"
-require "resumetools/resume/resume"
-require "resumetools/resume/text_reader"
-require "resumetools/resume/pdf"
-require "resumetools/resume/plain_text"
-require "resumetools/resume/json"
-require "resumetools/resume/export"