thinreports 0.8.2 → 0.9.0

data/lib/thinreports.rb

@@ -8,7 +8,6 @@ require 'thinreports/version'
 require 'thinreports/config'
 require 'thinreports/core/utils'
 require 'thinreports/core/errors'
-require 'thinreports/core/events'
 require 'thinreports/core/format/base'
 require 'thinreports/core/shape'
 require 'thinreports/core/utils'

data/lib/thinreports/config.rb

@@ -43,7 +43,10 @@ module Thinreports
     #   config.convert_palleted_transparency_png = true
     #   config.convert_palleted_transparency_png = false # default
     # @see https://github.com/thinreports/thinreports-generator/pull/32
+    # @deprecated convert_palleted_transparency_png is deprecated and will be removed in thinreports-generator 1.0 with no replacement
     def convert_palleted_transparency_png=(enable)
+      warn '[DEPRECATION] convert_palleted_transparency_png is deprecated' \
+           ' and will be removed in thinreports-generator 1.0 with no replacement.' if enable
       @convert_palleted_transparency_png = enable
     end
 

data/lib/thinreports/core/errors.rb

@@ -52,9 +52,6 @@ module Thinreports
       end
     end
 
-    class NoConfigurationFound < Basic
-    end
-
     class UnsupportedColorName < Basic
     end
 

data/lib/thinreports/core/format/base.rb

@@ -1,13 +1,9 @@
 # coding: utf-8
-require 'thinreports/core/format/builder'
-
 module Thinreports::Core
   module Format
 
     # @abstract
     class Base
-      extend Format::Builder
-
       class << self
         def config_reader(*configs, &block)
           each_configs(*configs) do |m, location|
@@ -60,6 +56,10 @@ module Thinreports::Core
         block.call(self) if ::Kernel.block_given?
       end
 
+      def attributes
+        @config
+      end
+
       private
 
       def find(*keys)

data/lib/thinreports/core/shape.rb

@@ -12,15 +12,7 @@ module Thinreports
         find_by_type(type)::Format
       end
 
-      def Configuration(type)
-        klass = find_by_type(type)
-        unless klass.const_defined?(:Configuration)
-          raise Thinreports::Errors::NoConfigurationFound, type
-        end
-        klass.const_get(:Configuration)
-      end
-
-      module_function :Interface, :Format, :Configuration
+      module_function :Interface, :Format
 
       def self.find_by_type(type)
         case type

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

@@ -2,11 +2,11 @@
 
 module Thinreports
   module Core::Shape
-    
+
     module Basic
-      TYPE_NAMES = %w( s-line s-rect s-ellipse s-image )
+      TYPE_NAMES = %w( line rect ellipse image )
     end
-    
+
   end
 end
 

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

@@ -4,7 +4,7 @@ module Thinreports
   module Core::Shape
 
     class Basic::BlockFormat < Basic::Format
-      config_reader :value, :box
+      config_reader :value
     end
 
   end

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

@@ -7,20 +7,8 @@ module Thinreports
       include Utils
 
       config_reader :type, :id
-      config_reader svg_tag: %w( svg tag ),
-                    svg_attrs: %w( svg attrs )
-
-      config_checker 'true', :display
-
-      class << self
-      private
-
-        # @param [Hash] raw_format
-        # @return [Thinreports::Core::Shape::Basic::Format]
-        def build_internal(raw_format)
-          new(raw_format)
-        end
-      end
+      config_reader :style
+      config_checker true, :display
     end
 
   end

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

@@ -5,14 +5,14 @@ module Thinreports
 
     class Basic::Internal < Base::Internal
       # Delegate to Format's methods
-      format_delegators :id, :svg_tag, :type
+      format_delegators :id, :type
 
       def style
         @style ||= Style::Graphic.new(format)
       end
 
       def type_of?(type_name)
-        ['s-basic', self.type].include?("s-#{type_name}")
+        [:basic, self.type].include?(type_name)
       end
 
       def identifier

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

@@ -2,11 +2,11 @@
 
 module Thinreports
   module Core::Shape
-    
+
     module ImageBlock
-      TYPE_NAME = 's-iblock'
+      TYPE_NAME = 'image-block'
     end
-    
+
   end
 end
 

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

@@ -4,8 +4,6 @@ module Thinreports
   module Core::Shape
 
     class ImageBlock::Format < Basic::BlockFormat
-      config_reader position_x: %w( position-x ),
-                    position_y: %w( position-y )
     end
 
   end

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

@@ -7,7 +7,7 @@ module Thinreports
       alias_method :src, :read_value
 
       def type_of?(type_name)
-        type_name == :iblock || super
+        type_name == ImageBlock::TYPE_NAME || super
       end
     end
 

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

@@ -2,11 +2,11 @@
 
 module Thinreports
   module Core::Shape
-    
+
     module List
-      TYPE_NAME = 's-list'
+      TYPE_NAME = 'list'
     end
-    
+
   end
 end
 
@@ -19,7 +19,3 @@ require 'thinreports/core/shape/list/page_state'
 require 'thinreports/core/shape/list/section_format'
 require 'thinreports/core/shape/list/section_interface'
 require 'thinreports/core/shape/list/section_internal'
-
-require 'thinreports/core/shape/list/store'
-require 'thinreports/core/shape/list/events'
-require 'thinreports/core/shape/list/configuration'

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

@@ -5,26 +5,34 @@ module Thinreports
 
     class List::Format < Basic::Format
       config_reader height: %w( content-height )
-      config_checker 'true', auto_page_break: %w( page-break )
+      config_checker true, auto_page_break: %w( auto-page-break )
 
+      # @deprecated
       config_reader :header,
                     :detail,
                     :footer
+      # @deprecated
       config_reader page_footer: %w( page-footer )
 
-      config_checker 'true', has_header: %w( header-enabled )
-      config_checker 'true', has_footer: %w( footer-enabled )
-      config_checker 'true', has_page_footer: %w( page-footer-enabled )
+      config_checker true, has_header: %w( header enabled )
+      config_checker true, has_footer: %w( footer enabled )
+      config_checker true, has_page_footer: %w( page-footer enabled )
 
       config_reader page_footer_height: %w( page-footer height )
       config_reader footer_height: %w( footer height )
       config_reader header_height: %w( header height )
       config_reader detail_height: %w( detail height )
 
-      config_accessor :sections
+      attr_reader :sections
+
+      def initialize(*)
+        super
+        initialize_sections
+      end
 
       # @param [Symbol] section_name
       # @return [Hash]
+      # @deprecated
       def section(section_name)
         __send__(section_name)
       end
@@ -41,29 +49,34 @@ module Thinreports
         has_section?(section_name) ? __send__(:"#{section_name}_height") : 0
       end
 
-      class << self
+      # @param [:detai, :header, :page_footer, :footer] section_name
+      # @return [Numeric]
+      def section_base_position_top(section_name)
+        section = @sections[section_name]
+        return 0 unless has_section?(section_name)
 
-      private
+        top = section.relative_top
 
-        # @param [Hash] raw_format
-        # @return [Thinreports::Core::Shape::List::Format]
-        def build_internal(raw_format)
-          new(raw_format) do |f|
-            f.sections = {}
-            build_section(:detail, f)
-            build_section(:header, f) if f.has_header?
-            build_section(:footer, f) if f.has_footer?
-            build_section(:page_footer, f) if f.has_page_footer?
-          end
+        case section_name
+        when :page_footer
+          top - section_height(:detail)
+        when :footer
+          top - section_height(:detail) - section_height(:page_footer)
+        else
+          top
         end
+      end
 
-        # @param [Symbol] section_name
-        # @param [Thinreports::Core::Shape::List::Format] list
-        # @return [Thinreports::Core::Shape::List::SectionFormat]
-        def build_section(section_name, list)
-          list.sections[section_name] =
-            List::SectionFormat.build(list.section(section_name))
-        end
+      private
+
+      def initialize_sections
+        @sections = {
+          detail: List::SectionFormat.new(attributes['detail'])
+        }
+
+        @sections[:header] = List::SectionFormat.new(attributes['header']) if has_section?(:header)
+        @sections[:page_footer] = List::SectionFormat.new(attributes['page-footer']) if has_section?(:page_footer)
+        @sections[:footer] = List::SectionFormat.new(attributes['footer']) if has_section?(:footer)
       end
     end
 

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

@@ -6,9 +6,6 @@ module Thinreports
     class List::Manager
       include Utils
 
-      # @return [Thinreports::Core::Shape::List::Configuration]
-      attr_reader :config
-
       # @return [Thinreports::Core::Shape:::List::Page]
       attr_reader :current_page
 
@@ -31,7 +28,6 @@ module Thinreports
       def initialize(page)
         switch_current!(page)
 
-        @config = init_config
         @finalized = false
         @page_count = 0
 
@@ -159,16 +155,6 @@ module Thinreports
         end
       end
 
-      # @return [Thinreports::Core::Shape::List::Store]
-      def store
-        config.store
-      end
-
-      # @return [Thinreports::Core::Shape::List::Events]
-      def events
-        config.internal_events
-      end
-
       # @return [Boolean]
       def auto_page_break?
         format.auto_page_break?
@@ -184,22 +170,10 @@ module Thinreports
 
         if !options[:ignore_page_footer] && format.has_page_footer?
           page_footer = insert_row(init_section(:page_footer))
-
-          # [DEPRECATION] Use List::Interface#on_page_footer_insert instead.
-          events.
-            dispatch(List::Events::SectionEvent.new(:page_footer_insert,
-                                                    page_footer, store))
-          # In 0.8 or later
           @page_footer_handler.call(page_footer) if @page_footer_handler
         end
-        current_page_state.finalized!
 
-        # [DEPRECATION] Use List::Interface#on_page_finalize instead.
-        events.
-          dispatch(List::Events::PageEvent.new(:page_finalize,
-                                               current_page,
-                                               current_page_state.parent))
-        # In 0.8 or later
+        current_page_state.finalized!
         @page_finalize_handler.call if @page_finalize_handler
 
         @page_count += 1
@@ -213,10 +187,6 @@ module Thinreports
         if format.has_footer?
           footer = init_section(:footer)
 
-          # [DEPRECATION] Use List::Interface#on_footer_insert instead.
-          events.dispatch(List::Events::SectionEvent.new(:footer_insert, footer, store))
-
-          # In 0.8 or later
           @footer_handler.call(footer) if @footer_handler
 
           if auto_page_break? && overflow_with?(:footer)
@@ -250,11 +220,6 @@ module Thinreports
       def format
         current_page_state.format
       end
-
-      # @return [Thinreports::Core::Shape::List::Configuration]
-      def init_config
-        layout.config.activate(current_page.id) || List::Configuration.new
-      end
     end
 
   end

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

@@ -69,21 +69,6 @@ module Thinreports
         manager.overflow_with?(:detail)
       end
 
-      # @return [Thinreports::Core::Shape::List::Configuration]
-      def config
-        manager.config
-      end
-
-      # @return [Thinreports::Core::Shape::List::Store]
-      def store
-        config.store
-      end
-
-      # @return [Thinreports::Core::Shape::List::Events]
-      def events
-        config.events
-      end
-
       # @param [Thinreports::Report::Page] new_parent
       # @return [Thinreports::Core::Shape::List::Page]
       def copy(new_parent)

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

@@ -34,7 +34,7 @@ module Thinreports
       end
 
       def type_of?(type_name)
-        type_name == :list
+        type_name == List::TYPE_NAME
       end
     end
 

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

@@ -7,24 +7,26 @@ module Thinreports
       config_reader :height
       config_reader relative_left: %w( translate x ),
                     relative_top: %w( translate y )
+      config_reader :style
 
-      config_reader layout: %w( svg content ),
-                    svg_tag: %w( svg tag ),
-                    svg_attrs: %w( svg attrs )
+      # For compatible 0.8.x format API
+      config_checker true, display: %w( enabled )
+
+      def initialize(*)
+        super
+        initialize_items(attributes['items'])
+      end
 
-      class << self
       private
 
-        def build_internal(raw_format)
-          new(raw_format) do |f|
-            build_layout(f, level: 2) do |type, shape_format|
-              Core::Shape::Format(type).build(shape_format)
-            end
-            clean(f.layout)
-          end
+      def initialize_items(item_schemas)
+        item_schemas.each do |item_schema|
+          id, type = item_schema.values_at 'id', 'type'
+          next if id.empty?
+
+          self.shapes[id.to_sym] = Core::Shape::Format(type).new(item_schema)
         end
       end
-
     end
 
   end