h3 3.7.1 → 3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a2e10e1deba82674a8ea642385fdbd753ba86860
-  data.tar.gz: df8a3687f67e5ebfa8432ce1c456b7c038a2de50
+SHA256:
+  metadata.gz: acb338f235d3507df322d3e148a135fe72d67911ba05edf9af82873ac190a556
+  data.tar.gz: 506b3fddfec2bdd388a57a8e08aeac7522508b8f6e04e9f1d421a6611367890a
 SHA512:
-  metadata.gz: f4b83e62d5b0cea99238ad0c04e06e906b73a4d871c6fb0205994ec493036cbd56561184c0998b6e04f81bd0c7af27eff37e82e7c4da7f5d6a5ca214b14b4bd1
-  data.tar.gz: 33d956b62f5e0a465efebc8014bd03c05743e9e013fbdbbfd52ff6da94a448728c1677b69ba8ff23f26eab6a166f8d62ecd537a9d3a160ff480a311e7f9c5457
+  metadata.gz: e73b0b8d43710cf5b0a802bd08a0a87f607990c162c34eddda36940b10890f6bc252873d96431d2063b659e32af55336a0edd7d748e82aebc3d5ad7d0adfc54c
+  data.tar.gz: 7bf43c08a6fe09da1a4b0cbf9f688d56a3d0ec3bab060af939f422f39b0f1e43ec40e45f50b2aa14fd8c486ace24ef4beb7b1e50c9e440df9f0f1d67212e5c64

data/.github/workflows/ruby_ci.yml

@@ -0,0 +1,30 @@
+name: Ruby CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: [3.0.1, 2.7.3, 2.6.7, 2.5.9]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@477b21f02be01bcb8030d50f37cfec92bfa615b6
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - name: Install system dependencies
+        run: sudo apt-get install cmake make gcc libtool
+      - name: Install gems
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake spec

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.5
   Exclude:
     - "vendor/**/*"
     - "db/schema.rb"

data/.ruby-version

@@ -0,0 +1 @@
+2.7.2

data/CHANGELOG.md

@@ -6,6 +6,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 We track the MAJOR and MINOR version levels of Uber's H3 project (https://github.com/uber/h3) but maintain independent patch levels so we can make small fixes and non breaking changes.
 
+## [3.7.2] - 2020-07-17
+### Fixed
+- kRing of invalid indexes should not crash.
+
 ## [3.7.1] - 2020-10-7
 ### Added
 - Area and haversine distance functions:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    h3 (3.7.1)
+    h3 (3.7.2)
       ffi (~> 1.9)
       rgeo-geojson (~> 2.1)
       zeitwerk (~> 2.1)
@@ -9,18 +9,10 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    coveralls (0.8.22)
-      json (>= 1.8, < 3)
-      simplecov (~> 0.16.1)
-      term-ansicolor (~> 1.3)
-      thor (~> 0.19.4)
-      tins (~> 1.6)
     diff-lcs (1.3)
-    docile (1.3.1)
-    ffi (1.13.1)
-    json (2.3.1)
+    ffi (1.15.3)
     rake (12.3.3)
-    rgeo (2.1.1)
+    rgeo (2.3.0)
     rgeo-geojson (2.1.1)
       rgeo (>= 1.0.0)
     rspec (3.8.0)
@@ -36,23 +28,13 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    simplecov (0.16.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    term-ansicolor (1.7.0)
-      tins (~> 1.0)
-    thor (0.19.4)
-    tins (1.20.2)
     yard (0.9.20)
-    zeitwerk (2.4.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  coveralls (~> 0.8)
   h3!
   rake (~> 12.3)
   rspec (~> 3.8)

data/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2019 Stuart Delivery
+Copyright (c) 2018-2020 Stuart Delivery
 
 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

@@ -2,8 +2,7 @@
 
 ![h3](https://user-images.githubusercontent.com/98526/50283275-48177300-044d-11e9-8337-eba8d3cc88a2.png)
 
-[![Build Status](https://travis-ci.org/StuartApp/h3_ruby.svg?branch=master)](https://travis-ci.org/StuartApp/h3_ruby)
-[![Maintainability](https://api.codeclimate.com/v1/badges/74a47e7fa516588ab545/maintainability)](https://codeclimate.com/repos/5ca38395a86379029800281f/maintainability) [![Coverage Status](https://coveralls.io/repos/github/StuartApp/h3_ruby/badge.svg?branch=master)](https://coveralls.io/github/StuartApp/h3_ruby?branch=master) [![Gem Version](https://badge.fury.io/rb/h3.svg)](https://badge.fury.io/rb/h3)
+![Build Status](https://github.com/StuartApp/h3_ruby/actions/workflows/ruby_ci/badge.svg) [![Coverage Status](https://coveralls.io/repos/github/StuartApp/h3_ruby/badge.svg?branch=master)](https://coveralls.io/github/StuartApp/h3_ruby?branch=master) [![Maintainability](https://api.codeclimate.com/v1/badges/74a47e7fa516588ab545/maintainability)](https://codeclimate.com/repos/5ca38395a86379029800281f/maintainability) [![Gem Version](https://badge.fury.io/rb/h3.svg)](https://badge.fury.io/rb/h3)
 
 Ruby-to-C bindings for Uber's [H3 library](https://uber.github.io/h3/).
 
@@ -39,7 +38,7 @@ or add it to your Gemfile
 
 ```ruby
 # Gemfile
-gem "h3", "~> 3.2"
+gem "h3", "~> 3.7"
 ```
 
 ## Usage

data/ext/h3/src/.github/workflows/test-linux.yml

@@ -2,9 +2,9 @@ name: test-linux
 
 on:
   push:
-    branches: [master]
+    branches: [master, stable-*]
   pull_request:
-    branches: [master]
+    branches: [master, stable-*]
 
 jobs:
   tests:
@@ -23,7 +23,7 @@ jobs:
       - name: Install Doxygen
         run: |
           sudo apt update
-          sudo apt-get install doxygen graphviz
+          sudo apt-get install doxygen graphviz clang-format-9
 
       - name: Configure build
         run: cmake -Bbuild -DWARNINGS_AS_ERRORS=ON .

data/ext/h3/src/.github/workflows/test-macos.yml

@@ -2,9 +2,9 @@ name: test-macos
 
 on:
   push:
-    branches: [master]
+    branches: [master, stable-*]
   pull_request:
-    branches: [master]
+    branches: [master, stable-*]
 
 jobs:
   tests:

data/ext/h3/src/.github/workflows/test-website.yml

@@ -2,9 +2,9 @@ name: test-website
 
 on:
   push:
-    branches: [master]
+    branches: [master, stable-*]
   pull_request:
-    branches: [master]
+    branches: [master, stable-*]
 
 jobs:
   tests:
@@ -16,7 +16,7 @@ jobs:
 
       - uses: actions/setup-node@v1
         with:
-          node-version: 10.x
+          node-version: 12.x
 
       - name: Install FOSSA
         run: |

data/ext/h3/src/.github/workflows/test-windows.yml

@@ -2,9 +2,9 @@ name: test-windows
 
 on:
   push:
-    branches: [master]
+    branches: [master, stable-*]
   pull_request:
-    branches: [master]
+    branches: [master, stable-*]
 
 jobs:
   tests:
@@ -24,7 +24,7 @@ jobs:
 
       - name: Configure build
         shell: cmd
-        run: cmake -Bbuild -A ${{ matrix.arch }} -DWARNINGS_AS_ERRORS=ON .
+        run: cmake -Bbuild -A ${{ matrix.arch }} -DWARNINGS_AS_ERRORS=ON -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=ON .
 
       - name: Build
         working-directory: build

data/ext/h3/src/CHANGELOG.md

@@ -7,6 +7,10 @@ The public API of this library consists of the functions declared in file
 
 ## [Unreleased]
 
+## [3.7.2] - 2021-07-15
+### Fixed
+- `gridDisk` of invalid indexes should not crash. (#498)
+
 ## [3.7.1] - 2020-10-05
 ### Fixed
 - Finding invalid edge boundaries should not crash. (#399)

data/ext/h3/src/VERSION

@@ -1 +1 @@
-3.7.1
+3.7.2

data/ext/h3/src/src/apps/testapps/testKRing.c

@@ -351,4 +351,22 @@ SUITE(kRing) {
             }
         }
     }
+
+    TEST(kRingInvalid) {
+        int k = 1000;
+        int kSz = H3_EXPORT(maxKringSize)(k);
+        H3Index *neighbors = calloc(kSz, sizeof(H3Index));
+        H3_EXPORT(kRing)(0x7fffffffffffffff, k, neighbors);
+        // Assertion is should not crash - should return an error in the future
+        free(neighbors);
+    }
+
+    TEST(kRingInvalidDigit) {
+        int k = 2;
+        int kSz = H3_EXPORT(maxKringSize)(k);
+        H3Index *neighbors = calloc(kSz, sizeof(H3Index));
+        H3_EXPORT(kRing)(0x4d4b00fe5c5c3030, k, neighbors);
+        // Assertion is should not crash - should return an error in the future
+        free(neighbors);
+    }
 }

data/ext/h3/src/src/h3lib/lib/algos.c

@@ -317,7 +317,10 @@ H3Index h3NeighborRotations(H3Index origin, Direction dir, int* rotations) {
         } else {
             Direction oldDigit = H3_GET_INDEX_DIGIT(out, r + 1);
             Direction nextDir;
-            if (isResClassIII(r + 1)) {
+            if (oldDigit == INVALID_DIGIT) {
+                // Only possible on invalid input
+                return H3_NULL;
+            } else if (isResClassIII(r + 1)) {
                 H3_SET_INDEX_DIGIT(out, r + 1, NEW_DIGIT_II[oldDigit][dir]);
                 nextDir = NEW_ADJUSTMENT_II[oldDigit][dir];
             } else {

data/h3.gemspec

@@ -9,14 +9,14 @@ Gem::Specification.new do |spec|
   spec.authors  = ["Lachlan Laycock", "Sean Handley"]
   spec.email    = "l.laycock@stuart.com"
 
-  spec.required_ruby_version = "> 2.3"
+  spec.required_ruby_version = ">= 2.5"
   spec.files = `git ls-files --recurse-submodules`.split("\n")
 
   spec.add_runtime_dependency "ffi", "~> 1.9"
   spec.add_runtime_dependency "rgeo-geojson", "~> 2.1"
   spec.add_runtime_dependency "zeitwerk", "~> 2.1"
 
-  spec.add_development_dependency "coveralls", "~> 0.8"
+  # spec.add_development_dependency "coveralls", "~> 0.8"
   spec.add_development_dependency "rake", "~> 12.3"
   spec.add_development_dependency "rspec", "~> 3.8"
   spec.add_development_dependency "yard", "~> 0.9"

data/lib/h3/version.rb

@@ -1,3 +1,3 @@
 module H3
-  VERSION = "3.7.1".freeze
+  VERSION = "3.7.2".freeze
 end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
-require "coveralls"
-Coveralls.wear!
+# require "coveralls"
+# Coveralls.wear!
 
 begin
   require "h3"

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: h3
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.7.2
 platform: ruby
 authors:
 - Lachlan Laycock
 - Sean Handley
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -53,20 +53,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +95,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-description: 
+description:
 email: l.laycock@stuart.com
 executables: []
 extensions:
@@ -117,11 +103,12 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/workflows/ruby_ci.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
+- ".ruby-version"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -448,24 +435,23 @@ homepage: https://github.com/StuartApp/h3_ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: C Bindings for Uber's H3 library
 test_files: []

data/.travis.yml

@@ -1,11 +0,0 @@
-language: ruby
-cache: bundler
-rvm:
-  - 2.4
-addons:
-  apt:
-    packages:
-    - cmake
-    - make
-    - gcc
-    - libtool