thinreports 0.13.1 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46a5ac716f23028a34055ed5812d6d9704585857378aba29d419144b1657320d
-  data.tar.gz: c6cbc734f42cc6b4b0ddc7b7c6443b8f0cf70461e3d03cb200b7146724967725
+  metadata.gz: 0233a79937eb8039a999b9711cef50a013311af86dd0ccde5ce94559af172235
+  data.tar.gz: 818dab5e4f71506ed895b2480dddfab7df13d042500322b14d68258af1cfaba8
 SHA512:
-  metadata.gz: 519eb3ef5e2c2aea6675cadc19bad8bad476244d5cb72248edeecc9f197c74fbf16e053cc4f0cdc7590c2b26ea480cb2fec5b4b6596635b8cac2d7e2a1e35b4e
-  data.tar.gz: 463c5c6db3e308891cba03f393a1e95ec2df9a6e3a6f9c5cc59b7cde79f1fd81e4b6e40adf6b98ce5f562325b5a7be3f0899bfd37d0ae3ec04373c217409acd8
+  metadata.gz: 0b1a8a8d67828b3fc901d831cc6087b3dccfbc7b120578a8118ae210d782e6064d80406665e5c0911222cf81ee059692235350cde6f3bcad27bd55d27a2f921f
+  data.tar.gz: 8600a21f94a6851e4281c09ff4f3a0eab2db5977f5fa6100770ba6d35e6e29ad46364b0f523298d144d5e4f5006d4349c1af5b1bdaa0d88aef8bfd1926ec52d6

data/.github/workflows/test.yml

@@ -1,6 +1,9 @@
 name: Test
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [ main, dev ]
+  pull_request:
 
 jobs:
   setup:
@@ -8,16 +11,13 @@ jobs:
 
     runs-on: ubuntu-latest
 
-    # Run this build only on either pull request or push.
-    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
-
     strategy:
       matrix:
         ruby:
-          - "2.7"
           - "3.0"
           - "3.1"
           - "3.2"
+          - "3.3"
 
     steps:
       - uses: actions/checkout@v4

data/CHANGELOG.md

@@ -1,8 +1,24 @@
 ## main (Unreleased)
 
+## 0.14.1
+
+Enhancements:
+
+* Add overflow-wrap option #129
+
+## 0.14.0
+
+Breaking Changes:
+
+* Drop Ruby 2.7 support
+
+Bug Fixes:
+
+* Fix LoadError: cannot load such file -- matrix #131
+
 ## 0.13.1
 
-Bug fixes:
+Bug Fixes:
 
  * allow title argument to be specified in Report.generate method #127
 

data/Gemfile

@@ -9,7 +9,6 @@ gem 'rake'
 gem 'minitest'
 gem 'mocha'
 gem 'pdf-inspector'
-gem 'matrix'
 gem 'pdf_matcher-testing'
 
 # suppress warning: assigned but unused variable - y1

data/README.md

@@ -9,7 +9,7 @@ A Ruby library for [Thinreports](https://github.com/thinreports/thinreports).
 
 ### Supported Versions
 
-- Ruby 2.7, 3.0, 3.1, 3.2
+- Ruby 3.0, 3.1, 3.2, 3.3
 - Prawn 2.4+
 
 ## Installation

data/lib/thinreports/basic_report/generator/pdf/document/graphics/attributes.rb

@@ -25,6 +25,8 @@ module Thinreports
           # @yieldparam [Hash] attrs
           # @return [Hash]
           def build_text_attributes(style, &block)
+            word_wrap = word_wrap(style['word-wrap'])
+
             text_attributes = {
               font: font_family(style['font-family']),
               size: style['font-size'],
@@ -35,12 +37,32 @@ module Thinreports
               letter_spacing: letter_spacing(style['letter-spacing']),
               line_height: line_height(style['line-height']),
               overflow: text_overflow(style['overflow']),
-              word_wrap: word_wrap(style['word-wrap'])
+              word_wrap: word_wrap,
+              # Deprecated: Use overflow_wrap instead of word_wrap
+              overflow_wrap: overflow_wrap(style['overflow-wrap'], word_wrap)
             }
             block.call(text_attributes) if block_given?
             text_attributes
           end
 
+          def overflow_wrap(style, computed_word_wrap)
+            case style || migrate_overflow_wrap_from_word_wrap(computed_word_wrap)
+            when 'normal', nil then :normal
+            when 'anywhere' then :anywhere
+            # Deprecated: This is a temporary value for migrating from word_wrap.
+            when 'disable-break-word-by-space' then :disable_break_word_by_space
+            else :normal
+            end
+          end
+
+          def migrate_overflow_wrap_from_word_wrap(computed_word_wrap)
+            case computed_word_wrap
+            when :none then 'disable-break-word-by-space'
+            when :break_word then 'normal'
+            else raise ArgumentError, 'Invalid computed word_wrap value'
+            end
+          end
+
           # @param [Array<String>] font_names
           # @return [String]
           def font_family(font_names)

data/lib/thinreports/basic_report/generator/pdf/document/graphics/text.rb

@@ -23,6 +23,7 @@ module Thinreports
           # @option attrs [Boolean] :single (false)
           # @option attrs [:trancate, :shrink_to_fit, :expand] :overflow (:trancate)
           # @option attrs [:none, :break_word] :word_wrap (:none)
+          # @option attrs [:normal, :anywhere, :disable_break_word_by_space] :overflow_wrap (:normal)
           def text_box(content, x, y, w, h, attrs = {}, &block)
             w, h = s2f(w, h)
 
@@ -32,8 +33,7 @@ module Thinreports
               overflow: attrs[:overflow]
             )
 
-            # Do not break by word unless :word_wrap is :break_word
-            content = text_without_line_wrap(content) if attrs[:word_wrap] == :none
+            content = replace_space_to_nbsp(content) if attrs[:overflow_wrap] == :disable_break_word_by_space
 
             with_text_styles(attrs) do |built_attrs, font_styles|
               if block
@@ -112,6 +112,12 @@ module Thinreports
             spacing = attrs.delete(:letter_spacing)
             attrs[:character_spacing] = s2f(spacing) if spacing
 
+            # Disable line breaking on chars such as spaces and hyphens
+            attrs[:disable_word_break] = true if attrs.delete(:overflow_wrap) == :anywhere
+
+            # Delete unnecessary attributes
+            attrs.delete(:word_wrap)
+
             # Or... with_font_styles(attrs, fontinfo, &block)
             with_font_styles(attrs, fontinfo) do |modified_attrs, styles|
               block.call(modified_attrs, styles)
@@ -131,7 +137,7 @@ module Thinreports
 
           # @param [String] content
           # @return [String]
-          def text_without_line_wrap(content)
+          def replace_space_to_nbsp(content)
             content.gsub(/ /, Prawn::Text::NBSP)
           end
 

data/lib/thinreports/basic_report/generator/pdf.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 require 'prawn'
+require 'prawn/disable_word_break'
+
+Prawn::DisableWordBreak.config.default = false
 
 module Thinreports
   module BasicReport

data/lib/thinreports/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Thinreports
-  VERSION = '0.13.1'
+  VERSION = '0.14.1'
 end

data/thinreports.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
   s.metadata    = { 'rubygems_mfa_required' => 'true' }
 
-  s.required_ruby_version = '>= 2.7.0'
+  s.required_ruby_version = Gem::Requirement.new('>= 3.0.0')
 
   s.files = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^test/}) }
@@ -23,5 +23,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_dependency 'prawn', '>= 2.4.0'
+  s.add_dependency 'matrix', '~> 0.4'
+  s.add_dependency 'prawn-disable_word_break', '>= 2.3.1'
   s.add_dependency 'rexml'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thinreports
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.1
 platform: ruby
 authors:
 - Matsukei Co.,Ltd.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-10 00:00:00.000000000 Z
+date: 2023-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: matrix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: prawn-disable_word_break
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="