thinreports 0.7.7 → 0.8.0

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

@@ -1,49 +1,48 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Generator::PDF::Drawer
-    
+
     # @abstract
-    # @private
     class Base
-      # @param [ThinReports::Generator::PDF::Document] pdf
-      # @param [ThinReports::Core::Shape::Manager::Format] format
+      # @param [Thinreports::Generator::PDF::Document] pdf
+      # @param [Thinreports::Core::Shape::Manager::Format] format
       def initialize(pdf, format)
         @pdf     = pdf
         @format  = format
         @stamps  = []
         @draw_at = nil
       end
-      
+
       # @abstract
       def draw
         raise NotImplementedError
       end
-      
+
     private
-      
-      # @param [ThinReports::Core::Shape::Base::Internal] shape
+
+      # @param [Thinreports::Core::Shape::Base::Internal] shape
       # @return [String]
       def pdf_stamp_id(shape)
         "#{@format.identifier}#{shape.identifier}"
       end
-      
+
       # @overload pdf_stamp(shape_id)
       #   @param [String] shape_id
       # @overload pdf_stamp(shape)
-      #   @param [ThinReports::Core::Shape::Base::Internal] shape
+      #   @param [Thinreports::Core::Shape::Base::Internal] shape
       def pdf_stamp(shape)
         unless shape.is_a?(::String)
           shape = pdf_stamp_id(shape)
         end
         @pdf.stamp(shape, @draw_at)
       end
-      
-      # @param [ThinReports::Core::Shape::Base::Internal] shape
+
+      # @param [Thinreports::Core::Shape::Base::Internal] shape
       def create_pdf_stamp(shape, &block)
         @pdf.create_stamp(pdf_stamp_id(shape), &block)
       end
     end
-    
+
   end
 end

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

@@ -1,24 +1,23 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Generator::PDF::Drawer
-    
-    # @private
+
     class List < Base
       # @param (see PDF::Drawer::Base#initialize)
       def initialize(pdf, format)
         super
         @sections = {}
       end
-      
-      # @param [ThinReports::Core::Shape::List::PageState] list_page
+
+      # @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
+        # Returns Thinreports::Report::Page object
         manager = list_page.parent.manager
 
         list_id = list_page.id.to_s
@@ -26,7 +25,7 @@ module ThinReports
           next unless list_pageno?(list_id, shape)
 
           shape = manager.final_shape(id)
-          @pdf.draw_shape_pageno(shape.internal, 
+          @pdf.draw_shape_pageno(shape.internal,
                                  list_page.no, list_page.manager.page_count)
         end
       end
@@ -34,25 +33,25 @@ module ThinReports
     private
 
       # @param [String] list_id
-      # @param [ThinReports::Core::Shape::Base::Format] shape
+      # @param [Thinreports::Core::Shape::Base::Format] shape
       # @return [Boolean]
       def list_pageno?(list_id, shape)
-        shape.type == ThinReports::Core::Shape::PageNumber::TYPE_NAME &&
+        shape.type == Thinreports::Core::Shape::PageNumber::TYPE_NAME &&
         shape.target == list_id
       end
 
-      # @param [ThinReports::Core::Shape::List::SectionInterface] section
+      # @param [Thinreports::Core::Shape::List::SectionInterface] section
       def draw_section(section)
         internal = section.internal
         drawer(internal).draw(section, internal.relative_position)
       end
-      
-      # @param [ThinReports::Core::Shape::List::SectionInternal] section
-      # @return [ThinReports::Generator::PDF::Drawer::ListSection]
+
+      # @param [Thinreports::Core::Shape::List::SectionInternal] section
+      # @return [Thinreports::Generator::PDF::Drawer::ListSection]
       def drawer(section)
         @sections[section.section_name] ||= ListSection.new(@pdf, section)
       end
     end
-    
+
   end
 end

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

@@ -1,31 +1,30 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Generator::PDF::Drawer
-    
-    # @private
+
     class ListSection < Page
       # @param pdf (see PDF::Drawer::Page#initialize)
-      # @param section [ThinReports::Core::Shape::List::SectionInternal] section
+      # @param section [Thinreports::Core::Shape::List::SectionInternal] section
       def initialize(pdf, section)
         super(pdf, section.format)
         @section       = section
         @stamp_created = false
       end
-      
-      # @param [ThinReports::Core::Shape::List::SectionInternal] section
+
+      # @param [Thinreports::Core::Shape::List::SectionInternal] section
       # @param [Array<Numeric>] at
       def draw(section, at)
         @draw_at = at
         draw_section
         super(section)
       end
-      
+
     private
-      
+
       def draw_section
         id = @format.identifier.to_s
-        
+
         unless @stamp_created
           @pdf.create_stamp(id) do
             @pdf.parse_svg('<svg xmlns:xlink="http://www.w3.org/1999/xlink">' +
@@ -35,17 +34,17 @@ module ThinReports
         end
         pdf_stamp(id)
       end
-      
-      # @see ThinReports::Generator::PDF::Drawer::Page#draw_tblock_shape      
+
+      # @see Thinreports::Generator::PDF::Drawer::Page#draw_tblock_shape
       def draw_tblock_shape(shape)
         @pdf.translate(*@draw_at) { super }
       end
-      
-      # @see ThinReports::Generator::PDF::Drawer::Page#draw_iblock_shape      
+
+      # @see Thinreports::Generator::PDF::Drawer::Page#draw_iblock_shape
       def draw_iblock_shape(shape)
         @pdf.translate(*@draw_at) { super }
       end
     end
-    
+
   end
 end

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

@@ -1,17 +1,16 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Generator::PDF::Drawer
-    
-    # @private
+
     class Page < Base
       # @param (see PDF::Drawer::Base#initialize)
       def initialize(pdf, format)
         super
         @lists = {}
       end
-      
-      # @param [ThinReports::Core::Page] page
+
+      # @param [Thinreports::Report::Page] page
       def draw(page)
         manager = page.manager
 
@@ -28,7 +27,7 @@ module ThinReports
           end
         end
       end
-      
+
     private
 
       def draw_shape(shape)
@@ -48,7 +47,7 @@ module ThinReports
           pdf_stamp(shape)
         end
       end
-      
+
       def draw_pageno_shape(shape, page)
         @pdf.draw_shape_pageno(shape, page.no, page.report.page_count)
       end
@@ -58,18 +57,18 @@ module ThinReports
         drawer = @lists[shape.id] ||= List.new(@pdf, shape.format)
         drawer.draw(shape)
       end
-      
+
       # @see #draw_shape
       def draw_tblock_shape(shape)
         @pdf.draw_shape_tblock(shape)
       end
-      
+
       # @see #draw_shape
       def draw_iblock_shape(shape)
         @pdf.draw_shape_iblock(shape)
       end
-      
-      # @param [ThinReports::Core::Shape::Base::Internal] shape
+
+      # @param [Thinreports::Core::Shape::Base::Internal] shape
       def create_basic_shape_stamp(shape)
         case
         when shape.type_of?(:text)    then create_text_stamp(shape)
@@ -79,35 +78,35 @@ module ThinReports
         when shape.type_of?(:line)    then create_line_stamp(shape)
         end
       end
-      
+
       # @see #create_basic_shape_stamp
       def create_image_stamp(shape)
         create_pdf_stamp(shape) do
           @pdf.draw_shape_image(shape)
         end
       end
-      
+
       # @see #create_basic_shape_stamp
       def create_rect_stamp(shape)
         create_pdf_stamp(shape) do
           @pdf.draw_shape_rect(shape)
         end
       end
-      
+
       # @see #create_basic_shape_stamp
       def create_ellipse_stamp(shape)
         create_pdf_stamp(shape) do
           @pdf.draw_shape_ellipse(shape)
         end
       end
-      
+
       # @see #create_basic_shape_stamp
       def create_line_stamp(shape)
         create_pdf_stamp(shape) do
           @pdf.draw_shape_line(shape)
         end
       end
-      
+
       # @see #create_basic_shape_stamp
       def create_text_stamp(shape)
         create_pdf_stamp(shape) do
@@ -115,6 +114,6 @@ module ThinReports
         end
       end
     end
-    
+
   end
 end

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

@@ -1,47 +1,31 @@
 # coding: utf-8
 
-# @private
 module Prawn
   class Document
-    # Create around alias.
     alias_method :original_width_of, :width_of
-    
+
     def width_of(string, options={})
       font.compute_width_of(string, options) +
         (character_spacing * (font.character_count(string) - 1))
     end
-    
-  private
-    # Create around alias.
-    alias_method :original_calc_image_dimensions, :calc_image_dimensions
-    
-    def calc_image_dimensions(info, options)
-      if options[:auto_fit]
-        w, h = info.width, info.height
-        sw, sh = options.delete(:auto_fit)
-        
-        if w > sw || h > sh
-          options[:fit] = [sw, sh]
-        end
-      end
-      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
+  module Images
+    class Image
+      alias_method :original_calc_image_dimensions, :calc_image_dimensions
+
+      def calc_image_dimensions(options)
+        if options[:auto_fit]
+          w = options[:width] || width
+          h = options[:height] || height
+
+          box_width, box_height = options.delete(:auto_fit)
+
+          if w > box_width || h > box_height
+            options[:fit] = [box_width, box_height]
+          end
+        end
+        original_calc_image_dimensions(options)
       end
     end
   end

data/lib/thinreports/layout.rb

@@ -1,9 +1,9 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   
   module Layout
-    # @see ThinReports::Layout::Base#initialize
+    # @see Thinreports::Layout::Base#initialize
     def self.new(filename, options = {})
       Base.new(filename, options)
     end

data/lib/thinreports/layout/base.rb

@@ -1,49 +1,36 @@
 # coding: utf-8
 
-module ThinReports
+module Thinreports
   module Layout
-    
+
     class Base
       EXT_NAME = 'tlf'
-      
+      include Utils
+
       class << self
         # @param [String] filename
-        # @return [ThinReports::Layout::Format]
-        # @raise [ThinReports::Errors::InvalidLayoutFormat]
-        # @raise [ThinReports::Errors::IncompatibleLayoutFormat]
-        # @private
+        # @return [Thinreports::Layout::Format]
+        # @raise [Thinreports::Errors::InvalidLayoutFormat]
+        # @raise [Thinreports::Errors::IncompatibleLayoutFormat]
         def load_format(filename)
           filename += ".#{EXT_NAME}" unless filename =~/\.#{EXT_NAME}$/
-          
+
           unless File.exists?(filename)
-            raise ThinReports::Errors::LayoutFileNotFound
+            raise Thinreports::Errors::LayoutFileNotFound
           end
           # Build format.
-          ThinReports::Layout::Format.build(filename)
-        end
-        
-        # @private
-        def Page
-          const_defined?(:Page) ? Page : Core::Page
-        end
-        
-      private
-        
-        # @private
-        def PageHelpers(&block)
-          const_set(:Page, ::Class.new(Core::Page, &block))
+          Thinreports::Layout::Format.build(filename)
         end
       end
-      
-      # @private
+
       attr_reader :format
-      
+
       # @return [String]
       attr_reader :filename
-      
+
       # @return [Symbol]
       attr_reader :id
-      
+
       # @param [String] filename
       # @param [Hash] options
       # @option options [Symbol] :id (nil)
@@ -52,29 +39,28 @@ module ThinReports
         @format   = self.class.load_format(filename)
         @id       = options[:id]
       end
-      
+
       # @return [Boolean] Return the true if is default layout.
       def default?
         @id.nil?
       end
-      
+
       # @yield [config]
       # @yieldparam [List::Configuration] config
       # @return [List::Configuration]
       def config(&block)
         @config ||= Layout::Configuration.new(self)
-        block_exec_on(@config, &block)
+        call_block_in(@config, &block)
       end
-      
-      # @param [ThinReports::Report::Base] parent
+
+      # @param [Thinreports::Report::Base] parent
       # @param [Hash] options ({})
       # @option option [Boolean] :count (true)
       # @return [Page]
-      # @private
-      def init_new_page(parent, options = {})
-        self.class.Page.new(parent, self, options)
+      def new_page(parent, options = {})
+        Report::Page.new(parent, self, options)
       end
     end
-    
+
   end
 end