elegant 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71086f754d84de1cefce3f26f368ee7b35dca6ed
-  data.tar.gz: b0b2a2efd39a1a684fb4d0410b0a95fab6185354
+  metadata.gz: f2e7cd7cced97c061f7a69326ed86bc86be3f443
+  data.tar.gz: d4f2e63d066cc775673f4959a0d909d9a2cd18e0
 SHA512:
-  metadata.gz: d464e48963c95b78a4511da7c85b7730d7eaedd834a4e18126413066d13ab2e1ed01712543180cf1ccbcaedf790d8c2ff84dde7554b49b9d403aec79c32b2555
-  data.tar.gz: 43e91120f1a7ef0bec95ecab3e2d7e48008e5f658c4d8df14b137e62ef158c5e7a8a9caa40ceb3afc65567303833835d8dfee2d87e0a0691f7226cf3567cbf08
+  metadata.gz: a0aed6189b36da2bd4b9add5999f11f757f4eae33abe67fe543b1534fffea0f9e32fd325357dcd9286afb24842f7c21c0c264fcdc70c7fa99befb73605ac2c46
+  data.tar.gz: 1160b31beb3d9d7feac865ab4af73e34a197a7d106e05a3a6346a91e957bf9689e00bf525eabdea3ffdf63dd2fe12530fa22b30490ce8ac66180f1a32add3233

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.1.0
+  - 2.3.0

data/CHANGELOG.md

@@ -6,6 +6,11 @@ For more information about changelogs, check
 [Keep a Changelog](http://keepachangelog.com) and
 [Vandamme](http://tech-angels.github.io/vandamme).
 
+## 1.2.0 - 2016.01.21
+
+* [ENHANCEMENT] White background below the logo
+* [ENHANCEMENT] Add inline-format to footer text (allows for links)
+
 ## 1.1.0 - 2015.11.12
 
 * [ENHANCEMENT] Taller title (now has room for two lines)

data/bin/elegant

@@ -7,13 +7,41 @@ rescue LoadError
   require 'elegant'
 end
 
+
+#####################
+
+def asset(path)
+  File.expand_path "../../tmp/#{path}", __FILE__
+end
+
+def ttf(family)
+  {normal: asset("#{family}-Regular.ttf"), bold: asset("#{family}-Bold.ttf")}
+end
+
+Elegant.configure do |config|
+  config.author    = 'Fullscreen'
+  config.creator   = 'Channel+'
+  config.producer  = 'Channel+ by Fullscreen'
+  config.watermark = asset 'images/logo.png'
+  config.fonts     = {
+    'Helvetica'  => ttf('fonts/HelveticaWorld'),
+    'Sans Serif' => ttf('fonts/ProximaNova'),
+    'Fallback'   => ttf('fonts/ArialUnicode'),
+  }
+end
+
+#####################
+
+def icon_for(name)
+  asset "images/icons/#{name}.png"
+end
+
 class Section
   attr_accessor :title, :page, :alignment
   def initialize(title:, page:, alignment:)
     @title, @page, @alignment = title, page, alignment
   end
 
-  attr_accessor :document
   include Prawn::View
   def render_to(pdf)
     @document = pdf
@@ -22,11 +50,7 @@ class Section
 
   def render
     header
-
-    bounding_box [0, cursor], width: bounds.width, height: 170 do
-      stroke_bounds
-    end
-
+    body
     footer
   end
 
@@ -38,10 +62,16 @@ private
     end
 
     move_down 10
-    formatted_text_box [{text: title.upcase, font: sans_serif, styles: [:bold], valign: :center, color: '556270', size: 14}], height: 15, at: [0, cursor]
+    formatted_text_box [header_text_box], height: 15, at: [0, cursor]
     move_down 30 # 15 of the float box, and 15 real
   end
 
+  def body
+    bounding_box [0, cursor], width: bounds.width, height: 170 do
+      stroke_bounds
+    end
+  end
+
   def footer
     unless alignment == :bottom
       document.move_down 25
@@ -52,6 +82,17 @@ private
   def sans_serif
     'Sans Serif' if document.font_families['Sans Serif']
   end
+
+  def header_text_box
+    {
+      text: title.upcase,
+      font: sans_serif,
+      styles: [:bold],
+      valign: :center,
+      color: '556270',
+      size: 14
+    }
+  end
 end
 
 sections = [
@@ -62,38 +103,20 @@ sections = [
   Section.new(title: 'Month over month view tracking', page: 2, alignment: :middle),
 ]
 
-def font_files_for(family)
-  {normal: ttf("#{family}-Regular"), bold: ttf("#{family}-Bold")}
-end
+#####################
 
-def ttf(basename)
-  asset "fonts/#{basename}.ttf"
-end
-
-def png(basename)
-  asset "images/#{basename}.png"
-end
-
-def asset(path)
-  File.expand_path "../../tmp/#{path}", __FILE__
-end
-
-fonts = {}.tap do |families|
-  families['Helvetica']    = font_files_for 'HelveticaWorld'
-  families['Fallback']     = font_files_for 'ArialUnicode'
-  families['Sans Serif']   = font_files_for 'ProximaNova'
-end
-
-company_logo = png('logo')
-company_name = 'Fullscreen'
-title = 'March 2015'
-thumbnail = png('thumbnail')
-footer = "Report for channelpl.us (2015/02/12 – 2015/10/12)"
+header = {text: 'March 2015', logo: {url: asset('images/thumbnail.png')}}
+footer = {text: "Report for <link href='https://www.channelpl.us'>Channel+</link> (2015/02/12 – 2015/10/12)"}
 
 filename = 'elegant.pdf'
 
-Elegant::Document.new(fonts: fonts, title: title, company_logo: company_logo, thumbnail: thumbnail, footer: footer, company_name: company_name) do |pdf|
-  sections.each{|section| section.render_to pdf}
+Elegant::Document.new(header: header, footer: footer) do |pdf|
+  sections.each do |section|
+    section.render_to pdf
+    if pdf.cursor != 15.0 && section.alignment == :bottom
+      p "CURSOR #{pdf.cursor}"
+    end
+  end
 end.render_file filename
 
-`open #{filename}`
+`open #{filename}`

data/elegant.gemspec

@@ -26,6 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'prawn-manual_builder', '~> 0.2.0'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.3'
-  spec.add_development_dependency 'coveralls', '~> 0.8.2'
+  spec.add_development_dependency 'coveralls', '~> 0.8.10'
   spec.add_development_dependency 'pry-nav', '~> 0.2.4'
 end

data/lib/elegant/document.rb

@@ -16,8 +16,8 @@ module Elegant
     #   (a Hash with a :url key with the location of the logo image and
     #    optional :width and :height, which default to 50x50).
     # @option options [Hash] :footer ({}) The options for the footer. Accepted
-    #   values are :text (the text in the bottom-center of the page) and :url
-    #   (to make that text a link to a URL).
+    #   values are :text (the text in the bottom-center of the page which may
+    #   include a link which will be formatted inline).
     # @see http://www.rubydoc.info/gems/prawn/Prawn/Document
     def initialize(options = {}, &block)
       options = options.dup

data/lib/elegant/footer.rb

@@ -5,7 +5,7 @@ module Elegant
 
     def initialize(document, options = {})
       @document = document
-      @text, @url = options.values_at :text, :url
+      @text = options[:text]
     end
 
     # Draws in the header of each page a horizontal line, the name of the
@@ -28,13 +28,12 @@ module Elegant
     end
 
     def render_text
-      text = @url ? "<link href='#{@url}'>#{@text}</link>" : @text
       left = 50
       options = {size: 7, align: :center, valign: :top, inline_format: true}
       options[:at] = [left, -6]
       options[:width] = bounds.width - 2 * left
       options[:height] = 10
-      text_box text, options
+      text_box @text, options
     end
 
     def render_page_number

data/lib/elegant/header.rb

@@ -16,7 +16,7 @@ module Elegant
       repeat(:all) do
         render_watermark
         stroke_horizontal_rule
-        render_logo if @logo
+        render_logo
         render_heading
       end
     end
@@ -44,7 +44,7 @@ module Elegant
     def render_logo
       float do
         render_logo_frame
-        render_logo_image
+        render_logo_image if @logo[:url]
       end if @logo
     end
 
@@ -54,7 +54,13 @@ module Elegant
       height = @logo_height + line_width
       left = bounds.right - width - 0.5 * line_width
       top = bounds.top + 0.5 * height
-      bounding_box([left, top], width: width, height: height) {stroke_bounds}
+      bounding_box([left, top], width: width, height: height) do
+        old_color = self.fill_color
+        fill_color 'FFFFFF'
+        fill_rectangle [0, height], width, height
+        fill_color old_color
+        stroke_bounds
+      end
     end
 
     # Renders the actual image as the logo in the top-right corner.

data/lib/elegant/version.rb

@@ -1,3 +1,3 @@
 module Elegant
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elegant
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - claudiob
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2016-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.10
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: An elegant layout for PDF reports generated in Ruby.