asyncapi-client 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13ebb832003a17b09de81bdfb57189642d7fcadc
-  data.tar.gz: 138494b7d2eb080eaab93682140874b57b3737b6
+  metadata.gz: cab20cbbe30a21d0b85d178847743113ec9396f0
+  data.tar.gz: f7a5d27f8b8c1389a238d70a749da18e11f6dc3c
 SHA512:
-  metadata.gz: ea09a451882fb31a7d9c2ed01f1f111b853bf2bc61e1a513266767ea0ce9d35ab242e08168d771b3690696ac572641660b2bbaefff5ac60598d94b7aa0531bc8
-  data.tar.gz: ead656b31c998c890eb930133aa27f50cdc457c35b6b0ba50c115ecb4c113bdff2b5077809b53c3978ec4d87c7185f39592f5853779d62272d64443a7dff752b
+  metadata.gz: 4ba00f9669e29ca8286eb426bcf1614258a37bcf851669f63896f5347dd9f3a374dee330bc04277fc4cb079655ae45964118a67d7e76c8106c30269c2310b784
+  data.tar.gz: 03005f2e7dd1d16d512dd9bb3e5990329a5bebcaace342a33919c0ecf47abe44627e681936eeac821ee6e0877557d9bcfd2220371e60824696a6a5f2d8495ae4

data/README.md

@@ -17,6 +17,7 @@ Asyncapi::Client::Job.post(
   on_success: DoOnSuccess,
   on_error: DoOnError,
   on_queue: DoOnQueue,
+  on_queue_error: DoOnQueueError,
   on_time_out: DoOnTimeOut,
   time_out: 2.minutes # Defaults to nil (never time out)
 )
@@ -42,7 +43,7 @@ end
 
 class DoOnError < Asyncapi::Client::CallbackRunner
   def call
-    # you have access to: job and it fields: callback_params, :body, :headers, :message
+    # you have access to: job and its fields: callback_params, :body, :headers, :message, :response_code
     Rails.logger.info "Job##{job.id} failed. The server's response: #{job.message}"
   end
 end
@@ -54,6 +55,7 @@ In the callback classes, you have access to the `job` and its fields (directly):
 - `body`
 - `headers`
 - `message`
+- `response_code`
 
 Currently, this Engine only works with [Sidekiq](http://sidekiq.org), [typhoeus](https://github.com/typhoeus/typhoeus), and [kaminari](https://github.com/amatsuda/kaminari). Customizing these can be introduced as needed.
 
@@ -119,9 +121,11 @@ Asyncapi::Client::Job.attr_accessible(
   :on_queue,
   :on_success,
   :on_error,
+  :on_queue_error,
   :headers,
   :body,
   :status,
+  :response_code,
 )
 ```
 

data/app/models/asyncapi/client/callback_runner.rb

@@ -7,6 +7,7 @@ module Asyncapi::Client
       :body,
       :headers,
       :message,
+      :response_code,
     ]
     delegate *DELEGATED_ATTRS, to: :job
 

data/app/models/asyncapi/client/job.rb

@@ -4,7 +4,7 @@ module Asyncapi::Client
     after_initialize :generate_secret
     before_create :set_expired_at
 
-    enum status: %i[queued success error timed_out fresh]
+    enum status: %i[queued success error timed_out fresh queue_error]
     serialize :headers, Hash
     serialize :callback_params, Hash
 
@@ -15,6 +15,7 @@ module Asyncapi::Client
       state :success
       state :error
       state :timed_out
+      state :queue_error
 
       event :enqueue do
         transitions from: :fresh, to: :queued
@@ -31,12 +32,17 @@ module Asyncapi::Client
       event :time_out do
         transitions from: [:fresh, :queued], to: :timed_out
       end
+
+      event :fail_queue do
+        transitions from: :fresh, to: :queue_error
+      end
     end
 
     scope :expired, -> { where(arel_table[:expired_at].lt(Time.now)) }
     scope :with_time_out, -> { where(arel_table[:time_out_at].not_eq(nil)) }
     scope :for_time_out, -> do
-      with_time_out.where(arel_table[:time_out_at].lt(Time.now))
+      where(arel_table[:time_out_at].lt(Time.now)).
+      where(status: [statuses[:queued], statuses[:fresh]])
     end
 
     def self.post(url,
@@ -46,6 +52,7 @@ module Asyncapi::Client
                   on_success: nil,
                   on_error: nil,
                   on_time_out: nil,
+                  on_queue_error: nil,
                   callback_params: {},
                   follow_up: 5.minutes,
                   time_out: nil)
@@ -55,6 +62,7 @@ module Asyncapi::Client
         on_queue: on_queue,
         on_success: on_success,
         on_error: on_error,
+        on_queue_error: on_queue_error,
         on_time_out: on_time_out,
         callback_params: callback_params,
         headers: headers,
@@ -75,7 +83,7 @@ module Asyncapi::Client
       write_attribute :body, json
     end
 
-    [:on_success, :on_error, :on_queue, :on_time_out].each do |attr|
+    [:on_success, :on_error, :on_queue, :on_time_out, :on_queue_error].each do |attr|
       define_method("#{attr}=") do |klass|
         write_attribute attr, klass.to_s
       end
@@ -91,5 +99,15 @@ module Asyncapi::Client
       self.secret ||= SecureRandom.uuid
     end
 
+    def self.initial_state
+      self.aasm.state_machine.initial_state
+    end
+
+    def self.non_initial_states
+      self.aasm.states.reject do |state|
+        state == initial_state
+      end.map(&:name)
+    end
+
   end
 end

data/app/workers/asyncapi/client/job_post_worker.rb

@@ -24,7 +24,8 @@ module Asyncapi::Client
           JobStatusWorker.perform_async(job.id)
         end
       else
-        if job.update_attributes(status: :error, message: response.body)
+        job.fail_queue
+        if job.update_attributes!(message: response.body, response_code: response.response_code)
           JobStatusWorker.perform_async(job.id)
         end
       end
@@ -33,7 +34,7 @@ module Asyncapi::Client
     def job_params_from(response)
       response_body = JSON.parse(response.body).with_indifferent_access
       server_job_params = response_body[:job]
-      {server_job_url: server_job_params[:url]}
+      {server_job_url: server_job_params[:url], response_code: response.response_code}
     end
 
     def server_params_from(job, params)

data/app/workers/asyncapi/client/job_status_worker.rb

@@ -9,6 +9,7 @@ module Asyncapi::Client
       success: :on_success,
       error: :on_error,
       timed_out: :on_time_out,
+      queue_error: :on_queue_error,
     }.with_indifferent_access
 
     def perform(job_id)

data/app/workers/asyncapi/client/job_time_out_worker.rb

@@ -9,9 +9,7 @@ module Asyncapi::Client
     recurrence { minutely }
 
     def perform
-      Job.for_time_out.find_each do |job|
-        time_out_job(job) if job.may_time_out?
-      end
+      Job.for_time_out.find_each { |job| time_out_job(job) }
     end
 
     private

data/db/migrate/20150630004215_add_response_code_to_asyncapi_client_jobs.rb

@@ -0,0 +1,5 @@
+class AddResponseCodeToAsyncapiClientJobs < ActiveRecord::Migration
+  def change
+    add_column :asyncapi_client_jobs, :response_code, :integer
+  end
+end

data/db/migrate/20150703001225_add_on_queue_error_to_asyncapi_client_jobs.rb

@@ -0,0 +1,5 @@
+class AddOnQueueErrorToAsyncapiClientJobs < ActiveRecord::Migration
+  def change
+    add_column :asyncapi_client_jobs, :on_queue_error, :string
+  end
+end

data/lib/asyncapi/client/version.rb

@@ -1,5 +1,5 @@
 module Asyncapi
   module Client
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asyncapi-client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - G5
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -251,6 +251,8 @@ files:
 - db/migrate/20150202062320_populate_asyncapi_client_job_expired_at.rb
 - db/migrate/20150610053320_add_on_time_out_to_asyncapi_client_job.rb
 - db/migrate/20150612082965_add_time_out_index_to_asyncapi_client_job.rb
+- db/migrate/20150630004215_add_response_code_to_asyncapi_client_jobs.rb
+- db/migrate/20150703001225_add_on_queue_error_to_asyncapi_client_jobs.rb
 - lib/asyncapi-client.rb
 - lib/asyncapi/client.rb
 - lib/asyncapi/client/engine.rb
@@ -278,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Asynchronous API communication