asyncapi-server 1.1.0 → 1.3.0

data/spec/models/job_spec.rb

@@ -20,7 +20,7 @@ module Asyncapi
         its(:status) { is_expected.to eq "queued" }
         its(:callback_url) { is_expected.to eq "http://callback_url.com" }
         its(:class_name) { is_expected.to eq "CreateStorageFacility" }
-        its(:params) { is_expected.to eq({param: "values"}.to_json) }
+        its(:params) { is_expected.to eq("{\"param\"=>\"values\"}") }
 
         context "status" do
           it "can also be assigned other values" do

data/spec/requests/enqueueing_jobs_spec.rb

@@ -4,29 +4,20 @@ describe "Enqueueing jobs", type: :request do
 
   let(:job) { build_stubbed(:asyncapi_server_job, secret: "secret") }
 
-  before do
-    allow(Asyncapi::Server::Job).to receive(:create).with(
-      class_name: "Runner",
-      callback_url: "callback_url",
-      params: {client: "params"}.to_json,
-      secret: "secret",
-    ).and_return(job)
-
-    allow(job).to receive(:url).and_return("server_job_url")
-  end
-
-  it "allows asynchronous handing of http requests and cleans up old jobs" do
-    expect(Asyncapi::Server::JobWorker).to receive(:perform_async).with(job.id)
-
-    post("tests", job: {
-      callback_url: "callback_url",
-      params: {client: "params"}.to_json,
-      secret: "secret",
+  it "allows asynchronous handling of http requests and cleans up old jobs", cleaning_strategy: :truncation do
+    post("/tests", params: {
+      job: {
+        callback_url: "callback_url",
+        params: {client: "params"}.to_json,
+        secret: "secret",
+      }
     })
 
     expect(response).to be_successful
     parsed_response = indifferent_hash(response.body)[:job]
-    expect(parsed_response[:url]).to eq "server_job_url"
+    expect(Asyncapi::Server::JobWorker).
+      to have_enqueued_job(parsed_response[:id])
+    expect(parsed_response[:url]).to be_present
     expect(parsed_response[:secret]).to eq "secret"
   end
 

data/spec/serializers/job_serializer_spec.rb

@@ -8,6 +8,7 @@ module Asyncapi::Server
     subject(:serialized_hash) { serializer.attributes }
 
     its([:id]) { is_expected.to eq job.id }
+    its([:status]) { is_expected.to eq job.status }
 
     it "has a url" do
       allow(job).to receive(:url).and_return("url")

data/spec/spec_helper.rb

@@ -9,6 +9,7 @@ require "factory_girl_rails"
 require "pry"
 require "database_cleaner"
 require "timecop"
+require 'rspec-sidekiq'
 
 Rails.backtrace_cleaner.remove_silencers!
 
@@ -21,7 +22,6 @@ Dir[
 
 RSpec.configure do |config|
   config.fixture_path = "#{::Rails.root}/spec/fixtures"
-  config.use_transactional_fixtures = false
   config.infer_base_class_for_anonymous_controllers = false
   config.order = "random"
 
@@ -29,12 +29,13 @@ RSpec.configure do |config|
     DatabaseCleaner.clean_with :truncation
   end
 
-  config.before do
-    DatabaseCleaner.strategy = :transaction
+  config.before do |example|
+    DatabaseCleaner.strategy = example.metadata[:cleaning_strategy] ||
+      :transaction
     DatabaseCleaner.start
   end
 
-  config.after do
+  config.append_after(:each) do
     DatabaseCleaner.clean
   end
 end

data/spec/workers/job_status_notifier_worker_spec.rb

@@ -0,0 +1,115 @@
+require "spec_helper"
+
+module Asyncapi
+  module Server
+    describe JobStatusNotifierWorker do
+
+      it "does not retry" do
+        expect(described_class.sidekiq_options_hash['retry']).to be false
+      end
+
+      describe "#perform" do
+        let(:message) { nil }
+        let(:code) { 200 }
+        let(:body) do
+          {
+            id: 12345,
+            server_job_url: "server_job_url",
+            status: "success",
+          }
+        end
+        let(:response) do
+          double(:response_double,
+            code: code,
+            body: body,
+          )
+        end
+        let(:job) do
+          create(:asyncapi_server_job, {
+            class_name: "Runner",
+            callback_url: "client_job_url",
+            status: :success,
+            secret: "secret",
+          })
+        end
+
+        it "notifies a job's callback_url with the job status" do
+          expect(Typhoeus).to receive(:put).with(
+            job.callback_url,
+            body: {
+              job: {
+                status: job.status,
+                message: message,
+                secret: job.secret,
+              }
+            }.to_json,
+            headers: {
+              "Content-Type" => "application/json",
+              Accept: "application/json"
+            }
+          ).and_return(response)
+
+          described_class.new.perform(job.id, message)
+        end
+
+        context "when an error occurred while notifying callback_url" do
+          let(:code) { 404 }
+          let(:body) do
+            {
+              error: "404",
+              status: "Not Found",
+            }
+          end
+          let(:jid) { "abcde12345" }
+
+          before do
+            expect(Typhoeus).to receive(:put).with(
+              job.callback_url,
+              body: {
+                job: {
+                  status: job.status,
+                  message: message,
+                  secret: job.secret,
+                }
+              }.to_json,
+              headers: {
+                "Content-Type" => "application/json",
+                Accept: "application/json"
+              }
+            ).and_return(response)
+          end
+
+          context "when initial attempt fails" do
+            let(:retries) { 1 }
+
+            it "raises attempt failure and retries" do
+              expect(JobStatusNotifierWorker).to(
+                receive(:perform_async).with(job.id, message, retries+1).and_return(jid)
+              )
+
+              expect { described_class.new.perform(job.id, message, retries) }.not_to raise_error
+            end
+          end
+
+          context "when final attempt still fails" do
+            let(:expected_error_message) do
+              [
+                "Something went wrong while poking #{job.callback_url}",
+                "JobID: #{job.id}",
+                "Next Attempt: ",
+                "HTTP Status: #{response.code}",
+                "HTTP Response: #{response.inspect}",
+              ].join("\n")
+            end
+
+            it "raises error if no progress is made after MAX_RETRIES attempts" do
+              expect { described_class.new.perform(job.id, message, 3) }.to(
+                raise_error expected_error_message
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/workers/job_worker_spec.rb

@@ -19,20 +19,7 @@ module Asyncapi
 
           expect(Runner).to receive(:call).
             with(job.params) { "message" }
-          expect(Typhoeus).to receive(:put).with(
-            "client_job_url",
-            body: {
-              job: {
-                status: :success,
-                message: "message",
-                secret: "sekret",
-              }
-            }.to_json,
-            headers: {
-              "Content-Type" => "application/json",
-              Accept: "application/json"
-            }
-          )
+          expect(JobStatusNotifierWorker).to receive(:perform_async).with(job.id, "message")
 
           described_class.new.perform(job.id)
           job.reload
@@ -52,21 +39,7 @@ module Asyncapi
 
             allow(Runner).to receive(:call).
               and_raise(error)
-
-            expect(Typhoeus).to receive(:put).with(
-              "client_job_url",
-              body: {
-                job: {
-                  status: :error,
-                  message: ["my error", "back", "trace"].join("\n"),
-                  secret: "sekret",
-                }
-              }.to_json,
-              headers: {
-                "Content-Type" => "application/json",
-                Accept: "application/json"
-              }
-            )
+            expect(JobStatusNotifierWorker).to receive(:perform_async).with(job.id, ["my error", "back", "trace"].join("\n"))
 
             expect { described_class.new.perform(job.id) }.
               to raise_error(error)
@@ -74,8 +47,14 @@ module Asyncapi
             expect(job.status).to eq "error"
           end
         end
-      end
 
+        context "job is nil" do
+          it "retries JobWorker" do
+            expect(JobWorker).to receive(:perform_async).with("999", 1).and_return true
+            expect { described_class.new.perform("999") }.to raise_error
+          end
+        end
+      end
     end
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: asyncapi-server
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - G5
 - Marc Ignacio
 - Ramon Tayag
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-21 00:00:00.000000000 Z
+date: 2021-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari
@@ -42,6 +42,34 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
+- !ruby/object:Gem::Dependency
+  name: active_model_serializers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -55,7 +83,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: active_model_serializers
+  name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -69,7 +97,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: typhoeus
+  name: responders
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -83,7 +111,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sidekiq
+  name: ar_after_transaction
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -116,14 +144,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -138,6 +166,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: rspec-sidekiq
+  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'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -209,6 +251,7 @@ files:
 - app/controllers/asyncapi/server/v1/jobs_controller.rb
 - app/models/asyncapi/server/job.rb
 - app/serializers/asyncapi/server/job_serializer.rb
+- app/workers/asyncapi/server/job_status_notifier_worker.rb
 - app/workers/asyncapi/server/job_worker.rb
 - config/database.yml
 - config/routes.rb
@@ -257,11 +300,11 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
-- spec/dummy/db/migrate/20141212065005_create_asyncapi_server_jobs.asyncapi_server.rb
-- spec/dummy/db/migrate/20141212065006_add_secret_to_asyncapi_server_job.asyncapi_server.rb
-- spec/dummy/db/migrate/20150130062901_add_expired_at_to_asyncapi_server_job.asyncapi_server.rb
-- spec/dummy/db/migrate/20150201231329_drop_expired_at_from_asyncapi_server_jobs.asyncapi_server.rb
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
+- spec/dummy/db/test.sqlite3
+- spec/dummy/log/development.log
+- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -275,12 +318,13 @@ files:
 - spec/spec_helper.rb
 - spec/support/factory_girl.rb
 - spec/support/indifferent_hash.rb
+- spec/workers/job_status_notifier_worker_spec.rb
 - spec/workers/job_worker_spec.rb
 homepage: https://github.com/G5/asyncapi-server
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -295,60 +339,60 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.3
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Asynchronous API communication - Server
 test_files:
-- spec/controllers/asyncapi/server/v1/jobs_controller_spec.rb
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
+- spec/spec_helper.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/tests_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/bin/rake
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
-- spec/dummy/bin/rake
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
+- spec/dummy/config/secrets.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/config/locales/en.yml
 - spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/application.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/boot.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/default_url_options.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config/secrets.yml
+- spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/initializers/default_url_options.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config.ru
-- spec/dummy/db/migrate/20141212065005_create_asyncapi_server_jobs.asyncapi_server.rb
-- spec/dummy/db/migrate/20141212065006_add_secret_to_asyncapi_server_job.asyncapi_server.rb
-- spec/dummy/db/migrate/20150130062901_add_expired_at_to_asyncapi_server_job.asyncapi_server.rb
-- spec/dummy/db/migrate/20150201231329_drop_expired_at_from_asyncapi_server_jobs.asyncapi_server.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/public/404.html
+- spec/dummy/Rakefile
+- spec/dummy/public/favicon.ico
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/Rakefile
+- spec/dummy/public/404.html
+- spec/dummy/db/schema.rb
+- spec/dummy/db/test.sqlite3
+- spec/dummy/db/development.sqlite3
+- spec/dummy/log/test.log
+- spec/dummy/log/development.log
 - spec/dummy/README.rdoc
-- spec/factories/job.rb
-- spec/fixtures/runner.rb
+- spec/server_spec.rb
 - spec/models/job_spec.rb
 - spec/requests/enqueueing_jobs_spec.rb
 - spec/serializers/job_serializer_spec.rb
-- spec/server_spec.rb
-- spec/spec_helper.rb
-- spec/support/factory_girl.rb
 - spec/support/indifferent_hash.rb
+- spec/support/factory_girl.rb
+- spec/factories/job.rb
+- spec/fixtures/runner.rb
 - spec/workers/job_worker_spec.rb
+- spec/workers/job_status_notifier_worker_spec.rb
+- spec/controllers/asyncapi/server/v1/jobs_controller_spec.rb