prep 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/examples/generate_sample8.rb

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+require File.join(File.dirname(__FILE__), "..", "lib", "prep")
+
+prep = PREP::Core::Prep.new("sample8.yml")
+values = {
+  :content =>
+  {
+    :out_loop =>
+    {
+      :values => [
+                  { :inner_loop =>
+                    {:values =>
+                      [
+                       {:title => "hogehoge1"},
+                       {:title => "hogehoge2"},
+                       {:title => "hogehoge3"},
+                       {:title => "hogehoge4"},
+                       {:title => "hogehoge5"},
+                       {:title => "hogehoge6"},
+                       {:title => "hogehoge7"},
+                       {:title => "hogehoge8"},
+                       {:title => "hogehoge9"},
+                       {:title => "hogehoge10"},
+                       {:title => "hogehoge11"},
+                       {:title => "hogehoge12"},
+                      ],
+                      :header => { :title=> "in title" },
+                    },
+                  },
+                 ],
+      :header => { :title_label => "タイトル(一回だけ)" },
+    },
+  },
+}
+
+prep.generate("#{$0}.pdf", values)

data/examples/sample8.yml

@@ -0,0 +1,59 @@
+page:
+  size: a4
+  orientation: portrait
+  margin:
+    top: 10
+    left: 10
+    bottom: 10
+    right: 10
+# 内側のグループ定義
+inner_loop_header:
+  type: group
+  title:
+    type: label
+    label: "hogehoge"
+    region:
+      x: 10
+      y: 10
+      width: 60
+      height: 10
+inner_loop_content:
+  type: group
+  title:
+    type: label
+    label: "hogehoge"
+    region:
+      x: 10
+      y: 10
+      width: 60
+      height: 10
+# 外側のテーブル定義
+out_loop_header:
+  type: group
+  # タイトル文字列
+  title_label:
+    type: label
+    label: "タイトル"
+    region:
+      x: 10
+      y: 10
+      width: 50
+      height: 5
+out_loop_content:
+  type: group
+  inner_loop:
+    type: loop
+    direction: vertical
+    gap: 10
+    header: inner_loop_header
+    iterator: inner_loop_content
+    page_break: true
+content:
+  type: group
+  out_loop:
+    type: loop
+    header: out_loop_header
+    iterator: out_loop_content
+    direction: vertical
+    page_break: true
+    header_repeat: false

data/lib/core/loop.rb

@@ -24,9 +24,14 @@ module PREP # nodoc
         :allow_header_split => true,
         :fixed_times => nil,
         :at_least_one => false,
+        :header_repeat => true,
+        :x => 0,
+        :y => 0,
       }
 
-      attr_reader :direction, :gap, :header_group, :iterator_group, :footer_group, :point, :page_break, :width, :height, :allow_header_split, :fixed_times, :at_least_one
+      attr_reader :direction, :gap, :header_group, :iterator_group, :footer_group, :point
+      attr_reader :page_break, :width, :height, :allow_header_split, :fixed_times, :at_least_one
+      attr_reader :header_repeat
 
       def initialize(identifier, values = { })
         values = @@default_values.merge(key_string_to_symbol(values))
@@ -43,6 +48,8 @@ module PREP # nodoc
         @allow_header_split = values[:allow_header_split]
         @fixed_times = values[:fixed_times]
         @at_least_one = !!values[:at_least_one]
+        @header_repeat = !!values[:header_repeat]
+        @header_rendering_count = 0
       end
 
       def direction=(d)
@@ -130,6 +137,8 @@ module PREP # nodoc
 
           return w, h
         end
+        # 計算を抜けるタイミングで @header_rendering_count をクリア
+        @header_rendering_count = 0
       end
 
       # リージョン補正
@@ -201,6 +210,9 @@ module PREP # nodoc
 
         # フッタブロック描画
         current_region = draw_footer(prep, current_region, values, stop_on_drawable)
+
+        # ヘッダの描画回数をクリア
+        @header_rendering_count = 0
       end
 
       private
@@ -209,6 +221,12 @@ module PREP # nodoc
       #
       # 描画後に新しい region を返却
       def draw_header(prep, region, values, stop_on_drawable = nil)
+        # ヘッダー描画回数をインクリメント
+        @header_rendering_count += 1
+        if !@header_repeat && @header_rendering_count > 1
+          # ヘッダー繰り返しなしかつヘッダの描画回数が２回目以降の場合は何もせずに region を返却
+          return region
+        end
         unless @header_group.nil?
           header = prep.group(@header_group)
           w, h = rewind_current_page(prep) do
@@ -237,6 +255,12 @@ module PREP # nodoc
 
       # ヘッダ構成要素の描画領域を計算するためのメソッド
       def calculate_header_region(prep, region, values, stop_on_drawable = nil)
+        # ヘッダー描画回数をインクリメント
+        @header_rendering_count += 1
+        if !@header_repeat && @header_rendering_count > 1
+          # ヘッダー繰り返しなしかつヘッダの描画回数が２回目以降の場合は何もせずに region を返却
+          return region
+        end
         unless @header_group.nil?
           header = prep.group(@header_group)
           w, h = header.calculate_region(prep, region, values[:header], stop_on_drawable)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: prep
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  segments_generated: true
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Tetsuhisa MAKINO
@@ -15,82 +15,86 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-10 00:00:00 +09:00
-default_executable: 
+date: 2011-10-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &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
+  version_requirements: *id001
+  name: hpdf
   prerelease: false
   type: :runtime
-  name: hpdf
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &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
+  version_requirements: *id002
+  name: rspec
   prerelease: false
   type: :development
-  name: rspec
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &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
+  version_requirements: *id003
+  name: bundler
   prerelease: false
   type: :development
-  name: bundler
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &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
+  version_requirements: *id004
+  name: jeweler
   prerelease: false
   type: :development
-  name: jeweler
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  requirement: *id005
+  version_requirements: *id005
+  name: rcov
   prerelease: false
   type: :development
-  name: rcov
 description: PREP is PDF Report generator depends on HPDF.
 email: tim.makino@gmail.com
 executables: 
@@ -121,6 +125,7 @@ files:
 - examples/generate_sample5.rb
 - examples/generate_sample6.rb
 - examples/generate_sample7.rb
+- examples/generate_sample8.rb
 - examples/generate_sample_dataset.rb
 - examples/group_sample.yml
 - examples/image_sample.yml
@@ -131,6 +136,7 @@ files:
 - examples/sample5.yml
 - examples/sample6.yml
 - examples/sample7.yml
+- examples/sample8.yml
 - lib/core/arc_rectangle.rb
 - lib/core/color.rb
 - lib/core/drawable.rb
@@ -151,7 +157,6 @@ files:
 - spec/component_spec.rb
 - spec/prep_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/maki-tetsu/prep
 licenses: 
 - MIT
@@ -161,25 +166,27 @@ 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.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: PREP is PDF Report generator depends on HPDF.
@@ -193,6 +200,7 @@ test_files:
 - examples/generate_sample5.rb
 - examples/generate_sample6.rb
 - examples/generate_sample7.rb
+- examples/generate_sample8.rb
 - examples/generate_sample_dataset.rb
 - spec/component_spec.rb
 - spec/prep_spec.rb