prep 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/examples/generate_sample7.rb

@@ -0,0 +1,40 @@
+require File.join(File.dirname(__FILE__), "..", "lib", "prep")
+
+prep = PREP::Core::Prep.new("sample7.yml")
+values = {
+  :content => {
+    :out_table => {
+      :header => { :header_title => "hoge" },
+      :values => [
+                  {
+                    :inner_table => {
+                      :header => { :inner_table_header_title => "First" },
+                      :values => [
+                                  { :inner_table_content_column01_label => "1-1" },
+                                  { :inner_table_content_column01_label => "1-2" },
+                                  ],
+                    },
+                  },
+                  {
+                    :inner_table => {
+                      :header => { :inner_table_header_title => "Second" },
+                      :values => [
+                                  { :inner_table_content_column01_label => "2-1" },
+                                  { :inner_table_content_column01_label => "2-2" },
+                                  ],
+                    },
+                  },
+                  {
+                    :inner_table => {
+                      :header => { :inner_table_header_title => "Third" },
+                      :values => [
+                                  { :inner_table_content_column01_label => "3-1" },
+                                  { :inner_table_content_column01_label => "3-2" },
+                                  ],
+                    },
+                  },
+                 ],
+    }
+  }
+}
+prep.generate("#{$0}.pdf", values)

data/examples/sample.yml

@@ -88,3 +88,31 @@ content:
       y: 10
       width: 10
       height: 10
+  # arc_rect_rect:
+  #   type: rectangle
+  #   region:
+  #     x: 50
+  #     y: 200
+  #     width: 100
+  #     height: 30
+  #   line_color:
+  #     red: 0
+  #     green: 0
+  #     blue: 1
+  arc_rect:
+    type: arc_rectangle
+    line_width: 10
+    region:
+      x: 50
+      y: 200
+      width: 100
+      height: 30
+    line_color:
+      red: 1
+      green: 0
+      blue: 1
+    fill_color:
+      red: 0
+      green: 1
+      blue: 1
+    round_arc: 5

data/examples/sample7.yml

@@ -0,0 +1,130 @@
+page:
+  size: a4
+  orientation: portrait
+  margin:
+    top: 10
+    left: 10
+    bottom: 10
+    right: 10
+content:
+  type: group
+  out_table:
+    type: loop
+    x: 0
+    y: 0
+    direction: vertical
+    fixed_times: 2
+    page_break: false
+    gap: 0
+    header: out_table_header
+    iterator: out_table_content
+    footer: out_table_footer
+
+# 外側のテーブル定義
+out_table_content:
+  type: group
+  inner_table:
+    type: loop
+    x: 0
+    y: 0
+    direction: horizontal
+    fixed_times: 4
+    at_least_one: true
+    page_break: false
+    gap: 0
+    header: inner_table_header
+    iterator: inner_table_content
+    footer: inner_table_footer
+out_table_header:
+  type: group
+  out_table_header_label:
+    type: label
+    label: 外側のテーブルヘッダ
+    align: center
+    expand: true
+    region:
+      x: 0
+      y: 0
+      width: 30
+      height: 10
+  out_table_header_rect:
+    type: rectangle
+    expand: true
+    region:
+      x: 0
+      y: 0
+      width: 30
+      height: 10
+out_table_footer:
+  type: group
+  out_table_footer_label:
+    type: label
+    label: 外側のテーブルフッタ
+    align: center
+    expand: true
+    region:
+      x: 0
+      y: 0
+      width: 30
+      height: 10
+  out_table_header_rect:
+    type: rectangle
+    expand: true
+    region:
+      x: 0
+      y: 0
+      width: 30
+      height: 10
+
+# 内側のテーブル定義
+inner_table_content:
+  type: group
+  inner_table_content_column01_label:
+    type: label
+    label: 値１
+    region:
+      x: 0
+      y: 0
+      width: 30
+      height: 10
+  inner_table_content_column01_rect:
+    type: rectangle
+    region:
+      x: 0
+      y: 0
+      width: 30
+      height: 10
+inner_table_header:
+  type: group
+  inner_table_header_title:
+    type: label
+    label: 内側のテーブルヘッダ
+    region:
+      x: 0
+      y: 0
+      width: 30
+      height: 10
+  inner_table_header_column01_rect:
+    type: rectangle
+    region:
+      x: 0
+      y: 0
+      width: 30
+      height: 10
+inner_table_footer:
+  type: group
+  inner_table_footer_column01_label:
+    type: label
+    label: 内側のテーブルフッタ
+    region:
+      x: 0
+      y: 0
+      width: 30
+      height: 10
+  inner_table_footer_column01_rect:
+    type: rectangle
+    region:
+      x: 0
+      y: 0
+      width: 30
+      height: 10

data/lib/core/arc_rectangle.rb

@@ -0,0 +1,168 @@
+# -*- coding: utf-8 -*-
+# ArcRectangle クラスのソースファイル
+# Author:: maki-tetsu
+# Date:: 2011/10/10
+# Copyright:: Copyright (c) 2011 maki-tetsu
+
+require File.join(File.dirname(__FILE__), "drawable")
+require File.join(File.dirname(__FILE__), "color")
+require File.join(File.dirname(__FILE__), "region")
+require File.join(File.dirname(__FILE__), "rectangle")
+require File.join(File.dirname(__FILE__), "..", "mm2pixcel")
+
+module PREP # nodoc
+  module Core # nodoc
+    # 角丸矩形描画構成要素クラス
+    class ArcRectangle < Rectangle
+      @@default_values[:round_arc] = nil
+
+      attr_reader :round_arc
+
+      def initialize(identifier, values = { })
+        values = @@default_values.merge(key_string_to_symbol(values))
+        @round_arc = values.delete(:round_arc)
+
+        if @round_arc.nil?
+          raise "round_arc must be specified for arc_rectangle."
+        else
+          @round_arc = @round_arc.mm2pixcel
+        end
+
+        super(identifier, values)
+      end
+
+      # 角丸矩形の描画
+      def draw(prep, region, values, stop_on_drawable = nil)
+        if self === stop_on_drawable
+          raise ReRenderJump.new(region)
+        end
+        STDERR.puts("Draw on #{self.class} #{self.identifier}") if ENV['DEBUG']
+        # 領域判定
+        calculate_region(prep, region, values)
+        # 円弧描画時は 5% 太さを上げる
+        prep.current_page.set_line_width(@line_width.to_f * 1.05)
+        unless @line_color.white?
+          prep.current_page.set_rgb_stroke(@line_color.red.to_f,
+                                           @line_color.green.to_f,
+                                           @line_color.blue.to_f)
+        end
+        unless @fill_color.white?
+          prep.current_page.set_rgb_fill(@fill_color.red.to_f,
+                                         @fill_color.green.to_f,
+                                         @fill_color.blue.to_f)
+        end
+        region_backup = @region.dup
+        if @expand_region
+          @region = @expand_region.dup
+          @expand_region = nil
+        end
+        pos_x, pos_y = calculate_pos(prep.current_page, region, @region.x, @region.y)
+
+        ### 塗り潰し描画
+        unless @fill_color.white?
+          # 縦方向
+          prep.current_page.rectangle(pos_x + @round_arc, pos_y - @region.height,
+                                      @region.width - (@round_arc * 2), @region.height)
+          prep.current_page.fill
+          # 横方向
+          prep.current_page.rectangle(pos_x, pos_y - @region.height + @round_arc,
+                                      @region.width, @region.height - (@round_arc * 2))
+          prep.current_page.fill
+        end
+
+        # ここからが本番
+        ### ４角の円弧を描画
+        # 左上
+        unless @fill_color.white?
+          prep.current_page.move_to(pos_x + @round_arc, pos_y - @round_arc)
+          prep.current_page.line_to(pos_x, pos_y - @round_arc)
+          prep.current_page.arc(pos_x + @round_arc,
+                                pos_y - @round_arc,
+                                @round_arc, 360 * 0.75, 360)
+          prep.current_page.line_to(pos_x + @round_arc, pos_y - @round_arc)
+          prep.current_page.fill
+        end
+        unless @line_color.white?
+          prep.current_page.arc(pos_x + @round_arc,
+                                pos_y - @round_arc,
+                                @round_arc, 360 * 0.75, 360)
+          prep.current_page.stroke
+        end
+        # 右上
+        unless @fill_color.white?
+          prep.current_page.move_to(pos_x + @region.width - @round_arc, pos_y - @round_arc)
+          prep.current_page.line_to(pos_x + @region.width - @round_arc, pos_y)
+          prep.current_page.arc(pos_x + @region.width - @round_arc,
+                                pos_y - @round_arc,
+                                @round_arc, 0, 360 * 0.25)
+          prep.current_page.line_to(pos_x + @region.width - @round_arc, pos_y - @round_arc)
+          prep.current_page.fill
+        end
+        unless @line_color.white?
+          prep.current_page.arc(pos_x + @region.width - @round_arc,
+                                pos_y - @round_arc,
+                                @round_arc, 0, 360 * 0.25)
+          prep.current_page.stroke
+        end
+        # 左下
+        unless @fill_color.white?
+          prep.current_page.move_to(pos_x + @round_arc, pos_y - @region.height + @round_arc)
+          prep.current_page.line_to(pos_x + @round_arc, pos_y - @region.height)
+          prep.current_page.arc(pos_x + @round_arc,
+                                pos_y - @region.height + @round_arc,
+                                @round_arc, 360 * 0.5, 360 * 0.75)
+          prep.current_page.line_to(pos_x + @round_arc, pos_y - @region.height + @round_arc)
+          prep.current_page.fill
+        end
+        unless @line_color.white?
+          prep.current_page.arc(pos_x + @round_arc,
+                                pos_y - @region.height + @round_arc,
+                                @round_arc, 360 * 0.5, 360 * 0.75)
+          prep.current_page.stroke
+        end
+        # 右下
+        unless @fill_color.white?
+          prep.current_page.move_to(pos_x + @region.width - @round_arc, pos_y - @region.height + @round_arc)
+          prep.current_page.line_to(pos_x + @region.width, pos_y - @region.height + @round_arc)
+          prep.current_page.arc(pos_x + @region.width - @round_arc,
+                                pos_y - @region.height + @round_arc,
+                                @round_arc, 360 * 0.25, 360 * 0.5)
+          prep.current_page.line_to(pos_x + @region.width - @round_arc, pos_y - @region.height + @round_arc)
+          prep.current_page.fill
+        end
+        unless @line_color.white?
+          prep.current_page.arc(pos_x + @region.width - @round_arc,
+                                pos_y - @region.height + @round_arc,
+                                @round_arc, 360 * 0.25, 360 * 0.5)
+          prep.current_page.stroke
+        end
+
+        # 元の太さへ
+        prep.current_page.set_line_width(@line_width.to_f)
+
+        # ### ４辺描画
+        unless @line_color.white?
+          # 上
+          prep.current_page.move_to(pos_x + @round_arc,                 pos_y)
+          prep.current_page.line_to(pos_x + @region.width - @round_arc, pos_y)
+          prep.current_page.stroke
+          # 下
+          prep.current_page.move_to(pos_x + @round_arc,                 pos_y - @region.height)
+          prep.current_page.line_to(pos_x + @region.width - @round_arc, pos_y - @region.height)
+          prep.current_page.stroke
+          # 左
+          prep.current_page.move_to(pos_x,                              pos_y - @region.height + @round_arc)
+          prep.current_page.line_to(pos_x,                              pos_y - @round_arc)
+          prep.current_page.stroke
+          # 右
+          prep.current_page.move_to(pos_x + @region.width,              pos_y - @region.height + @round_arc)
+          prep.current_page.line_to(pos_x + @region.width,              pos_y - @round_arc)
+          prep.current_page.stroke
+        end
+
+        @region = region_backup
+        prep.current_page.drawed = true
+      end
+    end
+  end
+end

data/lib/core/group.rb

@@ -8,6 +8,7 @@ require File.join(File.dirname(__FILE__), "drawable")
 require File.join(File.dirname(__FILE__), "label")
 require File.join(File.dirname(__FILE__), "line")
 require File.join(File.dirname(__FILE__), "rectangle")
+require File.join(File.dirname(__FILE__), "arc_rectangle")
 require File.join(File.dirname(__FILE__), "image")
 require File.join(File.dirname(__FILE__), "loop")
 
@@ -91,6 +92,15 @@ module PREP # nodoc
               end
             end
           end
+        when "arc_rectangle"
+          klass = ArcRectangle
+          unless @@allow_all
+            @drawables.values.each do |drawable|
+              if Loop === drawable
+                raise "Group already has Loop!!"
+              end
+            end
+          end
         when "image"
           klass = Image
           unless @@allow_all

data/lib/core/loop.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Loop クラスのソースファイル
 # Author:: maki-tetsu
 # Date:: 2011/03/11
@@ -21,9 +22,11 @@ module PREP # nodoc
         :page_break => false,
         :layer => 4,
         :allow_header_split => true,
+        :fixed_times => nil,
+        :at_least_one => false,
       }
 
-      attr_reader :direction, :gap, :header_group, :iterator_group, :footer_group, :point, :page_break, :width, :height, :allow_header_split
+      attr_reader :direction, :gap, :header_group, :iterator_group, :footer_group, :point, :page_break, :width, :height, :allow_header_split, :fixed_times, :at_least_one
 
       def initialize(identifier, values = { })
         values = @@default_values.merge(key_string_to_symbol(values))
@@ -38,6 +41,8 @@ module PREP # nodoc
         @point = Point.new(values[:x].mm2pixcel, values[:y].mm2pixcel)
         @page_break = values[:page_break]
         @allow_header_split = values[:allow_header_split]
+        @fixed_times = values[:fixed_times]
+        @at_least_one = !!values[:at_least_one]
       end
 
       def direction=(d)
@@ -57,7 +62,12 @@ module PREP # nodoc
           dataset[:header] = header.generate_sample_dataset(prep)
         end
         iterator = prep.group(@iterator_group)
-        dataset[:values] = [iterator.generate_sample_dataset(prep)]
+        dataset[:values] =
+          [
+           iterator.generate_sample_dataset(prep),
+           iterator.generate_sample_dataset(prep),
+           iterator.generate_sample_dataset(prep),
+          ]
         unless @footer_group.nil?
           footer = prep.group(@footer_group)
           dataset[:footer] = footer.generate_sample_dataset(prep)
@@ -288,7 +298,20 @@ module PREP # nodoc
       # 繰返し構成要素を描画するためのメソッド
       def draw_iterator(prep, region, values, stop_on_drawable = nil)
         iterator = prep.group(@iterator_group)
-        values[:values].each_with_index do |iterator_values, index|
+        # 固定繰り返し時のエラー回避用
+        if @at_least_one
+          values[:values] ||= [nil]
+        else
+          values[:values] ||= []
+        end
+        if !@fixed_times.nil? && !(values[:values].size % @fixed_times).zero?
+          iterator_times = ((values[:values].size / @fixed_times) + 1) * @fixed_times
+        else
+          iterator_times = values[:values].size
+        end
+        iterator_times.times do |index|
+          iterator_values = values[:values][index]
+          iterator_values ||= { }
           begin
             w, h = rewind_current_page(prep) do
               iterator.calculate_region(prep, region, iterator_values, stop_on_drawable)
@@ -372,7 +395,20 @@ module PREP # nodoc
       # 繰返し構成要素の描画領域を計算するためのメソッド
       def calculate_iterator_region(prep, region, values, stop_on_drawable = nil)
         iterator = prep.group(@iterator_group)
-        values[:values].each_with_index do |iterator_values, index|
+        # 固定繰り返し時のエラー回避用
+        if @at_least_one
+          values[:values] ||= [nil]
+        else
+          values[:values] ||= []
+        end
+        if !@fixed_times.nil? && !(values[:values].size % @fixed_times).zero?
+          iterator_times = ((values[:values].size / @fixed_times) + 1) * @fixed_times
+        else
+          iterator_times = values[:values].size
+        end
+        iterator_times.times do |index|
+          iterator_values = values[:values][index]
+          iterator_values ||= { }
           begin
             w, h = iterator.calculate_region(prep, region, iterator_values, stop_on_drawable)
             # 描画したので、方向に応じてリージョン補正

data/lib/core/page.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Page クラスのソースファイル
 # Author:: maki-tetsu
 # Date:: 2011/03/11
@@ -13,6 +14,7 @@ module PREP # nodoc
     class Page
       # ページサイズの設定種別
       SIZES = {
+        :a5 => HPDFDoc::HPDF_PAGE_SIZE_A5, # A5
         :a4 => HPDFDoc::HPDF_PAGE_SIZE_A4, # A4
         :a3 => HPDFDoc::HPDF_PAGE_SIZE_A3, # A3
       }

data/lib/core/prep.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Prep クラスのソースファイル
 # Author:: maki-tetsu
 # Date:: 2011/03/11
@@ -11,6 +12,7 @@ require "hpdf"
 require File.join(File.dirname(__FILE__), "label")
 require File.join(File.dirname(__FILE__), "line")
 require File.join(File.dirname(__FILE__), "rectangle")
+require File.join(File.dirname(__FILE__), "arc_rectangle")
 require File.join(File.dirname(__FILE__), "group")
 require File.join(File.dirname(__FILE__), "region")
 require File.join(File.dirname(__FILE__), "page")

data/lib/core/rectangle.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Rectangle クラスのソースファイル
 # Author:: maki-tetsu
 # Date:: 2011/03/11
@@ -120,6 +121,13 @@ module PREP # nodoc
         pos_x, pos_y = calculate_pos(prep.current_page, region, @region.x, @region.y)
         prep.current_page.rectangle(pos_x, pos_y - @region.height, @region.width, @region.height)
 
+        fill_and_or_stroke(prep)
+
+        @region = region_backup
+        prep.current_page.drawed = true
+      end
+
+      def fill_and_or_stroke(prep)
         if @fill_color.white?
           unless @line_color.white?
             prep.current_page.stroke
@@ -129,9 +137,8 @@ module PREP # nodoc
         else
           prep.current_page.fill_stroke
         end
-        @region = region_backup
-        prep.current_page.drawed = true
       end
+      private :fill_and_or_stroke
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: prep
 version: !ruby/object:Gem::Version 
-  hash: 19
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  segments_generated: true
+  version: 0.3.1
 platform: ruby
 authors: 
 - Tetsuhisa MAKINO
@@ -15,87 +15,82 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-20 00:00:00 +09:00
+date: 2011-10-10 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: hpdf
   version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 2
         - 0
         - 8
+        segments_generated: true
         version: 2.0.8
   requirement: *id001
+  prerelease: false
   type: :runtime
+  name: hpdf
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: rspec
   version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 2
         - 3
         - 0
+        segments_generated: true
         version: 2.3.0
   requirement: *id002
+  prerelease: false
   type: :development
+  name: rspec
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: bundler
   version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
         - 0
+        segments_generated: true
         version: 1.0.0
   requirement: *id003
+  prerelease: false
   type: :development
+  name: bundler
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: jeweler
   version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 5
         - 2
+        segments_generated: true
         version: 1.5.2
   requirement: *id004
+  prerelease: false
   type: :development
+  name: jeweler
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: rcov
   version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
   requirement: *id005
+  prerelease: false
   type: :development
+  name: rcov
 description: PREP is PDF Report generator depends on HPDF.
 email: tim.makino@gmail.com
 executables: 
@@ -125,6 +120,7 @@ files:
 - examples/generate_sample4.rb
 - examples/generate_sample5.rb
 - examples/generate_sample6.rb
+- examples/generate_sample7.rb
 - examples/generate_sample_dataset.rb
 - examples/group_sample.yml
 - examples/image_sample.yml
@@ -134,6 +130,8 @@ files:
 - examples/sample3.yml
 - examples/sample5.yml
 - examples/sample6.yml
+- examples/sample7.yml
+- lib/core/arc_rectangle.rb
 - lib/core/color.rb
 - lib/core/drawable.rb
 - lib/core/group.rb
@@ -163,27 +161,25 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: PREP is PDF Report generator depends on HPDF.
@@ -196,6 +192,7 @@ test_files:
 - examples/generate_sample4.rb
 - examples/generate_sample5.rb
 - examples/generate_sample6.rb
+- examples/generate_sample7.rb
 - examples/generate_sample_dataset.rb
 - spec/component_spec.rb
 - spec/prep_spec.rb