job_notifier 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 813294d11402f27d16f0bbe8b06d89a8a87f87b6
-  data.tar.gz: f75746f4cbcf03310f3f2ae55aa3cd5aeb625cdc
+  metadata.gz: a68d1d5104e379f3ada2d94b7c32b034fbdb73e0
+  data.tar.gz: 01ba5257b1ebbf75d5846577a19e385a1e8bf587
 SHA512:
-  metadata.gz: 31bf07ea0ba043d2de9771d715954a572f4c3620eabea7da9ccabf0889acc9cbdd373cddb5b2e9469d91c6b87e1458b21e421c6b44cdeccba6a72f314e46ac5f
-  data.tar.gz: 2aa14ea7ef333066cbc5b7decbbccb1fc07a039f4d606282d3941143a3984730937c5f36220230bf0876b96cb33990b6a31c436be3c1a398009b0eda41696204
+  metadata.gz: 9aab43a3f1e70c51225c8a8ea4676eac6dc86b282d839943d11961ee5849e64b804f6dd965bee08a9afa62942e59d8a911022fc3c13d89000bae45e30e05a692
+  data.tar.gz: 24986bffc98509d1134ef828d510440918d005de91e079e281526555e80eadd28b91b532c9cfa25f06446fc1e70ddc928fc2d19e865132dbb8cf26d6227e2c15

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+### v1.0.0
+
+#### Added
+
+- Replace `GET /jobs` with `GET /:identifier/jobs/pending` and `PUT /:identifier/jobs/notify` to mark jobs as notified in a second step.
+
 ### v0.2.1
 
 #### Fixed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    job_notifier (0.2.1)
+    job_notifier (1.0.0)
       enumerize (~> 1.0.0, ~> 1.0)
       rails (~> 4.2, >= 4.2.0)
 
@@ -65,9 +65,9 @@ GEM
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
     method_source (0.8.2)
-    mime-types (3.0)
+    mime-types (3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0221)
+    mime-types-data (3.2016.0521)
     mini_portile2 (2.0.0)
     minitest (5.8.4)
     nokogiri (1.6.7.2)

data/app/assets/javascripts/job_notifier/notifier.js

@@ -1,6 +1,7 @@
 (function(window){
   'use strict';
   function defineLibrary(){
+    var MILLISECONDS_TO_GET_JOBS = 5000;
     var JobNotifier = {};
 
     JobNotifier.init = function() {
@@ -12,24 +13,44 @@
       }
 
       JobNotifier.rootUrl = body.dataset.rootUrl;
-      setInterval(JobNotifier.poll, 5000);
+      JobNotifier.findJobs();
     };
 
-    JobNotifier.poll = function() {
+    JobNotifier.performRequest = function(method, action, onLoadCallback) {
       var oReq = new XMLHttpRequest();
-      oReq.onload = JobNotifier.reqListener;
+      oReq.onload = onLoadCallback;
       oReq.onerror = JobNotifier.onError;
-      var url = JobNotifier.rootUrl + 'job_notifier/jobs.json?identifier=' + JobNotifier.jobIdentifier;
-      oReq.open('get', url, true);
+      var url = JobNotifier.rootUrl + 'job_notifier/' + JobNotifier.jobIdentifier + '/jobs/' + action + '.json';
+      oReq.open(method, url, true);
       oReq.send();
     };
 
-    JobNotifier.reqListener = function() {
+    JobNotifier.findJobs = function() {
+      setTimeout(JobNotifier.findPendingJobs, MILLISECONDS_TO_GET_JOBS);
+    };
+
+    JobNotifier.findPendingJobs = function() {
+      JobNotifier.performRequest('get', 'pending', JobNotifier.onPendingJobsLoad);
+    };
+
+    JobNotifier.notifyJobs = function() {
+      JobNotifier.performRequest('put', 'notify', JobNotifier.onNotifyJobsLoad);
+    };
+
+    JobNotifier.onPendingJobsLoad = function() {
       var data = JSON.parse(this.responseText);
 
-      if(data.length > 0) {
-        JobNotifier.onNotify(data);
+      if(data.length === 0) {
+        JobNotifier.findJobs();
+        return;
       }
+
+      JobNotifier.onNotify(data);
+      JobNotifier.notifyJobs();
+    };
+
+    JobNotifier.onNotifyJobsLoad = function() {
+      JobNotifier.findJobs();
     };
 
     JobNotifier.onNotify = function(data) {

data/app/controllers/job_notifier/jobs_controller.rb

@@ -3,8 +3,12 @@ module JobNotifier
     skip_before_action :verify_authenticity_token
 
     def index
-      jobs = Job.unnotified_by_identifier!(params[:identifier])
-      render json: jobs
+      render json: Job.unnotified_by_identifier(params[:identifier])
+    end
+
+    def update
+      Job.notify_by_identifier(params[:identifier])
+      head :no_content
     end
   end
 end

data/app/models/job_notifier/job.rb

@@ -12,11 +12,12 @@ module JobNotifier
       job.update_columns(result: data.to_s, status: status, notified: false)
     end
 
-    def self.unnotified_by_identifier!(encoded_identifier)
-      jobs = JobNotifier::Job.where(identifier: encoded_identifier).where(notified: false)
-      job_ids = jobs.ids
-      jobs.update_all(notified: true)
-      where(id: job_ids)
+    def self.unnotified_by_identifier(encoded_identifier)
+      JobNotifier::Job.where(identifier: encoded_identifier).where(notified: false)
+    end
+
+    def self.notify_by_identifier(encoded_identifier)
+      unnotified_by_identifier(encoded_identifier).update_all(notified: true)
     end
   end
 end

data/config/routes.rb

@@ -1,4 +1,4 @@
 JobNotifier::Engine.routes.draw do
-  resources :jobs, only: [:index]
-  resources :adapters, only: [:show]
+  get ":identifier/jobs/pending", to: "jobs#index"
+  put ":identifier/jobs/notify", to: "jobs#update"
 end

data/lib/job_notifier/version.rb

@@ -1,3 +1,3 @@
 module JobNotifier
-  VERSION = "0.2.1"
+  VERSION = "1.0.0"
 end