ruby-rtf 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6c49f3df763a3eed0f7db3da2c0f8b3b8c719d82
-  data.tar.gz: 44d7a2e153fd5b5c98ee33ef1e5c4c3bf601f4aa
+SHA256:
+  metadata.gz: 50dd0ca707eb1c3d3ceddca62ceb88f46ba2ecd712f403059d99aa9566d89d34
+  data.tar.gz: 5be0b6e3dd052d0261a5177b31a22cc8e2f91a9e2b7e4c2009c70ab26fe2d085
 SHA512:
-  metadata.gz: b5b942ab6e002d1be0dd70d1041b84f2f34bc8851c62d6f5aa391321ec55d8fcdfd38111f5ddfb43e6804c7afa76410fe45c719ab152646731568337733592e4
-  data.tar.gz: 1339b06aca24cf79cf5156f689e6a24d160e20a49b198c75f8d8da249c143ea5be215e93242eb898cb4a8c4cf61d8131bd65779233f3b0c61f606b9c175f42d1
+  metadata.gz: b13544d45d381eee9bb4aef1209ce6e099bc5e3d4c1366e84905800204687bdcb8e1b6afdd23d081610707797d0171e817a926219f4f2bf2a60d71d25d0286c1
+  data.tar.gz: 9d31de78bf52d44399431724f57eece4f5254b4d3566438ce4dc011bc81128a58dce7c99dca3fffed3c0e8c018d5f81904b855e8ea6b6526c353df0bb91bc74c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby-rtf (0.0.2)
+    ruby-rtf (0.0.5)
 
 GEM
   remote: http://rubygems.org/
@@ -20,7 +20,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
-    yard (0.9.9)
+    yard (0.9.24)
 
 PLATFORMS
   ruby
@@ -28,7 +28,7 @@ PLATFORMS
 DEPENDENCIES
   rspec (> 2.0)
   ruby-rtf!
-  yard
+  yard (~> 0.9.11)
 
 BUNDLED WITH
-   1.14.6
+   1.16.1

data/lib/ruby-rtf/parser.rb

@@ -126,7 +126,15 @@ module RubyRTF
       case(name)
       when :rtf then ;
       when :deff then @doc.default_font = val
-      when :ansicpg then self.encoding = "windows-#{val}"
+      when :ansicpg then
+        begin
+          # Set the encoding if it's valid
+          Encoding.find("windows-#{val}")
+          self.encoding = "windows-#{val}"
+        rescue => e
+          # ignore
+        end
+
       when *[:ansi, :mac, :pc, :pca] then @doc.character_set = name
       when :fonttbl then current_pos = parse_font_table(src, current_pos)
       when :colortbl then current_pos = parse_colour_table(src, current_pos)
@@ -412,7 +420,7 @@ module RubyRTF
             colour.theme = ctrl.to_s[1..-1].to_sym
           end
 
-        when *["\r", "\n"] then current_pos += 1
+        when *["\r", "\n", " "] then current_pos += 1
         when ';' then
           @doc.colour_table << colour
 
@@ -513,14 +521,20 @@ module RubyRTF
     def force_section!(mods = {}, text =  nil)
       current_context << @current_section
 
+      # The modifiers for the new section
+      modifiers = {}
+
       fs = formatting_stack.last || {}
       fs.each_pair do |k, v|
         next if BLACKLISTED.include?(k)
-        mods[k] = v
+        modifiers[k] = v
       end
-      formatting_stack.push(mods)
 
-      @current_section = {:text => (text || ''), :modifiers => mods}
+      modifiers.merge!(mods)
+
+      formatting_stack.push(modifiers)
+
+      @current_section = {:text => (text || ''), :modifiers => modifiers}
     end
 
     # Resets the current section to default formating

data/lib/ruby-rtf/version.rb

@@ -1,5 +1,5 @@
 # Main namespace of the RTF parser
 module RubyRTF
   # Current library version
-  VERSION = '0.0.3'
+  VERSION = '0.0.5'
 end

data/ruby-rtf.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.description = s.summary
 
   s.add_development_dependency 'rspec', '>2.0'
-  s.add_development_dependency 'yard'
+  s.add_development_dependency 'yard', '~>0.9.11'
 
   s.bindir = 'bin'
   s.executables << 'rtf_parse'

data/spec/parser_spec.rb

@@ -391,6 +391,36 @@ ffd8ffe000104a4649460001010100b400b40000ffe1158a687474703a2f2f6e732e61646f62652e
       clr.blue.should == 255
     end
 
+    it 'ignores single space between colour sections' do
+      src = '{\rtf1{\colortbl\red0\green0\blue0; \red127\green2\blue255;}}'
+      doc = parser.parse(src)
+
+      clr = doc.colour_table[0]
+      clr.red.should == 0
+      clr.green.should == 0
+      clr.blue.should == 0
+
+      clr = doc.colour_table[1]
+      clr.red.should == 127
+      clr.green.should == 2
+      clr.blue.should == 255
+    end
+
+    it 'ignores double space between colour sections' do
+      src = '{\rtf1{\colortbl\red0\green0\blue0;  \red127\green2\blue255;}}'
+      doc = parser.parse(src)
+
+      clr = doc.colour_table[0]
+      clr.red.should == 0
+      clr.green.should == 0
+      clr.blue.should == 0
+
+      clr = doc.colour_table[1]
+      clr.red.should == 127
+      clr.green.should == 2
+      clr.blue.should == 255
+    end
+
     it 'sets the first colour if missing' do
       src = '{\rtf1{\colortbl;\red255\green0\blue0;\red0\green0\blue255;}}'
       doc = parser.parse(src)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-rtf
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - dan sinclair
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -28,16 +28,16 @@ dependencies:
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.11
 description: Library for working with RTF files
 email: dj2@everburning.com
 executables:
@@ -86,8 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Library for working with RTF files