thinreports 0.10.3 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ff5ca20b68e3f8f628676d7be5d77c1da4e9aa4520a7eac0cc7bdfe13fe2a5b
-  data.tar.gz: de2899e1abdde8986add98d6458721cd88fd7c8f6a795db0b8dac2f086a116a6
+  metadata.gz: b53f36fac9af329499239b3db9313911fba89c82dd28cf81ac2e9942bcdce13a
+  data.tar.gz: 38ce4e9d25a709240a1242948a33d96372e3cb6981b07e3121c88967279a3eed
 SHA512:
-  metadata.gz: 03bbb8f4fc1a39ab33e91e5afc32622ecd10873053324cd8c097fd0b7ec97b01c56df746fb6a8ee26009cb0fa4e695c73b8557fdf9f092655bb8eaf8b7493c59
-  data.tar.gz: 6904f289cf0585ad814e4e127ce2623439fbcf25d7dbaf4cc7faa2246b8811d085cf5e3e08d17bd244f97cb90643aec1e270fd32bad0d6d262c0f6691f4c8426
+  metadata.gz: 5db1f93781fd6be18f53424eb2853b6701449938f2dc2875f287be74720611361f5dc7b6f657ea9fd96ed83de8056efa92cd4ae7b5b8c0df3d11bb318a81f7d6
+  data.tar.gz: 25d1cc37589223ea85f574f7c6cf007a9e5682dff6f59051286c3fe691b5ab9704d9c5e40e8b3b9b49134406af538aa4e688a74d5416aa1082f6bc1330de173a

data/.github/workflows/test.yml

@@ -0,0 +1,39 @@
+name: Test
+
+on: push
+
+jobs:
+  test:
+    name: Test against ${{ matrix.ruby }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby:
+          - 2.4
+          - 2.5
+          - 2.6
+          - 2.7
+          - jruby
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Set up diff-pdf
+      run: |
+        sudo apt-get update
+        sudo apt-get install make automake g++ libpoppler-glib-dev poppler-utils libwxgtk3.0-dev
+        git clone https://github.com/vslavik/diff-pdf.git -b v0.4.1 --depth 1 /tmp/diff-pdf-src
+        cd /tmp/diff-pdf-src
+        ./bootstrap && ./configure && make && sudo make install
+
+    - name: Set up Ruby ${{ matrix.ruby }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+
+    - name: Build and test with Rake
+      run: |
+        gem install bundler
+        bundle install --jobs 4 --retry 3
+        bundle exec rake test:units
+        bundle exec rake test:features

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## master
+
+## 0.11.0
+
+Breaking Changes:
+
+ * Dropped Ruby 2.1 support
+ * Dropped Ruby 2.2 support
+ * Dropped Ruby 2.3 support
+ * Formatter of a text-block works even with multiple-line (#95)
+
+Enhancements:
+
+ * Ruby 2.7.0 support
+ * Support Pathname layout option on `Thinreports::Report` #99 [@meganemura]
+
+Bug Fixes:
+
+ * Fixed: thousands separation is applied to decimal part #95
+
 ## 0.10.3
 
 Bug Fixes:

data/Dockerfile

@@ -0,0 +1,12 @@
+FROM ruby:2.7.1
+
+RUN apt-get update -qq && apt-get install -y build-essential xvfb
+
+# Install diff-pdf
+WORKDIR /tmp
+RUN apt-get install -y libpoppler-glib-dev poppler-utils libwxgtk3.0-dev && curl -L https://github.com/vslavik/diff-pdf/archive/master.tar.gz -o diff-pdf-master.tar.gz && tar zxf diff-pdf-master.tar.gz && cd diff-pdf-master && ./bootstrap && ./configure && make && make install
+
+RUN mkdir /thinreports
+
+WORKDIR /thinreports
+VOLUME /thinreports

data/Gemfile

@@ -3,3 +3,8 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'minitest', '>= 5.14.1'
+gem 'mocha', '>= 1.11.2'
+gem 'pdf-inspector', '>= 1.3.0'
+gem 'rake', '>= 13.0.1'

data/README.md

@@ -1,7 +1,7 @@
 # Thinreports Generator
 
 [![Gem Version](https://badge.fury.io/rb/thinreports.svg)](http://badge.fury.io/rb/thinreports)
-[![](http://img.shields.io/travis/thinreports/thinreports-generator.svg?style=flat)](http://travis-ci.org/thinreports/thinreports-generator)
+[![Test](https://github.com/thinreports/thinreports-generator/workflows/Test/badge.svg)](https://github.com/thinreports/thinreports-generator/actions)
 [![Maintainability](https://api.codeclimate.com/v1/badges/054b400031608957ec4a/maintainability)](https://codeclimate.com/github/thinreports/thinreports-generator/maintainability)
 
 [Thinreports](http://www.thinreports.org) is an open source report generating tool for Ruby.
@@ -14,13 +14,12 @@
   * [Installation Guide](http://www.thinreports.org/documentation/getting-started/installation.html)
   * [Quick Start Guide](http://www.thinreports.org/documentation/getting-started/quickstart.html)
   * [Examples](https://github.com/thinreports/thinreports-examples)
-  * [Rails5 Example](https://github.com/thinreports/thinreports-rails5-example)
   * [Changelog](https://github.com/thinreports/thinreports-generator/blob/master/CHANGELOG.md)
   * [Discussion Group](https://groups.google.com/forum/#!forum/thinreports)
 
 ## Supported versions
 
-  * Ruby 2.1, 2.2, 2.3, 2.4, 2.5
+  * Ruby 2.4, 2.5, 2.6, 2.7
   * JRuby 9.2
 
 ## Quick Reference
@@ -261,19 +260,44 @@ Generator can dynamically:
 
 ## Contributing
 
-### Report bug, post your suggestion
+Bug reports and pull requests are welcome on GitHub at https://github.com/thinreports/thinreports-generator.
 
-If you find bugs or improvements for the Editor, please report it [here](https://github.com/thinreports/thinreports-generator/issues/new).
+## Development
 
-### Sending a Pull Request
+### How to run feature tests
 
-  1. Fork it
-  2. Clone your forked repository
-  3. Create your feature branch: `git checkout -b my-new-feature`
-  4. Fix your feature
-  5. Commit your changes: `git commit -am 'Fixed some bugs or features'`
-  6. Push to the branch: `git push origin my-new-feature`
-  7. Create new Pull Request
+```
+$ bundle exec rake test:features
+```
+
+In order to run `test:features`, you need to install [diff-pdf](https://github.com/vslavik/diff-pdf) in your environment, or you can run test in the docker container as below.
+
+### How to develop in Docker container
+
+You can use the Docker container for development. This container contains the libraries required for testing, such as diff-pdf.
+
+```
+$ docker build -t thinreports-dev .
+$ docker run -v $PWD:/thinreports:cached -it thinreports-dev bash
+
+> /thinreports#
+```
+
+You can run test:
+
+```
+> /thinreports# bundle install
+> /thinreports# bundle exec rake test:features
+```
+
+## Releasing Generator
+
+1. Update the version number in `version.rb`
+2. Update `CHANGELOG.md` and `README.md` (if needed)
+3. Create the Release PR like #105
+4. Merge the PR
+5. Is the master CI green? If not, make it green
+6. Run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to rubygems.org
 
 ## License
 

data/Rakefile

@@ -1,3 +1,4 @@
+require 'bundler/gem_tasks'
 require 'rake/testtask'
 
 task default: :test

data/lib/thinreports/core/shape/image_block.rb

@@ -4,7 +4,7 @@ module Thinreports
   module Core
     module Shape
       module ImageBlock
-        TYPE_NAME = 'image-block'.freeze
+        TYPE_NAME = 'image-block'
       end
     end
   end

data/lib/thinreports/core/shape/list.rb

@@ -4,7 +4,7 @@ module Thinreports
   module Core
     module Shape
       module List
-        TYPE_NAME = 'list'.freeze
+        TYPE_NAME = 'list'
       end
     end
   end

data/lib/thinreports/core/shape/page_number.rb

@@ -4,7 +4,7 @@ module Thinreports
   module Core
     module Shape
       module PageNumber
-        TYPE_NAME = 'page-number'.freeze
+        TYPE_NAME = 'page-number'
       end
     end
   end

data/lib/thinreports/core/shape/text.rb

@@ -4,7 +4,7 @@ module Thinreports
   module Core
     module Shape
       module Text
-        TYPE_NAME = 'text'.freeze
+        TYPE_NAME = 'text'
       end
     end
   end

data/lib/thinreports/core/shape/text_block.rb

@@ -4,7 +4,7 @@ module Thinreports
   module Core
     module Shape
       module TextBlock
-        TYPE_NAME = 'text-block'.freeze
+        TYPE_NAME = 'text-block'
       end
     end
   end

data/lib/thinreports/core/shape/text_block/formatter/number.rb

@@ -35,7 +35,12 @@ module Thinreports
             end
 
             def number_with_delimiter(value, delimiter = ',')
-              value.to_s.gsub(/(\d)(?=(\d{3})+(?!\d))/) { "#{$1}#{delimiter}" }
+              value_int, value_float = value.to_s.split('.')
+
+              [
+                value_int.gsub(/(\d)(?=(\d{3})+(?!\d))/) { "#{$1}#{delimiter}" },
+                value_float
+              ].compact.join('.')
             end
 
             def number_with_precision(value, precision = 3)

data/lib/thinreports/core/shape/text_block/internal.rb

@@ -50,8 +50,6 @@ module Thinreports
           end
 
           def format_enabled?
-            return false if multiple?
-
             if states.key?(:format_enabled)
               states[:format_enabled]
             else

data/lib/thinreports/generator/pdf/prawn_ext/width_of.rb

@@ -4,6 +4,12 @@ module Thinreports
   module Generator
     module PrawnExt
       module WidthOf
+        # TODO: Remove this path when a version of prawn that includes the following PR is released:
+        # https://github.com/prawnpdf/prawn/pull/1117
+        #
+        # This PR makes this patch unnecessary.
+        #
+        #
         # Subtract the width of one character space from the string width calculation result.
         #
         # The original Prawn::Document#width_of returns the following result:

data/lib/thinreports/layout/base.rb

@@ -3,7 +3,7 @@
 module Thinreports
   module Layout
     class Base
-      EXT_NAME = 'tlf'.freeze
+      EXT_NAME = 'tlf'
       include Utils
 
       class << self

data/lib/thinreports/layout/version.rb

@@ -4,7 +4,7 @@ module Thinreports
   module Layout
     class Version
       COMPATIBLE_RULES = ['>= 0.8.0', '< 1.0.0'].freeze
-      NEW_SCHEMA_FROM = '0.9.0'.freeze
+      NEW_SCHEMA_FROM = '0.9.0'
 
       class << self
         def compatible_rules

data/lib/thinreports/report/internal.rb

@@ -96,6 +96,8 @@ module Thinreports
       end
 
       def init_layout(filename, id = nil)
+        filename = filename.to_path if filename.is_a?(Pathname)
+
         Thinreports::Layout.new(filename, id: id)
       end
     end

data/lib/thinreports/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Thinreports
-  VERSION = '0.10.3'.freeze
+  VERSION = '0.11.0'
 end

data/thinreports.gemspec

@@ -14,16 +14,12 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://www.thinreports.org'
   s.license     = 'MIT'
 
-  s.required_ruby_version = '>= 2.1.0'
+  s.required_ruby_version = '>= 2.4.0'
 
-  s.files = `git ls-files`.split($\)
-  s.require_path = 'lib'
+  s.files = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^test/}) }
+  end
+  s.require_paths = ['lib']
 
   s.add_dependency 'prawn', '~> 2.2.0'
-
-  s.add_development_dependency 'bundler', '>= 1.0.0'
-  s.add_development_dependency 'minitest', '>= 5.0.0'
-  s.add_development_dependency 'mocha', '>= 0'
-  s.add_development_dependency 'pdf-inspector', '>= 0'
-  s.add_development_dependency 'rake', '>= 0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thinreports
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.11.0
 platform: ruby
 authors:
 - Matsukei Co.,Ltd.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-17 00:00:00.000000000 Z
+date: 2020-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -24,76 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0
-- !ruby/object:Gem::Dependency
-  name: mocha
-  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'
-- !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'
 description: Thinreports is an open source report generation tool for Ruby.
 email: thinreports@gmail.com
 executables: []
@@ -101,9 +31,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/CONTRIBUTING.md"
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
+- Dockerfile
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -196,134 +127,6 @@ files:
 - lib/thinreports/report/internal.rb
 - lib/thinreports/report/page.rb
 - lib/thinreports/version.rb
-- test/data/font.ttf
-- test/data/image_normal.jpg
-- test/data/image_normal.png
-- test/data/image_normal_jpg_noext
-- test/data/image_normal_png_noext
-- test/data/image_pallete_based.png
-- test/data/legacy_layout/all-items.tlf
-- test/features/dynamic_style/expect.pdf
-- test/features/dynamic_style/image.png
-- test/features/dynamic_style/templates/styles.tlf
-- test/features/dynamic_style/templates/styles_in_list.tlf
-- test/features/dynamic_style/test_dynamic_style.rb
-- test/features/eudc/eudc.ttf
-- test/features/eudc/expect.pdf
-- test/features/eudc/template.tlf
-- test/features/eudc/test_eudc.rb
-- test/features/feature_test.rb
-- test/features/graphics/expect.pdf
-- test/features/graphics/template.tlf
-- test/features/graphics/test_graphics.rb
-- test/features/hidden_item/expect.pdf
-- test/features/hidden_item/template.tlf
-- test/features/hidden_item/test_hidden_item.rb
-- test/features/image_block/expect.pdf
-- test/features/image_block/img200x100.png
-- test/features/image_block/img50x50.png
-- test/features/image_block/template.tlf
-- test/features/image_block/test_image_block.rb
-- test/features/list_events/expect.pdf
-- test/features/list_events/template.tlf
-- test/features/list_events/test_list_events.rb
-- test/features/list_manually/expect.pdf
-- test/features/list_manually/template.tlf
-- test/features/list_manually/test_list_manually.rb
-- test/features/page_number/expect.pdf
-- test/features/page_number/template.tlf
-- test/features/page_number/test_page_number.rb
-- test/features/page_number_with_list/expect.pdf
-- test/features/page_number_with_list/template.tlf
-- test/features/page_number_with_list/test_page_number_with_list.rb
-- test/features/palleted_png/expect.pdf
-- test/features/palleted_png/palleted_png.png
-- test/features/palleted_png/template.tlf
-- test/features/palleted_png/test_palleted_png.rb
-- test/features/report_callbacks/expect.pdf
-- test/features/report_callbacks/template.tlf
-- test/features/report_callbacks/test_report_callbacks.rb
-- test/features/text_align/expect.pdf
-- test/features/text_align/template.tlf
-- test/features/text_align/test_text_align.rb
-- test/features/text_block_overflow/expect.pdf
-- test/features/text_block_overflow/template.tlf
-- test/features/text_block_overflow/test_text_block_overflow.rb
-- test/features/text_block_singleline/expect.pdf
-- test/features/text_block_singleline/template.tlf
-- test/features/text_block_singleline/test_text_block_singleline.rb
-- test/features/text_block_style/expect.pdf
-- test/features/text_block_style/templates/basic_styles.tlf
-- test/features/text_block_style/templates/font_size.tlf
-- test/features/text_block_style/test_text_block_style.rb
-- test/features/text_character_spacing/expect.pdf
-- test/features/text_character_spacing/template.tlf
-- test/features/text_character_spacing/test_text_character_spacing.rb
-- test/features/text_word_wrap/expect.pdf
-- test/features/text_word_wrap/template.tlf
-- test/features/text_word_wrap/test_text_word_wrap.rb
-- test/schema_helper.rb
-- test/test_helper.rb
-- test/units/core/format/test_base.rb
-- test/units/core/shape/base/test_internal.rb
-- test/units/core/shape/basic/test_block_format.rb
-- test/units/core/shape/basic/test_block_interface.rb
-- test/units/core/shape/basic/test_block_internal.rb
-- test/units/core/shape/basic/test_format.rb
-- test/units/core/shape/basic/test_interface.rb
-- test/units/core/shape/basic/test_internal.rb
-- test/units/core/shape/image_block/test_interface.rb
-- test/units/core/shape/image_block/test_internal.rb
-- test/units/core/shape/list/test_format.rb
-- test/units/core/shape/list/test_manager.rb
-- test/units/core/shape/list/test_page.rb
-- test/units/core/shape/list/test_page_state.rb
-- test/units/core/shape/list/test_section_format.rb
-- test/units/core/shape/list/test_section_interface.rb
-- test/units/core/shape/list/test_section_internal.rb
-- test/units/core/shape/manager/test_format.rb
-- test/units/core/shape/manager/test_internal.rb
-- test/units/core/shape/manager/test_target.rb
-- test/units/core/shape/page_number/test_format.rb
-- test/units/core/shape/page_number/test_interface.rb
-- test/units/core/shape/page_number/test_internal.rb
-- test/units/core/shape/styles/test_base.rb
-- test/units/core/shape/styles/test_basic.rb
-- test/units/core/shape/styles/test_graphic.rb
-- test/units/core/shape/styles/test_text.rb
-- test/units/core/shape/text/test_format.rb
-- test/units/core/shape/text/test_internal.rb
-- test/units/core/shape/text_block/formatter/test_basic.rb
-- test/units/core/shape/text_block/formatter/test_datetime.rb
-- test/units/core/shape/text_block/formatter/test_number.rb
-- test/units/core/shape/text_block/formatter/test_padding.rb
-- test/units/core/shape/text_block/test_format.rb
-- test/units/core/shape/text_block/test_formatter.rb
-- test/units/core/shape/text_block/test_interface.rb
-- test/units/core/shape/text_block/test_internal.rb
-- test/units/core/test_shape.rb
-- test/units/core/test_utils.rb
-- test/units/generator/pdf/document/graphics/test_attributes.rb
-- test/units/generator/pdf/document/graphics/test_basic.rb
-- test/units/generator/pdf/document/graphics/test_image.rb
-- test/units/generator/pdf/document/graphics/test_text.rb
-- test/units/generator/pdf/document/test_font.rb
-- test/units/generator/pdf/document/test_graphics.rb
-- test/units/generator/pdf/document/test_page.rb
-- test/units/generator/pdf/document/test_parse_color.rb
-- test/units/generator/pdf/prawn_ext/test_calc_image_dimensions.rb
-- test/units/generator/pdf/prawn_ext/test_width_of.rb
-- test/units/generator/pdf/test_document.rb
-- test/units/generator/test_pdf.rb
-- test/units/layout/test_base.rb
-- test/units/layout/test_format.rb
-- test/units/layout/test_legacy_schema.rb
-- test/units/layout/test_version.rb
-- test/units/report/test_base.rb
-- test/units/report/test_internal.rb
-- test/units/test_config.rb
-- test/units/test_layout.rb
-- test/units/test_report.rb
 - thinreports.gemspec
 homepage: http://www.thinreports.org
 licenses:
@@ -337,15 +140,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: An open source report generation tool for Ruby.