edn_turbo 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bdaf1257c512aad396ab5db5e554d1a0c5bec29
-  data.tar.gz: e51ad5ecc5029c72078bec4852990001544bc30a
+  metadata.gz: 55486f37f4ec63643add89b5ca31256f4e5e71eb
+  data.tar.gz: 1114085a545a160ab5329c0332574850a02bbf3e
 SHA512:
-  metadata.gz: 5c052722da212c13e23d00966270cc82a38a91dba82c838f65c43c36d258230404918b517f6bf77d61ce2deb4bd43c01e1ce59efb5c8df289620694b66d3ea9a
-  data.tar.gz: 7207cd8c45ff82be2a2482a4dbf76b81a234316a5580a145be6bfbc34abfd4a47f20235aa033099ee3fa9b3cd9155a9af13bd51f14a4515014ce024d52743337
+  metadata.gz: e10e95095bebcfc3b2216dd231642c0dfaf007e9a63ff05f177eb8e9f227ede8ff5ca2645bddd5dfaadb8b653c7413d8c8db96700e3bc6af4a2892b1e0f52b63
+  data.tar.gz: e1468de18ccd2b6de6d8ade7674dbcc863aa5a9119961697f186a081a0b3b22f7ba595d563e598587b83febf5b92239b39023233bad0482ab9e5a11867863c30

data/README.md

@@ -1,5 +1,5 @@
-edn_turbo
-=========
+edn_turbo 0.5.6
+===============
 
 Fast Ragel-based EDN parser for Ruby.
 
@@ -37,8 +37,8 @@ Dependencies
 ============
 
 - ruby gems:
-  - [rake 10.3](http://rake.rubyforge.org)
-  - [rake-compiler 0.9](http://rake-compiler.rubyforge.org)
+  - [rake](http://rake.rubyforge.org)
+  - [rake-compiler 1.0](http://rake-compiler.rubyforge.org)
   - [edn 1.1](https://github.com/relevance/edn-ruby)
 - [icu4c](http://icu-project.org/apiref/icu4c/)
 
@@ -49,9 +49,9 @@ Notes:
 - `edn_turbo` uses a ragel-based parser but the generated .cc file is
   bundled so ragel should not need to be installed.
 
-- As of 0.3.0, [rice](http://rice.rubyforge.org) is no longer
-  required.
-
+- If the gem fails to install due to a compilation error, make sure you
+  have `icu4c` installed. The reported gem install error doesn't make
+  it clear this is the issue.
 
 Usage
 =====

data/ext/edn_turbo/extconf.rb

@@ -2,24 +2,48 @@
 
 require 'mkmf'
 
-HEADER_DIRS = [
-  '/usr/local/include',
-  '/usr/local/opt/icu4c/include',
-  '/usr/include'
-]
-
-LIB_DIRS = [
-  '/usr/local/lib', # must be the first entry; add others after it
-  '/usr/local/opt/icu4c/lib'
-]
-
-dir_config('edn_ext', HEADER_DIRS, LIB_DIRS)
+header_dirs =
+  if RUBY_PLATFORM =~ /darwin/
+    abort "\n>> failed to find pkg-config binary - Is brew installed? If so, run 'brew install pkg-config'?\n\n" unless
+      File.exist?('/usr/local/bin/pkg-config')
+
+    abort "\n>> failed to find icu4c package - Did you run 'brew install icu4c'?\n\n" unless
+      File.exist?('/usr/local/opt/icu4c/lib/pkgconfig/icu-uc.pc')
+
+    i_opt = %x[ export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig" && /usr/local/bin/pkg-config --cflags-only-I icu-uc ]
+    [
+      i_opt[/-I(.+?)\s/,1]
+    ].freeze
+  else
+    [
+      '/usr/local/include',
+      '/usr/local/opt/icu4c/include',
+      '/usr/include'
+    ].freeze
+  end
+
+lib_dirs =
+  if RUBY_PLATFORM =~ /darwin/
+    l_opt = %x[ /usr/local/bin/pkg-config --libs icu-uc ]
+    [
+      l_opt[/-L(.+?)\s/,1]
+    ].freeze
+  else
+    [
+      '/usr/local/lib', # must be the first entry; add others after it
+      '/usr/local/opt/icu4c/lib'
+    ].freeze
+  end
+
+dir_config('icuuc', header_dirs, lib_dirs)
 
 # feels very hackish to do this but the new icu4c needs it on MacOS
-$CXXFLAGS << ' -stdlib=libc++ -std=c++11' if RUBY_PLATFORM =~ /darwin/
+$CXXFLAGS << ' -stdlib=libc++ -std=c++11' if RUBY_PLATFORM.match?(/darwin/)
 
-abort 'icu4c headers missing' unless find_header('unicode/uversion.h')
+abort "\n>> failed to find icu4c headers - is icu4c installed?\n\n" unless
+  find_header('unicode/uversion.h')
 
-abort 'ic4c lib missing' unless have_library('icuuc')
+abort "\n>> failed to find icu4c library - is icu4c installed?\n\n" unless
+  have_library('icuuc')
 
 create_makefile('edn_turbo/edn_turbo')

data/lib/edn_turbo/edn_parser.rb

@@ -5,15 +5,7 @@
 module EDNT
   # Bind the given meta to the value.
   def self.extend_for_meta(value, ext_meta)
-    meta = ext_meta
-
-    metadata = meta.reduce({}) do |acc, m|
-      case m
-      when Symbol then acc.merge(m => true)
-      when EDN::Type::Symbol then acc.merge(tag: m)
-      else acc.merge(m)
-      end
-    end
+    metadata = EDNT.merge_meta(ext_meta)
 
     unless metadata.empty?
       value.extend EDN::Metadata
@@ -22,4 +14,14 @@ module EDNT
 
     value
   end
+
+  def self.merge_meta(meta)
+    meta.reduce({}) do |acc, m|
+      case m
+      when Symbol then acc.merge(m => true)
+      when EDN::Type::Symbol then acc.merge(tag: m)
+      else acc.merge(m)
+      end
+    end
+  end
 end

data/lib/edn_turbo/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module EDNT
-  VERSION = '0.5.5'
-  RELEASE_DATE = '2018-01-04'
+  VERSION = '0.5.6'
+  RELEASE_DATE = '2019-01-30'
 end

data/test/test_output_diff.rb

@@ -1,23 +1,27 @@
 #!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
+
+# frozen_string_literal: true
+
 $LOAD_PATH << File.expand_path(File.dirname(__FILE__) + '/../lib')
 require 'minitest/autorun'
 require 'edn_turbo'
 require 'date'
 
 class EDNT_Test < Minitest::Test
+  #
+  # helpers
   def setup
     @parser = EDNT::Parser.new
   end
 
   def check_file(file, expected_output)
     output = nil
-    File.open(file) { |source|
+    File.open(file) do |source|
       input = source.instance_of?(String) ? source : source.read
 
       # test using parse() first
       output = @parser.parse(input)
-      if expected_output == nil
+      if expected_output.nil?
         assert_nil(output)
       else
         assert_equal(expected_output, output)
@@ -26,23 +30,23 @@ class EDNT_Test < Minitest::Test
       # now test setting the source and using read (although one-shot)
       @parser.set_input(input)
       output = @parser.read
-      if expected_output == nil
+      if expected_output.nil?
         assert_nil(output)
       else
         assert_equal(expected_output, output)
       end
-    }
+    end
 
     # and test passing the IO
-    File.open(file) { |file_io|
+    File.open(file) do |file_io|
       @parser.set_input(file_io)
       output = @parser.read
-      if expected_output == nil
+      if expected_output.nil?
         assert_nil(output)
       else
         assert_equal(expected_output, output)
       end
-     }
+    end
     output
   end
 
@@ -74,33 +78,26 @@ class EDNT_Test < Minitest::Test
   end
 
   def test_number
-
     check_file('test/number.edn',
                [0, 0, 5, 12, 232, -98798, 13213, 0.11, 231.312, -2321.0, 11.22, 432,
                 123412341231212121241234,
                 123412341231212121241234,
-                4.54e+44, 4.5e+44]
-              )
+                4.54e+44, 4.5e+44])
   end
 
   def test_keyword
-
     check_file('test/keyword.edn',
-               [:key1, :"key_2/adsd2", :key_3, :"key-4", :"key_5/asd-32_ee", :"#/:a"]
-              )
+               [:key1, :"key_2/adsd2", :key_3, :"key-4", :"key_5/asd-32_ee", :"#/:a"])
   end
 
   def test_values
-
     check_file('test/values.edn',
                [false, true, nil, "this is a test", "this\tis\\only\ta\ttest\rof\"various\nescaped\\values",
                 ['c', "\n", "\t"],
-                '123➪456®789']
-              )
+                '123➪456®789'])
   end
 
   def test_builtin_tagged_inst
-
     check_file('test/inst.edn',
                [
                  DateTime.rfc3339('1985-04-12T23:20:50.52Z'),
@@ -108,14 +105,11 @@ class EDNT_Test < Minitest::Test
                  DateTime.rfc3339('1990-12-31T23:59:60Z'),
                  DateTime.rfc3339('1990-12-31T15:59:60-08:00'),
                  DateTime.rfc3339('1937-01-01T12:00:27.87+00:20')
-               ]
-              )
+               ])
   end
 
   def test_builtin_tagged_uuid
-
     check_file('test/uuid.edn', 'f81d4fae-7dec-11d0-a765-00a0c91e6bf6')
-
   end
 
   def test_sets

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edn_turbo
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Ed Porras
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-04 00:00:00.000000000 Z
+date: 2019-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: edn
@@ -28,30 +28,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.7'
-description: Optimization for parsing of EDN files using ragel in a c++ extension
+description: Optimized plugin for parsing EDN files using ragel
 email: ed@motologic.com
 executables:
 - ppedn