prep 0.2.5 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.3.0

data/examples/generate_image_sample.rb

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

data/examples/image_sample.yml

@@ -0,0 +1,98 @@
+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
+  rect1:
+    type: rectangle
+    region:
+      x: 0
+      y: 0
+      width: 10
+      height: 10
+  rect2:
+    type: rectangle
+    region:
+      x: 10
+      y: 10
+      width: 10
+      height: 10
+  normal_image:
+    type: image
+    image_path: "qrimage.png"
+    region:
+      x: 120
+      y: 70
+      width: 25
+      height: 25

data/lib/core/group.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Group クラスのソースファイル
 # Author:: maki-tetsu
 # Date:: 2011/03/11
@@ -7,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__), "image")
 require File.join(File.dirname(__FILE__), "loop")
 
 module PREP # nodoc
@@ -89,6 +91,15 @@ module PREP # nodoc
               end
             end
           end
+        when "image"
+          klass = Image
+          unless @@allow_all
+            @drawables.values.each do |drawable|
+              if Loop === drawable
+                raise "Group already has Loop!!"
+              end
+            end
+          end
         when "group"
           # global でのみグループ定義を許可
           unless global

data/lib/core/image.rb

@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+# Image クラスのソースファイル
+# Author:: maki-tetsu
+# Date:: 2011/09/12
+# 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__), "..", "mm2pixcel")
+
+module PREP # nodoc
+  module Core # nodoc
+    # イメージ描画構成要素クラス
+    class Image < Drawable
+      @@default_values = {
+        :layer  => 1,
+        :expand => false,
+      }
+
+      def initialize(identifier, values = { })
+        values = @@default_values.merge(key_string_to_symbol(values))
+        super(identifier, values[:layer])
+
+        @region = Region.new(values[:region][:x].mm2pixcel,
+                             values[:region][:y].mm2pixcel,
+                             values[:region][:width].mm2pixcel,
+                             values[:region][:height].mm2pixcel)
+        @image_path = values[:image_path].to_s
+        @expand = values[:expand]
+      end
+
+      # イメージ描画領域の計算
+      def calculate_region(prep, region, value, stop_on_drawable = nil)
+        if self == stop_on_drawable
+          raise ReRenderJump.new(region)
+        end
+
+        puts "Calculate region for #{self.class}: #{self.identifier} region: #{region}" if ENV["DEBUG"]
+        ret_region = Region.new(0, 0,
+                                region.width - (@region.x + @region.width),
+                                region.height - (@region.y + @region.height))
+        return @region.x + @region.width, @region.y + @region.height
+      end
+
+      # イメージの描画
+      def draw(prep, region, value, 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, value)
+        
+        # イメージファイルの指定があるか確認
+        if value.to_s != ""
+          # Load png image from specific file path
+          image_path = value.to_s
+        else
+          # Load png image from default path
+          image_path = @image_path.dup
+        end
+        begin
+          image_data = prep.pdf.load_png_image_from_file(image_path)
+        rescue => e
+          raise "Failed to load the PNG image from '#{image_path}'"
+        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)
+        # draw png image
+        prep.current_page.draw_image(image_data,
+                                     pos_x, pos_y - @region.height,
+                                     @region.width, @region.height)
+        @region = region_backup
+        prep.current_page.drawed = true
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: prep
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: 
+  hash: 19
+  prerelease: false
   segments: 
   - 0
-  - 2
-  - 5
-  version: 0.2.5
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Tetsuhisa MAKINO
@@ -15,11 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-27 00:00:00 +09:00
+date: 2011-09-20 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  prerelease: false
+  name: hpdf
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,10 +33,10 @@ dependencies:
         - 8
         version: 2.0.8
   requirement: *id001
-  prerelease: false
-  name: hpdf
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  type: :development
+  prerelease: false
+  name: rspec
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,10 +49,10 @@ dependencies:
         - 0
         version: 2.3.0
   requirement: *id002
-  prerelease: false
-  name: rspec
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: bundler
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,10 +65,10 @@ dependencies:
         - 0
         version: 1.0.0
   requirement: *id003
-  prerelease: false
-  name: bundler
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: jeweler
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -80,10 +81,10 @@ dependencies:
         - 2
         version: 1.5.2
   requirement: *id004
-  prerelease: false
-  name: jeweler
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rcov
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -94,8 +95,7 @@ dependencies:
         - 0
         version: "0"
   requirement: *id005
-  prerelease: false
-  name: rcov
+  type: :development
 description: PREP is PDF Report generator depends on HPDF.
 email: tim.makino@gmail.com
 executables: 
@@ -118,6 +118,7 @@ files:
 - bin/prep-helper
 - bin/prep-test
 - examples/generate_group_sample.rb
+- examples/generate_image_sample.rb
 - examples/generate_sample.rb
 - examples/generate_sample2.rb
 - examples/generate_sample3.rb
@@ -126,6 +127,8 @@ files:
 - examples/generate_sample6.rb
 - examples/generate_sample_dataset.rb
 - examples/group_sample.yml
+- examples/image_sample.yml
+- examples/qrimage.png
 - examples/sample.yml
 - examples/sample2.yml
 - examples/sample3.yml
@@ -134,6 +137,7 @@ files:
 - lib/core/color.rb
 - lib/core/drawable.rb
 - lib/core/group.rb
+- lib/core/image.rb
 - lib/core/label.rb
 - lib/core/line.rb
 - lib/core/loop.rb
@@ -179,12 +183,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: PREP is PDF Report generator depends on HPDF.
 test_files: 
 - examples/generate_group_sample.rb
+- examples/generate_image_sample.rb
 - examples/generate_sample.rb
 - examples/generate_sample2.rb
 - examples/generate_sample3.rb