pisoni 1.30.0 → 1.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc7b659e66478ddb954b8144e47cd83cbf80acd54e16f7f051c82f07f47c221f
-  data.tar.gz: fb1ab6344af206a17085bf42134622fef72e57093bad247ce8efaa2b823b8ff6
+  metadata.gz: 5804502f649cd2bb89c6a7e696684c4226c53430e4c132e4f82fd755d4e1a96d
+  data.tar.gz: 354583b6d17ebdf0a5ed15c7121ab5b550ce008e3383c1fab17ac5f8a66c8a97
 SHA512:
-  metadata.gz: 2b39b7a9ed13db3500fb782b1f1f5e75cc9d15261938f70e11788f84a96957a6f38ca3cc801bf84f7b5ee94cb4bac4a1bfed12ec9a4bc99fb5c01f73ed4ea860
-  data.tar.gz: 1de636e31c5d8c5897eda7282283a157553a032c81f26b58378c39a342021786285b851c59bd786dbbf3f5ea536ed3cd4f564c415240887af136e46e18345c2f
+  metadata.gz: a25cc7464fe34178899e3239fc39d0ce394e70dfb68f9cc6f4ebe0c062dfe3f72975d2158132df9fadb65d488f18fb6f19b0fc3d0d803fb0093fb3f5f976a100
+  data.tar.gz: 8343b9dae4eac7195396cc48563a3df20c07b5402dd4ef5010a100bda895833664845131e91c0838d7788f32258cdb6763989c8cf02ed45e337c4748e3236e6b

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 Notable changes to Pisoni will be tracked in this document.
 
+## 1.31.0 - 2026-07-03
+
+### Added
+
+- Batch update support for applications via `Application.save_batch`. [#37](https://github.com/3scale/pisoni/pull/37)
+- Qlty integration for code quality and coverage reporting, replacing codeclimate. [#39](https://github.com/3scale/pisoni/pull/39)
+
+### Changed
+
+- Updated Faraday dependency to allow >= 2.14.3 (removed <= 2.9 cap). [#36](https://github.com/3scale/pisoni/pull/36)
+- Minimum Ruby version bumped from 2.6 to 3.0 (required by Faraday >= 2.9). [#36](https://github.com/3scale/pisoni/pull/36)
+- CircleCI now requires manual approval before running builds. [#38](https://github.com/3scale/pisoni/pull/38)
+- Pinned minitest to ~> 5.0 to prevent breakage from minitest 6. [#36](https://github.com/3scale/pisoni/pull/36)
+
 ## 1.30.0 - 2024-02-29
 
 ### Changed

data/Gemfile

@@ -3,8 +3,9 @@ source "https://rubygems.org"
 gemspec
 
 group :test do
-  gem 'minitest'
-  gem "codeclimate-test-reporter", require: nil
+  gem 'minitest', '~> 5.0'
+  gem 'simplecov', require: false
+  gem 'simplecov_json_formatter', require: false
 end
 
 group :development, :test do

data/Makefile

@@ -1,78 +1,24 @@
-MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
-PROJECT_PATH := $(patsubst %/,%,$(dir $(MKFILE_PATH)))
+COMPOSE ?= podman-compose
 
-include $(PROJECT_PATH)/.env
+.PHONY: deps_up
+deps_up:
+	$(COMPOSE) up -d
 
-include $(PROJECT_PATH)/mk/compose.mk
-COMPOSE ?= $(COMPOSE_BIN) -f $(PROJECT_PATH)/docker/docker-compose.yml -f $(PROJECT_PATH)/docker/docker-compose.apisonator.yml
-
-CI_IMAGE_REPO ?= quay.io/3scale
-CI_IMAGE_NAME ?= pisoni-ci
-CI_IMAGE ?= $(CI_IMAGE_REPO)/$(CI_IMAGE_NAME)
-CI_DOCKERFILE ?= $(PROJECT_PATH)/docker/Dockerfile.ci
-
-include $(PROJECT_PATH)/mk/ci-image.mk
-include $(PROJECT_PATH)/mk/ci.mk
-
-all: clean pull build test
-
-$(call ci_build_target,ci-pull,pull)
-$(call ci_build_target,ci-test,test)
-$(call ci_build_target,ci-compose-config,compose-config)
+.PHONY: deps_down
+deps_down:
+	- $(COMPOSE) down
 
-.PHONY: compose-config
-compose-config: compose
-	$(COMPOSE) config
+.PHONY: run_test
+run_test:
+	THREESCALE_CORE_INTERNAL_API=http://user:password@localhost:3001 bundle exec rake test
 
 .PHONY: test
-test: run_test clean
-
-.PHONY: bash
-bash: run clean
-
-.PHONY: dev
-dev: run
-
-.PHONY: run
-run: compose
-	$(COMPOSE) run --rm test /bin/bash
-
-.PHONY: run_test
-run_test: compose
-	$(COMPOSE) run --rm -e COVERAGE=$(COVERAGE) test
+test: deps_up run_test deps_down
 
 .PHONY: license_finder
-license_finder: compose
-	$(COMPOSE) run --rm -e COVERAGE=$(COVERAGE) test bundle exec rake license_finder:check
-
-.PHONY: build
-build: compose
-	$(COMPOSE) build
-
-.PHONY: pull
-pull: compose
-	$(COMPOSE) pull
+license_finder:
+	$(COMPOSE) run --rm -e COVERAGE=$(COVERAGE) pisoni bundle exec rake license_finder:check
 
 .PHONY: stop
-stop: compose
+stop:
 	$(COMPOSE) stop
-
-.PHONY: clean
-clean: stop
-	- $(COMPOSE) rm -f -v
-
-.PHONY: up
-up: compose
-	$(COMPOSE) up --abort-on-container-exit --exit-code-from test -t 2 --remove-orphans
-
-.PHONY: down
-down: clean
-	- $(COMPOSE) down
-
-.PHONY: destroy
-destroy: clean
-	$(COMPOSE) down -v --remove-orphans --rmi local
-
-.PHONY: destroy-all
-destroy-all: clean
-	$(COMPOSE) down -v --remove-orphans --rmi all

data/README.md

@@ -23,22 +23,16 @@ where x.y.z is the version you aim for.
 
 ## Development
 
-### Environment set up
+### Running tests with `make` and `podman-compose`
 
-We are using [Docker Compose](https://docs.docker.com/compose/) to run the tests
-in an isolated environment.
+We are using [podman-compose](https://github.com/containers/podman-compose) to run the dependencies (redis and apisonator) for the tests.
+You need to have it installed locally.
 
-You should first `make pull build` to download the needed images and build the
-one used for actual testing and development.
+You can run the test suite (with the required dependencies) by executing `make test`.
 
-You can then run `make test` to run the test suite, and `make dev` to enter
-a container in which the code is sync'ed back to your host.
+For cleaning up the dependencies containers, you can run `make deps_down`.
 
-For cleaning up containers, volumes and networks you can run `make clean` and
-`make destroy`. If you want to also get rid of pulled images, run `make
-destroy-all`.
-
-### Running tests
+### Running tests locally
 
 You can run both tests & specs with:
 

data/lib/3scale/core/api_client/operations.rb

@@ -63,6 +63,11 @@ module ThreeScale
             api_do_delete(attributes, api_options, &blk)[:ok]
           end
 
+          def api_update_batch(attributes, api_options = {}, &blk)
+            ret = api_do_put(attributes, api_options.merge(prefix: ''), &blk)
+            ret[:response_json]
+          end
+
           # Helpers
 
           def api_do_get(attributes, api_options = {}, &blk)

data/lib/3scale/core/application.rb

@@ -25,6 +25,11 @@ module ThreeScale
       end
       private_class_method :key_uri
 
+      def self.batch_uri(service_id)
+        "#{base_uri(service_id)}batch"
+      end
+      private_class_method :batch_uri
+
       def self.load(service_id, id)
         api_read({}, uri: app_uri(service_id, id))
       end
@@ -38,6 +43,10 @@ module ThreeScale
         api_delete({}, uri: app_uri(service_id, id))
       end
 
+      def self.save_batch(service_id, applications)
+        api_update_batch({ applications: applications }, uri: batch_uri(service_id))
+      end
+
       def initialize(attributes = {})
         @state = :active
         super(attributes)

data/lib/3scale/core/version.rb

@@ -1,5 +1,5 @@
 module ThreeScale
   module Core
-    VERSION = '1.30.0'
+    VERSION = '1.31.0'
   end
 end

data/pisoni.gemspec

@@ -18,8 +18,7 @@ Gem::Specification.new do |s|
   s.description = 'Client for the Apisonator internal API for model data.'
   s.license     = 'Apache-2.0'
 
-  # faraday v2.9.0 removes support for Ruby 2.7, see https://github.com/lostisland/faraday/releases/tag/v2.9.0
-  s.add_runtime_dependency 'faraday', '~> 2.0', '<= 2.9'
+  s.add_runtime_dependency 'faraday', '~> 2.0', '>= 2.14.3'
   s.add_runtime_dependency 'json', '~> 2.7', '>= 2.7.1'
   s.add_runtime_dependency 'injectedlogger', '0.0.13'
   s.add_runtime_dependency 'faraday-net_http_persistent', '~> 2.1'
@@ -40,5 +39,5 @@ Gem::Specification.new do |s|
 
   s.rdoc_options = ["--charset=UTF-8"]
 
-  s.required_ruby_version = '>= 2.6.0'
+  s.required_ruby_version = '>= 3.0.0'
 end

data/podman-compose.yml

@@ -0,0 +1,19 @@
+version: '3'
+services:
+
+  redis:
+    image: redis:6.2-alpine
+
+  apisonator:
+    image: quay.io/3scale/apisonator:latest
+    ports:
+      - "3001:3001"
+    environment:
+      CONFIG_INTERNAL_API_USER: user
+      CONFIG_INTERNAL_API_PASSWORD: password
+      CONFIG_QUEUES_MASTER_NAME: redis://redis:6379
+      CONFIG_REDIS_PROXY: redis://redis:6379
+      RACK_ENV: test
+    command: 3scale_backend start -p 3001
+    depends_on:
+      - redis

data/spec/application_spec.rb

@@ -269,6 +269,99 @@ module ThreeScale
         end
       end
 
+      describe '.save_batch' do
+        let(:service_id) { 2001 }
+
+        before do
+          Application.delete(service_id, 'batch_app_1')
+          Application.delete(service_id, 'batch_app_2')
+          Application.delete(service_id, 'batch_app_3')
+        end
+
+        it 'creates multiple applications in a single request' do
+          apps = [
+            { id: 'batch_app_1', state: 'active', plan_id: '100', plan_name: 'Gold',
+              redirect_url: 'http://example.com', user_key: 'uk_batch_1' },
+            { id: 'batch_app_2', state: 'suspended', plan_id: '101', plan_name: 'Silver' }
+          ]
+
+          result = Application.save_batch(service_id, apps)
+
+          result[:status].must_equal 'completed'
+          result[:total].must_equal 2
+          result[:successful].must_equal 2
+          result[:failed].must_equal 0
+
+          app1 = Application.load(service_id, 'batch_app_1')
+          app1.wont_be_nil
+          app1.plan_name.must_equal 'Gold'
+
+          app2 = Application.load(service_id, 'batch_app_2')
+          app2.wont_be_nil
+          app2.plan_name.must_equal 'Silver'
+        end
+
+        it 'reports failures for invalid applications without blocking valid ones' do
+          apps = [
+            { id: 'batch_app_1', state: 'active', plan_id: '100', plan_name: 'Gold' },
+            { id: 'batch_app_3', plan_id: '102', plan_name: 'Bronze' }
+          ]
+
+          result = Application.save_batch(service_id, apps)
+
+          result[:status].must_equal 'completed'
+          result[:total].must_equal 2
+          result[:successful].must_equal 1
+          result[:failed].must_equal 1
+
+          result[:failures].wont_be_nil
+          result[:failures].size.must_equal 1
+          result[:failures][0][:id].must_equal 'batch_app_3'
+
+          Application.load(service_id, 'batch_app_1').wont_be_nil
+        end
+
+        it 'returns modified status for existing applications' do
+          Application.save(service_id: service_id, id: 'batch_app_1',
+                           state: 'active', plan_id: '100', plan_name: 'Old')
+
+          apps = [
+            { id: 'batch_app_1', state: 'active', plan_id: '200', plan_name: 'New' }
+          ]
+
+          result = Application.save_batch(service_id, apps)
+
+          result[:successful].must_equal 1
+          result[:applications][0][:status].must_equal 'modified'
+
+          app = Application.load(service_id, 'batch_app_1')
+          app.plan_name.must_equal 'New'
+        end
+
+        it 'handles empty applications array' do
+          result = Application.save_batch(service_id, [])
+
+          result[:status].must_equal 'completed'
+          result[:total].must_equal 0
+          result[:successful].must_equal 0
+          result[:failed].must_equal 0
+        end
+
+        it 'saves user keys and application keys' do
+          apps = [
+            { id: 'batch_app_1', state: 'active', plan_id: '100', plan_name: 'Gold',
+              user_key: 'uk_batch_test', application_keys: ['ak1', 'ak2'] }
+          ]
+
+          result = Application.save_batch(service_id, apps)
+
+          result[:successful].must_equal 1
+          result[:applications][0][:application][:user_key].must_equal 'uk_batch_test'
+          result[:applications][0][:application][:application_keys].must_include 'ak1'
+          result[:applications][0][:application][:application_keys].must_include 'ak2'
+        end
+      end
+
       describe 'by_key' do
         let(:key) { 'a_key' }
         let(:key_with_special_chars) { SPECIAL_CHARACTERS }

data/spec/spec_helper.rb

@@ -1,9 +1,11 @@
 if ENV['COVERAGE'] && !ENV['COVERAGE'].empty?
-  require 'codeclimate-test-reporter'
+  require 'simplecov'
+  require 'simplecov_json_formatter'
   SimpleCov.start do
-    formatter ENV['CODECLIMATE_REPO_TOKEN'] ?
-      CodeClimate::TestReporter::Formatter :
+    formatter SimpleCov::Formatter::MultiFormatter.new([
+      SimpleCov::Formatter::JSONFormatter,
       SimpleCov::Formatter::HTMLFormatter
+    ])
     add_filter '/spec/'
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pisoni
 version: !ruby/object:Gem::Version
-  version: 1.30.0
+  version: 1.31.0
 platform: ruby
 authors:
 - Alejandro Martinez Ruiz
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-05 00:00:00.000000000 Z
+date: 2026-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -17,9 +16,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - "<="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: 2.14.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +26,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - "<="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: 2.14.3
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +130,7 @@ files:
 - lib/3scale_core.rb
 - lib/pisoni.rb
 - pisoni.gemspec
+- podman-compose.yml
 - spec/alert_limit_spec.rb
 - spec/application_key_spec.rb
 - spec/application_referrer_filter_spec.rb
@@ -149,7 +149,6 @@ homepage: https://github.com/3scale/pisoni
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -158,15 +157,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 4.0.4
 specification_version: 4
 summary: Client for the Apisonator internal API for model data
 test_files: