h3 3.7.1 → 3.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a2e10e1deba82674a8ea642385fdbd753ba86860
-  data.tar.gz: df8a3687f67e5ebfa8432ce1c456b7c038a2de50
+SHA256:
+  metadata.gz: 0afa20a7c2275ee45b230c3bae8f3af1959d7c93af314bd49b11eff46cbe8ebc
+  data.tar.gz: 5ff07967dd552ef299d1c7637997c2320835fabb858d914c3b590ddac07e6402
 SHA512:
-  metadata.gz: f4b83e62d5b0cea99238ad0c04e06e906b73a4d871c6fb0205994ec493036cbd56561184c0998b6e04f81bd0c7af27eff37e82e7c4da7f5d6a5ca214b14b4bd1
-  data.tar.gz: 33d956b62f5e0a465efebc8014bd03c05743e9e013fbdbbfd52ff6da94a448728c1677b69ba8ff23f26eab6a166f8d62ecd537a9d3a160ff480a311e7f9c5457
+  metadata.gz: 1ced432edf93da613678ee7c48896a116fbf4f9b53908d9e50bcb3de148f9f16c7cdb3d2d422c79f7a2a210c0d7026af841a44eb05fe0b666584e331106c9c02
+  data.tar.gz: 6189e6185e58c8a5d64b6ea0e904d7571bb52b7f86fa86d3d086b0ff14594e856430071277ebbce5e6b1ae5e0641305ea166af5a158db048322fc3c6db3f2d65

data/.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "bundler" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

data/.github/workflows/ruby_ci.yml

@@ -0,0 +1,24 @@
+name: Ruby CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+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.7', '3.0', '3.1', '3.2', '3.3']
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v4
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - run: bundle exec rake

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,15 @@ 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.3] - 2025-04-04
+### Fixed
+- `H3.from_string(nil)` should not crash
+- Cmake fixed
+
+## [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,62 +1,46 @@
 PATH
   remote: .
   specs:
-    h3 (3.7.1)
+    h3 (3.7.4)
       ffi (~> 1.9)
       rgeo-geojson (~> 2.1)
-      zeitwerk (~> 2.1)
+      zeitwerk (~> 2.5)
 
 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)
-    rake (12.3.3)
-    rgeo (2.1.1)
-    rgeo-geojson (2.1.1)
+    diff-lcs (1.5.1)
+    ffi (1.17.1)
+    multi_json (1.15.0)
+    rake (13.2.1)
+    rgeo (3.0.0)
+    rgeo-geojson (2.2.0)
+      multi_json (~> 1.15)
       rgeo (>= 1.0.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       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)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    yard (0.9.37)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  coveralls (~> 0.8)
   h3!
-  rake (~> 12.3)
+  rake (~> 13.0)
   rspec (~> 3.8)
   yard (~> 0.9)
 
 BUNDLED WITH
-   2.1.4
+   2.2.22

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/seanhandley/h3_ruby/actions/workflows/ruby_ci.yml/badge.svg) [![Coverage Status](https://coveralls.io/repos/github/seanhandley/h3_ruby/badge.svg?branch=master)](https://coveralls.io/github/seanhandley/h3_ruby?branch=master) [![Maintainability](https://api.codeclimate.com/v1/badges/d253207a3307cad4e4c9/maintainability)](https://codeclimate.com/github/seanhandley/h3_ruby/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
@@ -65,7 +64,7 @@ H3.to_boundary("8819429a9dfffff".to_i(16))
 
 ## Documentation
 
-Please read [the Gem Documentation](https://www.rubydoc.info/github/StuartApp/h3_ruby/H3) for a full reference of available methods.
+Please read [the Gem Documentation](https://www.rubydoc.info/gems/h3) for a full reference of available methods.
 
 ## Development
 

data/ext/h3/Makefile

@@ -1,5 +1,5 @@
 make:
-	cd src; cmake . -DBUILD_SHARED_LIBS=true -DBUILD_FILTERS=OFF -DBUILD_BENCHMARKS=OFF; make
+	cd src; cmake . -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DBUILD_SHARED_LIBS=true -DBUILD_FILTERS=OFF -DBUILD_BENCHMARKS=OFF -DENABLE_LINTING=OFF; make
 install:
 	: # do nothing, we'll load the lib directly
 clean:

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

@@ -5,19 +5,19 @@ Gem::Specification.new do |spec|
   spec.version  = H3::VERSION
   spec.licenses = ["MIT"]
   spec.summary  = "C Bindings for Uber's H3 library"
-  spec.homepage = "https://github.com/StuartApp/h3_ruby"
-  spec.authors  = ["Lachlan Laycock", "Sean Handley"]
-  spec.email    = "l.laycock@stuart.com"
+  spec.homepage = "https://github.com/seanhandley/h3_ruby"
+  spec.authors  = ["Sean Handley", "Xavier Noria", "Lachlan Laycock"]
+  spec.email    = "sean.handley@gmail.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_runtime_dependency "zeitwerk", "~> 2.5"
 
-  spec.add_development_dependency "coveralls", "~> 0.8"
-  spec.add_development_dependency "rake", "~> 12.3"
+  # spec.add_development_dependency "coveralls", "~> 0.8"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.8"
   spec.add_development_dependency "yard", "~> 0.9"
 

data/lib/h3/bindings/private.rb

@@ -57,6 +57,7 @@ module H3
       attach_function :point_distance_m, :pointDistM, [GeoCoord, GeoCoord], :double
       attach_function :polyfill, [GeoPolygon, Resolution, H3IndexesOut], :void
       attach_function :res_0_indexes, :getRes0Indexes, [H3IndexesOut], :void
+      attach_function :string_to_h3, :stringToH3, %i[string], :h3_index
       attach_function :uncompact, [H3IndexesIn, :size_t, H3IndexesOut, :size_t, Resolution], :bool
     end
   end

data/lib/h3/geo_json.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module H3
   # GeoJSON helper methods.
   #

data/lib/h3/inspection.rb

@@ -44,8 +44,13 @@ module H3
     #   H3.from_string("8928308280fffff")
     #   617700169958293503
     #
+    # @raise [ArgumentError] If h3_string is nil
+    #
     # @return [Integer] H3 index
-    attach_function :from_string, :stringToH3, %i[string], :h3_index
+    def from_string(h3_string)
+      raise ArgumentError if h3_string.nil?
+      Bindings::Private.string_to_h3(h3_string)
+    end
 
     # @!method pentagon?(h3_index)
     #

data/lib/h3/version.rb

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

data/spec/geo_json_spec.rb

@@ -57,7 +57,7 @@ RSpec.describe H3 do
       let(:input) { "blah" }
 
       it "raises an error" do
-        expect { geo_json_to_coordinates }.to raise_error(ArgumentError)
+        expect { geo_json_to_coordinates }.to raise_error(MultiJson::ParseError)
       end
     end
 

data/spec/inspection_spec.rb

@@ -20,12 +20,21 @@ RSpec.describe H3 do
   end
 
   describe ".from_string" do
-    let(:h3_index) { "8928308280fffff"}
-    let(:result) { h3_index.to_i(16) }
-
     subject(:from_string) { H3.from_string(h3_index) }
+    context "- valid" do
+      let(:h3_index) { "8928308280fffff"}
+      let(:result) { h3_index.to_i(16) }
 
-    it { is_expected.to eq(result) }
+      it { is_expected.to eq(result) }
+    end
+
+    context "- nil" do
+      let(:h3_index) { nil }
+
+      it "raises an error" do
+        expect { subject }.to raise_error(ArgumentError)
+      end
+    end
   end
 
   describe ".to_string" do

data/spec/spec_helper.rb

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

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: h3
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.7.4
 platform: ruby
 authors:
-- Lachlan Laycock
 - Sean Handley
-autorequire: 
+- Xavier Noria
+- Lachlan Laycock
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2025-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -45,42 +46,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !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'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -109,19 +96,21 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-description: 
-email: l.laycock@stuart.com
+description:
+email: sean.handley@gmail.com
 executables: []
 extensions:
 - ext/h3/extconf.rb
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/dependabot.yml"
+- ".github/workflows/ruby_ci.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
+- ".ruby-version"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -444,28 +433,27 @@ files:
 - spec/support/shared_contexts/constants.rb
 - spec/traversal_spec.rb
 - spec/unidirectional_edges_spec.rb
-homepage: https://github.com/StuartApp/h3_ruby
+homepage: https://github.com/seanhandley/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