thinreports 0.10.2 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4474cfbc0c46ee058fe7c39e3a6b927f6095ca471696c119e306c1cf9aa7e67
-  data.tar.gz: ef944d6dc314c13c8c983af7fc9ccec2a949f7c59e113978b1626daaea3bee54
+  metadata.gz: 3abf53b7bac12b336d4ef9b4af7dd4400081eeb632f8ece362e60f6cca47c2b4
+  data.tar.gz: 4461aca74ccae200d234715a06bbc60e753a7694053116c58ef2d031b8f01047
 SHA512:
-  metadata.gz: eb722605ed4c420f4eaca8880be300e3dbed0817b3c0eaac6fe8c34cd52f55b097dfec1a691e26c996f46405fec10db2f3caace17a8d7a1b248338f92b3e9cca
-  data.tar.gz: fb5756fdf71f6ccf23f75102b4e94c362e0959e50e79f84f6dc33f116e3ca758a38471c49499132cebc17da58c8ca2ae6e492bb9ca40690a5d3371fc865742bb
+  metadata.gz: 8ebae61bcd5ce2524bc8c09eff3f2fa047de632a250dfce9390a4db78b806d945ed32ea563c1063836d938e139b433b53c595592ec741a3a0c719bb74d7ffb1b
+  data.tar.gz: ef7d77b8edaf345b546cc42bb4f2ac98d23e2e74fe62921a181976ff38f11c6f4a6ef875ede3bcb40dfd0fa02ddc42cfe532df7c7bad633efe4f8cfd056a32ca

data/.github/CONTRIBUTING.md

@@ -1,2 +1,2 @@
-**We only accept bug reports and pull requests in GitHub**.
-If you have a support question about how to use thinreports, please [ask on Google Group](https://groups.google.com/forum/?hl=ja#!forum/thinreports).
+We only accept bug reports and pull requests in GitHub.
+If you have a support question about how to use thinreports, please [ask on GitHub Discussions](https://github.com/thinreports/thinreports/discussions).

data/.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "daily"

data/.github/workflows/test.yml

@@ -0,0 +1,50 @@
+name: Test
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    name: Test against ruby ${{ matrix.ruby }} and prawn ${{ matrix.prawn }}
+    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.5
+          - 2.6
+          - 2.7
+          - 3.0
+          - jruby
+        prawn:
+          - 2.2
+          - 2.3
+          - 2.4
+        exclude:
+          - ruby: 3.0
+            prawn: 2.2
+          - ruby: 3.0
+            prawn: 2.3
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - uses: hidakatsuya/setup-diff-pdf@v1
+      with:
+        diff-pdf-version: 0.5
+
+    - name: Set up Ruby ${{ matrix.ruby }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+
+    - name: Install dependencies
+      run: |
+        gem install bundler
+        bundle install --gemfile gemfiles/prawn-${{ matrix.prawn }}.gemfile --jobs 4 --retry 3
+
+    - name: Run tests
+      run: |
+        bundle exec rake test:units
+        bundle exec rake test:features

data/.gitignore

@@ -4,3 +4,4 @@ Gemfile.lock
 .bundle
 .yardoc
 doc
+!/test/features/*/expect.pdf

data/CHANGELOG.md

@@ -1,3 +1,46 @@
+## master (Unreleased)
+
+## 0.12.1
+
+Bug Fixes:
+
+ * Fix argument of Thinreports::Report.generate in Ruby 3.0 #116 [@sada]
+
+## 0.12.0
+
+Breaking Changes:
+
+ * Drop Ruby 2.4 support #108, #109
+
+Enhancements:
+
+ * Ruby 3.0 support #108, #109
+ * Prawn 2.4 support #108, #109
+
+## 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:
+
+ * Fixed: corner-radius of Rect is not applied correctly #93
+
 ## 0.10.2
 
 Bug Fixes:

data/Gemfile

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec
+

data/{MIT-LICENSE → LICENSE.txt}

@@ -1,3 +1,5 @@
+The MIT License (MIT)
+
 Copyright (c) 2015 Matsukei Co.,Ltd.
 
 Permission is hereby granted, free of charge, to any person obtaining

data/README.md

@@ -1,34 +1,46 @@
 # 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)
-[![Maintainability](https://api.codeclimate.com/v1/badges/054b400031608957ec4a/maintainability)](https://codeclimate.com/github/thinreports/thinreports-generator/maintainability)
-[![](http://img.shields.io/gemnasium/thinreports/thinreports-generator.svg?style=flat)](https://gemnasium.com/thinreports/thinreports-generator)
+[![Test](https://github.com/thinreports/thinreports-generator/workflows/Test/badge.svg)](https://github.com/thinreports/thinreports-generator/actions)
 
-[Thinreports](http://www.thinreports.org) is an open source report generating tool for Ruby.
+A Ruby library for [Thinreports](https://github.com/thinreports/thinreports).
 
-  * Thinreports Editor (GUI Designer)
-  * Thinreports Generator (Report Generator for Ruby)
+## Prerequisites
 
-## Getting Started
+### Supported Versions
+
+- Ruby 2.5, 2.6, 2.7, 3.0
+- JRuby 9.2
+- Prawn 2.2, 2.3, 2.4
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'thinreports'
+```
+
+And then execute:
+
+    $ bundle install
 
-  * [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)
+Or install it yourself as:
 
-## Supported versions
+    $ gem install thinreports
+
+
+## Getting Started
 
-  * Ruby 2.1, 2.2, 2.3, 2.4, 2.5
-  * JRuby 9.1.15.0
+First of all, check out [the README](https://github.com/thinreports/thinreports#getting-started) for an overview of Thinreports, its features, the two template formats available, and a complete example with template files and Ruby code.
 
-## Quick Reference
+## Usage
 
-**NOTE:** You need to create a layout file `.tlf` using [Thinreports Editor](http://www.thinreports.org/features/editor/).
+See [the README](https://github.com/thinreports/thinreports) for usage of the Section Format.
 
-### Basic Objects and Basic Usage
+### Basic Format
+
+The template file (`.tlf`) must be created in [the Basic Editor of the Thinreports Editor](https://github.com/thinreports/thinreports-editor/tree/master/basic-editor).
 
 ```ruby
 require 'thinreports'
@@ -103,7 +115,7 @@ Thinreports::Report.generate(filename: 'report.pdf', layout: 'report.tlf') do |r
 end
 ```
 
-### Report and Page
+#### Report and Page
 
 ```ruby
 report = Thinreports::Report.new layout: 'foo.tlf'
@@ -121,7 +133,7 @@ report.add_blank_page
 report.pages.last # => Report::BlankPage
 ```
 
-### Using multiple layouts
+#### Using multiple layouts
 
 ```ruby
 report = Thinreports::Report.new
@@ -142,7 +154,7 @@ report.start_new_page layout: '/path/to/other2.tlf' do |page|
 end
 ```
 
-### Callbacks
+#### Callbacks
 
 ```ruby
 report = Thinreports::Report.new layout: 'foo.tlf'
@@ -153,9 +165,9 @@ report.on_page_create do |page|
 end
 ```
 
-See also [examples/report_callbacks](https://github.com/thinreports/thinreports-generator/tree/master/examples/report_callbacks).
+See also [features/report_callbacks](https://github.com/thinreports/thinreports-generator/tree/master/test/features/report_callbacks).
 
-### List
+#### List
 
 ```ruby
 report = Thinreports::Report.new layout: 'list.tlf'
@@ -202,9 +214,9 @@ report.list do |list|
 end
 ```
 
-See also  [examples/list_events](https://github.com/thinreports/thinreports-generator/tree/master/examples/list_events).
+See also  [features/list_events](https://github.com/thinreports/thinreports-generator/tree/master/test/features/list_events).
 
-### Page Number
+#### Page Number
 
 ```ruby
 # Setting starting number of page
@@ -223,9 +235,9 @@ report.start_new_page do |page|
 end
 ```
 
-See also [examples/page_number](https://github.com/thinreports/thinreports-generator/blob/master/examples/page_number) and [examples/list_page_number](https://github.com/thinreports/thinreports-generator/blob/master/examples/list_page_number).
+See also [features/page_number](https://github.com/thinreports/thinreports-generator/blob/master/test/features/page_number) and [features/page_number_with_list](https://github.com/thinreports/thinreports-generator/blob/master/test/features/page_number_with_list).
 
-### Configuring fallback fonts
+#### Configuring fallback fonts
 
 ```ruby
 Thinreports.configure do |config|
@@ -235,51 +247,53 @@ end
 Thinreports.config.fallback_fonts = ['/path/to/font_a.ttf', '/path/to/font_b.ttf']
 ```
 
-See also [examples/eudc](https://github.com/thinreports/thinreports-generator/blob/master/examples/eudc).
-
-## Features
-
-Features of Editor is [here](http://www.thinreports.org/features/editor/).
+See also [features/eudc](https://github.com/thinreports/thinreports-generator/blob/master/test/features/eudc).
 
-### Easy to generate PDF
+## Contributing
 
-Design layout using Editor, then embed values to text field in layout.
+Bug reports and pull requests are welcome on GitHub at https://github.com/thinreports/thinreports-generator. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/thinreports/thinreports/blob/master/CODE_OF_CONDUCT.md).
 
-### Simple runtime environment
+## Development
 
-Ruby, RubyGems, Prawn and Generator.
+### How to run feature tests
 
-### Dynamic operation
+```
+$ bundle exec rake test:features
+```
 
-Generator can dynamically:
+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.
 
-  * change value of TextBlock and ImageBlock
-  * change style (border, fill, visibility, position, color, font) of Shape
+### How to develop in Docker container
 
-### Others
+You can use the Docker container for development. This container contains the libraries required for testing, such as diff-pdf.
 
-  * External characters (Gaiji) for Japanese
+```
+$ docker pull ghcr.io/hidakatsuya/ruby-with-diff-pdf:latest
+$ docker run -v $PWD:/src:cached -it ghcr.io/hidakatsuya/ruby-with-diff-pdf bash
 
-## Contributing
+> /src#
+```
 
-### Report bug, post your suggestion
+You can run test:
 
-If you find bugs or improvements for the Editor, please report it [here](https://github.com/thinreports/thinreports-generator/issues/new).
+```
+> /src# bundle install
+> /src# bundle exec rake test:features
+```
 
-### Sending a Pull Request
+## Releasing Generator
 
-  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
+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
 
-Thinreports Generator is licensed under the [MIT-License](https://github.com/thinreports/thinreports-generator/blob/master/MIT-LICENSE).
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
 
 ## Copyright
 
-© 2010-2015 [Matsukei Co.,Ltd](http://www.matsukei.co.jp).
+(c) 2021 [Matsukei Co.,Ltd](http://www.matsukei.co.jp).

data/Rakefile

@@ -1,35 +1,22 @@
+require 'bundler/gem_tasks'
 require 'rake/testtask'
-require 'yard'
 
 task default: :test
 
 Rake::TestTask.new do |t|
+  t.name = 'test:units'
+  t.description = 'Run unit tests'
   t.libs << 'test'
-  t.test_files = Dir['test/unit/**/test_*.rb']
+  t.test_files = Dir['test/units/**/test_*.rb']
 end
 
-namespace :examples do
-  desc 'Run all examples'
-  task :all do
-    require_relative 'examples/helper'
-    Dir['examples/*/*.rb'].each { |f| require_relative f }
-  end
-
-  Dir['examples/*/*.rb'].each do |f|
-    casename = File.basename(File.dirname(f))
-
-    desc "Run example: #{casename}"
-    task casename.to_sym => :_init do
-      require_relative 'examples/helper'
-      require_relative "examples/#{casename}/#{casename}"
-    end
-  end
+Rake::TestTask.new do |t|
+  t.name = 'test:features'
+  t.description = 'Run feature tests'
+  t.libs << 'test/features'
+  t.test_files = Dir['test/features/*/test_*.rb']
+  t.warning = false
 end
 
-desc 'Run all examples'
-task examples: :'examples:all'
-
-YARD::Rake::YardocTask.new :doc do |yard|
-  yard.files = Dir['lib/**/*.rb']
-  yard.options = ['--readme', 'README.md']
-end
+desc 'Run unit and feature tests'
+task test: %i( test:units test:features )

data/gemfiles/prawn-2.2.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'prawn', '~> 2.2.0'
+
+gemspec path: '../'

data/gemfiles/prawn-2.3.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'prawn', '~> 2.3.0'
+
+gemspec path: '../'

data/gemfiles/prawn-2.4.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'prawn', '~> 2.4.0'
+
+gemspec path: '../'

data/lib/thinreports/core/shape/basic/format.rb

@@ -10,6 +10,11 @@ module Thinreports
           config_reader :type, :id
           config_reader :style
           config_checker true, :display
+          config_reader follow_stretch: %w[follow-stretch]
+
+          def affect_bottom_margin?
+            attributes.fetch('affect-bottom-margin', true)
+          end
         end
       end
     end

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/stack_view/format.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Thinreports
+  module Core
+    module Shape
+      module StackView
+        class Format < Basic::Format
+          attr_reader :rows
+
+          def initialize(*)
+            super
+            initialize_rows
+          end
+
+          private
+
+          def initialize_rows
+            @rows = []
+            attributes['rows'].each do |row|
+              @rows << StackView::RowFormat.new(row)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/thinreports/core/shape/stack_view/interface.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Thinreports
+  module Core
+    module Shape
+      module StackView
+        class Interface < Basic::Interface
+          private
+
+          def init_internal(parent, format)
+            StackView::Internal.new(parent, format)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Thinreports
+  module Core
+    module Shape
+      module StackView
+        class Internal < Basic::Internal
+          def initialize(parent, format)
+            super
+            @rows = []
+          end
+
+          attr_accessor :rows
+
+          def type_of?(type_name)
+            type_name == StackView::TYPE_NAME
+          end
+        end
+      end
+    end
+  end
+end

data/lib/thinreports/core/shape/stack_view/row_format.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Thinreports
+  module Core
+    module Shape
+      module StackView
+        class RowFormat < Core::Format::Base
+          config_reader :id
+          config_reader :height
+          config_checker true, :display
+          config_checker true, auto_stretch: 'auto-stretch'
+
+          attr_reader :items
+
+          def initialize(*)
+            super
+            @items = []
+            @item_with_ids = {}
+            initialize_items(attributes['items'])
+          end
+
+          def find_item(id)
+            @item_with_ids[id.to_sym]
+          end
+
+          private
+
+          def initialize_items(item_schemas)
+            item_schemas.each do |item_schema|
+              item = Core::Shape::Format(item_schema['type']).new(item_schema)
+              @items << item
+              @item_with_ids[item.id.to_sym] = item unless item.id.empty?
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Thinreports
+  module Core
+    module Shape
+      module StackView
+        TYPE_NAME = 'stack-view'.freeze
+      end
+    end
+  end
+end
+
+require_relative 'stack_view/format'
+require_relative 'stack_view/interface'
+require_relative 'stack_view/internal'
+
+require_relative 'stack_view/row_format'

data/lib/thinreports/core/shape/style/basic.rb

@@ -5,9 +5,12 @@ module Thinreports
     module Shape
       module Style
         class Basic < Style::Base
-          style_accessible :visible
+          style_accessible :visible, :offset_x, :offset_y
           attr_accessor :visible
 
+          style_accessor :offset_x, 'offset-x'
+          style_accessor :offset_y, 'offset-y'
+
           def initialize(*args)
             super
             @visible = @format.display?

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/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/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