edn_turbo 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ef6fae989e30efe46585a8cfe01ae00255e4014ade4a0ac5f36a0d7c1e98511
-  data.tar.gz: fc19904544cc35bfb84e08a2cb5d13e7fc4fc8b6a19117de247cc5d701c25bee
+  metadata.gz: c1f65f5310e96d3499d0399693a666beabec89267a1d9b24208975838a798975
+  data.tar.gz: 99f6e84ff441c7011b7d565086e94202b9d559e344b32a131c3f6c22efb8321f
 SHA512:
-  metadata.gz: d7bbeacf3d1d4e8e75356986bf87a3838d6e40729ea206aab1b55860d693b1e4e0d0bb1b63d2ae5689d3080f9a4dc239beb3aa7b29b9fe191e6d3592dfb3514b
-  data.tar.gz: 1877016ec61e37c41f4aed022444d721406068f062d6210cfd41cfe5d48290889de24f2d1bd5ebe00cd2ad34dd97af4904567644335a45255cb91d79e118e4fc
+  metadata.gz: 79fb42952469ab2a60549f15237020a989e6dda70e251dee8888b14f5274788b2fc6b467a02c758bade4bbb7429983341d9eb7bce5bc2937172b80f42a8c7c34
+  data.tar.gz: a194eb08824f20c2f42e991269afd54e159fb3038d26184e3b192e5ace56a8463af40a1c209967d938a0da8d925367ae2b7604bbdf4fbe19a58dad3e732129a4

data/.github/workflows/ruby-ext.yml

@@ -0,0 +1,33 @@
+name: Build c-ext gem
+
+on:
+  push:
+  pull_request:
+    branches: [ devel ]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: 
+          - ubuntu-latest
+        #  - macos-latest
+        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
+        ruby:
+          - '2.6'
+          - '2.7'
+          - '3.0'
+          - '3.1'
+          - '3.2'
+    runs-on: ${{ matrix.os }}
+    steps:
+    - run: sudo apt-get install -y libicu-dev libreadline-dev ragel
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - uses: actions/checkout@v2
+    - run: bundle install
+    - run: bundle exec rake
+    - run: bundle exec rspec

data/CHANGELOG.md

@@ -1,8 +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.3] - 2021-11-06
+## [0.8.0] - 2023-03-12
 ### Changed
+* switch edn-ruby dependency to use edn2023.
+
+## [0.7.4] - 2022-05-03
+### Fixed
+* empty strings should use utf-8 encoding (#11).
+
+## [0.7.3] - 2021-11-06
+### Fixed
 * Fix by Caleb Land for new homebrew installs to /opt
 
 ## [0.7.2] - 2021-09-20
@@ -52,7 +60,9 @@ All notable changes to this project will be documented in this file. This change
 ### Added
 * initial version of docker configs for testing on Ubuntu.
 
-[Unreleased]: https://github.com/edporras/edn_turbo/-/compare/0.7.3...main
+[Unreleased]: https://github.com/edporras/edn_turbo/-/compare/0.8.0...main
+[0.8.0]: https://github.com/edporras/edn_turbo/-/compare/0.7.4...0.8.0
+[0.7.4]: https://github.com/edporras/edn_turbo/-/compare/0.7.3...0.7.4
 [0.7.3]: https://github.com/edporras/edn_turbo/-/compare/0.7.2...0.7.3
 [0.7.2]: https://github.com/edporras/edn_turbo/-/compare/0.7.1...0.7.2
 [0.7.1]: https://github.com/edporras/edn_turbo/-/compare/0.7.0...0.7.1

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2021 Ed Porras
+Copyright (c) 2015-2023 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/README.md

@@ -1,13 +1,12 @@
-edn_turbo 0.7.3
+edn_turbo 0.8.0
 ===============
 
 Fast [Ragel](http://www.colm.net/open-source/ragel/)-based EDN parser for Ruby.
 
-`edn_turbo` can be used as a parser plugin for
-[edn](https://github.com/relevance/edn-ruby). With a few exceptions
-`edn_turbo` provides the same functionality as the edn gem, but since
-the `edn_turbo` parser is implemented in C++, it is an order of
-magnitude faster.
+`edn_turbo` can be used as a parser plugin for [edn-ruby]. With a few
+exceptions `edn_turbo` provides the same functionality as the edn gem,
+but since the `edn_turbo` parser is implemented in C++, it is an order
+of magnitude faster.
 
 Some quick sample runs comparing time output of file reads using `edn`
 and `edn_turbo` (see [issue 12](https://github.com/relevance/edn-ruby/issues/12)):
@@ -38,8 +37,8 @@ Ruby 2.6 or greater.
 
 - ruby gems:
   - [rake](http://rake.rubyforge.org)
-  - [rake-compiler 1.0](http://rake-compiler.rubyforge.org)
-  - [edn 1.1](https://github.com/relevance/edn-ruby)
+  - [rake-compiler](http://rake-compiler.rubyforge.org)
+  - [edn2023]
 - a C++-11 capable compiler.
 - [icu4c](http://icu-project.org/apiref/icu4c/)
 
@@ -48,6 +47,11 @@ Notes:
 
 - `edn_turbo` uses a ragel-based parser but the generated .cc file is
   bundled so ragel should not need to be installed.
+- If your system updates the installed version of icu4c, you'll likely
+  get symbol errors when trying to use `edn_turbo` as the libraries it
+  was linked against when first installed will no longer exist. To
+  resolve this, reinstall the gem so it is built against the new icu4c
+  libraries.
 
 Usage
 =====
@@ -114,3 +118,10 @@ calls into the ruby side.
   `Float::INFINITY` and `##NaN` as `Float::NAN`.
 
 - As of v0.7.1, `edn_turbo` requires ruby 2.5 or greater.
+
+- As of v0.7.4, `edn_turbo` requires ruby 2.6 or greater.
+
+- As of v0.8.0, `edn_turbo` replaces its [edn-ruby] with [edn2023].
+
+[edn-ruby]: https://github.com/relevance/edn-ruby
+[edn2023]: https://github.com/edn2023/edn2023

data/Rakefile

@@ -50,8 +50,8 @@ task :graph, %i[machine] do |_t, args|
   machine = args[:machine]
 
   # assumes graphviz is installed
-  sh "ragel -Vp -S #{machine} -o #{tmpfile} #{EXT_PATH}/#{RAGEL_PARSER_SRC} && "\
-    "dot -Tpng #{tmpfile} -o #{machine}.png"
+  sh "ragel -Vp -S #{machine} -o #{tmpfile} #{EXT_PATH}/#{RAGEL_PARSER_SRC} && " \
+     "dot -Tpng #{tmpfile} -o #{machine}.png"
 end
 
 task build: %i[clean ragel compile chmod]

data/ext/edn_turbo/edn_parser.cc

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

@@ -2,7 +2,7 @@
 
 # The MIT License (MIT)
 
-# Copyright (c) 2015-2021 Ed Porras
+# Copyright (c) 2015-2023 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/main.cc

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

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

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 
-// Copyright (c) 2015-2021 Ed Porras
+// Copyright (c) 2015-2023 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
@@ -214,7 +214,7 @@ namespace edn
             if (error) throw_error(error);
             return true;
          } else if (p_end == p_start) {
-            v_utf8 = rb_str_new("", 0);
+            v_utf8 = rb_utf8_str_new_lit("");
             return true;
          }
 

data/ext/edn_turbo/util.h

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 
-// Copyright (c) 2015-2021 Ed Porras
+// Copyright (c) 2015-2023 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-2021 Ed Porras
+// Copyright (c) 2015-2023 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-2021 Ed Porras
+// Copyright (c) 2015-2023 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-2021 Ed Porras
+# Copyright (c) 2015-2023 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

@@ -2,7 +2,7 @@
 
 # The MIT License (MIT)
 #
-# Copyright (c) 2015-2021 Ed Porras
+# Copyright (c) 2015-2023 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
@@ -23,6 +23,6 @@
 # THE SOFTWARE.
 
 module EDNT
-  VERSION = '0.7.3'
-  RELEASE_DATE = '2021-11-06'
+  VERSION = '0.8.0'
+  RELEASE_DATE = '2023-03-12'
 end

data/lib/edn_turbo.rb

@@ -2,7 +2,7 @@
 
 # The MIT License (MIT)
 #
-# Copyright (c) 2015-2021 Ed Porras
+# Copyright (c) 2015-2023 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/spec/edn_turbo/edn_parser_spec.rb

@@ -1,5 +1,27 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2015-2023 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
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
 require 'edn_turbo'
-require 'pry-byebug'
+# require 'pry-byebug'
 
 module EDNT
   RSpec.describe Parser do
@@ -415,5 +437,11 @@ module EDNT
         expect(subject.parse('[ 1 2 3 4 #_ { :a 1 } ]')).to eq([1, 2, 3, 4])
       end
     end
+
+    context 'encoding' do
+      it 'empty str as utf-8' do
+        expect(subject.parse('""').encoding).to eq(Encoding::UTF_8)
+      end
+    end
   end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: edn_turbo
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Ed Porras
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-06 00:00:00.000000000 Z
+date: 2023-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: edn
+  name: edn2023
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -45,73 +45,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '14.0'
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
+        version: '3.9'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '3.7'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '3.7'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '3.8'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '3.8'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.28'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.28'
 description: Optimized plugin for parsing EDN files using ragel
 email: github@digressed.net
 executables:
@@ -121,6 +109,7 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".dir-locals.el"
+- ".github/workflows/ruby-ext.yml"
 - ".gitignore"
 - ".rspec"
 - CHANGELOG.md
@@ -130,14 +119,6 @@ files:
 - Rakefile
 - bin/ppedn
 - bin/ppedn-ruby
-- 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
@@ -166,15 +147,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: Read EDN files
 test_files: []

data/docker/Dockerfile

@@ -1,40 +0,0 @@
-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 -)"
-
-RUN rm -f .ruby-version
-
-# 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

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-. docker/common.sh
-
-set -e
-
-set_ruby_ver $@
-
-docker build --build-arg ruby_version=$RUBY_VERSION -f docker/Dockerfile -t digressed/test:edn_turbo-rb-$RUBY_VERSION .
-docker tag "digressed/test:edn_turbo-rb-$RUBY_VERSION" "edn_turbo-rb-$RUBY_VERSION"
-docker push "digressed/test:edn_turbo-rb-$RUBY_VERSION"

data/docker/common.sh

@@ -1,28 +0,0 @@
-#!/bin/sh
-
-RUBY_MAJOR_VER=3.0
-
-function update_ruby_build()
-{
-    if [ -e "~/.rbenv/plugins/" ]; then
-        echo "Updating ruby-build definitions"
-
-        pushd ~/.rbenv/plugins/ruby-build/ >> /dev/null
-        git pull
-        popd >> /dev/null
-    fi
-}
-
-function set_ruby_ver()
-{
-    local args=("$@")
-
-    if [ ${#args[@]} -eq 0 ]; then
-        update_ruby_build
-        RUBY_VERSION=`ruby-build --definitions | grep  "^$RUBY_MAJOR_VER" | tail -1`
-    else
-        RUBY_VERSION=$1
-    fi
-
-    echo "Using ruby $RUBY_VERSION"
-}

data/docker/console

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-if [ $# -eq 0 ]; then
-    RUBY_VERSION=3.0.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

@@ -1,22 +0,0 @@
-version: "3"
-services:
-
-  rb-3.0.2:
-    image: digressed/test:edn_turbo-rb-3.0.2
-    stdin_open: true
-    tty: true
-
-  rb-2.7.4:
-    image: digressed/test:edn_turbo-rb-2.7.4
-    stdin_open: true
-    tty: true
-
-  rb-2.6.8:
-    image: digressed/test:edn_turbo-rb-2.6.8
-    stdin_open: true
-    tty: true
-
-  rb-2.5.9:
-    image: digressed/test:edn_turbo-rb-2.5.9
-    stdin_open: true
-    tty: true

data/docker/entrypoint

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

data/docker/make-check

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

data/docker/run

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-. docker/common.sh
-
-set -e
-
-set_ruby_ver $@
-
-docker-compose -f docker/docker-compose.yml run rb-$RUBY_VERSION docker/make-check