nasturtium 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 846c9e4a10b33c6c7f1eb7ed54d3e6fffc22e5c8883e27de6aeb2fe33fd62892
-  data.tar.gz: 7fb67a76a990c4be8c121dd2ea31ea6a81c6e66b52cb66122ab165139c78b18a
+  metadata.gz: 00fbcc67e682c17e4b44ad8b8d67d0b1ae09245bce3b13047bbc7965182d0316
+  data.tar.gz: 35c4853c81836fb2d3e048ba0d9034452574e2de7a3a2584a4a6ecb308eccb95
 SHA512:
-  metadata.gz: 530f527fb343370ae535651aee434bdaf7520b282871b2da1a0d6ae847f7b48f15446956061e97da416bce43cb62f2d73c600403ca1f7856b2c089f2271b8d99
-  data.tar.gz: 45dff29921cfa88502c1db503442e759cfeccd8315ef6f822630b9473e11ff447097672020112b79304bcde4fd3e8fd048f1e95d07a69b913da1793be0dfdd62
+  metadata.gz: 5314e8c36ec73652a28a33a24d69f0c99cd70975f43a4eb008f8a75bd98f77c2c2f0ae85e1b2c7603b6900789a481e98ad3aa74301ab34b42c721f5666e32dbf
+  data.tar.gz: f5b0478301b6b21dece20e84543c2288c90cd781b9f59abbb58ede58b0c69d7ac923d10ca007ca4776a281c0c035a32a16ae9d15b6be1f9adf887c2b917b6e3c

data/.github/workflows/main.yml

@@ -5,12 +5,15 @@ on: [push,pull_request]
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['3.3.4', '4.0.0']
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Ruby
+    - name: Set up Ruby ${{ matrix.ruby-version }}
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.1.3
+        ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true
     - name: Run the default task
       run: bundle exec rake

data/.gitignore

@@ -8,3 +8,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+Gemfile.lock

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## [Unreleased]
 
+## [0.1.2] - 2026-06-17
+ - Allow Ruby 4.0.0:
+    - Relaxed `required_ruby_version` to `>= 2.5.0, < 5.0`
+    - Added Ruby 4.0.0 to the CI matrix
+    - Bumped `faraday-follow_redirects` upper bound to allow 0.5+ (which lifts the Ruby < 4 cap)
+    - Dropped the `bundler` development dependency
+ - Fixed `elseif` typo in `Faraday::NasturtiumErrors` middleware that crashed error parsing on non-message error bodies; hardened `error_body` against unexpected shapes
+ - Updated tests to match current iNaturalist API responses (taxonomy drift, fuzzy autocomplete, post-endpoint 404s on empty projects)
+ - Updated license from NCSA to MIT
+
+## [0.1.1] - 2024-09-11
+ - Removed Gemfile.lock
+ - Bumped development depency versions to avoid CVE-2024-43398
+
 ## [0.1.0] - 2022-01-20
 
 - Initial release

data/LICENSE.txt

@@ -1,13 +1,10 @@
-Copyright © 2023 Species File Group. All rights reserved.
+The MIT License (MIT)
 
-Developed by: Species File Group 
-Illinois Natural History Survey
-https://github.com/SpeciesFileGroup/nasturtium
+Copyright © 2024 Species File Group
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal with 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:
+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:
 
-    Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimers.
-    Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimers in the documentation and/or other materials provided with the distribution.
-    Neither the names of <Name of Development Group, Name of Institution>, nor the names of its contributors may be used to endorse or promote products derived from this Software without specific prior written permission.
+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.
 
-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 CONTRIBUTORS 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 WITH THE SOFTWARE.

data/README.md

@@ -527,7 +527,7 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/Specie
 
 ## License
 
-The gem is available as open source under the terms of the [NCSA/Illinois](https://opensource.org/licenses/NCSA).
+The gem is available as open source under the terms of the [MIT license](https://opensource.org/licenses/NCSA).
 
 ## Code of Conduct
 

data/lib/nasturtium/error.rb

@@ -1,24 +1,24 @@
 # frozen_string_literal: true
 
 module Nasturtium
-    # Custom error class for rescuing from all Bonamia errors
+    # Custom error class for rescuing from all iNaturalist errors
     class Error < StandardError; end
   
-    # Raised when Bionomia returns the HTTP status code 400
+    # Raised when iNaturalist returns the HTTP status code 400
     class BadRequest < Error; end
   
-    # Raised when Bionomia returns the HTTP status code 404
+    # Raised when iNaturalist returns the HTTP status code 404
     class NotFound < Error; end
   
-    # Raised when Bionomia returns the HTTP status code 500
+    # Raised when iNaturalist returns the HTTP status code 500
     class InternalServerError < Error; end
   
-    # Raised when Bionomia returns the HTTP status code 502
+    # Raised when iNaturalist returns the HTTP status code 502
     class BadGateway < Error; end
   
-    # Raised when Bionomia returns the HTTP status code 503
+    # Raised when iNaturalist returns the HTTP status code 503
     class ServiceUnavailable < Error; end
   
-    # Raised when Bionomia returns the HTTP status code 504
+    # Raised when iNaturalist returns the HTTP status code 504
     class GatewayTimeout < Error; end
-  end
+end

data/lib/nasturtium/faraday.rb

@@ -40,24 +40,15 @@ module Faraday
       end
 
       def error_body(body)
-        if !body.nil? && !body.empty? && body.is_a?(String)
-          if json?(body)
-            body = ::MultiJson.load(body)
-            if body["message"].nil?
-              body = nil
-              elseif body["message"].length == 1
-              body = body["message"]
-            else
-              body = body["message"].collect { |x| x["message"] }.join("; ")
-            end
-          end
-        end
+        return nil if body.nil? || !body.is_a?(String) || body.empty?
+        return ": #{body}" unless json?(body)
 
-        if body.nil?
-          nil
-        else
-          ": #{body}"
-        end
+        parsed = ::MultiJson.load(body)
+        msg = parsed["message"] || parsed["error"]
+        return nil if msg.nil?
+
+        msg = msg.collect { |x| x.is_a?(Hash) ? x["message"] : x.to_s }.join("; ") if msg.is_a?(Array)
+        ": #{msg}"
       end
 
       def error_message_500(response, body = nil)

data/lib/nasturtium/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nasturtium
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/lib/nasturtium.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "erb"
-#require 'nokogiri'
 require 'open-uri'
 require_relative "nasturtium/error"
 require_relative "nasturtium/version"

data/nasturtium.gemspec

@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   s.summary       = "Nasturtium Client"
   s.description   = "Nasturtium is a low-level wrapper around the iNaturalist API."
   s.homepage      = "https://github.com/SpeciesFileGroup/nasturtium"
-  s.license       = "NCSA"
-  s.required_ruby_version = ">= 2.4.0"
+  s.license       = "MIT"
+  s.required_ruby_version = [">= 2.5.0", "< 5.0"]
 
  # s.metadata["allowed_push_host"] = "TODO: Set to 'https://mygemserver.com'"
 
@@ -32,23 +32,17 @@ Gem::Specification.new do |s|
   # Uncomment to register a new dependency of your gem
   # s.add_dependency "example-gem", "~> 1.0"
 
-  s.add_development_dependency "bundler", "~> 2.1", ">= 2.1.4"
-  # s.add_development_dependency "codecov", "~> 0.5.0"
-  # s.add_development_dependency "json", "~> 2.3", ">= 2.3.1"
   s.add_development_dependency "rake", "~> 13.0", ">= 13.0.1"
-  # s.add_development_dependency "standard", "~> 1.0"
-  # s.add_development_dependency "simplecov", "~> 0.21.2"
   s.add_development_dependency "test-unit", "~> 3.3", ">= 3.3.6"
   s.add_development_dependency "vcr", "~> 6.0"
   s.add_development_dependency "webmock", "~> 3.18"
+  s.add_development_dependency "rexml", "~> 3.3", ">= 3.3.6"
+  #s.add_development_dependency "byebug"
 
   s.add_runtime_dependency "faraday", "~> 2.2"
-  s.add_runtime_dependency "faraday-follow_redirects", ">= 0.1", "< 0.4"
+  s.add_runtime_dependency "faraday-follow_redirects", ">= 0.1", "< 0.6"
   s.add_runtime_dependency "multi_json", "~> 1.15"
 
-  # TODO: comment out
-  s.add_development_dependency "byebug"
-
   #  s.add_runtime_dependency "thor", "~> 1.0", ">= 1.0.1"
 
   # For more information and examples about making a new gem, checkout our

metadata

@@ -1,35 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nasturtium
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Geoff Ower, Matt Yoder
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-15 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -98,6 +77,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.18'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.6
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +120,7 @@ dependencies:
         version: '0.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -131,7 +130,7 @@ dependencies:
         version: '0.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -146,20 +145,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.15'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Nasturtium is a low-level wrapper around the iNaturalist API.
 email:
 - gdower@illinois.edu
@@ -172,7 +157,6 @@ files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -188,12 +172,11 @@ files:
 - nasturtium.gemspec
 homepage: https://github.com/SpeciesFileGroup/nasturtium
 licenses:
-- NCSA
+- MIT
 metadata:
   homepage_uri: https://github.com/SpeciesFileGroup/nasturtium
   source_code_uri: https://github.com/SpeciesFileGroup/nasturtium
-  changelog_uri: https://github.com/SpeciesFileGroup/nasturtium/releases/tag/v0.1.0
-post_install_message:
+  changelog_uri: https://github.com/SpeciesFileGroup/nasturtium/releases/tag/v0.1.2
 rdoc_options: []
 require_paths:
 - lib
@@ -201,15 +184,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '5.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Nasturtium Client
 test_files: []

data/Gemfile.lock

@@ -1,53 +0,0 @@
-PATH
-  remote: .
-  specs:
-    nasturtium (0.1.0)
-      faraday (~> 2.2)
-      faraday-follow_redirects (>= 0.1, < 0.4)
-      multi_json (~> 1.15)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
-    byebug (11.1.3)
-    crack (0.4.5)
-      rexml
-    faraday (2.7.10)
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-follow_redirects (0.3.0)
-      faraday (>= 1, < 3)
-    faraday-net_http (3.0.2)
-    hashdiff (1.0.1)
-    minitest (5.15.0)
-    multi_json (1.15.0)
-    power_assert (2.0.1)
-    public_suffix (5.0.1)
-    rake (13.0.6)
-    rexml (3.2.5)
-    ruby2_keywords (0.0.5)
-    test-unit (3.5.3)
-      power_assert
-    vcr (6.0.0)
-    webmock (3.18.1)
-      addressable (>= 2.8.0)
-      crack (>= 0.3.2)
-      hashdiff (>= 0.4.0, < 2.0.0)
-
-PLATFORMS
-  x86_64-linux
-
-DEPENDENCIES
-  bundler (~> 2.1, >= 2.1.4)
-  byebug
-  nasturtium!
-  minitest (~> 5.0)
-  rake (~> 13.0)
-  test-unit (~> 3.3, >= 3.3.6)
-  vcr (~> 6.0)
-  webmock (~> 3.18)
-
-BUNDLED WITH
-   2.3.24