prawn_cocktail 0.7.1 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cb77563957d34bfccd712288a44393dcc250cf7f
-  data.tar.gz: c2ce56312ac0b9ce75fa7e9531ec7b7754d66664
+SHA256:
+  metadata.gz: 61d84eedd5dfe30a88044ffc489cb3045888cdc2d55ce2418ee1f7c1a8069034
+  data.tar.gz: 64c8bf00e8398dbf2f66c545c0c287633104b7fa9087694fb24ad3cabae60a90
 SHA512:
-  metadata.gz: ce20074e919bc258a631287632d816f21d0cc7fa6d2c9cc4097a13b4e16573d121e1c8a836b50afd5dfa08504013c75c6d7ff90b0aed446dc2bbbe794a368f5e
-  data.tar.gz: 055eb84d6c3418f43fe2b400e87044e647211fda697c89acf626e49a5d00d02a3b0180e9a7cebdd4c04f97c0eae1139d1f41ef868c628dd7b6c848fffd381610
+  metadata.gz: 75f3e9779418238920e385563ec5b451e7dfd23d1be4379973ef6ac4f30eebbccdce798cae7a8116c3d33de7a1e8a5a52d093f2e385a39278ebddecf9b4e7824
+  data.tar.gz: be55301fdc96c7cc719a8a5f79b38de2a456c191f668a91fd14f8c24f75424de45712c5ab904e264ddf04b10943cf9a5f90c2e63ce20792c200b9d30ec6d8878

data/.github/workflows/ci.yml

@@ -0,0 +1,26 @@
+name: Ruby CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: ["3.0", "2.7", "2.6", "2.5"]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@ae9cb3b565e36682a2c6045e4f664388da4c73aa
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Run tests
+        run: bundle exec rake

data/.rubocop.yml

@@ -0,0 +1,5 @@
+AllCops:
+  Exclude:
+    - "tmp/**/*"
+inherit_gem:
+  barsoom_utils: shared_rubocop.yml

data/Gemfile

@@ -1,4 +1,9 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in prawn_cocktail.gemspec
 gemspec
+
+group :development do
+  gem "barsoom_utils", github: "barsoom/barsoom_utils"
+  gem "rubocop"
+end

data/README.md

@@ -1,6 +1,6 @@
 # PrawnCocktail
 
-[![Build status](https://secure.travis-ci.org/barsoom/prawn_cocktail.png)](https://travis-ci.org/#!/barsoom/prawn_cocktail/builds)
+[![Ruby CI](https://github.com/barsoom/prawn_cocktail/actions/workflows/ci.yml/badge.svg)](https://github.com/barsoom/prawn_cocktail/actions/workflows/ci.yml)
 
 Simple documents, templates and helpers on top of Prawn.
 
@@ -8,8 +8,6 @@ Because writing Prawn documents PHP 4 style is no fun.
 
 If you're using this with Ruby on Rails, get [`PrawnCocktailRails`](http://github.com/barsoom/prawn_cocktail_rails).
 
-Ruby 1.9 only since we use and love instance\_exec.
-
 ![](http://upload.wikimedia.org/wikipedia/commons/f/f8/Cocktail_1_bg_060702.jpg)
 
 ## Usage

data/Rakefile

@@ -5,4 +5,4 @@ Rake::TestTask.new do |t|
   t.pattern = "spec/*_spec.rb"
 end
 
-task :default => :test
+task default: :test

data/lib/prawn_cocktail/document.rb

@@ -8,7 +8,7 @@ module PrawnCocktail
     self.initializers = []
 
     def self.initialize_template(&block)
-      self.initializers += [block]
+      self.initializers += [ block ]
     end
 
     def self.helper(mod)

data/lib/prawn_cocktail/renderer.rb

@@ -5,13 +5,14 @@ require_relative "utils/recursive_closed_struct"
 module PrawnCocktail
   class Renderer
     def initialize(template_name, data, initializers)
+      @prawn_document_options = {}
       @template_name = template_name
       @data = data
       @initializers = initializers
     end
 
     def meta(opts)
-      @prawn_document_options = opts
+      @prawn_document_options.merge!(opts)
     end
 
     def content(&block)

data/lib/prawn_cocktail/utils/recursive_closed_struct.rb

@@ -3,8 +3,8 @@ class RecursiveClosedStruct
     @hash = hash
   end
 
-  def has_key?(key)
-    @hash.has_key? key
+  def include?(key)
+    @hash.include?(key)
   end
 
   def method_missing(name, *)

data/lib/prawn_cocktail/version.rb

@@ -1,3 +1,3 @@
 module PrawnCocktail
-  VERSION = "0.7.1"
+  VERSION = "0.8.1"
 end

data/prawn_cocktail.gemspec

@@ -1,20 +1,21 @@
 # -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'prawn_cocktail/version'
+require "prawn_cocktail/version"
 
 Gem::Specification.new do |gem|
   gem.name          = "prawn_cocktail"
   gem.version       = PrawnCocktail::VERSION
-  gem.authors       = ["Henrik Nyh"]
-  gem.email         = ["henrik@barsoom.se"]
+  gem.authors       = [ "Henrik Nyh" ]
+  gem.email         = [ "henrik@barsoom.se" ]
   gem.summary       = "Simple documents, templates and helpers on top of Prawn."
   gem.homepage      = ""
+  gem.metadata      = { "rubygems_mfa_required" => "true" }
+
 
   gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.require_paths = [ "lib" ]
 
   gem.add_dependency "prawn"
   gem.add_dependency "activesupport"

data/spec/integration_spec.rb

@@ -15,7 +15,7 @@ describe PrawnCocktail do
     it "has the right contents" do
       assert_equal(
         [ "Init works.", "Test document", "Status: success" ],
-        parse_strings(data)
+        parse_strings(data),
       )
     end
 
@@ -33,7 +33,7 @@ describe PrawnCocktail do
     it "has the right contents" do
       assert_equal(
         [ "Init works.", "Test document", "Status: success" ],
-        parse_strings(data)
+        parse_strings(data),
       )
     end
 
@@ -50,7 +50,7 @@ describe PrawnCocktail do
     it "inherits initializers and helpers" do
       assert_equal(
         [ "Init works.", "Sub-init works.", "Sub test document", "Status: success" ],
-        parse_strings(data)
+        parse_strings(data),
       )
     end
   end
@@ -65,5 +65,5 @@ def parse_geometry(pdf_data)
 end
 
 def expected_geometry(name)
-  Prawn::Document::PageGeometry::SIZES[name]
+  PDF::Core::PageGeometry::SIZES[name]
 end

data/spec/recursive_closed_struct_spec.rb

@@ -17,25 +17,25 @@ describe RecursiveClosedStruct do
 
   it "recurses through hashes" do
     subject = RecursiveClosedStruct.new({
-      one: { two: { three: "four" } }
+      one: { two: { three: "four" } },
     })
     assert_equal "four", subject.one.two.three
   end
 
+  describe "#include?" do
+    it "is true if that key exists" do
+      subject = RecursiveClosedStruct.new(real: true)
+      assert subject.include?(:real)
+    end
 
-  it "lets a user check if the key exists without throwing an error" do
-    subject = RecursiveClosedStruct.new({
-      real: true
-    })
-
-    assert subject.has_key?(:real)
-  end
-
-  it "lets a user check if the key does not exist without throwing an error" do
-    subject = RecursiveClosedStruct.new({
-      real: true
-    })
+    it "is false if that key does not exist" do
+      subject = RecursiveClosedStruct.new(real: true)
+      refute subject.include?(:imaginary)
+    end
 
-    refute subject.has_key?(:imaginary)
+    it "recurses" do
+      subject = RecursiveClosedStruct.new(one: { two: "three" })
+      assert subject.one.include?(:two)
+    end
   end
 end

data/spec/renderer_spec.rb

@@ -0,0 +1,14 @@
+require_relative "spec_helper"
+
+describe PrawnCocktail::Renderer do
+  describe "#meta" do
+    it "merges options if run multiple times" do
+      subject = PrawnCocktail::Renderer.new(nil, nil, nil)
+      subject.meta one: nil, two: 2
+      subject.meta one: 1, three: 3
+
+      expected = { one: 1, two: 2, three: 3 }
+      assert_equal expected, subject.send(:prawn_document_options)
+    end
+  end
+end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: prawn_cocktail
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.1
 platform: ruby
 authors:
 - Henrik Nyh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2021-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pdf-inspector
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -73,8 +73,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".github/workflows/ci.yml"
+- ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -91,27 +92,28 @@ files:
 - spec/fixtures/test_document.pdf.rb
 - spec/integration_spec.rb
 - spec/recursive_closed_struct_spec.rb
+- spec/renderer_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 3.2.31
 signing_key: 
 specification_version: 4
 summary: Simple documents, templates and helpers on top of Prawn.
@@ -121,5 +123,5 @@ test_files:
 - spec/fixtures/test_document.pdf.rb
 - spec/integration_spec.rb
 - spec/recursive_closed_struct_spec.rb
+- spec/renderer_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/.travis.yml

@@ -1,5 +0,0 @@
-language: ruby
-rvm:
-  - 2.0.0
-  - 1.9.3
-  - rbx-19mode