wizport 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53d1e0971467e04e81b02164399415c267f598a1
-  data.tar.gz: b2d5613b850cd95eb5910c240ee0121d0552bc71
+  metadata.gz: 03f599ae695fa960b9e048e9f822d2abc82d7754
+  data.tar.gz: f767cb682c80b1183bdd84cf58933c4f9d7427a6
 SHA512:
-  metadata.gz: 4e9882bfc1ec31fc40e5b0cc70576ce9f1c66ceef49c434e8346a8d96fbff8ea2db8c56e7d4d14892fc0bc85190bf60d1b0ffd473396b8b1f8818a89861d85d9
-  data.tar.gz: bced81d48864da8009310f3965069b12fa7fd8427916203e51b4fe74e723c93b81d9f5b8997dea3b4659e1b25f4aa1e1e4de8e455b04a1cb748650cffc211909
+  metadata.gz: d082abbab53dcdc6a8a26ca702356e6d4c8f6946e78b5baff9bc0055d6b1a2a7502600adb6011d6647775ad666d031ddf176b2a2295e91101cc23e4c69987d55
+  data.tar.gz: 89e941967dfed7fed1b37178055ed20dc2245ae8540ef75056fef5a3622fadbcc8ba07f1f551927829ad244c27a30519c1f5a934c2663671deac77e1141cf645

data/lib/wizport.rb

@@ -14,10 +14,10 @@ require "wizport/visitor"
 require "wizport/document/rtf/element"
 require "wizport/document/rtf/text"
 require "wizport/document/rtf/table"
+require "wizport/document/rtf/image"
 require "wizport/document/rtf/document"
 require "wizport/document/rtf"
 
-
 require "wizport/document/pdf/element"
 require "wizport/document/pdf/catalog"
 require "wizport/document/pdf/pages"
@@ -26,7 +26,6 @@ require "wizport/document/pdf/document"
 require "wizport/document/pdf/x_ref_tbl"
 require "wizport/document/pdf/pdf_builder"
 
-
 require "wizport/builder/pdf"
 require "wizport/builder/rtf"
 

data/lib/wizport/document/rtf/document.rb

@@ -43,10 +43,6 @@ module Wizport
         save file if file
       end
 
-      def write(txt)
-        @rtf << txt
-      end
-
       def text(str, styles = {:align => :left})
         Wizport::Rtf::Text.new(self, str, styles)
       end
@@ -56,8 +52,8 @@ module Wizport
         Wizport::Rtf::Table.new(self, rows, options, &block)
       end
 
-      def image
-
+      def image(file)
+        Wizport::Rtf::Image.new(self, file)
       end
 
       def line_break

data/lib/wizport/document/rtf/element.rb

@@ -10,6 +10,10 @@ module Wizport
         @rtf = rtf || StringIO.new
       end
 
+      def write(txt)
+        @rtf.write txt
+      end
+
       def cmd(name, value = nil)
         @rtf.write '\\'
         @rtf.write name

data/lib/wizport/document/rtf/image.rb

@@ -0,0 +1,91 @@
+# encoding: utf-8
+
+# Wizport: A gem for creating reports by specifying columns, groups, styles, etc.
+# Copyright 2012 by sgzhe@163.com
+
+module Wizport
+  module Rtf
+    class Image < Element
+      JPEG_SOF_BLOCKS = [0xC0, 0xC1, 0xC2, 0xC3, 0xC5, 0xC6, 0xC7, 0xC9, 0xCA, 0xCB, 0xCD, 0xCE, 0xCF]
+      PIC_TYPE = {png: :pngblip, jpg: :jpegblip, bmp: :pngblip, gif: :pngblip}
+
+      def initialize(rtf, file)
+        super(rtf)
+        begin
+          @io = IO.binread(file)
+        rescue  Exception => e
+          STDERR.puts "** error parsing #{file}: #{e.inspect}"
+          return
+        end
+        @width, @height = self.size
+        group do
+          cmd '*'
+          cmd 'shppict'
+          group do
+            cmd :pict
+            cmd PIC_TYPE[@type]
+            cmd :picscalex, 99
+            cmd :picscaley, 99
+            cmd :picw, @width
+            cmd :pich, @height
+            write "\n"
+            @io.each_byte do |b|
+              hex_str = b.to_s(16)
+              hex_str.insert(0,'0') if hex_str.length == 1
+              write hex_str
+            end
+            write "\n"
+          end
+        end
+
+      end
+
+      def type
+        png = Regexp.new("\x89PNG".force_encoding("binary"))
+        jpg = Regexp.new("\xff\xd8\xff\xe0\x00\x10JFIF".force_encoding("binary"))
+        jpg2 = Regexp.new("\xff\xd8\xff\xe1(.*){2}Exif".force_encoding("binary"))
+
+        @type = case @io
+          when /^GIF8/
+            :gif
+          when /^#{png}/
+            :png
+          when /^#{jpg}/
+            :jpg
+          when /^#{jpg2}/
+            :jpg
+          when /^BM/
+            :bmp
+          else
+            :unknown
+        end
+      end
+
+      def size
+        case self.type
+          when :gif
+            @io[6..10].unpack('SS')
+          when :png
+            @io[16..24].unpack('NN')
+          when :bmp
+            d = @io[14..28]
+            d.unpack('C')[0] == 40 ? d[4..-1].unpack('LL') : d[4..8].unpack('SS')
+          when :jpg
+            d = StringIO.new(@io)
+            section_marker = 0xff # Section marker.
+            d.seek(2) # Skip the first two bytes of JPEG identifier.
+            loop do
+              marker, code, length = d.read(4).unpack('CCn')
+              fail "JPEG marker not found!" if marker != section_marker
+              if JPEG_SOF_BLOCKS.include?(code)
+                #@bits, @height, @width, @channels = d.read(6).unpack("CnnC")
+                return d.read(6).unpack('CnnC')[1..2].reverse
+              end
+              d.seek(length - 2, IO::SEEK_CUR)
+            end
+        end
+      end
+    end
+  end
+end
+

data/lib/wizport/version.rb

@@ -1,3 +1,3 @@
 module Wizport
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/wizport/document/rtf/document_spec.rb

@@ -7,6 +7,10 @@ describe Wizport::Rtf::Document do
   it "a simple example of Rtf" do
       rtf = Wizport::Rtf::Document.new do
         text "学生综合素质评价", :align => :center, 'font-size' => 48
+        image('h:\f.gif')
+        image('h:\ua.bmp')
+        image('h:\eahey.jpg')
+        image('h:\eahey.png')
         page_break
         text "ss"
         table [[{content:'e',rowspan:4},{content:'4',rowspan:4},1,{content:'1',colspan:2}],
@@ -14,6 +18,8 @@ describe Wizport::Rtf::Document do
           add_row [1]
         end
 
+
+
         #table [["姓名", "person.name", "性别", {content: "{Core::Person::GENDER_TYPE[person.gender]}", colspan: 3}, "出生日期", {content: "nil}", colspan: 2}, {content: "一寸照片", colspan: 2, rowspan: 3}],
         #      ["民族", {content: "{Core}", colspan: 2}, "入队(团)时间", {content: '', colspan: 5}],
         #      ["家庭住址", {content: "person", colspan: 8}]]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wizport
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - songgz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-03 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,6 +83,7 @@ files:
 - lib/wizport/document/rtf.rb
 - lib/wizport/document/rtf/document.rb
 - lib/wizport/document/rtf/element.rb
+- lib/wizport/document/rtf/image.rb
 - lib/wizport/document/rtf/spec.rb
 - lib/wizport/document/rtf/table.rb
 - lib/wizport/document/rtf/text.rb