prawn_cocktail 0.5.1 → 0.5.3

data/lib/prawn_cocktail/document.rb

@@ -6,6 +6,17 @@ require_relative "renderer"
 
 module PrawnCocktail
   class Document
+    class_attribute :doc_initializers
+    self.doc_initializers ||= []
+
+    def self.initialize_document(&block)
+      self.doc_initializers << block
+    end
+
+    def self.helper(mod)
+      initialize_document { extend mod }
+    end
+
     def render
       renderer.render_data
     end
@@ -16,27 +27,22 @@ module PrawnCocktail
 
     def filename
       # Override in your subclass.
+      nil
     end
 
     private
 
     def renderer
-      @renderer ||= Renderer.new(template, data, self.class.doc_initializers)
+      @renderer ||= Renderer.new(template_name, data, self.class.doc_initializers)
     end
 
-    def template
+    def template_name
       self.class.name.underscore
     end
 
-    class_attribute :doc_initializers
-    self.doc_initializers ||= []
-
-    def self.initialize_document(&block)
-      self.doc_initializers << block
-    end
-
-    def self.helper(mod)
-      initialize_document { extend mod }
+    def data
+      # Override in your subclass.
+      {}
     end
   end
 end

data/lib/prawn_cocktail/renderer.rb

@@ -1,7 +1,9 @@
+require_relative "template"
+
 module PrawnCocktail
   class Renderer
-    def initialize(template, data, doc_initializers)
-      @template = template
+    def initialize(template_name, data, doc_initializers)
+      @template_name = template_name
       @data = data
       @doc_initializers = doc_initializers
     end
@@ -12,46 +14,34 @@ module PrawnCocktail
 
     def content(&block)
       @doc_initializers.each do |proc|
-        doc.instance_eval(&proc)
+        prawn_document.instance_eval(&proc)
       end
 
-      doc.instance_exec(data_object, &block)
+      prawn_document.instance_exec(data_object, &block)
     end
 
     def render_data
-      render
-      doc.render
+      apply_template
+      prawn_document.render
     end
 
     def render_file(file)
-      render
-      doc.render_file(file)
+      apply_template
+      prawn_document.render_file(file)
     end
 
     private
 
-    def render
-      instance_eval(read_template, template_path)
+    def apply_template
+      Template.new(@template_name).apply(self)
     end
 
-    def doc
+    def prawn_document
       @doc ||= Prawn::Document.new(@prawn_document_options || {})
     end
 
     def data_object
       OpenStruct.new(@data)
     end
-
-    def read_template
-      File.read(template_path)
-    end
-
-    def template_path
-      File.join(template_root, "#{@template}.pdf.rb")
-    end
-
-    def template_root
-      PrawnCocktail.template_root
-    end
   end
 end

data/lib/prawn_cocktail/template.rb

@@ -0,0 +1,25 @@
+module PrawnCocktail
+  class Template
+    def initialize(name)
+      @name = name
+    end
+
+    def apply(context)
+      context.instance_eval(read_template, template_path)
+    end
+
+    private
+
+    def read_template
+      File.read(template_path)
+    end
+
+    def template_path
+      File.join(template_root, "#{@name}.pdf.rb")
+    end
+
+    def template_root
+      PrawnCocktail.template_root
+    end
+  end
+end

data/lib/prawn_cocktail/version.rb

@@ -1,3 +1,3 @@
 module PrawnCocktail
-  VERSION = "0.5.1"
+  VERSION = "0.5.3"
 end

data/spec/integration_spec.rb

@@ -8,28 +8,44 @@ PrawnCocktail.template_root = "spec/fixtures"
 require_relative "fixtures/document"
 
 describe PrawnCocktail do
+  let(:data) do
+    TestDocument.new("success").render
+  end
+
   describe "#render" do
-    it "works" do
-      data = TestDocument.new("success").render
-      assert_test_document data
+    it "has the right contents" do
+      assert_document_has_the_right_contents
+    end
+
+    it "has the right geometry" do
+      assert_document_has_the_right_geometry
     end
   end
 
   describe "#render_file" do
-    it "works" do
+    let(:data) do
       TestDocument.new("success").render_file("/tmp/test_document.pdf")
-      data = File.read("/tmp/test_document.pdf")
-      assert_test_document data
+      File.read("/tmp/test_document.pdf")
+    end
+
+    it "has the right contents" do
+      assert_document_has_the_right_contents
+    end
+
+    it "has the right geometry" do
+      assert_document_has_the_right_geometry
     end
   end
 end
 
-def assert_test_document(data)
+def assert_document_has_the_right_contents
   assert_equal(
     [ "Init works.", "Test document", "Status: success" ],
     parse_strings(data)
   )
+end
 
+def assert_document_has_the_right_geometry
   assert_equal(
     parse_geometry(data),
     expected_geometry("A4")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prawn_cocktail
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
-  requirement: &70216788921060 !ruby/object:Gem::Requirement
+  requirement: &70204700961000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70216788921060
+  version_requirements: *70204700961000
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70216788920580 !ruby/object:Gem::Requirement
+  requirement: &70204700960520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70216788920580
+  version_requirements: *70204700960520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70216776430360 !ruby/object:Gem::Requirement
+  requirement: &70204700774940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70216776430360
+  version_requirements: *70204700774940
 - !ruby/object:Gem::Dependency
   name: pdf-inspector
-  requirement: &70216776429880 !ruby/object:Gem::Requirement
+  requirement: &70204700774460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70216776429880
+  version_requirements: *70204700774460
 description: 
 email:
 - henrik@barsoom.se
@@ -71,6 +71,7 @@ files:
 - lib/prawn_cocktail/configuration.rb
 - lib/prawn_cocktail/document.rb
 - lib/prawn_cocktail/renderer.rb
+- lib/prawn_cocktail/template.rb
 - lib/prawn_cocktail/version.rb
 - prawn_cocktail.gemspec
 - spec/fixtures/document.rb