thinreports 0.14.0 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca00a89102c8683e9d93b0b9589cdbe9b4ad7d86105de73d22f3de41997d0fa6
-  data.tar.gz: da3ee5c69c8b74612e18fa22d90e9ae7217111b5847f65f6e89f1f3683cef5f2
+  metadata.gz: ebb86fe29d4b90b28de900ba96c3088d5ef6a6f3526568d6e2fa4d2546b3102a
+  data.tar.gz: 63b04f6253b6c346a9cb9e7455c1fc9df507548354406a4fc7b380a97da7f2cd
 SHA512:
-  metadata.gz: df0b7b69c44692865e67a2c0a59d4c4620aa88b560ad8d9bd0d6a7005af1d881b49118d76fb63e2e7e51844a882b005c6a53fe9676fe7f5e7a3bb5b2d3b948e6
-  data.tar.gz: 596814b3d23e600193748ff728ff24e065696661ae3b1104b924516fd1bfa1fb28a79b5d0a341605c3dda0c132d46c2b62770ef3a249312204b90a542a326358
+  metadata.gz: b04fb4c22e8f09fbd563f15bdd259cf4f9819da1a4d9c339b3885805c18aa6b389d0f2b1bee3eda7b5efb0eb55e33a2efdf234cfbfb2b77002da52bb5e57e069
+  data.tar.gz: 935590d3f281ebcda264bb4f0e01d362d663b882256decc37f57492d3a10701e034cfaff71f667164baa4cbd3ecbf3032f8b525e1a7d525568c1d9b0131f7569

data/.github/workflows/test.yml

@@ -2,7 +2,9 @@ name: Test
 
 on:
   push:
-    branches: [ main, dev ]
+    branches:
+      - main
+      - "dev**"
   pull_request:
 
 jobs:
@@ -17,6 +19,7 @@ jobs:
           - "3.0"
           - "3.1"
           - "3.2"
+          - "3.3"
 
     steps:
       - uses: actions/checkout@v4

data/CHANGELOG.md

@@ -1,13 +1,31 @@
 ## main (Unreleased)
 
+## 0.14.2
+
+Changes:
+
+* Add base64 and bigdecimal to the gemspec #133
+* Remove matrix gem version constraint
+
+## 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/README.md

@@ -9,7 +9,7 @@ A Ruby library for [Thinreports](https://github.com/thinreports/thinreports).
 
 ### Supported Versions
 
-- Ruby 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.14.0'
+  VERSION = '0.14.2'
 end

data/thinreports.gemspec

@@ -23,6 +23,9 @@ 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 'base64'
+  s.add_dependency 'bigdecimal'
+  s.add_dependency 'matrix'
   s.add_dependency 'rexml'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thinreports
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.2
 platform: ruby
 authors:
 - Matsukei Co.,Ltd.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-30 00:00:00.000000000 Z
+date: 2024-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -24,20 +24,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.0
+- !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: base64
+  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: bigdecimal
+  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: matrix
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement