thinreports 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40890b67b0013db37dcab5672e1b3166919adc9c
-  data.tar.gz: 00d5a8a495b282c6f6c83864a2550774b09a9995
+  metadata.gz: 687d41cb0fe000892fa4cb8751fdc8fa70e20f0e
+  data.tar.gz: 0a40e144fe135538bb37e793117f7a56348a934b
 SHA512:
-  metadata.gz: 7c84274da336894155c19db3ae9b6ce66f3c69bde20605c74efd841dd318c51d7317553a261cac391b8e5eb9d197d15fd05cfb18d0e87ffdafbf8b0a2ffbe315
-  data.tar.gz: f2f4b9e4aa7edeca96bb40f7ceb187fa04dd9bdfcaf6d750af6602077f0d5c25cb19466ae50780cf87d1a433f82ea11f5837263d4f16b35922b0f525b475fd91
+  metadata.gz: 0d6da77661a179f657503f76f3e4c12b6664a73cac7f403aaf4506efb201ad336a18dd44612e4e456fdfb063e3c837692c02e877a3117897fb54b1dd4eefb3fe
+  data.tar.gz: 57443d5529f32831839676b6f9a8bb7a487153d0282e8c5fbee762ac52443f997071437b99d8543e81eeb8fbf785b5fb07b17825ff774f83b3e1508fe4239e37

data/.rubocop.yml

@@ -34,7 +34,7 @@ Style/NumericPredicate:
 Style/PerlBackrefs:
   Enabled: false
 
-Style/PredicateName:
+Naming/PredicateName:
   Enabled: false
 
 Style/SafeNavigation:

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.10.1
+
+Bug Fixes:
+
+ * Fixed a bug that an error occurred on page break in other list when there is a list with page-break disabled #87 [@meganemura]
+
 ## 0.10.0
 
  * Thinreports requires Prawn 2.2

data/lib/thinreports/core/shape.rb

@@ -3,11 +3,11 @@
 module Thinreports
   module Core
     module Shape
-      def Interface(parent, format) # rubocop:disable Style/MethodName
+      def Interface(parent, format) # rubocop:disable Naming/MethodName
         find_by_type(format.type)::Interface.new(parent, format)
       end
 
-      def Format(type) # rubocop:disable Style/MethodName
+      def Format(type) # rubocop:disable Naming/MethodName
         find_by_type(type)::Format
       end
 

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

@@ -87,7 +87,7 @@ module Thinreports
               internal.rows.each do |row|
                 new_list.internal.rows << row.copy(new_list)
               end
-              new_list.finalized!
+              new_list.internal.finalized!
             end
 
             if internal.format.has_header?

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

@@ -32,8 +32,7 @@ module Thinreports
 
             def normalize(value)
               if value.is_a?(String)
-                # rubocop:disable Style/RescueModifier
-                (Integer(value) rescue nil) || (Float(value) rescue nil)
+                convert_to_integer(value) || convert_to_float(value)
               else
                 value
               end
@@ -47,6 +46,18 @@ module Thinreports
               value = BigDecimal(value.to_s).round(precision)
               sprintf("%.#{precision}f", value)
             end
+
+            def convert_to_integer(value)
+              Integer(value)
+            rescue ArgumentError
+              nil
+            end
+
+            def convert_to_float(value)
+              Float(value)
+            rescue ArgumentError
+              nil
+            end
           end
         end
       end

data/lib/thinreports/core/utils.rb

@@ -6,13 +6,16 @@ module Thinreports
       klass.extend self
     end
 
-    # rubocop:disable Style/RescueModifier
     def deep_copy(src)
       case src
       when Hash
-        src.each_with_object({}) { |(k, v), h| h[k] = v.dup rescue v }
+        src.each_with_object({}) do |(k, v), h|
+          h[k] = v.dup rescue v # rubocop:disable Lint/RescueWithoutErrorClass,Lint/RescueModifier
+        end
       when Array
-        src.map { |a| a.dup rescue a }
+        src.map do |a|
+          a.dup rescue a # rubocop:disable Lint/RescueWithoutErrorClass,Lint/RescueModifier
+        end
       else
         raise ArgumentError
       end

data/lib/thinreports/report/internal.rb

@@ -74,7 +74,7 @@ module Thinreports
             raise ArgumentError, 'Invalid argument for layout.'
           end
 
-        @default_layout = layout unless @default_layout
+        @default_layout ||= layout
         layout
       end
 

data/lib/thinreports/report/page.rb

@@ -86,7 +86,7 @@ module Thinreports
 
         # For list shapes.
         if at == :create
-          manager.lists.values.each { |list| list.manager.finalize }
+          manager.lists.each_value { |list| list.manager.finalize }
         end
 
         @finalized = true

data/lib/thinreports/version.rb

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

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

@@ -8,6 +8,41 @@ class Thinreports::Core::Shape::List::TestPage < Minitest::Test
   # Alias
   List = Thinreports::Core::Shape::List
 
+  LIST_SCHEMA = {
+    'type' => 'list',
+    'id' => 'list',
+    'display' => true,
+    'x' => 10.0,
+    'y' => 20.0,
+    'width' => 30.0,
+    'height' => 40.0,
+    'content-height' => 255,
+    'auto-page-break' => true,
+    'header' => {
+      'enabled' => true,
+      'height' => 10.0,
+      'translate' => { 'x' => 210.0, 'y' => 310.0 },
+      'items' => []
+    },
+    'detail' => {
+      'height' => 20.0,
+      'translate' => { 'x' => 220.0, 'y' => 320.0 },
+      'items' => []
+    },
+    'page-footer' => {
+      'enabled' => false,
+      'height' => 30.0,
+      'translate' => { 'x' => 230.0, 'y' => 330.0 },
+      'items' => []
+    },
+    'footer' => {
+      'enabled' => false,
+      'height' => 40.0,
+      'translate' => { 'x' => 240.0, 'y' => 340.0 },
+      'items' => []
+    }
+  }
+
   def create_report(&block)
     report = Thinreports::Report.new layout: layout_file.path
     block.call(report) if block_given?
@@ -79,4 +114,45 @@ class Thinreports::Core::Shape::List::TestPage < Minitest::Test
   rescue => e
     flunk exception_details(e, 'Not worked when list has not header')
   end
+
+  def test_copy_when_auto_page_break_disabled
+    list_schema = LIST_SCHEMA.merge('auto-page-break' => false)
+
+    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)
+
+    list_page = List::Page.new(report.page, list_format)
+
+    2.times { list_page.add_row }
+
+    copied_list_page = list_page.copy(Thinreports::Report::Page.new(report, layout))
+
+    assert list_page.manager.finalized?
+    assert copied_list_page.manager.finalized?
+    assert_equal 2, copied_list_page.internal.rows.count
+  end
+
+  def test_copy_when_auto_page_break_enabled
+    list_schema = LIST_SCHEMA.merge('auto-page-break' => true)
+
+    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)
+
+    list_page = List::Page.new(report.page, list_format)
+
+    2.times { list_page.add_row }
+    list_page.manager.finalize_page
+
+    copied_list_page = list_page.copy(Thinreports::Report::Page.new(report, layout))
+
+    refute list_page.manager.finalized?
+    refute copied_list_page.manager.finalized?
+    assert_empty copied_list_page.internal.rows
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thinreports
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Matsukei Co.,Ltd.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-09 00:00:00.000000000 Z
+date: 2017-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn