thinreports 0.7.6 → 0.7.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8bd5e81c97f873dec7aea631b5ee9a3f2194bdad
+  data.tar.gz: 8e84d4b9e83f60c98293305d2f4f937ae65697a3
+SHA512:
+  metadata.gz: db8ff91414f3f2826c6dc4d58b2dfc77fd824075a363da23d7bdbeb0049cca5b72f4fdf2c04cc7b33641baf6ed383705ad791d28376cc152e648cf5cf7950349
+  data.tar.gz: f6198bc83cc5eb2566c20e50223a1c74a9d09a04b47b06e4c78111efafbe1f8ae2394026378909d57090acefaa8ed8681b8488f2815b3e8942ebf69a384f0975

data/.gitignore

@@ -3,6 +3,7 @@ Gemfile.lock
 *.swp
 *.pdf
 
+.bundle/
 doc/yardoc
 .yardoc/
 coverage

data/.travis.yml

@@ -1,6 +1,16 @@
+language: ruby
+
+before_install:
+  - gem update --system 2.1.11
+  - gem --version
 rvm: 
   - 1.8.7
   - 1.9.3
-  - jruby-18mode
+  - 2.0.0
+  - 2.1.0
+  - jruby
+env:
+  - JRUBY_OPTS=--1.8
 
 script: rake test:unit
+

data/Gemfile

@@ -2,13 +2,6 @@ source 'http://rubygems.org'
 
 gemspec
 
-# In the case of Ruby 1.8.7.
-unless RUBY_VERSION > '1.9'
-  gem 'json', '>= 1.4.6'
-  gem 'minitest', '>= 0'
-  gem 'turn', '>=0'
-end
+# For 1.8.7
+gem 'json', '>= 1.4.6' unless RUBY_VERSION > '1.9'
 
-platforms :mswin, :mingw do
-  gem 'win32console'
-end

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Matsukei Co.,Ltd.
+Copyright (c) 2014 Matsukei Co.,Ltd.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,6 +1,6 @@
 = ThinReports Generator
 
-{<img src="https://secure.travis-ci.org/thinreports/thinreports-generator.png" />}[http://travis-ci.org/thinreports/thinreports-generator] {<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/thinreports/thinreports-generator]
+{<img src="https://secure.travis-ci.org/thinreports/thinreports-generator.png" />}[http://travis-ci.org/thinreports/thinreports-generator] {<img src="https://codeclimate.com/github/thinreports/thinreports-generator.png" />}[https://codeclimate.com/github/thinreports/thinreports-generator] {<img src="https://gemnasium.com/thinreports/thinreports-generator.png" />}[https://gemnasium.com/thinreports/thinreports-generator]
 
 {ThinReports}[http://www.thinreports.org/] is Open Source Reporting Solution for Ruby.
 
@@ -34,8 +34,8 @@ Generator can be dynamically operated ...
 
 == Supported Versions
 
-* Ruby 1.8.7, 1.9.2, 1.9.3
-* JRuby 1.6.5+ (Only 1.8mode)
+* Ruby 1.8.7,1.9.3, 2.0.0, 2.1.0
+* JRuby 1.6, 1.7.0 (Only 1.8 mode)
 
 == Install
 
@@ -71,11 +71,11 @@ Or:
     page.item(:title).style(:color, 'red')
   end
 
-  report.generate_file('report.pdf')
+  report.generate(:filename => 'report.pdf')
 
 Or, 
 
-  ThinReports::Report.generate_file('report.pdf', :layout => 'report.tlf') do
+  ThinReports::Report.generate(:filename => 'report.pdf', :layout => 'report.tlf') do
     start_new_page
     
     page.item(:title).value('ThinReports')
@@ -91,45 +91,43 @@ Or,
   report.start_new_page
 
   10.times do |n|
-    report.page.list(:default).add_row do |row|
+    report.list.add_row do |row|
       row.item(:no).value(n)
     end
   end
 
-  report.generate_file('list.tlf')
+  report.generate(:filename => 'list.tlf')
 
 Or, 
 
-  report.page.list(:default) do |list|
+  10.times do |n|
+    report.list.add_row :no => n
+  end
+
+Or,
+
+  report.list(:other_list_id) do |list|
     10.times do |n|
       list.add_row :no => n
     end
   end
 
-Since 0.7.5:
+* +#start_new_page+ can be omitted because it is created new page automatically when +#list+ is called
+* id argument of +#list+ can be omitted if is +:default+
+
+0.7.0 and earlier:
 
   report = ThinReports::Report.new :layout => 'list.tlf'
 
   10.times do |n|
-    report.list.add_row do |row|
+    report.page.list(:default).add_row do |row|
       row.item(:no).value(n)
     end
   end
 
-More simply,
-
-  report.list do |list|
-    10.times do |n|
-      list.add_row :title => n
-    end
-  end
-
-* +#start_new_page+ can be omitted because it is created new page automatically when +#list+ is called
-* id argument of +#list+ can be omitted if is :default
-
-{Learn more}[http://osc.matsukei.net/projects/thinreports/wiki/Getting_Started].
+{Learn more}[http://osc.matsukei.net/projects/thinreports/wiki/En_Getting_Started].
 
-=== Rails3
+=== Rails3, 4
 
 * Rails Template handler for ThinReports DSL: {thinreports-rails}[https://github.com/takeshinoda/thinreports-rails]
 
@@ -142,9 +140,10 @@ More simply,
 
 === Documentation
 
-{Getting Started}[http://osc.matsukei.net/projects/thinreports/wiki/Getting_Started] /
-{Examples}[http://osc.matsukei.net/projects/thinreports/wiki/Examples] /
-{HowTos}[http://osc.matsukei.net/projects/thinreports/wiki/HowTos]
+* Getting Started [{en}[http://osc.matsukei.net/projects/thinreports/wiki/En_Getting_Started] / {ja}[http://osc.matsukei.net/projects/thinreports/wiki/Getting_Started]]
+* Examples [{en}[http://osc.matsukei.net/projects/thinreports/wiki/En_Examples] / {ja}[http://osc.matsukei.net/projects/thinreports/wiki/Examples]]
+* HowTos [{en}[http://osc.matsukei.net/projects/thinreports/wiki/En_HowTos] / {ja}[http://osc.matsukei.net/projects/thinreports/wiki/HowTos]]
+* Tutorial [{en}[http://osc.matsukei.net/projects/thinreports/wiki/En_Tutorial] / {ja}[http://osc.matsukei.net/projects/thinreports/wiki/Tutorial]]
 
 === Support
 

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

@@ -6,11 +6,6 @@ module ThinReports
     # @abstract
     # @private
     class Base
-      # Work like a BlankSlate.
-      instance_methods.each do |m|
-        undef_method(m) unless m.to_s =~ /^(object|eq|__|instance_|=|!)/
-      end
-      
       class << self
         include Core::Format::Builder
         

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

@@ -15,7 +15,7 @@ module ThinReports
       def build(*args)
         build_internal(*args)
       rescue ThinReports::Errors::Basic => e
-        raise e
+        raise
       rescue => e
         raise ThinReports::Errors::InvalidLayoutFormat
       end
@@ -31,13 +31,13 @@ module ThinReports
       # @param [Hash] options
       def build_layout(format, options = {}, &block)
         level = '-' * ((options[:level] || 1 ) - 1)
+        pattern = /<!--#{level}SHAPE(.*?)SHAPE#{level}-->/
 
-        format.layout.gsub!(/<!--#{level}SHAPE(.*?)SHAPE#{level}-->/) do
-          shape_format = block.call(*parsed_format_and_shape_type($1))
-          
+        format.layout.scan(pattern) do |m|
+          shape_format = block.call(*parsed_format_and_shape_type(m.first))
           format.shapes[shape_format.id.to_sym] = shape_format
-          shape_tag(shape_format)
         end
+        format.layout.gsub!(pattern, '')
       end
       
       # @param [String] svg

data/lib/thinreports/core/page.rb

@@ -35,8 +35,10 @@ module ThinReports
       
       # @param [ThinReports::Report::Base] report
       # @param [ThinReports::Layout::Base] layout
-      def initialize(report, layout)
-        super(true)
+      # @param [Hash] options ({})
+      # @option options [Boolean] :count (true)
+      def initialize(report, layout, options = {})
+        super(options.key?(:count) ? options[:count] : true)
         
         @report    = report
         @layout    = layout
@@ -54,7 +56,7 @@ module ThinReports
       
       # @private
       def copy
-        new_page = self.class.new(report, layout)
+        new_page = self.class.new(report, layout, :count => count?)
         
         manager.shapes.each do |id, shape|
           new_shape = shape.copy(new_page)

data/lib/thinreports/core/shape.rb

@@ -32,6 +32,7 @@ module ThinReports
         when ImageBlock::TYPE_NAME then ImageBlock
         when List::TYPE_NAME       then List
         when Text::TYPE_NAME       then Text
+        when PageNumber::TYPE_NAME then PageNumber
         when *Basic::TYPE_NAMES    then Basic
         else
           raise ThinReports::Errors::UnknownShapeType
@@ -50,3 +51,4 @@ require 'thinreports/core/shape/text'
 require 'thinreports/core/shape/text_block'
 require 'thinreports/core/shape/image_block'
 require 'thinreports/core/shape/list'
+require 'thinreports/core/shape/page_number'

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

@@ -15,6 +15,10 @@ module ThinReports
       def type_of?(type_name)
         ['s-basic', self.type].include?("s-#{type_name}")
       end
+
+      def identifier
+        "#{id}#{style.identifier}"
+      end
     end
   end
-end
+end

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

@@ -6,10 +6,10 @@ module ThinReports
     class List::Configuration
       # @return [ThinReports::Core::Shape::List::Events]
       attr_reader :events
-      
+
       # @return [ThinReports::Core::Shape::List::Store]
       attr_reader :store
-            
+
       # @param [ThinReports::Core::Shape::List::Events, nil] events (nil)
       # @param [ThinReports::Core::Shape::List::Store, nil] store (nil)
       def initialize(events = nil, store = nil)
@@ -27,7 +27,13 @@ module ThinReports
       def copy
         self.class.new(@events.copy, @store && @store.copy)
       end
+
+      # @return [String]
+      def type
+        List::TYPE_NAME
+      end
     end
     
   end
-end
+end
+

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

@@ -5,6 +5,7 @@ module ThinReports
     
     # @private
     class List::Manager
+      # @return [ThinReports::Core::Shape::List::Configuration]
       attr_reader :config
       
       # @return [ThinReports::Core::Shape:::List::Page]
@@ -12,13 +13,17 @@ module ThinReports
       
       # @return [ThinReports::Core::Shape::List::PageState]
       attr_reader :current_page_state
+
+      # @return [Integer]
+      attr_accessor :page_count
       
       # @param [ThinReports::Core::Shape::List::Page] page
       def initialize(page)
         switch_current!(page)
 
-        @config    = init_config
-        @finalized = false
+        @config     = init_config
+        @finalized  = false
+        @page_count = 0
       end
       
       # @param [ThinReports::Core::Shape::List::Page] page
@@ -137,7 +142,7 @@ module ThinReports
       def auto_page_break?
         format.auto_page_break?
       end
-      
+
       # @param [Hash] options
       # @option [Boolean] :ignore_page_footer (false)
       #   When the switch of the page is generated by #finalize, it is used. 
@@ -163,7 +168,9 @@ module ThinReports
           dispatch(List::Events::PageEvent.new(:page_finalize,
                                                current_page, 
                                                current_page_state.parent))
-      end      
+        @page_count += 1
+        current_page_state.no = @page_count
+      end
       
       # @private
       def finalize

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

@@ -4,7 +4,6 @@ module ThinReports
   module Core::Shape
     
     class List::Page < Basic::Interface
-      
       # @param [ThinReports::Core::Page] parent
       # @param [ThinReports::Core::Shape::Basic::Format] format
       # @param [ThinReports::Core::Shape::List::PageState] internal (nil)
@@ -17,6 +16,9 @@ module ThinReports
         else
           List::Manager.new(self)
         end
+
+        # Set a reference to List::PageState List::Manager
+        self.internal.manager = self.manager
       end
       
       # @param [Hash] values ({})

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

@@ -6,8 +6,11 @@ module ThinReports
     # @private
     class List::PageState < Basic::Internal
       attr_reader :rows
+
       attr_accessor :height
       attr_accessor :header
+      attr_accessor :no
+      attr_accessor :manager
       
       def initialize(*args)
         super(*args)
@@ -41,4 +44,4 @@ module ThinReports
     List::Internal = List::PageState
     
   end
-end
+end

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

@@ -97,4 +97,4 @@ module ThinReports
     end
     
   end
-end
+end

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

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

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

@@ -0,0 +1,25 @@
+# coding: utf-8
+
+module ThinReports
+  module Core::Shape
+
+    class PageNumber::Format < Basic::Format
+      config_reader :overflow, :target, :box
+      config_reader :default_format => %w( format )
+
+      def id
+        unless @id
+          @id = read('id')
+          @id = self.class.next_default_id if @id.blank?
+        end
+        @id
+      end
+
+      def self.next_default_id
+        @id_counter ||= 0
+        "__pageno#{@id_counter += 1}"
+      end
+    end
+
+  end
+end

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

@@ -0,0 +1,27 @@
+# coding: utf-8
+
+module ThinReports
+  module Core::Shape
+
+    class PageNumber::Interface < Basic::Interface
+      internal_delegators :reset_format
+
+      def format(*args)
+        if args.empty?
+          internal.read_format
+        else
+          internal.write_format(args.first)
+          self
+        end
+      end
+
+    private
+    
+      # @see ThinReports::Core::Shape::Base::Interface#init_internal
+      def init_internal(parent, format)
+        PageNumber::Internal.new(parent, format)
+      end
+    end
+
+  end
+end

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

@@ -0,0 +1,57 @@
+# coding: utf-8
+
+module ThinReports
+  module Core::Shape
+
+    class PageNumber::Internal < Basic::Internal
+      format_delegators :box
+
+      def read_format
+        states.key?(:format) ? states[:format] : format.default_format.dup
+      end
+
+      def reset_format
+        states.delete(:format)
+      end
+
+      def write_format(format)
+        states[:format] = format.to_s
+      end
+
+      def build_format(page_no, page_count)
+        return '' if read_format.blank?
+
+        if start_page_number > 1
+          page_no += start_page_number - 1
+          page_count += start_page_number - 1
+        end
+
+        read_format.dup.tap do |f|
+          f.gsub! '{page}', page_no.to_s
+          f.gsub! '{total}', page_count.to_s
+        end
+      end
+
+      def style
+        @style ||= PageNumber::Style.new(format)
+      end
+
+      def for_report?
+        format.target.blank?
+      end
+
+      def type_of?(type_name)
+        type_name == :pageno
+      end
+
+      def start_page_number
+        for_report? ? parent.report.start_page_number : 1
+      end
+    end
+
+    class PageNumber::Style < Style::Text
+      accessible_styles.delete :valign
+    end
+
+  end
+end