edn_turbo 0.4.1 → 0.5.0

data/test/test_output_diff.rb

@@ -25,6 +25,13 @@ class EDNT_Test < Minitest::Test
       output = @parser.read
       assert_equal(expected_output, output)
     }
+
+    # and test passing the IO
+    File.open(file) { |file_io|
+      @parser.set_input(file_io)
+       output = @parser.read
+       assert_equal(expected_output, output)
+     }
     output
   end
 
@@ -231,143 +238,176 @@ class EDNT_Test < Minitest::Test
   end
 
   def test_discard
-
     check_file('test/discard.edn', [:a, :b, 42, [:c]])
     check_file('test/discard2.edn', [:a])
     check_file('test/discard3.edn', 456)
     check_file('test/discard4.edn', [1, 2, 3, 4])
   end
 
+  REF_MAP3_DATA = {:meta=>{:data_format_version=>304,
+                           :filename=>"test/colorspan.pdf",
+                           :is_ok=>true,
+                           :font_engine_ok=>true,
+                           :pdf_ver_major=>1,
+                           :pdf_ver_minor=>3,
+                           :num_pages=>1,
+                           :outline=>[],
+                           :font_size_list=>[12.0],
+                           :lib_versions=>
+                           {:edsel=>"0.20.3",:poppler=>"0.29.0",:libpng=>"1.6.16",:openjpeg=>"1.5.0",:boost=>"1.57",:fontconfig=>"2.11.1",:freetype=>"2.5.5",:leptonica=>"1.71"}},
+                   :pages=>
+                   [{:data_format_version=>304,
+                     :pgnum=>1,
+                     :is_ok=>true,
+                     :width=>612.0,
+                     :height=>792.0,
+                     :rotation=>0,
+                     :has_invisible_text=>false,
+                     :text_bounds=>[[72.0, 71.0], [336.11500000000024, 83.0]],
+                     :gfx_bounds=>[[0.0, 0.0], [612.0, 792.0]],
+                     :bounds=>[[0.0, 0.0], [612.0, 792.0]],
+                     :resources=>
+                     {:colors=>["#000000", "#ffffff", "#b51a00", "#669c34"],
+                      :fonts=>[{:original_name=>"FQRLCA+Helvetica",:family=>"Helvetica",:general_family=>:sans_serif,:type=>:truetype,:embedded=>true,:c2g_md5=>"fca1d2ac4bbb8bb8ca033cd3f24483d6"}],
+                      :images=>{},
+                      :glyphs=>[]},
+                     :text_spans=>
+                     [{:bbox=>[[72.0, 71.0], [182.71680000000006, 83.0]],
+                       :type=>:span,
+                       :text=>"This is a test of the e",
+                       :font_idx=>0,
+                       :size=>12.0,
+                       :color_idx=>0,
+                       :x_vector=>
+                       [72.0,
+                        79.3296,
+                        86.00399999999999,
+                        88.67039999999999,
+                        94.67039999999999,
+                        98.00399999999999,
+                        100.67039999999999,
+                        106.67039999999999,
+                        110.00399999999999,
+                        116.67839999999998,
+                        120.01199999999999,
+                        123.34559999999999,
+                        130.01999999999998,
+                        136.01999999999998,
+                        139.3536,
+                        142.68720000000002,
+                        149.3616,
+                        152.69520000000003,
+                        156.02880000000005,
+                        159.36240000000006,
+                        166.03680000000006,
+                        172.71120000000005,
+                        176.04480000000007],
+                       :clip_path=>0},
+                      {:bbox=>[[182.7188, 71.0], [216.7316, 83.0]],
+                       :type=>:span,
+                       :text=>"merge",
+                       :font_idx=>0,
+                       :size=>12.0,
+                       :color_idx=>2,
+                       :x_vector=>[182.7188, 192.7148, 199.3892, 203.3852, 210.0596],
+                       :clip_path=>0},
+                      {:bbox=>[[216.7324, 71.0], [223.4044, 83.0]],
+                       :type=>:span,
+                       :text=>"n",
+                       :font_idx=>0,
+                       :size=>12.0,
+                       :color_idx=>3,
+                       :x_vector=>[216.7324],
+                       :clip_path=>0},
+                      {:bbox=>[[223.4062, 71.0], [336.11500000000024, 83.0]],
+                       :type=>:span,
+                       :text=>"cy broadcast system.",
+                       :font_idx=>0,
+                       :size=>12.0,
+                       :color_idx=>0,
+                       :x_vector=>
+                       [223.4062,
+                        229.4062,
+                        235.4062,
+                        238.73980000000003,
+                        245.41420000000002,
+                        249.41020000000003,
+                        256.0846000000001,
+                        262.7590000000001,
+                        269.4334000000002,
+                        275.4334000000002,
+                        282.1078000000002,
+                        288.1078000000002,
+                        291.4414000000002,
+                        294.7750000000002,
+                        300.7750000000002,
+                        306.7750000000002,
+                        312.7750000000002,
+                        316.1086000000002,
+                        322.78300000000024,
+                        332.7790000000002],
+                       :clip_path=>0}],
+                     :graphics=>
+                     [{:type=>:path,
+                       :commands=>
+                       [[{:move_to=>[0.0, 792.0]},{:line_to=>[612.0, 792.0]},{:line_to=>[612.0, 0.0]},{:line_to=>[0.0, 0.0]},{:line_to=>[0.0, 792.0]},{:close_path=>true}]],
+                       :bbox=>[[0.0, 0.0], [612.0, 792.0]],
+                       :path_type=>:clip,
+                       :id=>0,
+                       :attribs=>{}},
+                      {:type=>:path,
+                       :commands=>
+                       [[{:move_to=>[0.0, 792.0]},{:line_to=>[612.0, 792.0]},{:line_to=>[612.0, 0.0]},{:line_to=>[0.0, 0.0]},{:line_to=>[0.0, 792.0]},{:close_path=>true}]],
+                       :bbox=>[[0.0, 0.0], [612.0, 792.0]],
+                       :path_type=>:fill,
+                       :clip_path=>0,
+                       :attribs=>{:fill_color_idx=>1}},
+                      {:type=>:path,
+                       :commands=>
+                       [[{:move_to=>[0.0, 792.0]},{:line_to=>[612.0, 792.0]},{:line_to=>[612.0, 0.0]},{:line_to=>[0.0, 0.0]},{:line_to=>[0.0, 792.0]},{:close_path=>true}]],
+                       :bbox=>[[0.0, 0.0], [612.0, 792.0]],
+                       :path_type=>:fill,
+                       :clip_path=>0,
+                       :attribs=>{:fill_color_idx=>1}}],
+                     :links=>[]}]}
+  
   def test_packard
+    check_file('test/map3.edn', REF_MAP3_DATA)
+  end
 
-    check_file('test/map3.edn',
-               {:meta=>{:data_format_version=>304,
-                        :filename=>"test/colorspan.pdf",
-                        :is_ok=>true,
-                        :font_engine_ok=>true,
-                        :pdf_ver_major=>1,
-                        :pdf_ver_minor=>3,
-                        :num_pages=>1,
-                        :outline=>[],
-                        :font_size_list=>[12.0],
-                        :lib_versions=>
-                        {:edsel=>"0.20.3",:poppler=>"0.29.0",:libpng=>"1.6.16",:openjpeg=>"1.5.0",:boost=>"1.57",:fontconfig=>"2.11.1",:freetype=>"2.5.5",:leptonica=>"1.71"}},
-               :pages=>
-               [{:data_format_version=>304,
-                 :pgnum=>1,
-                 :is_ok=>true,
-                 :width=>612.0,
-                 :height=>792.0,
-                 :rotation=>0,
-                 :has_invisible_text=>false,
-                 :text_bounds=>[[72.0, 71.0], [336.11500000000024, 83.0]],
-                 :gfx_bounds=>[[0.0, 0.0], [612.0, 792.0]],
-                 :bounds=>[[0.0, 0.0], [612.0, 792.0]],
-                 :resources=>
-                 {:colors=>["#000000", "#ffffff", "#b51a00", "#669c34"],
-                  :fonts=>[{:original_name=>"FQRLCA+Helvetica",:family=>"Helvetica",:general_family=>:sans_serif,:type=>:truetype,:embedded=>true,:c2g_md5=>"fca1d2ac4bbb8bb8ca033cd3f24483d6"}],
-                  :images=>{},
-                  :glyphs=>[]},
-                 :text_spans=>
-                 [{:bbox=>[[72.0, 71.0], [182.71680000000006, 83.0]],
-                   :type=>:span,
-                   :text=>"This is a test of the e",
-                   :font_idx=>0,
-                   :size=>12.0,
-                   :color_idx=>0,
-                   :x_vector=>
-                   [72.0,
-                    79.3296,
-                    86.00399999999999,
-                    88.67039999999999,
-                    94.67039999999999,
-                    98.00399999999999,
-                    100.67039999999999,
-                    106.67039999999999,
-                    110.00399999999999,
-                    116.67839999999998,
-                    120.01199999999999,
-                    123.34559999999999,
-                    130.01999999999998,
-                    136.01999999999998,
-                    139.3536,
-                    142.68720000000002,
-                    149.3616,
-                    152.69520000000003,
-                    156.02880000000005,
-                    159.36240000000006,
-                    166.03680000000006,
-                    172.71120000000005,
-                    176.04480000000007],
-                   :clip_path=>0},
-                  {:bbox=>[[182.7188, 71.0], [216.7316, 83.0]],
-                   :type=>:span,
-                   :text=>"merge",
-                   :font_idx=>0,
-                   :size=>12.0,
-                   :color_idx=>2,
-                   :x_vector=>[182.7188, 192.7148, 199.3892, 203.3852, 210.0596],
-                   :clip_path=>0},
-                  {:bbox=>[[216.7324, 71.0], [223.4044, 83.0]],
-                   :type=>:span,
-                   :text=>"n",
-                   :font_idx=>0,
-                   :size=>12.0,
-                   :color_idx=>3,
-                   :x_vector=>[216.7324],
-                   :clip_path=>0},
-                  {:bbox=>[[223.4062, 71.0], [336.11500000000024, 83.0]],
-                   :type=>:span,
-                   :text=>"cy broadcast system.",
-                   :font_idx=>0,
-                   :size=>12.0,
-                   :color_idx=>0,
-                   :x_vector=>
-                   [223.4062,
-                    229.4062,
-                    235.4062,
-                    238.73980000000003,
-                    245.41420000000002,
-                    249.41020000000003,
-                    256.0846000000001,
-                    262.7590000000001,
-                    269.4334000000002,
-                    275.4334000000002,
-                    282.1078000000002,
-                    288.1078000000002,
-                    291.4414000000002,
-                    294.7750000000002,
-                    300.7750000000002,
-                    306.7750000000002,
-                    312.7750000000002,
-                    316.1086000000002,
-                    322.78300000000024,
-                    332.7790000000002],
-                   :clip_path=>0}],
-                 :graphics=>
-                 [{:type=>:path,
-                   :commands=>
-                   [[{:move_to=>[0.0, 792.0]},{:line_to=>[612.0, 792.0]},{:line_to=>[612.0, 0.0]},{:line_to=>[0.0, 0.0]},{:line_to=>[0.0, 792.0]},{:close_path=>true}]],
-                   :bbox=>[[0.0, 0.0], [612.0, 792.0]],
-                   :path_type=>:clip,
-                   :id=>0,
-                   :attribs=>{}},
-                  {:type=>:path,
-                   :commands=>
-                   [[{:move_to=>[0.0, 792.0]},{:line_to=>[612.0, 792.0]},{:line_to=>[612.0, 0.0]},{:line_to=>[0.0, 0.0]},{:line_to=>[0.0, 792.0]},{:close_path=>true}]],
-                   :bbox=>[[0.0, 0.0], [612.0, 792.0]],
-                   :path_type=>:fill,
-                   :clip_path=>0,
-                   :attribs=>{:fill_color_idx=>1}},
-                  {:type=>:path,
-                   :commands=>
-                   [[{:move_to=>[0.0, 792.0]},{:line_to=>[612.0, 792.0]},{:line_to=>[612.0, 0.0]},{:line_to=>[0.0, 0.0]},{:line_to=>[0.0, 792.0]},{:close_path=>true}]],
-                   :bbox=>[[0.0, 0.0], [612.0, 792.0]],
-                   :path_type=>:fill,
-                   :clip_path=>0,
-                   :attribs=>{:fill_color_idx=>1}}],
-                 :links=>[]}]}
-             )
+  def test_ruby_file_io
+    File.open("test/true.edn", "r") do |f|
+      # now test setting the source and using read (although one-shot)
+      @parser.set_input(f)
+      output = @parser.read
+      assert_equal(true, output)
+    end
   end
 
+  def test_ruby_file_io_long
+      File.open("test/map3.edn", "r") do |f|
+        # now test setting the source and using read (although one-shot)
+        @parser.set_input(f)
+        output = @parser.read
+        assert_equal(REF_MAP3_DATA, output)
+      end
+  end
+
+  def test_ruby_string_io
+    s = StringIO.new('[ true false :alpha :beta 0 ]')
+
+    @parser.set_input(s)
+    output = @parser.read
+    assert_equal([true, false, :alpha, :beta, 0], output)
+  end
+
+  def test_init_arg
+    # test passing IO to constructor
+    File.open("test/map3.edn", "r") do |f|
+      p = EDNT::Parser.new(f)
+      output = p.read
+      assert_equal(REF_MAP3_DATA, output)
+    end
+  end
+  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edn_turbo
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Ed Porras
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: edn
@@ -81,11 +81,13 @@ files:
 - Rakefile
 - bin/ppedn
 - bin/ppedn-ruby
+- ext/edn_turbo/depend
 - ext/edn_turbo/edn_parser.cc
 - ext/edn_turbo/edn_parser.h
 - ext/edn_turbo/edn_parser.rl
-- ext/edn_turbo/edn_parser_unicode.cc
 - ext/edn_turbo/edn_parser_util.cc
+- ext/edn_turbo/edn_parser_util.h
+- ext/edn_turbo/edn_parser_util_unicode.cc
 - ext/edn_turbo/extconf.rb
 - ext/edn_turbo/main.cc
 - lib/edn_turbo.rb
@@ -112,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 3
 summary: Read EDN files

data/ext/edn_turbo/edn_parser_unicode.cc

@@ -1,29 +0,0 @@
-#include <string>
-
-//
-// needed to define this in its own file because icu and ruby have
-// differing definitions for Uchar and the compiler complains
-//
-#include <unicode/utypes.h>
-#include <unicode/ustring.h>
-#include <unicode/ucnv.h>
-
-#include "edn_parser.h"
-
-namespace edn
-{
-    //
-    // unescapes any values that need to be replaced, saves it to utf8
-    //
-    bool Parser::to_utf8(const char *s, std::size_t len, std::string& rslt)
-    {
-        icu::UnicodeString ustr(s, len);
-
-        if (ustr.isBogus()) {
-            return false;
-        }
-
-        ustr.unescape().toUTF8String(rslt);
-        return true;
-    }
-}