edn_turbo 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 873b791ab9878f7b9bd616689fbfbef2eacb3fd1d6d8ede55a71f182fcf3b9f4
-  data.tar.gz: a6ff013825a135846e1e3988e17a86d58ca0dd244fcde0a9b73f3eb22218e8cb
+  metadata.gz: 52581ae198013dd710765482a20fa056d4cd34e889ae1e22b86d3fa4bbf14316
+  data.tar.gz: 88352b596f68647b0106cf95b7c1f5cf6cdb398852de65b2feebe11a1b61506e
 SHA512:
-  metadata.gz: aa606e1bc5da4be831d70052415f3c217343e334390de2e72bb141dd18986f6ef3379c03c6f1adec2de86af65951bf2902dc3fcb09fae29874ad448323a7361d
-  data.tar.gz: 0cf810e71d6a3a3d2cabc798bed067d0826512149ef503d4f2940816e1f3cc15e71d9cffef5eb504b44efa70f597f274decc5147be878c515c3624f5a558854f
+  metadata.gz: 0ca4bc29b2d5dd0cbd051dbf77ae1362ea4c9e935166144137e7f37d5025db171ed309e5cd9e405f3f3ac207551dcf64eaf7eb908592dfb0ef440f73917d03db
+  data.tar.gz: 1cea625a086d7c9268427d2fd678cc27ff1647014fcf89cf6484511b14659e57bf10fb45fc73aeb85793cbee3a66b15940dac20fd5ff066afb19c48e8e938143

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 # Change Log
 All notable changes to this project will be documented in this file. This change log follows the conventions of [keepachangelog.com](http://keepachangelog.com/).
 
+## 0.7.0 - 2020-02-07
+### Added
+- big_decimal_edn_turbo method to replace calling edn-ruby's
+  big_decimal as it breaks things in ruby 2.7 and up
+
+### Changed
+- Removed compiler warning due to scalar wrapped in braces
+- Updated docker configs to use latest 2.4 and 2.6 ruby
+  versions. Added 2.5 and 2.7 too.
+
 ## 0.6.2 - 2019-05-21
 ### Fixed
 - Handling of ##Inf, ##Nan, et al.

data/README.md

@@ -1,4 +1,4 @@
-edn_turbo 0.6.2
+edn_turbo 0.7.0
 ===============
 
 Fast [Ragel](http://www.colm.net/open-source/ragel/)-based EDN parser for Ruby.

data/docker/Dockerfile

@@ -0,0 +1,38 @@
+FROM buildpack-deps:stretch
+MAINTAINER github@digressed.net
+ARG ruby_version
+
+ENV LC_ALL C.UTF-8
+
+USER root
+RUN groupadd -r ned -g 1000 && \
+    useradd -u 1000 -r -g ned -m -s /sbin/nologin -c "Docker image user" ned && \
+    mkdir /home/ned/bin && \
+    mkdir /home/ned/src && \
+    chown -R ned:ned /home/ned
+
+WORKDIR /home/ned/src
+
+# Update Ubuntu Software repository && update deps
+RUN apt-get update && \
+     apt-get install -y \
+     libicu-dev \
+     libreadline-dev \
+     ragel && \
+     rm -rf /var/lib/apt/lists/*
+
+USER ned
+
+ENV PATH "/home/ned/.rbenv/bin:/home/ned/.rbenv/shims:$PATH"
+
+# install rbenv
+RUN \curl -sL https://github.com/rbenv/rbenv-installer/raw/master/bin/rbenv-installer | bash - && \
+    eval "$(rbenv init -)"
+
+# the specified ruby version
+RUN rbenv install $ruby_version && \
+    rbenv global $ruby_version
+
+COPY --chown=ned:ned . /home/ned/src
+
+ENTRYPOINT ["docker/entrypoint"]

data/docker/build

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [ $# -eq 0 ]; then
+    RUBY_VERSION=2.7.0
+else
+    RUBY_VERSION=$1
+fi
+
+set -e
+
+docker build --build-arg ruby_version=$RUBY_VERSION -f docker/Dockerfile -t digressed/test:edn_turbo-rb-$RUBY_VERSION .

data/docker/console

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [ $# -eq 0 ]; then
+    RUBY_VERSION=2.7.0
+else
+    RUBY_VERSION=$1
+fi
+
+echo "running on ruby ${RUBY_VERSION}"
+
+docker-compose -f docker/docker-compose.yml run rb-$RUBY_VERSION /bin/bash

data/docker/docker-compose.yml

@@ -0,0 +1,24 @@
+version: "3"
+services:
+
+  rb-2.7.0:
+    image: digressed/test:edn_turbo-rb-2.7.0
+    stdin_open: true
+    tty: true
+
+  rb-2.6.5:
+    image: digressed/test:edn_turbo-rb-2.6.5
+    stdin_open: true
+    tty: true
+
+  rb-2.5.7:
+    image: digressed/test:edn_turbo-rb-2.5.7
+    stdin_open: true
+    tty: true
+
+  rb-2.4.9:
+    image: digressed/test:edn_turbo-rb-2.4.9
+    stdin_open: true
+    tty: true
+    # volumes:
+    #   - /Volumes/homes/ep/work/edn_turbo:/home/ned/app

data/docker/entrypoint

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec "$@"

data/docker/make-check

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -x -e
+
+gem install bundler &&
+    bundle && \
+    rake compile && \
+    bundle exec rspec

data/docker/run

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [ $# -eq 0 ]; then
+    RUBY_VERSION=2.7.0
+else
+    RUBY_VERSION=$1
+fi
+
+set -e
+
+docker-compose -f docker/docker-compose.yml run rb-$RUBY_VERSION docker/make-check

data/ext/edn_turbo/edn_parser.cc

@@ -2,7 +2,7 @@
 #line 1 "edn_parser.rl"
 // The MIT License (MIT)
 
-// Copyright (c) 2015-2019 Ed Porras
+// Copyright (c) 2015-2020 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/edn_parser.rl

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 
-// Copyright (c) 2015-2019 Ed Porras
+// Copyright (c) 2015-2020 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/extconf.rb

@@ -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-2020 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"
@@ -62,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,
    };
@@ -217,9 +218,16 @@ 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");
 
+#if defined(RUBY_API_VERSION_MAJOR) && (RUBY_API_VERSION_MAJOR == 2) && \
+    defined(RUBY_API_VERSION_MINOR) && (RUBY_API_VERSION_MINOR > 4)
+   // see lib/edn_turbo.rb
+   edn::EDN_MAKE_BIG_DECIMAL_METHOD   = rb_intern("big_decimal_edn_turbo");
+#else
+   edn::EDN_MAKE_BIG_DECIMAL_METHOD   = rb_intern("big_decimal");
+#endif
+
    // 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

data/ext/edn_turbo/parser.h

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 
-// Copyright (c) 2015-2019 Ed Porras
+// Copyright (c) 2015-2020 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-2020 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-2020 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-2020 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.cc

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 
-// Copyright (c) 2015-2019 Ed Porras
+// Copyright (c) 2015-2020 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.rb

@@ -2,7 +2,7 @@
 
 # The MIT License (MIT)
 #
-# Copyright (c) 2015-2019 Ed Porras
+# Copyright (c) 2015-2020 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/lib/edn_turbo/edn_parser.rb

@@ -2,7 +2,7 @@
 
 # The MIT License (MIT)
 #
-# Copyright (c) 2015-2019 Ed Porras
+# Copyright (c) 2015-2020 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,6 @@
 # The MIT License (MIT)
 #
-# Copyright (c) 2015-2019 Ed Porras
+# Copyright (c) 2015-2020 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 +21,6 @@
 # THE SOFTWARE.
 
 module EDNT
-  VERSION = '0.6.2'.freeze
-  RELEASE_DATE = '2019-05-21'.freeze
+  VERSION = '0.7.0'.freeze
+  RELEASE_DATE = '2020-02-07'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edn_turbo
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Ed Porras
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-21 00:00:00.000000000 Z
+date: 2020-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: edn
@@ -103,16 +103,19 @@ files:
 - ".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/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
@@ -148,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 3
 summary: Read EDN 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