thinreports 0.7.6 → 0.7.7

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

@@ -98,9 +98,13 @@ module ThinReports
     
     private
       
-      # @return [Symbol]
+      # @return [Symbol, nil]
       def default_valign
-        @format.valign.blank? ? :top : @format.valign.to_sym
+        if accessible_styles.include?(:valign)
+          @format.valign.blank? ? :top : @format.valign.to_sym
+        else
+          :top
+        end
       end
       
       # @param [Symbol] align The interface align name.

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

@@ -15,6 +15,7 @@ module ThinReports
                     :format_number_precision => %w( format number precision ),
                     :format_padding_char     => %w( format padding char ),
                     :format_padding_dir      => %w( format padding direction )
+      config_reader :word_wrap => %w( word-wrap )
 
       config_checker 'true', :multiple
       config_checker 'R', :format_padding_rdir => %w( format padding direction )

data/lib/thinreports/generator/pdf.rb

@@ -51,7 +51,7 @@ module ThinReports
         format = page.layout.format
         @pdf.start_new_page(format)
         
-        drawer(format).draw(page.manager)
+        drawer(format).draw(page)
       end
       
       def drawer(format)

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

@@ -20,6 +20,13 @@ module ThinReports
           text_box(content, x, y, w, h, attrs)
         end
       end
+
+      def draw_shape_pageno(shape, page_no, page_count)
+        x, y, w, h = shape.box.values_at('x', 'y', 'width', 'height')
+
+        text_box(shape.build_format(page_no, page_count), x, y, w, h, 
+                 common_text_attrs(shape.style.svg_attrs))
+      end
       
       # @param [ThinReports::Core::Shape::Basic::Internal] shape
       def draw_shape_image(shape)
@@ -83,12 +90,15 @@ module ThinReports
           attrs[:line_height] = format.line_height unless format.line_height.blank?
           # Set the :valign option.
           attrs[:valign]      = shape.style.valign
-
-          # Set the :overflow option.
-          attrs[:overflow] = text_overflow(format.overflow) if shape.type_of?(:tblock)
+          
+          if shape.type_of?(:tblock)
+            # Set the :overflow option.
+            attrs[:overflow] = text_overflow(format.overflow)
+            # Set the :word_wrap option
+            attrs[:word_wrap] = text_word_wrap(format.word_wrap)
+          end
         end
       end
-      
     end
     
   end

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

@@ -105,6 +105,15 @@ module ThinReports
         else :truncate
         end
       end
+
+      # @param [String] word_wrap
+      # @return [Symbol]
+      def text_word_wrap(word_wrap)
+        case word_wrap
+        when 'break-word' then :break_word
+        else :none
+        end
+      end
         
       # @param [String] xlink
       # @return [String]

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

@@ -21,13 +21,16 @@ module ThinReports
       # @option attrs [Numeric, String] :letter_spacing
       # @option attrs [Boolean] :single (false)
       # @option attrs [:trancate, :shrink_to_fit, :expand] :overflow (:trancate)
+      # @option attrs [:none, :break_word] :word_wrap (:none)
       def text_box(content, x, y, w, h, attrs = {})
         w, h = s2f(w, h)
         box_attrs = text_box_attrs(x, y, w, h, :single   => attrs.delete(:single), 
                                                :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
         
         with_text_styles(attrs) do |built_attrs, font_styles|
-          pdf.formatted_text_box([{:text   => text_without_line_wrap(content),
+          pdf.formatted_text_box([{:text   => content,
                                    :styles => font_styles}],
                                  built_attrs.merge(box_attrs))
         end

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

@@ -5,6 +5,11 @@ module ThinReports
     
     # @private
     module PDF::Page
+      # Add JIS-B4,B5 page geometry
+      Prawn::Document::PageGeometry::SIZES.update(
+        'B4_JIS' => [728.5, 1031.8],
+        'B5_JIS' => [515.9, 728.5]
+      )
       
       # @param [ThinReports::Layout::Format] format
       def start_new_page(format)
@@ -32,7 +37,7 @@ module ThinReports
       
       # @return [ThinReports::Layout::Format]
       attr_reader :current_page_format
-      
+
       # @param [ThinReports::Layout::Format] new_format
       # @return [Boolean]
       def change_page_format?(new_format)
@@ -57,14 +62,24 @@ module ThinReports
       # @return [Hash]
       def new_basic_page_options(format)
         options = {:layout => format.page_orientation.to_sym}
+
         options[:size] = if format.user_paper_type?
           [format.page_width.to_f, format.page_height.to_f]
         else
-          format.page_paper_type
+          case format.page_paper_type
+          # Convert B4(5)_ISO to B4(5)
+          when 'B4_ISO', 'B5_ISO'
+            format.page_paper_type.delete('_ISO')
+          # Convert B4(5) to B4(5)_JIS
+          when 'B4', 'B5'
+            "#{format.page_paper_type}_JIS"
+          else
+            format.page_paper_type
+          end
         end
         options
       end
     end
     
   end
-end
+end

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

@@ -1,11 +1,11 @@
 # coding: utf-8
 
 module ThinReports
-  module Generator
+  module Generator::PDF::Drawer
     
     # @abstract
     # @private
-    class PDF::Drawer::Base
+    class Base
       # @param [ThinReports::Generator::PDF::Document] pdf
       # @param [ThinReports::Core::Shape::Manager::Format] format
       def initialize(pdf, format)
@@ -25,12 +25,7 @@ module ThinReports
       # @param [ThinReports::Core::Shape::Base::Internal] shape
       # @return [String]
       def pdf_stamp_id(shape)
-        "#{@format.identifier}#{shape_stamp_id(shape)}"
-      end
-      
-      # @see #pdf_stamp_id
-      def shape_stamp_id(shape)
-        "#{shape.id}#{shape.style.identifier}"
+        "#{@format.identifier}#{shape.identifier}"
       end
       
       # @overload pdf_stamp(shape_id)

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

@@ -1,37 +1,56 @@
 # coding: utf-8
 
 module ThinReports
-  module Generator
+  module Generator::PDF::Drawer
     
     # @private
-    class PDF::Drawer::List < PDF::Drawer::Base
+    class List < Base
       # @param (see PDF::Drawer::Base#initialize)
       def initialize(pdf, format)
         super
         @sections = {}
       end
       
-      # @param [ThinReports::Core::Shape::List::PageState] list
-      def draw(list)
-        draw_section(list.header) if list.header
-        list.rows.each do |row|
+      # @param [ThinReports::Core::Shape::List::PageState] list_page
+      def draw(list_page)
+        draw_section(list_page.header) if list_page.header
+        list_page.rows.each do |row|
           draw_section(row)
         end
+
+        # Returns ThinReports::Core::Page object
+        manager = list_page.parent.manager
+
+        list_id = list_page.id.to_s
+        manager.format.shapes.each do |id, shape|
+          next unless list_pageno?(list_id, shape)
+
+          shape = manager.final_shape(id)
+          @pdf.draw_shape_pageno(shape.internal, 
+                                 list_page.no, list_page.manager.page_count)
+        end
       end
-      
-    private  
-      
+
+    private
+
+      # @param [String] list_id
+      # @param [ThinReports::Core::Shape::Base::Format] shape
+      # @return [Boolean]
+      def list_pageno?(list_id, shape)
+        shape.type == ThinReports::Core::Shape::PageNumber::TYPE_NAME &&
+        shape.target == list_id
+      end
+
       # @param [ThinReports::Core::Shape::List::SectionInterface] section
       def draw_section(section)
         internal = section.internal
-        drawer(internal).draw(section.manager, internal.relative_position)
+        drawer(internal).draw(section, internal.relative_position)
       end
       
       # @param [ThinReports::Core::Shape::List::SectionInternal] section
       # @return [ThinReports::Generator::PDF::Drawer::ListSection]
       def drawer(section)
-        @sections[section.section_name] ||=
-          PDF::Drawer::ListSection.new(@pdf, section)
+        @sections[section.section_name] ||= ListSection.new(@pdf, section)
       end
     end
     

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

@@ -1,10 +1,10 @@
 # coding: utf-8
 
 module ThinReports
-  module Generator
+  module Generator::PDF::Drawer
     
     # @private
-    class PDF::Drawer::ListSection < PDF::Drawer::Page
+    class ListSection < Page
       # @param pdf (see PDF::Drawer::Page#initialize)
       # @param section [ThinReports::Core::Shape::List::SectionInternal] section
       def initialize(pdf, section)
@@ -13,12 +13,12 @@ module ThinReports
         @stamp_created = false
       end
       
-      # @param [ThinReports::Core::Shape::Manager::Internal] manager
+      # @param [ThinReports::Core::Shape::List::SectionInternal] section
       # @param [Array<Numeric>] at
-      def draw(manager, at)
+      def draw(section, at)
         @draw_at = at
         draw_section
-        super(manager)
+        super(section)
       end
       
     private

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

@@ -1,28 +1,36 @@
 # coding: utf-8
 
 module ThinReports
-  module Generator
+  module Generator::PDF::Drawer
     
     # @private
-    class PDF::Drawer::Page < PDF::Drawer::Base
+    class Page < Base
       # @param (see PDF::Drawer::Base#initialize)
       def initialize(pdf, format)
         super
         @lists = {}
       end
       
-      # @param [ThinReports::Core::Shape::Manager::Internal] manager
-      def draw(manager)
+      # @param [ThinReports::Core::Page] page
+      def draw(page)
+        manager = page.manager
+
         manager.format.shapes.each_key do |id|
-          if shape = manager.final_shape(id)
-            draw_shape(shape.internal)
+          next unless shape = manager.final_shape(id)
+
+          shape = shape.internal
+
+          if shape.type_of?(:pageno)
+            # Do not draw pageno if is not for Report
+            draw_pageno_shape(shape, page) if page.count? && shape.for_report?
+          else
+            draw_shape(shape)
           end
         end
       end
       
     private
-      
-      # @param [ThinReports::Core::Shape::Base::Internal] shape
+
       def draw_shape(shape)
         case
         when shape.type_of?(:tblock)
@@ -32,7 +40,7 @@ module ThinReports
         when shape.type_of?(:iblock)
           draw_iblock_shape(shape)
         else
-          id = shape_stamp_id(shape)
+          id = shape.identifier
           unless @stamps.include?(id)
             create_basic_shape_stamp(shape)
             @stamps << id
@@ -41,9 +49,13 @@ module ThinReports
         end
       end
       
+      def draw_pageno_shape(shape, page)
+        @pdf.draw_shape_pageno(shape, page.no, page.report.page_count)
+      end
+
       # @see #draw_shape
       def draw_list_shape(shape)
-        drawer = @lists[shape.id] ||= PDF::Drawer::List.new(@pdf, shape.format)
+        drawer = @lists[shape.id] ||= List.new(@pdf, shape.format)
         drawer.draw(shape)
       end
       

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

@@ -2,7 +2,6 @@
 
 # @private
 module Prawn
-  # @private
   class Document
     # Create around alias.
     alias_method :original_width_of, :width_of
@@ -28,4 +27,22 @@ module Prawn
       original_calc_image_dimensions(info, options)
     end
   end
+
+  # Patch: https://github.com/prawnpdf/prawn/commit/34039d13b7886692debca11e85b9a572a20d57ee
+  module Core 
+    class Reference
+      def <<(data)
+        (@stream ||= "") << data
+        @data[:Length] = @stream.length
+        @stream
+      end
+ 
+      def compress_stream
+        @stream = Zlib::Deflate.deflate(@stream)
+        @data[:Filter] = :FlateDecode
+        @data[:Length] = @stream.length
+        @compressed = true
+      end
+    end
+  end
 end

data/lib/thinreports/layout/base.rb

@@ -67,10 +67,12 @@ module ThinReports
       end
       
       # @param [ThinReports::Report::Base] parent
+      # @param [Hash] options ({})
+      # @option option [Boolean] :count (true)
       # @return [Page]
       # @private
-      def init_new_page(parent)
-        self.class.Page.new(parent, self)
+      def init_new_page(parent, options = {})
+        self.class.Page.new(parent, self, options)
       end
     end
     

data/lib/thinreports/layout/format.rb

@@ -12,11 +12,7 @@ module ThinReports
       config_reader :page_paper_type     => %w( config page paper-type ),
                     :page_width          => %w( config page width ),
                     :page_height         => %w( config page height ),
-                    :page_orientation    => %w( config page orientation ),
-                    :page_margin_top     => %w( config page margin-top ),
-                    :page_margin_bottom  => %w( config page margin-bottom ),
-                    :page_margin_left    => %w( config page margin-left ), 
-                    :page_margin_left    => %w( config page margin-right )
+                    :page_orientation    => %w( config page orientation )
       
       config_checker 'user', :user_paper_type => %w( config page paper-type )
       

data/lib/thinreports/report/base.rb

@@ -7,6 +7,9 @@ module ThinReports
       # @return [ThinReports::Report::Internal]
       # @private
       attr_reader :internal
+
+      # @return [Integer]
+      attr_reader :start_page_number
       
       class << self
         # @param options (see #initialize)
@@ -52,10 +55,11 @@ module ThinReports
         # @yield (see .create)
         # @yieldparam (see .create)
         # @see .generate
+        # @deprecated Please use the #generate method with :filename option instead.
         # @return [void]
         def generate_file(*args, &block)
           raise ArgumentError, '#generate_file requires a block' unless block_given?
-          
+
           report_opts, generator_opts = extract_options!(args)
           
           report = create(report_opts, &block)
@@ -87,6 +91,12 @@ module ThinReports
       # @option options [String, nil] :layout (nil)
       def initialize(options = {})
         @internal = Report::Internal.new(self, options)
+        @start_page_number = 1
+      end
+
+      # @param [Integer] page_number
+      def start_page_number_from(page_number)
+        @start_page_number = page_number
       end
       
       # @param [String] layout path to layout-file.
@@ -102,15 +112,16 @@ module ThinReports
       
       # @param [Hash] options
       # @option options [String, Symbol] :layout (nil)
+      # @option options [Boolean] :count (true)
       # @yield [page]
       # @yieldparam [ThinReports::Core::Page] page
       # @return [ThinReports::Core::Page]
       def start_new_page(options = {}, &block)
-        unless layout = internal.load_layout(options[:layout])
+        unless layout = internal.load_layout(options.delete(:layout))
           raise ThinReports::Errors::NoRegisteredLayoutFound
         end
         
-        page = internal.add_page(layout.init_new_page(self))
+        page = internal.add_page(layout.init_new_page(self, options))
         block_exec_on(page, &block)
       end
       
@@ -147,10 +158,24 @@ module ThinReports
       #   Using the default generator type.
       #   @param [Hash] options ({})
       #   @return [String]
+      # @example Generate the PDF data
+      #   report.generate(:pdf) #=> "%PDF-1.4...."
+      #
+      #   # Or, you can omit the type of generator
+      #   report.generate
+      # @example Create the PDF file (Since v0.8)
+      #   report.generate(:pdf, :filename => 'foo.pdf')
       def generate(*args)
         options = args.last.is_a?(::Hash) ? args.pop : {}
-        type    = args.first || ThinReports.config.generator.default
-        ThinReports::Generator.new(type, self, options).generate
+        type = args.first || ThinReports.config.generator.default
+        filename = options.delete(:filename)
+        generator = ThinReports::Generator.new(type, self, options)
+
+        if filename
+          generator.generate_file(filename)
+        else
+          generator.generate
+        end
       end
       
       # @overload generate_file(type, filename, options = {})
@@ -160,11 +185,16 @@ module ThinReports
       #   @param [String] filename
       #   @param options (see #generate)
       #   @return [void]
+      # @deprecated Please use the #generate method with :filename option instead.
       def generate_file(*args)
+        warn '[DEPRECATION] The #generate_file method is deprecated. ' +
+             'Please use the #generate(:filename => "filename") instead.'
+
         options = args.last.is_a?(::Hash) ? args.pop : {}
         args.unshift(ThinReports.config.generator.default) if args.size == 1
         type, filename = args
-        ThinReports::Generator.new(type, self, options).generate_file(filename)
+
+        generate(type, options.merge(:filename => filename))
       end
       
       # @see ThinReports::Core::Shape::Manager::Target#list