unitwise 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 85c8f9524b9cffa66bf645e212104c3985e4efa3
-  data.tar.gz: b8a7623a2eb3186faef2d8c11056307f454d29ef
+SHA256:
+  metadata.gz: 0b30819c084e209df80a01852db2ab40a8e915af15321de9cd8e7181a4a7f622
+  data.tar.gz: 259f79ef2e7578d279f1c82adf861bc33166668fa39d20c2b5f906bd1b6fbfcc
 SHA512:
-  metadata.gz: 7cb7314cfefef4d4f4172c8608463b4e2f31c70aecc54115b4584eff913f76301a5114be12b79c64926b5ca19d33f106916c798643eb4999f7b16bce4e911fdb
-  data.tar.gz: c7e97adc9d4dc60f53f6ccff5d1d8b3522361b7f0118f08ccb61a8cc58cacb005e34802f6f1219c9b4ff3546bbc7749c171e47a514a362e4dfa9fe9d4d52699d
+  metadata.gz: 58310aa10271d1f864418bfb50641b102fa3227be68016ee97321c5f12054a48b4e8c76af02447b3dbe49f60aa5013d87c61b8fb7d17c67330d4c319b58fb1e7
+  data.tar.gz: 5422e3694fa60e13004221a3c5e75fdc633cc29b47142959e11712c0813f0112c86b6b59c6cf9828baaefc6bcafded450099d5929fa9b02f3da6a1df18768f58

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: 'bundler'
+    directory: '/'
+    schedule:
+      interval: 'weekly'

data/.github/workflows/ruby.yml

@@ -0,0 +1,42 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on: [push, pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version:
+          - '2.6'
+          - '2.7'
+          - '3.0'
+          - '3.1'
+          - 'jruby'
+          - 'truffleruby'
+
+    name: ${{ format('Tests (Ruby {0})', matrix.ruby-version) }}
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_WITHOUT: 'yard pry'
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+
+      - name: Run tests
+        run: bundle exec rake

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+3.1.1

data/CHANGELOG.md

@@ -7,6 +7,13 @@ Unitwise uses semantic versioning.
 
 ## Unreleased
 
+## 2.3.0 - 2022-10-19
+
+### Added
+
+- Support for newer Rubies (2.6+) & drops support for older ones (2.6 is EOL but will continue to support for now)
+- Support for Psych 4. Note: unit data YAML files in the gem are loaded using `unsafe_load`
+
 ## 2.2.0 - 2017-07-14
 
 ### Fixed

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'coveralls',  '~> 0.7'
-gem 'bigdecimal', '>= 1.2.6', :platform => :mri
+gem 'covered'
+gem 'bigdecimal', '>= 2', :platform => :mri
 
 gemspec

data/README.md

@@ -1,11 +1,9 @@
 # [Unitwise](//github.com/joshwlewis/unitwise)
 
 [![Gem Version](http://img.shields.io/gem/v/unitwise.svg?style=flat)](https://rubygems.org/gems/unitwise)
-[![Build Status](http://img.shields.io/travis/joshwlewis/unitwise.svg?style=flat)](https://travis-ci.org/joshwlewis/unitwise)
-[![Dependency Status](http://img.shields.io/gemnasium/joshwlewis/unitwise.svg?style=flat)](https://gemnasium.com/joshwlewis/unitwise)
+[![Build Status](https://github.com/joshwlewis/unitwise/actions/workflows/ruby.yml/badge.svg)](https://github.com/joshwlewis/unitwise/actions/workflows/ruby.yml)
 [![Coverage Status](http://img.shields.io/coveralls/joshwlewis/unitwise.svg?style=flat)](https://coveralls.io/r/joshwlewis/unitwise)
 [![Code Climate](http://img.shields.io/codeclimate/github/joshwlewis/unitwise.svg?style=flat)](https://codeclimate.com/github/joshwlewis/unitwise)
-![Analytics](https://ga-beacon.appspot.com/UA-49481499-1/joshwlewis/unitwise?pixel)
 
 Unitwise is a Ruby library for unit measurement conversion and math.
 
@@ -273,10 +271,9 @@ Unitwise(1, "🥃").to_cup
 This library aims to support and is tested against the following Ruby
 implementations:
 
-* Ruby 2.2
-* Ruby 2.3
-* Ruby 2.4
+* Ruby 2.6 - 3.1
 * [JRuby](http://jruby.org/)
+* [TruffleRuby](https://github.com/oracle/truffleruby)
 
 If something doesn't work on one of these versions, it's a bug.
 

data/lib/unitwise/atom.rb

@@ -10,7 +10,13 @@ module Unitwise
       # Array of hashes representing default atom properties.
       # @api private
       def data
-        @data ||= data_files.map { |file| YAML.load(File.open file) }.flatten
+        @data ||= begin
+          properties = data_files.map do |file|
+            f = File.open(file)
+            ::YAML.respond_to?(:unsafe_load) ? ::YAML.unsafe_load(f) : ::YAML.load(f)
+          end
+          properties.flatten
+        end
       end
 
       # Data files containing default atom data

data/lib/unitwise/number.rb

@@ -38,7 +38,7 @@ module Unitwise
     # @param value Something that can be represented as a string number
     # @return [Integer, BigDecimal]
     def self.coefficify(value)
-      d = BigDecimal.new(value.to_s)
+      d = BigDecimal(value.to_s)
       if (i = d.to_i) == d
         i
       else

data/lib/unitwise/prefix.rb

@@ -6,7 +6,8 @@ module Unitwise
     # The data loaded from the UCUM spec files
     # @api semipublic
     def self.data
-      @data ||= YAML.load File.open(data_file)
+      f = File.open(data_file)
+      @data ||= ::YAML.respond_to?(:unsafe_load) ? ::YAML.unsafe_load(f) : ::YAML.load(f)
     end
 
     # The location of the UCUM spec prefix data file

data/lib/unitwise/version.rb

@@ -1,3 +1,3 @@
 module Unitwise
-  VERSION = '2.2.0'.freeze
+  VERSION = '2.3.0'.freeze
 end

data/test/test_helper.rb

@@ -1,8 +1,4 @@
-if RUBY_VERSION > '1.8.7'
-  require 'coveralls'
-  Coveralls.wear!
-end
-
+require 'covered/minitest'
 require 'minitest/autorun'
 require 'minitest/pride'
 

data/test/unitwise/number_test.rb

@@ -3,20 +3,20 @@ require 'test_helper'
 describe Unitwise::Number do
   describe ".simplify" do
     it "simplifies to an Integer" do
-      [2, 2.0, BigDecimal.new(2), Rational(2, 1), '2', '2.0'].each do |n|
+      [2, 2.0, BigDecimal(2), Rational(2, 1), '2', '2.0'].each do |n|
         assert_equal Unitwise::Number.simplify(n), 2
       end
     end
 
     it "simplifies to a Float" do
-      [2.25, BigDecimal.new('2.25'), Rational(9, 4), '2.25'].each do |n|
+      [2.25, BigDecimal('2.25'), Rational(9, 4), '2.25'].each do |n|
         assert_equal Unitwise::Number.simplify(n), 2.25
       end
     end
 
     it "doesn't simplify complex BigDecimals" do
       s = "1234567890.0123456789"
-      d = BigDecimal.new(s)
+      d = BigDecimal(s)
       [s, d].each do |n|
         assert_equal Unitwise::Number.simplify(n), d
       end
@@ -37,14 +37,14 @@ describe Unitwise::Number do
 
     it "converts decimal values to BigDecimals" do
       [1.5, "1.5", "1.50", "0.15e1"].each do |n|
-        assert Unitwise::Number.coefficify(n).eql?(BigDecimal.new("1.5"))
+        assert Unitwise::Number.coefficify(n).eql?(BigDecimal("1.5"))
       end
     end
   end
 
   describe ".rationalize" do
     it "coerces numbers to rationals" do
-      [1.5, "1.5", BigDecimal.new("1.5")].each do |n|
+      [1.5, "1.5", BigDecimal("1.5")].each do |n|
         assert_equal Unitwise::Number.rationalize(n), Rational(3, 2)
       end
     end

data/unitwise.gemspec

@@ -23,11 +23,11 @@ Gem::Specification.new do |gem|
   gem.add_dependency               'liner',           '~> 0.2'
   gem.add_dependency               'signed_multiset', '~> 0.2'
   gem.add_dependency               'memoizable',      '~> 0.4'
-  gem.add_dependency               'parslet',         '~> 1.5'
+  gem.add_dependency               'parslet',         '~> 2.0'
 
-  gem.add_development_dependency   'nokogiri',        '~> 1.5'
-  gem.add_development_dependency   'pry',             '~> 0.9'
-  gem.add_development_dependency   'minitest',        '~> 5.0'
-  gem.add_development_dependency   'rake',            '~> 10.0'
-  gem.add_development_dependency   'nori',            '~> 2.3'
+  gem.add_development_dependency   'nokogiri',        '~> 1.13'
+  gem.add_development_dependency   'pry',             '~> 0.14'
+  gem.add_development_dependency   'minitest',        '~> 5.15'
+  gem.add_development_dependency   'rake',            '~> 13.0'
+  gem.add_development_dependency   'nori',            '~> 2.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unitwise
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Josh Lewis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-07-15 00:00:00.000000000 Z
+date: 2022-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liner
@@ -58,84 +58,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: nori
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.6'
 description: Physical quantity and units of measure conversion and math library
 email:
 - josh.w.lewis@gmail.com
@@ -143,9 +143,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -203,7 +204,7 @@ homepage: http://github.com/joshwlewis/unitwise
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -218,9 +219,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Convert between and perform mathematical operations on physical quantities
   and units of measure defined by the Unified Code for Units of Measure.

data/.travis.yml

@@ -1,16 +0,0 @@
-language: ruby
-cache: bundler
-bundler_args: --without yard pry
-sudo: false
-rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
-  - jruby-9.1.8.0
-  - ruby-head
-  - jruby-head
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-  fast_finish: true