edn_turbo 0.6.1 → 0.7.2

data/ext/edn_turbo/extconf.rb

@@ -2,7 +2,7 @@
 
 # The MIT License (MIT)
 
-# Copyright (c) 2015-2019 Ed Porras
+# Copyright (c) 2015-2021 Ed Porras
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -60,7 +60,19 @@ lib_dirs =
 dir_config('icuuc', header_dirs, lib_dirs)
 
 # feels very hackish to do this but the new icu4c needs it on MacOS
-$CXXFLAGS << ' -stdlib=libc++ -Wno-deprecated-register' if RUBY_PLATFORM =~ /darwin/
+if RUBY_PLATFORM =~ /darwin/
+  $CXXFLAGS << ' -stdlib=libc++ -Wno-deprecated-register'
+else
+  # remove some flags that are either clang-specific or unrecognized
+  # but somehow get passed under linux (?!)
+  %w[
+  -Wno-self-assign -Wno-parentheses-equality -Wno-constant-logical-operand
+  -Wno-cast-function-type -Wdeclaration-after-statement -Wimplicit-function-declaration
+  -Wimplicit-int
+    ].each do |f|
+    $warnflags.sub!(f, '')
+  end
+end
 $CXXFLAGS << ' -std=c++11 -std=gnu++11'
 
 abort "\n>> failed to find icu4c headers - is icu4c installed?\n\n" unless

data/ext/edn_turbo/main.cc

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 
-// Copyright (c) 2015-2019 Ed Porras
+// Copyright (c) 2015-2021 Ed Porras
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -26,6 +26,7 @@
 #include <cstring>
 
 #include <ruby/ruby.h>
+#include <ruby/version.h>
 #include <ruby/io.h>
 
 #include "parser.h"
@@ -48,6 +49,9 @@ namespace edn {
    VALUE RUBY_STRING_TO_F_METHOD      = Qnil;
    VALUE RUBY_READ_METHOD             = Qnil;
 
+   VALUE RUBY_NAN_CONST               = Qnil;
+   VALUE RUBY_INF_CONST               = Qnil;
+
    // returned when EOF - defined as a constant in EDN module
    VALUE EDN_EOF_CONST                = Qnil;
 
@@ -59,7 +63,7 @@ namespace edn {
 
    static const rb_data_type_t parser_data_type = {
       "edn_turbo::Parser",
-      {0, delete_parser, 0, {0}},
+      {0, delete_parser, 0, 0},
       0, 0,
       RUBY_TYPED_FREE_IMMEDIATELY,
    };
@@ -214,9 +218,11 @@ void Init_edn_turbo(void)
    edn::EDN_MAKE_SYMBOL_METHOD        = rb_intern("symbol");
    edn::EDN_MAKE_LIST_METHOD          = rb_intern("list");
    edn::EDN_MAKE_SET_METHOD           = rb_intern("set");
-   edn::EDN_MAKE_BIG_DECIMAL_METHOD   = rb_intern("big_decimal");
    edn::EDN_TAGGED_ELEM_METHOD        = rb_intern("tagged_element");
 
+   // see lib/edn_turbo.rb
+   edn::EDN_MAKE_BIG_DECIMAL_METHOD   = rb_intern("big_decimal_edn_turbo");
+
    // defined in EDNT - see edn_parser.rb
    edn::EDNT_EXTENDED_VALUE_METHOD    = rb_intern("extend_for_meta");
    edn::EDN_MAKE_RATIONAL_METHOD      = rb_intern("rational"); // should be in edn-ruby
@@ -226,6 +232,10 @@ void Init_edn_turbo(void)
    edn::RUBY_STRING_TO_F_METHOD       = rb_intern("to_f");
    edn::RUBY_READ_METHOD              = rb_intern("read");
 
+   VALUE rb_mFloat = rb_const_get(rb_cObject, rb_intern("Float"));
+   edn::RUBY_NAN_CONST                = rb_const_get(rb_mFloat, rb_intern("NAN"));
+   edn::RUBY_INF_CONST                = rb_const_get(rb_mFloat, rb_intern("INFINITY"));
+
    // so we can return EOF directly
    edn::EDN_EOF_CONST                 = rb_const_get(edn::rb_mEDN, rb_intern("EOF"));
 }

data/ext/edn_turbo/parser.h

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 
-// Copyright (c) 2015-2019 Ed Porras
+// Copyright (c) 2015-2021 Ed Porras
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

data/ext/edn_turbo/parser_def.cc

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 
-// Copyright (c) 2015-2019 Ed Porras
+// Copyright (c) 2015-2021 Ed Porras
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -205,7 +205,7 @@ namespace edn
    // =================================================================
    //
    // error reporting
-   void Parser::error(const std::string& func, const std::string& err, char c) const
+   void Parser::error(const std::string& /*func*/, const std::string& err, char c) const
    {
       std::cerr << "Parse error "
          //            "from " << func << "() "

data/ext/edn_turbo/util.cc

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 
-// Copyright (c) 2015-2019 Ed Porras
+// Copyright (c) 2015-2021 Ed Porras
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

data/ext/edn_turbo/util.h

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 
-// Copyright (c) 2015-2019 Ed Porras
+// Copyright (c) 2015-2021 Ed Porras
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -22,6 +22,8 @@
 
 #pragma once
 
+#include <cstddef>
+
 namespace edn
 {
    extern VALUE rb_mEDN;
@@ -41,6 +43,9 @@ namespace edn
    extern VALUE RUBY_STRING_TO_F_METHOD;
    extern VALUE RUBY_READ_METHOD;
 
+   extern VALUE RUBY_NAN_CONST;
+   extern VALUE RUBY_INF_CONST;
+
    namespace util
    {
       // defined in edn_parser_util.cc

data/ext/edn_turbo/util_unicode.cc

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 
-// Copyright (c) 2015-2019 Ed Porras
+// Copyright (c) 2015-2021 Ed Porras
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

data/ext/edn_turbo/util_unicode.h

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 
-// Copyright (c) 2015-2019 Ed Porras
+// Copyright (c) 2015-2021 Ed Porras
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

data/lib/edn_turbo/edn_parser.rb

@@ -2,7 +2,7 @@
 
 # The MIT License (MIT)
 #
-# Copyright (c) 2015-2019 Ed Porras
+# Copyright (c) 2015-2021 Ed Porras
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/lib/edn_turbo/version.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 # The MIT License (MIT)
 #
-# Copyright (c) 2015-2019 Ed Porras
+# Copyright (c) 2015-2021 Ed Porras
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -21,6 +23,6 @@
 # THE SOFTWARE.
 
 module EDNT
-  VERSION = '0.6.1'.freeze
-  RELEASE_DATE = '2019-05-20'.freeze
+  VERSION = '0.7.2'
+  RELEASE_DATE = '2021-09-20'
 end

data/lib/edn_turbo.rb

@@ -2,7 +2,7 @@
 
 # The MIT License (MIT)
 #
-# Copyright (c) 2015-2019 Ed Porras
+# Copyright (c) 2015-2021 Ed Porras
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -36,4 +36,10 @@ module EDN
   def self.rational(value)
     Rational(value)
   end
+
+  # edn-ruby uses BigDecimal.new() which breaks in ruby >= 2.7.0 so we
+  # use this instead
+  def self.big_decimal_edn_turbo(value)
+    BigDecimal(value)
+  end
 end

data/spec/edn_turbo/edn_parser_spec.rb

@@ -352,6 +352,15 @@ module EDNT
       it 'with mathematical operators' do
         expect(subject.parse('>:FOuy/+')).to eq(EDN::Type::Symbol.new('>:FOuy/+'))
       end
+      it 'NaN' do
+        expect(subject.parse('##NaN').to_f.nan?).to be_truthy
+      end
+      it 'infinity' do
+        expect(subject.parse('##Inf')).to eq(Float::INFINITY)
+      end
+      it 'negative infinity' do
+        expect(subject.parse('##-Inf')).to eq(EDN::Type::Symbol.new('-Inf'))
+      end
     end
 
     context 'metadata' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edn_turbo
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Ed Porras
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-20 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: edn
@@ -28,16 +28,22 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +98,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.8.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
 description: Optimized plugin for parsing EDN files using ragel
 email: github@digressed.net
 executables:
@@ -100,19 +120,24 @@ extensions:
 - ext/edn_turbo/extconf.rb
 extra_rdoc_files: []
 files:
+- ".dir-locals.el"
 - ".gitignore"
 - ".rspec"
 - CHANGELOG.md
-- Dockerfile
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- bin/build_docker_image.sh
-- bin/console.sh
 - bin/ppedn
 - bin/ppedn-ruby
-- docker-compose.yml
+- docker/Dockerfile
+- docker/build
+- docker/common.sh
+- docker/console
+- docker/docker-compose.yml
+- docker/entrypoint
+- docker/make-check
+- docker/run
 - ext/edn_turbo/depend
 - ext/edn_turbo/edn_parser.cc
 - ext/edn_turbo/edn_parser.rl
@@ -133,7 +158,7 @@ homepage: http://rubygems.org/gems/edn_turbo
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -141,15 +166,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 3
 summary: Read EDN files
 test_files: []

data/Dockerfile

@@ -1,34 +0,0 @@
-FROM buildpack-deps:stretch
-MAINTAINER github@digressed.net
-
-ENV LC_ALL C.UTF-8
-
-# Update Ubuntu Software repository
-RUN apt-get update
-
-# install dependencies & utils
-RUN apt-get install -y \
-    libicu-dev \
-    curl \
-    libreadline-dev 
-
-# aliases, environment
-RUN echo 'alias h="history"' >> /root/.bashrc
-RUN echo 'alias be="bundle exec"' >> /root/.bashrc
-ENV PATH "/root/.rbenv/bin:/root/.rbenv/shims:$PATH"
-
-# install rbenv & ruby
-RUN \curl -sL https://github.com/rbenv/rbenv-installer/raw/master/bin/rbenv-installer | bash -
-RUN eval "$(rbenv init -)"
-
-ENV RUBY_VERSION=2.6.3
-RUN rbenv install ${RUBY_VERSION}
-RUN rbenv global ${RUBY_VERSION}
-
-# mute bundle warning about root user
-RUN bundle config --global silence_root_warning 1
-
-WORKDIR /gem
-
-# cleanup
-RUN rm -rf /var/lib/apt/lists/*

data/bin/build_docker_image.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [[ $# -eq 0 ]]; then
-    RUBY_VERSION=2.6.3
-else
-    RUBY_VERSION=$1
-fi
-
-docker build -t edn_turbo_image:$RUBY_VERSION .

data/bin/console.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -e
-
-docker-compose run edn_turbo /bin/bash

data/docker-compose.yml

@@ -1,10 +0,0 @@
-version: "3"
-services:
-
-  edn_turbo:
-    image: edn_turbo_image:2.6.3
-    stdin_open: true
-    tty: true
-    volumes:
-      - ~/.bash_history:/root/.bash_history
-      - /Volumes/homes/ep/work/edn_turbo:/gem