manticore 0.6.4-java → 0.7.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 00b846373d0dce20d74cb4e2434868f908006e63
-  data.tar.gz: e136b3550efea6343291f9264d45ff1b6fa24448
+SHA256:
+  metadata.gz: 508b2d2c3ce9fc25ca2ac915954807783cc8266aac23936a6896d103121a2f0c
+  data.tar.gz: a8ac97bd7fb22df23ac164d5f06f3a35c926d9eac57ae7bfb8e84c0c8d9e7907
 SHA512:
-  metadata.gz: 6a02ebe1e15e565212f135d760cb83eaaaecbd73f8664c9470ef14feb00a163d76a8383918f3b51a28018853c8e88c0bb1f5af7eae28f9f5e0f7840806b70d79
-  data.tar.gz: 74f89a4d46806461ae86b2554ac418ebd3673e8b4c55a4add68da84d88cb54418ada667d1f4673f549782b693982e4f2a4ec84fb41f8248fd9fab1a2a150e817
+  metadata.gz: 56a60c747c187ddd1255e5da7cbc2ad78570c2ebf5390841298f45366133b48c857df8ac7b7b8bdbbb5194546e3b3112a8c08b5109c66a1299f6fe787ae890fc
+  data.tar.gz: 78e29e767486b820f1d1a280ae4db04b1ad33eccb7da7538bae9e48116305b44d069dc13ee322484146f9cce28b6edf71e868d73be8e075957404c50a99416eb

data/.gitlab-ci.yml

@@ -8,7 +8,7 @@
       - $HOME/.m2
   before_script:
     - apt update && apt install -y git
-    - gem install ruby-maven bundler
+    - gem install ruby-maven
     - bundle install --path vendor/bundle
   script:
     - bundle exec rake

data/.travis.yml

@@ -1,23 +1,20 @@
+dist: xenial
 language: ruby
-sudo: false
 cache:
   - bundler
   - directories:
     - $HOME/.m2
 rvm:
-  - jruby-1.7
-  - jruby-9.0.5.0
+  - jruby-9.1.17.0 # Ruby 2.3
+  - jruby-9.2.13.0 # Ruby 2.5
 jdk:
-  - oraclejdk8
-  - openjdk7
+  - openjdk9
+  - openjdk11
 before_install:
-  - gem install ruby-maven bundler
-  - bundle install
+  - gem install bundler -v 1.17.3
 matrix:
   include:
-    - rvm: jruby-9.2.0.0
-      jdk: oraclejdk8
     - rvm: jruby-head
-      jdk: oraclejdk8
+      jdk: openjdk10
   allow_failures:
     - rvm: jruby-head

data/CHANGELOG.md

@@ -1,8 +1,9 @@
 ## v0.6
 
-### v0.6.5
+### v0.7.0
 
-(unreleased)
+* Drop support for JRuby 1.7. It probably still works, but we don't test against it anymore
+* Fix a thread safety issue with regards to adding requests to the parallel execution queue while the client is already processing a queue (#80)
 
 ### v0.6.4
 

data/Gemfile

@@ -8,8 +8,9 @@ group :development, :test do
   gem "rspec", "~> 3.0"
   gem "rspec-its"
   gem "httpclient", "~> 2.3"
-  gem "rack", "~> 1.5"
+  gem "rack", ">= 2.1.4"
   gem "rake-compiler"
   gem "gserver"
   gem "simplecov"
+  gem "json"
 end

data/lib/faraday/adapter/manticore.rb

@@ -20,17 +20,12 @@ module Faraday
         ParallelManager.new
       end
 
-      def initialize(app, connection_options = {})
-        @connection_options = connection_options
-        super(app)
-      end
-
       def client(env)
         @client ||= begin
           opts = {}
           if ssl = env[:ssl].to_hash
             opts[:ssl] = {}
-            opts[:ssl][:verify] = :disable if ssl[:verify] == false
+            opts[:ssl][:verify] = ssl[:verify] unless ssl[:verify].nil?
             opts[:ssl][:ca_file] = ssl[:ca_file]
             opts[:ssl][:client_cert] = ssl[:client_cert]
             opts[:ssl][:client_key] = ssl[:client_key]

data/lib/manticore/client.rb

@@ -223,7 +223,7 @@ module Manticore
       @client = builder.build
       finalize @client, :close
       @options = options
-      @async_requests = []
+      @async_requests = Queue.new
       @stubs = {}
     end
 
@@ -334,8 +334,9 @@ module Manticore
     # @return [Array] An array of the responses from the requests executed.
     def execute!
       method = executor.java_method(:submit, [java.util.concurrent.Callable.java_class])
-      result = @async_requests.map { |r| method.call r }
-      @async_requests.clear
+
+      result = []
+      result << method.call(@async_requests.pop) until @async_requests.empty?
       result.map do |future|
         begin
           future.get

data/lib/manticore/version.rb

@@ -1,3 +1,3 @@
 module Manticore
-  VERSION = "0.6.4"
+  VERSION = "0.7.0"
 end

data/manticore.gemspec

@@ -27,9 +27,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "openssl_pkcs8_pure"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "jar-dependencies"
+  spec.add_development_dependency "jar-dependencies", "~> 0.4.1"
 
   spec.requirements << "jar org.apache.httpcomponents:httpclient, '~> 4.5.0'"
   spec.requirements << "jar org.apache.httpcomponents:httpmime,   '~> 4.5.0'"

data/spec/manticore/client_spec.rb

@@ -563,7 +563,7 @@ describe Manticore::Client do
   describe "#head" do
     it "works" do
       response = client.head(local_server)
-      expect(JSON.load(response.body)).to be_nil
+      expect(response.body).to be_nil
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manticore
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
 platform: java
 authors:
 - Chris Heald
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-28 00:00:00.000000000 Z
+date: 2020-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -17,8 +17,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: openssl_pkcs8_pure
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -27,17 +27,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -45,8 +45,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -55,17 +55,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
   name: jar-dependencies
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
 description: Manticore is an HTTP client built on the Apache HttpCore components
 email:
 - cheald@mashable.com
@@ -136,8 +136,7 @@ requirements:
 - jar commons-logging:commons-logging,      '~> 1.2'
 - jar commons-codec:commons-codec,          '~> 1.9'
 - jar org.apache.httpcomponents:httpcore,   '~> 4.4.4'
-rubyforge_project:
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
 summary: Manticore is an HTTP client built on the Apache HttpCore components