prep 0.3.2 → 0.3.3

data/ChangeLog

@@ -0,0 +1,8 @@
+2012-03-12  Tetsuhisa MAKINO  <tim.makino@gmail.com>
+
+	* lib/core/loop.rb (PREP::Core::Loop#draw_iterator): fix bug on gap calculation
+
+2012-03-08  Tetsuhisa MAKINO  <tim.makino@gmail.com>
+
+	* lib/core/rectangle.rb (PREP::Core::Rectangle#line_width): support to be able to specify the zero to line_width
+

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/examples/gap_test.yml

@@ -0,0 +1,245 @@
+page:
+  size: a5
+  orientation: landscape
+  margin:
+    top: 10
+    left: 10
+    bottom: 10
+    right: 10
+  header_height: 0
+  footer_height: 0
+content:
+  type: group
+  inner_loop:
+    type: loop
+    x: 0
+    y: 0
+    direction: vertical
+    page_break: true
+    gap: 3
+    header: loop_header
+    iterator: loop_iterator
+    footer: loop_footer
+loop_header:
+  type: group
+  top_line:
+    type: line
+    start:
+      x: 10
+      y: 0
+    end:
+      x: 150
+      y: 0
+  line01:
+    type: line
+    start:
+      x: 10
+      y: 0
+    end:
+      x: 10
+      y: 10
+  header1:
+    type: label
+    label: "Header1"
+    region:
+      x: 10
+      y: 0
+      width: 60
+      height: 10
+  line02:
+    type: line
+    start:
+      x: 70
+      y: 0
+    end:
+      x: 70
+      y: 10
+  header2:
+    type: label
+    label: "Header2"
+    region:
+      x: 70
+      y: 0
+      width: 50
+      height: 10
+  line03:
+    type: line
+    start:
+      x: 120
+      y: 0
+    end:
+      x: 120
+      y: 10
+  header3:
+    type: label
+    label: "Header3"
+    region:
+      x: 120
+      y: 0
+      width: 30
+      height: 10
+  line04:
+    type: line
+    start:
+      x: 150
+      y: 0
+    end:
+      x: 150
+      y: 10
+  bottom_line:
+    type: line
+    start:
+      x: 10
+      y: 10
+    end:
+      x: 150
+      y: 10
+loop_footer:
+  type: group
+  top_line:
+    type: line
+    start:
+      x: 10
+      y: 0
+    end:
+      x: 150
+      y: 0
+  line01:
+    type: line
+    start:
+      x: 10
+      y: 0
+    end:
+      x: 10
+      y: 10
+  footer1:
+    type: label
+    label: "Footer1"
+    region:
+      x: 10
+      y: 0
+      width: 60
+      height: 10
+  line02:
+    type: line
+    start:
+      x: 70
+      y: 0
+    end:
+      x: 70
+      y: 10
+  footer2:
+    type: label
+    label: "Footer2"
+    region:
+      x: 70
+      y: 0
+      width: 50
+      height: 10
+  line03:
+    type: line
+    start:
+      x: 120
+      y: 0
+    end:
+      x: 120
+      y: 10
+  footer3:
+    type: label
+    label: "Footer3"
+    region:
+      x: 120
+      y: 0
+      width: 30
+      height: 10
+  line04:
+    type: line
+    start:
+      x: 150
+      y: 0
+    end:
+      x: 150
+      y: 10
+  bottom_line:
+    type: line
+    start:
+      x: 10
+      y: 10
+    end:
+      x: 150
+      y: 10
+  
+loop_iterator:
+  type: group
+  top_line:
+    type: line
+    start:
+      x: 10
+      y: 0
+    end:
+      x: 150
+      y: 0
+  line01:
+    type: line
+    start:
+      x: 10
+      y: 0
+    end:
+      x: 10
+      y: 10
+  value1:
+    type: label
+    label: "Value 1"
+    region:
+      x: 10
+      y: 0
+      width: 60
+      height: 10
+  line02:
+    type: line
+    start:
+      x: 70
+      y: 0
+    end:
+      x: 70
+      y: 10
+  value2:
+    type: label
+    label: "Value 2"
+    region:
+      x: 70
+      y: 0
+      width: 50
+      height: 10
+  line03:
+    type: line
+    start:
+      x: 120
+      y: 0
+    end:
+      x: 120
+      y: 10
+  value3:
+    type: label
+    label: "Value 3"
+    region:
+      x: 120
+      y: 0
+      width: 30
+      height: 10
+  line04:
+    type: line
+    start:
+      x: 150
+      y: 0
+    end:
+      x: 150
+      y: 10
+  bottom_line:
+    type: line
+    start:
+      x: 10
+      y: 10
+    end:
+      x: 150
+      y: 10

data/examples/generate_gap_test.rb

@@ -0,0 +1,24 @@
+require File.join(File.dirname(__FILE__), "..", "lib", "prep")
+
+prep = PREP::Core::Prep.new("gap_test.yml")
+
+values = {:content=>
+  {:inner_loop=>
+    {:footer=>{:footer1=>"Footer1", :footer3=>"Footer3", :footer2=>"Footer2"},
+     :values=>
+      [{:value3=>"1-3", :value2=>"1-2", :value1=>"1-1"},
+       {:value3=>"2-3", :value2=>"2-2", :value1=>"2-1"},
+       {:value3=>"3-3", :value2=>"3-2", :value1=>"3-1"},
+       {:value3=>"4-3", :value2=>"4-2", :value1=>"4-1"},
+       {:value3=>"5-3", :value2=>"5-2", :value1=>"5-1"},
+       {:value3=>"6-3", :value2=>"6-2", :value1=>"6-1"},
+       {:value3=>"7-3", :value2=>"7-2", :value1=>"7-1"},
+       {:value3=>"8-3", :value2=>"8-2", :value1=>"8-1"},
+       {:value3=>"9-3", :value2=>"9-2", :value1=>"9-1"},
+       {:value3=>"10-3", :value2=>"10-2", :value1=>"10-1"},
+       {:value3=>"11-3", :value2=>"11-2", :value1=>"11-1"},
+       {:value3=>"12-3", :value2=>"12-2", :value1=>"12-1"}],
+     :header=>
+      {:header3=>"Header3", :header2=>"Header2", :header1=>"Header1"}}}}
+
+prep.generate("#{$0}.pdf", values)

data/examples/generate_rect_line_width_zero_sample.rb

@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+require File.join(File.dirname(__FILE__), "..", "lib", "prep")
+
+prep = PREP::Core::Prep.new("rect_line_width_zero_sample.yml")
+prep.generate("#{$0}.pdf", { :content => { :title => "外部引き渡しタイトル文字列" } })

data/examples/generate_ttfont_sample.rb

@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+require File.join(File.dirname(__FILE__), "..", "lib", "prep")
+
+prep = PREP::Core::Prep.new("ttfont_sample.yml")
+prep.generate("#{$0}.pdf", { :content => { :title => "外部引き渡しタイトル文字列" } })

data/examples/rect_line_width_zero_sample.yml

@@ -0,0 +1,134 @@
+page:
+  size: a4
+  orientation: portrait
+  margin:
+    top: 10
+    left: 10
+    bottom: 10
+    right: 10
+  header_height: 0
+  footer_height: 0
+content:
+  type: group
+  title:
+    type: label
+    label: "タイトル文字列"
+    region:
+      x: 10
+      y: 10
+      width: 100
+      height: 20
+    color:
+      red: 0
+      green: 0
+      blue: 0
+  line01:
+    type: line
+    start:
+      x: 10
+      y: 10
+    end:
+      x: 100
+      y: 10
+  line02:
+    type: line
+    start:
+      x: 10
+      y: 10
+    end:
+      x: 110
+      y: 110
+    color:
+      red: 1
+      green: 0
+      blue: 0
+  rectangle01:
+    type: rectangle
+    region:
+      x: 120
+      y: 0
+      width: 10
+      height: 5
+    line_color:
+      red: 0
+      green: 0.3
+      blue: 0
+    line_width: 3
+    fill_color:
+      red: 0
+      green: 1
+      blue: 1
+  rectangle02:
+    type: rectangle
+    region:
+      x: 10
+      y: 10
+      width: 100
+      height: 100
+    line_width: 1
+    line_color:
+      red: 1
+      green: 0
+      blue: 0
+    fill_color:
+      red: 1
+      green: 1
+      blue: 1
+  rectangle03:
+    type: rectangle
+    region:
+      x: 10
+      y: 120
+      width: 100
+      height: 40
+    line_width: 0
+    line_color:
+      red: 1
+      green: 0
+      blue: 0
+    fill_color:
+      red: 0
+      green: 1
+      blue: 0
+  rect1:
+    type: rectangle
+    region:
+      x: 0
+      y: 0
+      width: 10
+      height: 10
+  rect2:
+    type: rectangle
+    region:
+      x: 10
+      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: 0
+    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/lib/core/loop.rb

@@ -334,6 +334,7 @@ module PREP # nodoc
           iterator_times = values[:values].size
         end
         iterator_times.times do |index|
+          add_gap = false
           iterator_values = values[:values][index]
           iterator_values ||= { }
           begin
@@ -345,19 +346,23 @@ module PREP # nodoc
             end
             # 描画したので、方向に応じてリージョン補正
             if @direction == DIRECTIONS[:horizontal] # 右方向
-              if has_footer_group?(prep) || (values[:values].size > index + 1)
-                w += @gap
-              end
               region.x += w
               region.width -= w
+              if has_footer_group?(prep) || (values[:values].size > index + 1)
+                add_gap = true
+                region.x += @gap
+                region.width -= @gap
+              end
               @height ||= h
               @height = h if @height < h
             else # if @direction == DIRECTIONS[:vertical] # 下方向
-              if has_footer_group?(prep) || (values[:values].size > index + 1)
-                h += @gap
-              end
               region.y += h
               region.height -= h
+              if has_footer_group?(prep) || (values[:values].size > index + 1)
+                add_gap = true
+                region.y += @gap
+                region.height -= @gap
+              end
               @width ||= w
               @width = w if @width < w
             end
@@ -382,7 +387,11 @@ module PREP # nodoc
               end
               region = draw_header(prep, region, values, stop_on_drawable)
               # リトライ
-              retry
+              if add_gap
+                next
+              else
+                retry
+              end
             end
             raise
           rescue RegionHeightOverflowError
@@ -407,7 +416,11 @@ module PREP # nodoc
               # ヘッダを再描画
               region = draw_header(prep, region, values, stop_on_drawable)
               # リトライ
-              retry
+              if add_gap
+                next
+              else
+                retry
+              end
             end
             raise
           end
@@ -431,25 +444,30 @@ module PREP # nodoc
           iterator_times = values[:values].size
         end
         iterator_times.times do |index|
+          add_gap = false
           iterator_values = values[:values][index]
           iterator_values ||= { }
           begin
             w, h = iterator.calculate_region(prep, region, iterator_values, stop_on_drawable)
             # 描画したので、方向に応じてリージョン補正
             if @direction == DIRECTIONS[:horizontal] # 右方向
-              if has_footer_group?(prep) || (values[:values].size > index + 1)
-                w += @gap
-              end
               region.x += w
               region.width -= w
+              if has_footer_group?(prep) || (values[:values].size > index + 1)
+                add_gap = true
+                region.x += @gap
+                region.width -= @gap
+              end
               @height ||= h
               @height = h if @height < h
             else # if @direction == DIRECTIONS[:vertical] # 下方向
-              if has_footer_group?(prep) || (values[:values].size > index + 1)
-                h += @gap
-              end
               region.y += h
               region.height -= h
+              if has_footer_group?(prep) || (values[:values].size > index + 1)
+                add_gap = true
+                region.y += @gap
+                region.height -= @gap
+              end
               @width ||= w
               @width = w if @width < w
             end
@@ -475,7 +493,11 @@ module PREP # nodoc
               # ヘッダを再計算
               region = calculate_header_region(prep, region, values, stop_on_drawable)
               # リトライ
-              retry
+              if add_gap
+                next
+              else
+                retry
+              end
             end
             raise
           rescue RegionHeightOverflowError
@@ -500,7 +522,11 @@ module PREP # nodoc
               # ヘッダを再計算
               region = calculate_header_region(prep, region, values, stop_on_drawable)
               # リトライ
-              retry
+              if add_gap
+                next
+              else
+                retry
+              end
             end
             raise
           end

data/lib/core/rectangle.rb

@@ -44,12 +44,12 @@ module PREP # nodoc
         @line_color = Color.new(values[:line_color][:red],
                                 values[:line_color][:green],
                                 values[:line_color][:blue])
-        self.line_width = values[:line_width]
         self.line_style = values[:line_style]
         self.fill_pattern = values[:fill_pattern]
         @fill_color = Color.new(values[:fill_color][:red],
                                 values[:fill_color][:green],
                                 values[:fill_color][:blue])
+        self.line_width = values[:line_width]
         @expand = values[:expand]
       end
 
@@ -62,6 +62,8 @@ module PREP # nodoc
       def line_width=(w)
         if w > 0
           @line_width = w
+        elsif w.zero?
+          @line_color = @fill_color
         else
           raise "Rectangle line width must be grater than zero."
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: prep
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Tetsuhisa MAKINO
@@ -15,9 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-17 00:00:00 Z
+date: 2012-03-12 00:00:00 +09:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,11 +31,11 @@ dependencies:
         - 0
         - 8
         version: 2.0.8
-  version_requirements: *id001
   name: hpdf
+  version_requirements: *id001
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,11 +47,11 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  version_requirements: *id002
   name: rspec
+  version_requirements: *id002
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -61,11 +63,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id003
   name: bundler
+  version_requirements: *id003
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -77,11 +79,11 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  version_requirements: *id004
   name: jeweler
+  version_requirements: *id004
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -91,10 +93,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id005
   name: rcov
+  version_requirements: *id005
   prerelease: false
-  type: :development
 description: PREP is PDF Report generator depends on HPDF.
 email: tim.makino@gmail.com
 executables: 
@@ -103,11 +104,13 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
+- ChangeLog
 - LICENSE.txt
 - README.rdoc
 files: 
 - .document
 - .rspec
+- ChangeLog
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -116,8 +119,11 @@ files:
 - VERSION
 - bin/prep-helper
 - bin/prep-test
+- examples/gap_test.yml
+- examples/generate_gap_test.rb
 - examples/generate_group_sample.rb
 - examples/generate_image_sample.rb
+- examples/generate_rect_line_width_zero_sample.rb
 - examples/generate_sample.rb
 - examples/generate_sample2.rb
 - examples/generate_sample3.rb
@@ -130,6 +136,7 @@ files:
 - examples/group_sample.yml
 - examples/image_sample.yml
 - examples/qrimage.png
+- examples/rect_line_width_zero_sample.yml
 - examples/sample.yml
 - examples/sample2.yml
 - examples/sample3.yml
@@ -157,6 +164,8 @@ files:
 - spec/component_spec.rb
 - spec/prep_spec.rb
 - spec/spec_helper.rb
+- examples/generate_ttfont_sample.rb
+has_rdoc: true
 homepage: http://github.com/maki-tetsu/prep
 licenses: 
 - MIT
@@ -186,13 +195,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: PREP is PDF Report generator depends on HPDF.
 test_files: 
+- examples/generate_gap_test.rb
 - examples/generate_group_sample.rb
 - examples/generate_image_sample.rb
+- examples/generate_rect_line_width_zero_sample.rb
 - examples/generate_sample.rb
 - examples/generate_sample2.rb
 - examples/generate_sample3.rb
@@ -202,6 +213,7 @@ test_files:
 - examples/generate_sample7.rb
 - examples/generate_sample8.rb
 - examples/generate_sample_dataset.rb
+- examples/generate_ttfont_sample.rb
 - spec/component_spec.rb
 - spec/prep_spec.rb
 - spec/spec_helper.rb