thinreports 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 687d41cb0fe000892fa4cb8751fdc8fa70e20f0e
-  data.tar.gz: 0a40e144fe135538bb37e793117f7a56348a934b
+SHA256:
+  metadata.gz: b4474cfbc0c46ee058fe7c39e3a6b927f6095ca471696c119e306c1cf9aa7e67
+  data.tar.gz: ef944d6dc314c13c8c983af7fc9ccec2a949f7c59e113978b1626daaea3bee54
 SHA512:
-  metadata.gz: 0d6da77661a179f657503f76f3e4c12b6664a73cac7f403aaf4506efb201ad336a18dd44612e4e456fdfb063e3c837692c02e877a3117897fb54b1dd4eefb3fe
-  data.tar.gz: 57443d5529f32831839676b6f9a8bb7a487153d0282e8c5fbee762ac52443f997071437b99d8543e81eeb8fbf785b5fb07b17825ff774f83b3e1508fe4239e37
+  metadata.gz: eb722605ed4c420f4eaca8880be300e3dbed0817b3c0eaac6fe8c34cd52f55b097dfec1a691e26c996f46405fec10db2f3caace17a8d7a1b248338f92b3e9cca
+  data.tar.gz: fb5756fdf71f6ccf23f75102b4e94c362e0959e50e79f84f6dc33f116e3ca758a38471c49499132cebc17da58c8ca2ae6e492bb9ca40690a5d3371fc865742bb

data/.travis.yml

@@ -2,15 +2,14 @@ language: ruby
 sudo: false
 rvm:
   - 2.1.10
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
-  - jruby-9.1.8.0
+  - 2.2.9
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
+  - jruby-9.1.15.0
 
-branches:
-  only:
-    - master
-    - /stable$/
+before_install:
+  - travis_retry gem update --system
 
 notifications:
   slack:

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.10.2
+
+Bug Fixes:
+
+ * Fixed: Prawn::Errors::UnknownFont error occured: "is not a known font" #89
+
 ## 0.10.1
 
 Bug Fixes:

data/README.md

@@ -2,7 +2,7 @@
 
 [![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)
-[![](http://img.shields.io/codeclimate/github/thinreports/thinreports-generator.svg?style=flat)](https://codeclimate.com/github/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)
 
 [Thinreports](http://www.thinreports.org) is an open source report generating tool for Ruby.
@@ -21,8 +21,8 @@
 
 ## Supported versions
 
-  * Ruby 2.1, 2.2, 2.3, 2.4
-  * JRuby 9.1.8.0
+  * Ruby 2.1, 2.2, 2.3, 2.4, 2.5
+  * JRuby 9.1.15.0
 
 ## Quick Reference
 

data/Rakefile

@@ -1,8 +1,7 @@
 require 'rake/testtask'
-require 'rubocop/rake_task'
 require 'yard'
 
-task default: %i[test rubocop]
+task default: :test
 
 Rake::TestTask.new do |t|
   t.libs << 'test'
@@ -34,5 +33,3 @@ YARD::Rake::YardocTask.new :doc do |yard|
   yard.files = Dir['lib/**/*.rb']
   yard.options = ['--readme', 'README.md']
 end
-
-RuboCop::RakeTask.new

data/lib/thinreports/core/shape.rb

@@ -3,17 +3,16 @@
 module Thinreports
   module Core
     module Shape
-      def Interface(parent, format) # rubocop:disable Naming/MethodName
+      def Interface(parent, format)
         find_by_type(format.type)::Interface.new(parent, format)
       end
 
-      def Format(type) # rubocop:disable Naming/MethodName
+      def Format(type)
         find_by_type(type)::Format
       end
 
       module_function :Interface, :Format
 
-      # rubocop:disable Metrics/CyclomaticComplexity
       def self.find_by_type(type)
         case type
         when TextBlock::TYPE_NAME  then TextBlock

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

@@ -30,7 +30,6 @@ module Thinreports
           # @param [Thinreports::Core::Shape::Basic::Format] format
           # @return [Thinreports::Core::Shape::Basic::Internal]
           # @abstract
-          # rubocop:disable Lint/UnusedMethodArgument
           def init_internal(parent, format)
             raise NotImplementedError
           end

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

@@ -4,7 +4,6 @@ module Thinreports
   module Core
     module Shape
       module List
-        # rubocop:disable Metrics/ClassLength
         class Manager
           include Utils
 
@@ -136,9 +135,7 @@ module Thinreports
           def overflow_with?(section_name = :detail)
             max_height = page_max_height
 
-            if section_name == :footer && format.has_page_footer?
-              max_height += format.section_height(:page_footer)
-            end
+            max_height += format.section_height(:page_footer) if section_name == :footer && format.has_page_footer?
 
             height = format.section_height(section_name)
             (current_page_state.height + height) > max_height

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

@@ -74,7 +74,6 @@ module Thinreports
 
           # @param [Thinreports::Report::Page] new_parent
           # @return [Thinreports::Core::Shape::List::Page]
-          # rubocop:disable Metrics/AbcSize
           def copy(new_parent)
             if manager.auto_page_break?
               new_list = self.class.new(new_parent, internal.format,
@@ -90,9 +89,7 @@ module Thinreports
               new_list.internal.finalized!
             end
 
-            if internal.format.has_header?
-              new_list.internal.header = internal.header.copy(new_list)
-            end
+            new_list.internal.header = internal.header.copy(new_list) if internal.format.has_header?
             new_list
           end
 

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

@@ -47,7 +47,6 @@ module Thinreports
 
           # @param [String, Symbol] id
           # @return [Thinreports::Core::Shape::Base::Interface, nil]
-          # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
           def final_shape(id)
             shape = shapes[id]
 

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

@@ -19,7 +19,6 @@ module Thinreports
             states[:format] = format.to_s
           end
 
-          # rubocop:disable Metrics/AbcSize
           def build_format(page_no, page_count)
             return '' if blank_value?(read_format)
 

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

@@ -15,12 +15,8 @@ module Thinreports
               delimiter = format.format_number_delimiter
 
               if_applicable value do |val|
-                unless blank_value?(precision)
-                  val = number_with_precision(val, precision)
-                end
-                unless blank_value?(delimiter)
-                  val = number_with_delimiter(val, delimiter)
-                end
+                val = number_with_precision(val, precision) unless blank_value?(precision)
+                val = number_with_delimiter(val, delimiter) unless blank_value?(delimiter)
                 val
               end
             end

data/lib/thinreports/core/utils.rb

@@ -10,11 +10,11 @@ module Thinreports
       case src
       when Hash
         src.each_with_object({}) do |(k, v), h|
-          h[k] = v.dup rescue v # rubocop:disable Lint/RescueWithoutErrorClass,Lint/RescueModifier
+          h[k] = v.dup rescue v
         end
       when Array
         src.map do |a|
-          a.dup rescue a # rubocop:disable Lint/RescueWithoutErrorClass,Lint/RescueModifier
+          a.dup rescue a
         end
       else
         raise ArgumentError

data/lib/thinreports/generator/pdf/document/draw_shape.rb

@@ -5,7 +5,6 @@ module Thinreports
     class PDF
       module DrawShape
         # @param [Thinreports::Core::Shape::TextBlock::Internal] shape
-        # rubocop:disable Metrics/AbcSize
         def draw_shape_tblock(shape)
           x, y, w, h = shape.format.attributes.values_at('x', 'y', 'width', 'height')
 

data/lib/thinreports/generator/pdf/document/draw_template_items.rb

@@ -5,7 +5,6 @@ module Thinreports
     class PDF
       module DrawTemplateItems
         # @param [Array<Hash>] items
-        # rubocop:disable Metrics/CyclomaticComplexity
         def draw_template_items(items)
           items.each do |item_attributes|
             next unless drawable?(item_attributes)

data/lib/thinreports/generator/pdf/document/font.rb

@@ -7,10 +7,10 @@ module Thinreports
         FONT_STORE = Thinreports.root.join('fonts')
 
         BUILTIN_FONTS = {
-          'IPAMincho'  => { normal: FONT_STORE.join('ipam.ttf').to_s },
-          'IPAPMincho' => { normal: FONT_STORE.join('ipamp.ttf').to_s },
-          'IPAGothic'  => { normal: FONT_STORE.join('ipag.ttf').to_s },
-          'IPAPGothic' => { normal: FONT_STORE.join('ipagp.ttf').to_s }
+          'IPAMincho'  => FONT_STORE.join('ipam.ttf').to_s,
+          'IPAPMincho' => FONT_STORE.join('ipamp.ttf').to_s,
+          'IPAGothic'  => FONT_STORE.join('ipag.ttf').to_s,
+          'IPAPGothic' => FONT_STORE.join('ipagp.ttf').to_s
         }.freeze
 
         DEFAULT_FALLBACK_FONTS = %w[IPAMincho].freeze
@@ -20,10 +20,11 @@ module Thinreports
           'Times New Roman' => 'Times-Roman'
         }.freeze
 
-        # rubocop:disable Metrics/AbcSize
         def setup_fonts
           # Install built-in fonts.
-          pdf.font_families.update(BUILTIN_FONTS)
+          BUILTIN_FONTS.each do |font_name, font_path|
+            install_font(font_name, font_path)
+          end
 
           # Create aliases from the font list provided by Prawn.
           PRAWN_BUINTIN_FONT_ALIASES.each do |alias_name, name|
@@ -70,11 +71,16 @@ module Thinreports
           pdf.font_families.key?(family) ? family : default_family
         end
 
-        # @param [String] font
-        # @param [Symbol] style
+        # @param [String] font_name
+        # @param [:bold, :italic] font_style
         # @return [Boolean]
-        def font_has_style?(font, style)
-          (f = pdf.font_families[font]) && f.key?(style)
+        def font_has_style?(font_name, font_style)
+          font = pdf.font_families[font_name]
+
+          return false unless font
+          return false unless font.key?(font_style)
+
+          font[font_style] != font[:normal]
         end
       end
     end

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

@@ -23,7 +23,6 @@ module Thinreports
         # @yield [attrs]
         # @yieldparam [Hash] attrs
         # @return [Hash]
-        # rubocop:disable Metrics/AbcSize
         def build_text_attributes(style, &block)
           text_attributes = {
             font: font_family(style['font-family']),

data/lib/thinreports/generator/pdf/document/graphics/basic.rb

@@ -65,7 +65,6 @@ module Thinreports
         end
 
         # @param [Hash] attrs
-        # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
         def with_graphic_styles(attrs, &block)
           stroke = build_stroke_styles(attrs)
           fill = build_fill_styles(attrs)

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

@@ -40,7 +40,6 @@ module Thinreports
               built_attrs.merge(box_attrs)
             )
           end
-        # rubocop:disable Lint/HandleExceptions
         rescue Prawn::Errors::CannotFit
           # Nothing to do.
           #
@@ -81,7 +80,6 @@ module Thinreports
         # @yield [built_attrs, font_styles]
         # @yieldparam [Hash] built_attrs The finalized attributes.
         # @yieldparam [Array] font_styles The finalized styles.
-        # rubocop:disable Metrics/AbcSize
         def with_text_styles(attrs, &block)
           # When no color is given, do not draw.
           return unless attrs.key?(:color) && attrs[:color] != 'none'
@@ -139,7 +137,6 @@ module Thinreports
         # @yield [attributes, styles]
         # @yieldparam [Hash] modified_attrs
         # @yieldparam [Array] styles
-        # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         def with_font_styles(attrs, font, &block)
           # Building font styles.
           styles = attrs.delete(:styles)

data/lib/thinreports/generator/pdf/document/page.rb

@@ -10,16 +10,13 @@ module Thinreports
         }.freeze
 
         # @param [Thinreports::Layout::Format] format
-        # rubocop:disable Metrics/AbcSize
         def start_new_page(format)
           format_id =
             if change_page_format?(format)
               pdf.start_new_page(new_basic_page_options(format))
               @current_page_format = format
 
-              unless format_stamp_registry.include?(format.identifier)
-                create_format_stamp(format)
-              end
+              create_format_stamp(format) unless format_stamp_registry.include?(format.identifier)
               format.identifier
             else
               pdf.start_new_page(new_basic_page_options(current_page_format))

data/lib/thinreports/generator/pdf/drawer/list.rb

@@ -12,7 +12,6 @@ module Thinreports
           end
 
           # @param [Thinreports::Core::Shape::List::PageState] list_page
-          # rubocop:disable Metrics/AbcSize
           def draw(list_page)
             draw_section(list_page.header) if list_page.header
             list_page.rows.each do |row|

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

@@ -20,9 +20,7 @@ module Thinreports
 
             box_width, box_height = options.delete(:auto_fit)
 
-            if image_width > box_width || image_height > box_height
-              options[:fit] = [box_width, box_height]
-            end
+            options[:fit] = [box_width, box_height] if image_width > box_width || image_height > box_height
           end
           super(options)
         end

data/lib/thinreports/layout/base.rb

@@ -14,9 +14,7 @@ module Thinreports
         def load_format(filename)
           filename += ".#{EXT_NAME}" unless filename =~ /\.#{EXT_NAME}$/
 
-          unless File.exist?(filename)
-            raise Thinreports::Errors::LayoutFileNotFound
-          end
+          raise Thinreports::Errors::LayoutFileNotFound unless File.exist?(filename)
           # Build format.
           Thinreports::Layout::Format.build(filename)
         end

data/lib/thinreports/layout/format.rb

@@ -13,7 +13,6 @@ module Thinreports
                     page_orientation: %w[report orientation]
 
       class << self
-        # rubocop:disable Metrics/AbcSize
         def build(filename)
           schema = JSON.parse(read_file(filename))
           schema_version = Layout::Version.new(schema['version'])

data/lib/thinreports/layout/legacy_schema.rb

@@ -5,7 +5,6 @@ require 'rexml/document'
 
 module Thinreports
   module Layout
-    # rubocop:disable Metrics/ClassLength
     class LegacySchema
       include Utils
 
@@ -17,7 +16,6 @@ module Thinreports
         @legacy_svg = cleanup_svg(@legacy_svg)
       end
 
-      # rubocop:disable Metrics/AbcSize
       def upgrade
         config = legacy_schema['config']
         page_config = config['page']
@@ -48,7 +46,6 @@ module Thinreports
         build_item_schemas_from_svg(svg.elements['/svg/g'])
       end
 
-      # rubocop:disable Metrics/CyclomaticComplexity
       def build_item_schemas_from_svg(svg_elements)
         return [] unless svg_elements
 
@@ -277,9 +274,7 @@ module Thinreports
           'footer' => footer
         }
 
-        if page_footer['enabled']
-          page_footer['translate']['y'] += detail['height']
-        end
+        page_footer['translate']['y'] += detail['height'] if page_footer['enabled']
 
         if footer['enabled']
           footer['translate']['y'] += detail['height']

data/lib/thinreports/report/internal.rb

@@ -33,9 +33,7 @@ module Thinreports
         else
           id = options[:id].to_sym
 
-          if layout_registry.key?(id)
-            raise ArgumentError, "Id :#{id} is already in use."
-          end
+          raise ArgumentError, "Id :#{id} is already in use." if layout_registry.key?(id)
           layout_registry[id] = init_layout(layout, id)
         end
       end

data/lib/thinreports/report/page.rb

@@ -64,7 +64,6 @@ module Thinreports
         false
       end
 
-      # rubocop:disable Metrics/AbcSize
       def copy
         new_page = self.class.new(report, layout, count: count?)
 
@@ -72,9 +71,7 @@ module Thinreports
           new_shape = shape.copy(new_page)
           new_page.manager.shapes[id] = new_shape
 
-          if new_shape.internal.type_of?(Core::Shape::List::TYPE_NAME)
-            new_page.manager.lists[id] = new_shape
-          end
+          new_page.manager.lists[id] = new_shape if new_shape.internal.type_of?(Core::Shape::List::TYPE_NAME)
         end
         new_page
       end
@@ -85,9 +82,7 @@ module Thinreports
         at = options[:at] || :create
 
         # For list shapes.
-        if at == :create
-          manager.lists.each_value { |list| list.manager.finalize }
-        end
+        manager.lists.each_value { |list| list.manager.finalize } if at == :create
 
         @finalized = true
       end

data/lib/thinreports/version.rb

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

data/test/unit/core/shape/list/test_page.rb

@@ -120,7 +120,6 @@ class Thinreports::Core::Shape::List::TestPage < Minitest::Test
 
     report = Thinreports::Report::Base.new
     layout = Thinreports::Layout::Base.new(layout_file.path)
-    report_page = Thinreports::Report::Page.new(report, layout)
 
     list_format = Thinreports::Core::Shape::List::Format.new(list_schema)
 
@@ -140,7 +139,6 @@ class Thinreports::Core::Shape::List::TestPage < Minitest::Test
 
     report = Thinreports::Report::Base.new
     layout = Thinreports::Layout::Base.new(layout_file.path)
-    report_page = Thinreports::Report::Page.new(report, layout)
 
     list_format = Thinreports::Core::Shape::List::Format.new(list_schema)
 

data/test/unit/generator/pdf/document/test_font.rb

@@ -17,8 +17,14 @@ class Thinreports::Generator::PDF::TestFont < Minitest::Test
   def test_setup_fonts
     pdf = document.pdf
 
-    Font::BUILTIN_FONTS.each do |name, font|
-      assert_equal font, pdf.font_families[name]
+    Font::BUILTIN_FONTS.each do |name, path|
+      expected_font = {
+        normal: path,
+        bold: path,
+        italic: path,
+        bold_italic: path
+      }
+      assert_equal expected_font, pdf.font_families[name]
     end
 
     Font::PRAWN_BUINTIN_FONT_ALIASES.each do |alias_font, original_font|
@@ -65,16 +71,36 @@ class Thinreports::Generator::PDF::TestFont < Minitest::Test
     end
   end
 
-  def test_font_helpers
-    doc = document
+  def test_default_family
+    assert_equal 'Helvetica', document.default_family
+  end
+
+  def test_default_family_if_mmissing
+    assert_equal 'Helvetica', document.default_family_if_missing('unknown')
+    assert_equal 'IPAMincho', document.default_family_if_missing('IPAMincho')
+  end
+
+  def test_font_has_style?
+    doc = create_document
+
+    assert_equal false, doc.font_has_style?('unknown', :bold)
 
-    assert_equal 'Helvetica', doc.default_family
+    doc.pdf.font_families['font_foo'] = {
+      normal: '/path/to/foo.ttf'
+    }
+    assert_equal false, doc.font_has_style?('font_foo', :italic)
 
-    assert_equal 'Helvetica', doc.default_family_if_missing('unknown')
-    assert_equal 'IPAMincho', doc.default_family_if_missing('IPAMincho')
+    doc.pdf.font_families['font_foo'] = {
+      normal: '/path/to/foo.ttf',
+      bold: '/path/to/foo.ttf'
+    }
+    assert_equal false, doc.font_has_style?('font_foo', :bold)
 
-    assert_equal false, doc.font_has_style?('IPAMincho', :bold)
-    assert_equal true, doc.font_has_style?('Courier New', :bold)
+    doc.pdf.font_families['font_foo'] = {
+      normal: '/path/to/foo.ttf',
+      bold: '/path/to/foo_bold.ttf'
+    }
+    assert_equal true, doc.font_has_style?('font_foo', :bold)
   end
 
   def document

data/thinreports.gemspec

@@ -21,11 +21,10 @@ Gem::Specification.new do |s|
 
   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']
-  s.add_development_dependency 'rubocop', ['>= 0']
-  s.add_development_dependency 'yard'
+  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'
+  s.add_development_dependency 'yard', '>= 0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thinreports
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Matsukei Co.,Ltd.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-30 00:00:00.000000000 Z
+date: 2018-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  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: yard
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +116,6 @@ extra_rdoc_files: []
 files:
 - ".github/CONTRIBUTING.md"
 - ".gitignore"
-- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -361,7 +346,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: An open source report generation tool for Ruby.

data/.rubocop.yml

@@ -1,41 +0,0 @@
-AllCops:
-  Exclude:
-    - 'examples/**/*'
-    - 'test/**/*'
-    - 'thinreports.gemspec'
-
-Metrics/LineLength:
-  Max: 120
-
-Metrics/MethodLength:
-  Enabled: false
-
-Metrics/ParameterLists:
-  Max: 6
-
-Performance/RedundantBlockCall:
-  Enabled: false
-
-Performance/RegexpMatch:
-  Enabled: false
-
-Style/Documentation:
-  Enabled: false
-
-Style/FormatString:
-  Enabled: false
-
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
-Style/NumericPredicate:
-  Enabled: false
-
-Style/PerlBackrefs:
-  Enabled: false
-
-Naming/PredicateName:
-  Enabled: false
-
-Style/SafeNavigation:
-  Enabled: false