edn_turbo 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52581ae198013dd710765482a20fa056d4cd34e889ae1e22b86d3fa4bbf14316
-  data.tar.gz: 88352b596f68647b0106cf95b7c1f5cf6cdb398852de65b2feebe11a1b61506e
+  metadata.gz: 59342940a3cb92e4792239598d5a858376a2ed18ef78872ea2d6a00a4421e18b
+  data.tar.gz: 04e6d9ab8648b13a7e850ac0ea84d85464ac8e3474cde3642e83c9f9ac2a44c8
 SHA512:
-  metadata.gz: 0ca4bc29b2d5dd0cbd051dbf77ae1362ea4c9e935166144137e7f37d5025db171ed309e5cd9e405f3f3ac207551dcf64eaf7eb908592dfb0ef440f73917d03db
-  data.tar.gz: 1cea625a086d7c9268427d2fd678cc27ff1647014fcf89cf6484511b14659e57bf10fb45fc73aeb85793cbee3a66b15940dac20fd5ff066afb19c48e8e938143
+  metadata.gz: 208f82034dec3313c9bc6eaacc46debb746d39379e385195ee727afce4a3e5cf26cb5f06336a137428409a2914caa3e6531138a8c36b2223620bb9920a82f024
+  data.tar.gz: ab5e07ba292a835729b5174973280253040ea9fdf78742ff46bd7afd271f1e9884173a4571cffd4a766f21eca9a2232edddee7b3e7c969472e888069fe60ea02

data/.dir-locals.el

@@ -0,0 +1,3 @@
+((c++-mode
+  (flycheck-clang-language-standard . "c++11")
+  (flycheck-gcc-language-standard . "c++11")))

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # 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.1 - 2021-02-07
+### Changed
+- Set minimum ruby version to 2.5
+
+### Fixed
+- Compilation error when building against ruby versions > 2
+
 ## 0.7.0 - 2020-02-07
 ### Added
 - big_decimal_edn_turbo method to replace calling edn-ruby's
@@ -38,3 +45,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.1...main
+[0.7.1]: https://github.com/edporras/edn_turbo/-/compare/0.7.0...0.7.1
+[0.7.0]: https://github.com/edporras/edn_turbo/-/compare/0.6.2...0.7.0
+[0.6.2]: https://github.com/edporras/edn_turbo/-/compare/0.6.1...0.6.2
+[0.6.1]: https://github.com/edporras/edn_turbo/-/compare/0.6.0...0.6.1
+[0.6.0]: https://github.com/edporras/edn_turbo/-/compare/0.5.7...0.6.0

data/README.md

@@ -1,4 +1,4 @@
-edn_turbo 0.7.0
+edn_turbo 0.7.1
 ===============
 
 Fast [Ragel](http://www.colm.net/open-source/ragel/)-based EDN parser for Ruby.
@@ -34,7 +34,7 @@ irb(main):008:0> Benchmark.realtime { 100000.times { EDN::read(s) } }
 Dependencies
 ============
 
-Ruby 2.4 or greater as `edn_turbo` does not use the deprecated `Fixnum` or `Bignum`.
+Ruby 2.6 or greater.
 
 - ruby gems:
   - [rake](http://rake.rubyforge.org)
@@ -112,3 +112,5 @@ calls into the ruby side.
 
 - As of v0.6.2, `edn_turbo` supports representation of `##Inf` as
   `Float::INFINITY` and `##NaN` as `Float::NAN`.
+
+- As of v0.7.1, `edn_turbo` requires ruby 2.5 or greater.

data/Rakefile

@@ -36,7 +36,7 @@ CLEAN.include(['*.png', '*.gem'])
 # ragel cc source generation
 task ragel: GEN_CC_PARSER_SRC_PATH
 file GEN_CC_PARSER_SRC_PATH => RAGEL_PARSER_SRC_PATH do
-  cd EXT_PATH do
+  Dir.chdir(EXT_PATH) do
     sh "ragel -G2 -o #{GEN_CC_PARSER_SRC} #{RAGEL_PARSER_SRC}"
     src = File.read(GEN_CC_PARSER_SRC).gsub(/[ \t]+$/, '')
     File.open(GEN_CC_PARSER_SRC, 'w') { |f| f.print src }
@@ -44,24 +44,16 @@ file GEN_CC_PARSER_SRC_PATH => RAGEL_PARSER_SRC_PATH do
 end
 
 # graph generation for testing machine output
-task :graph, [:machine] do |_t, args|
+task :graph, %i[machine] do |_t, args|
   args.with_defaults(machine: 'EDN_value')
-  TMPFILE = '/tmp/ragel_edn'
-  MACHINE = args[:machine]
+  tmpfile = '/tmp/ragel_edn'
+  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: [:clean, :ragel, :compile, :chmod]
-
-# add dependency to test task
-task test:  EXT_BUNDLE
-
-Rake::TestTask.new do |t|
-  t.libs << 'test'
-  t.test_files = FileList['test/test_output_diff.rb']
-end
+task build: %i[clean ragel compile chmod]
 
 task default: :compile

data/docker/Dockerfile

@@ -29,6 +29,8 @@ ENV PATH "/home/ned/.rbenv/bin:/home/ned/.rbenv/shims:$PATH"
 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

data/docker/build

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

@@ -0,0 +1,28 @@
+#!/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,7 +1,7 @@
 #!/bin/bash
 
 if [ $# -eq 0 ]; then
-    RUBY_VERSION=2.7.0
+    RUBY_VERSION=3.0.0
 else
     RUBY_VERSION=$1
 fi

data/docker/docker-compose.yml

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

data/docker/run

@@ -1,11 +1,9 @@
 #!/bin/bash
 
-if [ $# -eq 0 ]; then
-    RUBY_VERSION=2.7.0
-else
-    RUBY_VERSION=$1
-fi
+. docker/common.sh
 
 set -e
 
+set_ruby_ver $@
+
 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-2020 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/edn_parser.rl

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

data/ext/edn_turbo/main.cc

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 
-// Copyright (c) 2015-2020 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
@@ -220,13 +220,8 @@ void Init_edn_turbo(void)
    edn::EDN_MAKE_SET_METHOD           = rb_intern("set");
    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");

data/ext/edn_turbo/parser.h

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

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 
-// Copyright (c) 2015-2020 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-2020 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;

data/ext/edn_turbo/util_unicode.cc

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

@@ -2,7 +2,7 @@
 
 # The MIT License (MIT)
 #
-# Copyright (c) 2015-2020 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-2020 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-2020 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.7.0'.freeze
-  RELEASE_DATE = '2020-02-07'.freeze
+  VERSION = '0.7.1'
+  RELEASE_DATE = '2021-02-07'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edn_turbo
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Ed Porras
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-07 00:00:00.000000000 Z
+date: 2021-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: edn
@@ -92,6 +92,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,6 +114,7 @@ extensions:
 - ext/edn_turbo/extconf.rb
 extra_rdoc_files: []
 files:
+- ".dir-locals.el"
 - ".gitignore"
 - ".rspec"
 - CHANGELOG.md
@@ -111,6 +126,7 @@ files:
 - bin/ppedn-ruby
 - docker/Dockerfile
 - docker/build
+- docker/common.sh
 - docker/console
 - docker/docker-compose.yml
 - docker/entrypoint
@@ -136,7 +152,7 @@ homepage: http://rubygems.org/gems/edn_turbo
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -144,15 +160,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.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 3
 summary: Read EDN files
 test_files: []