thinreports 0.6.0.pre3 → 0.7.0

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

@@ -6,24 +6,15 @@ module ThinReports
     # @private
     class Basic::Internal < Base::Internal
       # Delegate to Format's methods
-      format_delegators :id, :svg_tag, :svg_attrs, :type
+      format_delegators :id, :svg_tag, :type
       
-      def visible(visibility)
-        states[:display] = visibility
-      end
-      
-      def visible?
-        states.key?(:display) ? states[:display] : format.display?
-      end
-      
-      def svg_attr(attr_name, value)
-        attrs[attr_name.to_s] = value
+      def style
+        @style ||= Style::Graphic.new(format)
       end
       
       def type_of?(type_name)
         ['s-basic', self.type].include?("s-#{type_name}")
       end
     end
-    
   end
 end

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

@@ -0,0 +1,15 @@
+# coding: utf-8
+
+module ThinReports
+  module Core::Shape
+    
+    module ImageBlock
+      TYPE_NAME = 's-iblock'
+    end
+    
+  end
+end
+
+require 'thinreports/core/shape/image_block/format'
+require 'thinreports/core/shape/image_block/internal'
+require 'thinreports/core/shape/image_block/interface'

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

@@ -0,0 +1,13 @@
+# coding: utf-8
+
+module ThinReports
+  module Core::Shape
+    
+    # @private
+    class ImageBlock::Format < Basic::BlockFormat
+      config_reader :position_x => %w( position-x ),
+                    :position_y => %w( position-y )
+    end
+    
+  end
+end

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

@@ -0,0 +1,19 @@
+# coding: utf-8
+
+module ThinReports
+  module Core::Shape
+    
+    class ImageBlock::Interface < Basic::BlockInterface
+      # @see #value
+      alias_method :src, :value
+      
+    private
+      
+      # @see ThinReports::Core::Shape::Base::Interface#init_internal
+      def init_internal(parent, format)
+        ImageBlock::Internal.new(parent, format)
+      end
+    end
+    
+  end
+end

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

@@ -0,0 +1,16 @@
+# coding: utf-8
+
+module ThinReports
+  module Core::Shape
+    
+    # @private
+    class ImageBlock::Internal < Basic::BlockInternal
+      alias_method :src, :read_value
+      
+      def type_of?(type_name)
+        type_name == :iblock || super
+      end
+    end
+    
+  end
+end

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

@@ -6,7 +6,24 @@ module ThinReports
     class List::Events < Core::Events
       def initialize
         super(:page_footer_insert,
-              :footer_insert)
+              :footer_insert,
+              :page_finalize)
+      end
+      
+      class PageEvent < Event
+        # @return [ThinReports::Core::Page]
+        attr_reader :page
+        
+        # @param type (see ThinReports::Core::Events::Event#initialize)
+        # @param [ThinReports::Core::Shape::List::Page] target
+        # @param [ThinReports::Core::Page] page
+        def initialize(type, target, page)
+          super(type, target)
+          @page = page
+        end
+        
+        # @return [ThinReports::Core::Shape::List::Page]
+        alias_method :list, :target
       end
       
       class SectionEvent < Event
@@ -14,7 +31,7 @@ module ThinReports
         attr_reader :store
         
         # @param type (see ThinReports::Core::Events::Event#initialize)
-        # @param target (see ThinReports::Core::Events::Event#initialize)
+        # @param [ThinReports::Core::Shape::List::SectionInterface] target
         # @param [ThinReports::Core::Shape::List::Store] store
         def initialize(type, target, store)
           super(type, target)

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

@@ -43,7 +43,7 @@ module ThinReports
       # @see List::Page#header
       def header(values = {}, &block)
         unless format.has_header?
-          raise ThinReports::Errors::DisabledListSection, 'header'
+          raise ThinReports::Errors::DisabledListSection.new('header')
         end        
         current_page_state.header ||= init_section(:header)
         build_section(current_page_state.header, values, &block)
@@ -102,8 +102,14 @@ module ThinReports
       # @param [Symbol] section_name
       # @return [Boolean]
       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
+        
         height = format.section_height(section_name)
-        current_page_state.height + height > page_max_height
+        (current_page_state.height + height) > max_height
       end
       
       # @return [Numeric]
@@ -134,6 +140,7 @@ module ThinReports
       
       # @param [Hash] options
       # @option [Boolean] :ignore_page_footer (false)
+      #   When the switch of the page is generated by #finalize, it is used. 
       # @private
       def finalize_page(options = {})
         return if current_page_state.finalized?
@@ -144,12 +151,18 @@ module ThinReports
         
         if !options[:ignore_page_footer] && format.has_page_footer?
           footer = insert_new_row(:page_footer)
-          # Dispatch event on footer insert.
+          # Dispatch page-footer insert event.
           events.
             dispatch(List::Events::SectionEvent.new(:page_footer_insert,
                                                     footer, store))
         end
         current_page_state.finalized!
+        
+        # Dispatch page finalize event.
+        events.
+          dispatch(List::Events::PageEvent.new(:page_finalize,
+                                               current_page, 
+                                               current_page_state.parent))
       end      
       
       # @private
@@ -169,7 +182,7 @@ module ThinReports
           else
             footer = insert_new_row(:footer)
           end
-          # Dispatch event on footer insert.
+          # Dispatch footer insert event.
           events.dispatch(List::Events::SectionEvent.new(:footer_insert,
                                                          footer, store))
         end

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

@@ -86,13 +86,13 @@ module ThinReports
           
           new_list = self.class.new(new_parent, internal.format,
                                     internal.copy(new_parent), manager)
-          
-          new_list.internal.header = internal.header.copy(new_list)
           internal.rows.each do |row|
             new_list.internal.rows << row.copy(new_list)
           end
           new_list.finalized!
         end
+        # New-List inherit List-Header of Old-List.
+        new_list.internal.header = internal.header.copy(new_list)
         new_list
       end
       

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

@@ -18,6 +18,10 @@ module ThinReports
         @finalized = false
       end
       
+      def style
+        @style ||= Style::Basic.new(format)
+      end
+      
       def finalized?
         @finalized
       end

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

@@ -13,6 +13,10 @@ module ThinReports
       # @return [Symbol]
       attr_accessor :section_name
       
+      def style
+        @style ||= Style::Base.new(format)
+      end
+      
       # @param [Numeric] ry
       def move_top_to(ry)
         states[:relative_top] = ry

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

@@ -16,7 +16,7 @@ module ThinReports
       end
       
       def find_shape(id)
-        shapes && shapes[id]
+        shapes[id]
       end
       
       def shapes

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

@@ -43,20 +43,33 @@ module ThinReports
       # @param [String, Symbol] id
       # @return [ThinReports::Core::Shape::Base::Interface, nil]
       def final_shape(id)
+        # When shape was found in registry.
         if shape = shapes[id]
-          return shape.visible? ? shape : nil
-        end
-        
-        sformat = find_format(id)
-        if sformat.display?
-          case sformat.type
-          when Tblock::TYPE_NAME
-            if sformat.has_reference? || !sformat.value.blank?
-              init_item(sformat)
-            end
+          return nil unless shape.visible?
+          
+          # In the case of TextBlock or ImageBlock.
+          if shape.internal.type_of?(:block)
+            shape.internal.real_value.blank? ? nil : shape
+          else
+            shape
+          end
+        # When shape was not found in registry.
+        elsif f = find_format(id)
+          return nil unless f.display?
+          
+          case f.type
+          # In the case of TextBlock.
+          when TextBlock::TYPE_NAME
+            f.has_reference? || !f.value.blank? ? init_item(f) : nil
+          # In the case of ImageBlock, Return the nil constantly.
+          when ImageBlock::TYPE_NAME
+            nil
           else
-            init_item(sformat)
+            init_item(f)
           end
+        # In the case of other, Return the nil constantly.
+        else
+          nil
         end
       end
       

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

@@ -28,7 +28,7 @@ module ThinReports
         shape = find_item(id, :except => Core::Shape::List::TYPE_NAME)
         
         unless shape
-          raise ThinReports::Errors::UnknownItemId, id
+          raise ThinReports::Errors::UnknownItemId.new(id)
         else
           block_exec_on(shape, &block)
         end
@@ -59,7 +59,7 @@ module ThinReports
         shape = find_item(id, :only => Core::Shape::List::TYPE_NAME)
 
         unless shape
-          raise ThinReports::Errors::UnknownItemId, id
+          raise ThinReports::Errors::UnknownItemId.new(id, 'List')
         else
           manager.lists[id.to_sym] ||= shape
           block_exec_on(shape, &block)

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

@@ -0,0 +1,15 @@
+# coding: utf-8
+
+module ThinReports
+  module Core::Shape
+    
+    module Style
+    end
+    
+  end
+end
+
+require 'thinreports/core/shape/style/base'
+require 'thinreports/core/shape/style/basic'
+require 'thinreports/core/shape/style/graphic'
+require 'thinreports/core/shape/style/text'

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

@@ -0,0 +1,149 @@
+# coding: utf-8
+
+module ThinReports
+  module Core::Shape
+    
+    # @private
+    class Style::Base
+      class << self
+        # @param [Symbol] style_method
+        # @param [String] style
+        # @return [void]
+        def style_accessor(style_method, style)
+          style_reader(style_method, style)
+          style_writer(style_method, style)
+        end
+        
+        # @see .style_accessor
+        def style_reader(style_method, style)
+          define_method(style_method) do
+            read_internal_style(style)
+          end
+        end
+        
+        # @see .style_accessor
+        def style_writer(style_method, style)
+          define_method(:"#{style_method}=") do |value|
+            write_internal_style(style, value)
+          end
+        end
+        
+        # @param [Array<Symbol>] style_methods
+        def style_accessible(*style_methods)
+          accessible_styles.concat(style_methods)
+        end
+        
+        # @return [Array<Symbol>]
+        def accessible_styles
+          @accessible_styles ||= []
+        end
+        
+        # @private
+        def inherited(s)
+          s.accessible_styles.concat(accessible_styles.dup)
+        end
+      end
+      
+      # @return [Hash]
+      attr_accessor :styles
+      # @see .accessible_styles
+      attr_reader :accessible_styles
+      
+      # @param [ThinReports::Core::Format::Base] format
+      # @param [Hash] default_styles ({})
+      def initialize(format, default_styles = {})
+        @format = format
+        @styles = default_styles
+        @base_styles = format.svg_attrs || {}
+        
+        @accessible_styles = self.class.accessible_styles.dup
+        @finalized_svg_attributes = nil
+      end
+      
+      # @param [Symbol] style_method
+      # @return [Object]
+      def [](style_method)
+        verify_style_method(style_method)
+        send(style_method.to_sym)
+      end
+      
+      # @param [Symbol] style_method
+      # @param [String, Number, Array<String, Number>]
+      def []=(style_method, value)
+        verify_style_method(style_method)
+        send(:"#{style_method}=", value)
+      end
+      
+      # @return [String]
+      def identifier
+        create_identifier(@styles)
+      end
+      
+      # @return [self]
+      def copy
+        self.class.new(@format, @styles.empty? ? {} : @styles.simple_deep_copy)
+      end
+      
+      # @return [Hash]
+      def finalized_svg_attributes
+        if @finalized_svg_attributes.nil?
+          @finalized_svg_attributes = if @styles.empty?
+            @base_styles.dup
+          else
+            @base_styles.merge(@styles)
+          end
+        end
+        @finalized_svg_attributes
+      end
+      alias_method :svg_attrs, :finalized_svg_attributes
+    
+      # @param [String, Symbol] style
+      # @return [Object]
+      def read_internal_style(style)
+        style = style.to_s
+        @styles.key?(style) ? @styles[style] : @base_styles[style]
+      end
+      
+      # @param [String, Symbol] style
+      # @param [Object] value
+      def write_internal_style(style, value)
+        @styles[style.to_s] = value
+      end
+      
+      # @param [Symbol] style_method
+      # @return [Boolean]
+      def has_style?(style_method)
+        accessible_styles.include?(style_method)
+      end
+      
+    private
+      
+      # @param [Hash] s
+      # @return [String]
+      def create_identifier(s)
+        s.empty? ? '' : s.hash.to_s
+      end
+      
+      # @param [Symbol] style_method
+      # @return [Boolean]
+      # @raise ThinReports::Errors::UnknownShapeStyleName
+      def verify_style_method(style_method)
+        unless has_style?(style_method)
+          raise ThinReports::Errors::UnknownShapeStyleName.new(style_method,
+                                                               accessible_styles)
+        end
+      end
+      
+      # @param [Object] value
+      # @param [Array<Object>] allows
+      # @param [String] msg (nil)
+      # @raise ArgumentError
+      def verify_style_value(value, allows, msg = nil)
+        unless allows.include?(value)
+          raise ArgumentError, msg
+        end
+      end
+    end
+    
+  end
+end