rrtf 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc70901e84aadb460e92e00edce17a81a70cd993
-  data.tar.gz: 9cbfde57e949d1479bf77b7f0773d9502a4436e9
+  metadata.gz: 4696bbf7c9772c7cf36a9fa33e10d2c5ddb0b60e
+  data.tar.gz: cb8b674323d9ad87c4d75386994c8554c956ef5b
 SHA512:
-  metadata.gz: 01d07f75d2b50486c3e55174e10dff2954e235ce6c999be4b8a9d6abb1d5904df7c7a6578c9cebc3606d7ad59fd829031e3d5210233d1d172dd56b1a8cf6bb33
-  data.tar.gz: 0a74b57a08c94e549579b21196109718c3e2eac0fb042c760f3820224a21898e249997e4483ce2511cbccdc90527c7484c464c5755282768fc2fd574f3c1ba30
+  metadata.gz: '0827d3f9ce0bfb0c9e92efa91e0ef6dbfff0bc0008801d377ca261472baa3b5ab2854d2366ec8a82fd77d422cccae58db2b8533e8d2f94ae528ea73987172f8a'
+  data.tar.gz: 05eb44acdc466d1e1fd3a27669fcde7a2a65a09e07ebc7e678394551a3f10a8003d46a47c6dca281b449405fd0e0d777ee096ae1e4277efab11ddce5131f9901

data/CHANGELOG.md

@@ -22,3 +22,8 @@ _Version 1.0.0:_
 - Add BorderFormatting module and BorderStyle class to allow border definition on paragraphs and images.
 - Add ShadingFormatting module and ShadingStyle class to allow paragraph shading.
 - Add ShapeNode class to implement basic shapes.
+
+_Version 1.0.1:_
+
+- Allow remote source for images with open-uri.
+- Fix issue with setting "text_margin" for text boxes.

data/examples/08.rtf

@@ -7,11 +7,11 @@
 \red255\green0\blue0;
 }
 {\info
-{\createim\yr2017\mo7\dy30\hr23\min44}
+{\createim\yr2017\mo8\dy1\hr11\min6}
 }
 
 \hyphauto1\paperw12247\paperh15819\margl1440\margr1440\margt1440\margb1440
-{\pict \box\brdrdot\brdrw100\brsp240\brdrcf1\picwgoal2880\pichgoal2880\picw500\pich500\bliptag3007171\pngblip
+{\pict \box\brdrdot\brdrw100\brsp240\brdrcf1\picwgoal2880\pichgoal2880\picw500\pich500\bliptag0108171\pngblip
 89504e470d0a1a0a0000000d49484452000001f4000001f40806000000cbd6df8a00000009704859
 73000016250000162501495224f00000200049444154785eec5d077c5455f6fe26939e50549a2288
 8282aeae2b56545ceb2a8a34459705114511e952a45705040ba0880a289d208a8a7f51b161050545

data/examples/09.rtf

@@ -7,7 +7,7 @@
 \red255\green255\blue255;
 }
 {\info
-{\createim\yr2017\mo7\dy31\hr20\min2}
+{\createim\yr2017\mo8\dy1\hr11\min8}
 }
 
 \hyphauto1\paperw12247\paperh15819\margl1440\margr1440\margt1440\margb1440
@@ -22,10 +22,6 @@
 {\sp{\sn fFilled}{\sv 1}}
 {\sp{\sn fillColor}{\sv 13421772}}
 {\sp{\sn fLine}{\sv 0}}
-{\sp{\sn geoLeft}{\sv 0}}
-{\sp{\sn geoTop}{\sv 0}}
-{\sp{\sn geoRight}{\sv 30000}}
-{\sp{\sn geoBottom}{\sv 30000}}
 {\sp{\sn fLineOK}{\sv 1}}
 {\sp{\sn fFillOK}{\sv 1}}
 {\sp{\sn f3DOK}{\sv 1}}
@@ -43,10 +39,10 @@
 {\sp{\sn fLine}{\sv 1}}
 {\sp{\sn lineColor}{\sv 0}}
 {\sp{\sn lineWidth}{\sv 38100}}
-{\sp{\sn geoLeft}{\sv 0}}
-{\sp{\sn geoTop}{\sv 0}}
-{\sp{\sn geoRight}{\sv 30000}}
-{\sp{\sn geoBottom}{\sv 30000}}
+{\sp{\sn dxTextLeft}{\sv 457200}}
+{\sp{\sn dxTextRight}{\sv 457200}}
+{\sp{\sn dyTextTop}{\sv 457200}}
+{\sp{\sn dyTextBottom}{\sv 457200}}
 {\sp{\sn fLineOK}{\sv 1}}
 {\sp{\sn fFillOK}{\sv 1}}
 {\sp{\sn f3DOK}{\sv 1}}
@@ -72,11 +68,11 @@ red
 {\sp{\sn lineColor}{\sv 10027008}}
 {\sp{\sn geoLeft}{\sv 0}}
 {\sp{\sn geoTop}{\sv 0}}
-{\sp{\sn geoRight}{\sv 30000}}
-{\sp{\sn geoBottom}{\sv 30000}}
-{\sp{\sn pVerticies}{\sv 8;6;(0,0);(20000,0);(30000,0);(30000,15000);(30000,30000);(0,0)}}
+{\sp{\sn geoRight}{\sv 21600}}
+{\sp{\sn geoBottom}{\sv 21600}}
+{\sp{\sn pVerticies}{\sv 8;6;(0,0);(14400,0);(21600,0);(21600,10800);(21600,21600);(0,0)}}
 {\sp{\sn pSegmentInfo}{\sv 2;6;16384;1;8193;1;24577;32768}}
-{\sp{\sn pConnectionSites}{\sv 8;4;(0,0);(20000,0);(30000,30000);(0,0)}}
+{\sp{\sn pConnectionSites}{\sv 8;4;(0,0);(14400,0);(21600,21600);(0,0)}}
 {\sp{\sn fLineOK}{\sv 1}}
 {\sp{\sn fFillOK}{\sv 1}}
 {\sp{\sn f3DOK}{\sv 1}}

data/examples/09_shapes.rb

@@ -23,7 +23,8 @@ rtf.geometry(
   "width" => "3in",
   "height" => "3in",
   "horizontal_reference" => "PAGE",
-  "vertical_reference" => "PAGE"
+  "vertical_reference" => "PAGE",
+  "text_margin" => "0.5in"
 ) do |box|
   box.paragraph("foreground_color" => '#ffffff') do |p|
     p << "Should you ever find yourself on a spacefaring vessel wearing a "

data/lib/rrtf/node/image_node.rb

@@ -1,4 +1,5 @@
 require 'fastimage'
+require 'open-uri'
 
 module RRTF
   # This class represents an image within a RTF document. Currently only the
@@ -60,7 +61,7 @@ module RRTF
      # This is the constructor for the ImageNode class.
      #
      # @param parent [Node] a reference to the node that owns the new image node.
-     # @param source [String, File] a reference to the image source; this must be a String or a File.
+     # @param source [String, File] a reference to the image source; this must be a String, String URL, or a File.
      # @param id [Integer] a unique 32-bit identifier for the image.
      # @param options [Hash] a hash of options.
      # @option options [String] "width" (nil) the display width of the image in twips (can be a string, see {Utilities.value2twips}).
@@ -72,7 +73,7 @@ module RRTF
      #   specified source does not exist or cannot be accessed.
      def initialize(parent, source, id, options = {})
         super(parent)
-        @source = nil
+        @source = source
         @id     = id
 
         # load default options
@@ -95,16 +96,19 @@ module RRTF
         end
 
         # Store path to image.
-        @source = source if source.instance_of?(String) || source.instance_of?(Tempfile)
-        @source = source.path if source.instance_of?(File)
+        if @source.is_a?(String)
+          begin
+            @source = open(@source)
+          rescue OpenURI::HTTPError => error
+            response = error.io
+            RTFError.fire("Could not open '#{@source}'. Server responded with #{response.status.join(',')}.")
+          rescue Exception => error
+            RTFError.fire("Could not open '#{@source}'. #{error.message}.")
+          end # rescue block
+        elsif !@source.respond_to?(:each_byte)
+          RTFError.fire("A string or object that responds to :each_byte must be supplied - '#{@source}' given.")
+        end # unless
 
-        # Check the file's existence and accessibility.
-        if !File.exist?(@source)
-           RTFError.fire("Unable to find the #{File.basename(@source)} file.")
-        end
-        if !File.readable?(@source)
-           RTFError.fire("Access to the #{File.basename(@source)} file denied.")
-        end
         # Attempt to determine image type and dimensions.
         @type, @width, @height = self.class.inspect(@source)
         if @type.nil?
@@ -128,18 +132,16 @@ module RRTF
        text << "\\picw#{@width}\\pich#{@height}\\bliptag#{@id}"
        text << "\\#{@type}\n"
 
-       open_file do |file|
-         file.each_byte do |byte|
-           hex_str = byte.to_s(16)
-           hex_str.insert(0,'0') if hex_str.length == 1
-           text << hex_str
-           count += 1
-           if count == 40
-             text << "\n"
-             count = 0
-           end # if
-         end # each_byte
-       end # open_file
+       @source.each_byte do |byte|
+         hex_str = byte.to_s(16)
+         hex_str.insert(0,'0') if hex_str.length == 1
+         text << hex_str
+         count += 1
+         if count == 40
+           text << "\n"
+           count = 0
+         end # if
+       end # each_byte
        text << "\n}"
 
        text.string
@@ -162,14 +164,6 @@ module RRTF
            [(@width*scale_factor).to_i, (@height*scale_factor).to_i]
          end
        end # case
-     end
-
-     def open_file(&block)
-       if block
-         File.open(@source, 'rb', &block)
-       else
-         File.open(@source, 'rb')
-       end # if
-     end # open_file()
+     end # size_image()
   end # End of the ImageNode class.
 end # module RRTF

data/lib/rrtf/properties/geometry_properties.rb

@@ -320,10 +320,10 @@ module RRTF
          next if margin.nil?
 
          margin = Page::Margin.new(margin)
-         left = Utilities.value2emu(margin.left+'twip')
-         right = Utilities.value2emu(margin.right+'twip')
-         top = Utilities.value2emu(margin.top+'twip')
-         bottom = Utilities.value2emu(margin.bottom+'twip')
+         left = Utilities.value2emu("#{margin.left}twip")
+         right = Utilities.value2emu("#{margin.right}twip")
+         top = Utilities.value2emu("#{margin.top}twip")
+         bottom = Utilities.value2emu("#{margin.bottom}twip")
 
          instance_variable_set("@#{margin_attr}", margin)
          instance_variable_set("@#{margin_attr}_left", left)

data/lib/rrtf/version.rb

@@ -1,3 +1,3 @@
 module RRTF
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rrtf
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Wesley Hileman