activeadmin_jobs 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07e83a90ef11938bba5c98aa29cc5ee65e82b695
-  data.tar.gz: 1bbff96ed1503dabfe23ac695acded7e6ebc2ec5
+  metadata.gz: fc87fc50de20e3acb80bde2e43341217ae474d54
+  data.tar.gz: da28e26899d58186597c342a00354dc856a7e78f
 SHA512:
-  metadata.gz: b1a14b6a65555f0a2675dba872ec4b7627d64f1626c8e340ee5adb0d1b10b2dd417292ec8995549352640ac947620b39fde5258bcf89d37191f52011ee97c07e
-  data.tar.gz: dc4c0b9a912f6d61c48da615013ae30467330b2ab7676aeac0c03f37dda1984c55a26a03bc5c40475182445483ac9624404c79b4ce151a67416f288fcc9ee953
+  metadata.gz: 8014c32fd0bdece6b0e8e938706e977015948878ad6fc765d8374cc2f18be3f80aa3ef6c55dfbe8362411c8fed2eadbfe10a3946b8501b0b2c695b249d019140
+  data.tar.gz: 610cfb7a83d4588ee5aaa6ef850d5e8369a989d3fb09b5912b8d68e8f1f149c3dd1f82e3941aee42a69258cef7ef45249210f039d535f09ae70d2e20789f593c

data/.ruby-version

@@ -1 +1 @@
-2.2
+2.3

data/.travis.yml

@@ -0,0 +1,21 @@
+language: ruby
+rvm:
+- 2.3.1
+before_install: gem install bundler -v 1.12.5
+before_script:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+  - sleep 3 # give xvfb some time to start
+addons:
+  firefox: "31.0esr"
+script:
+  - cd spec/dummy && RAILS_ENV=test bundle exec rake db:create db:migrate
+  - cd ../.. && bundle exec rspec spec
+deploy:
+  provider: rubygems
+  api_key:
+    secure: bCeyRAepiV3YsCQfwrvYgZyxm6ys1gHpRyZ1p7z8c0pYxnOzkvEJF1RDuuMwU6fo2AIQH2LqfhywfPM7NCq96P3lGqQhZmgTiiZN7603akUXdU12nx40KputjJv2DhiGtLGOv3Ju5FVgBGQtxopWhvdRB/uaAzEL71YI/TRxfaGedPD46cWYF0Vj+b2bxe5b7f06NKJ+niE0YFpAho/GVY3eTbyCzqKGVwdZcOAWXdLoIdfhUL/wLxWUXhYIuBpDun/WQM0Oe0AcWAXSl8whys7jl+R/WbWDyqTjyNID/bKg3vdRilULU8tg04s7jq+AqnjqQ4BOGjJNzvTdhLs+H3tPfljK/sJr7bmeDZLe4vxlgGUa6dlKtuKOXZE0nUuY0nG5aHTRy8Yd4QRAQX5i/qGj+WIhpRlQMP8LqlTnZfGvm+rKu+a6aaQIbYeTuqRtKzRDwq6ZDWWjkeTEUSjVuIcfY2ZuWHj2CWWpbQlwz4yBauqc7/7GTUKVrDZRxE1ljU7r3TS5vQ0k8k7Ot4fb5uUpZReEvBxhLedLdS3IDI9UCREg07t5BQ1WQ9IkDmkirXkwNkXhBbJRA2borUsUewy1xh9qvrrh2ZNHr4HhLy7gALdj0y2omo/gehWiZ5WHwTASF4KsXki13bgt8ABIcIqbCleBdh/JGeUsthlHygc=
+  gem: activeadmin_jobs
+  on:
+    tags: true
+    repo: platanus/activeadmin_jobs

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+### v0.2.0
+
+#### Added
+
+- Add .travis.yml with config to deploy on tag creation.
+
+#### Removed
+
+- Remove useless notified column from index/show job's views.
+
+#### Security
+
+- Avoid CSRF issue executing protect_from_forgery in Application Controller.
+
 ### v0.1.2
 
 #### Fixed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activeadmin_jobs (0.1.2)
+    activeadmin_jobs (0.2.0)
       activeadmin (~> 1.0.0.pre2)
       activeadmin_addons (~> 0.9, >= 0.9.2)
       devise (~> 3.5, >= 3.5.0)
@@ -45,7 +45,7 @@ GEM
       ransack (~> 1.3)
       sass-rails
       sprockets (< 4)
-    activeadmin_addons (0.9.3)
+    activeadmin_addons (0.10.1)
       railties
       select2-rails (~> 3.5.9)
       xdan-datetimepicker-rails (~> 2.5.1)
@@ -70,7 +70,7 @@ GEM
       activesupport (>= 3.0.0)
     arel (6.0.3)
     bcrypt (3.1.11)
-    bourbon (4.2.7)
+    bourbon (4.3.3)
       sass (~> 3.4)
       thor (~> 0.19)
     builder (3.2.2)
@@ -90,9 +90,9 @@ GEM
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.10.0)
+    coffee-script-source (1.12.2)
     colorize (0.8.1)
-    concurrent-ruby (1.0.2)
+    concurrent-ruby (1.0.5)
     daemons (1.2.3)
     database_cleaner (1.5.3)
     delayed_job (4.1.2)
@@ -113,26 +113,26 @@ GEM
     erubis (2.7.0)
     execjs (2.7.0)
     ffi (1.9.10)
-    formtastic (3.1.4)
+    formtastic (3.1.5)
       actionpack (>= 3.2.13)
     formtastic_i18n (0.6.0)
-    globalid (0.3.6)
+    globalid (0.3.7)
       activesupport (>= 4.1.0)
-    has_scope (0.6.0)
-      actionpack (>= 3.2, < 5)
-      activesupport (>= 3.2, < 5)
+    has_scope (0.7.0)
+      actionpack (>= 4.1, < 5.1)
+      activesupport (>= 4.1, < 5.1)
     i18n (0.7.0)
-    inherited_resources (1.6.0)
-      actionpack (>= 3.2, < 5)
-      has_scope (~> 0.6.0.rc)
-      railties (>= 3.2, < 5)
+    inherited_resources (1.7.0)
+      actionpack (>= 3.2, < 5.1)
+      has_scope (~> 0.6)
+      railties (>= 3.2, < 5.1)
       responders
     job_notifier (1.1.1)
       colorize (~> 0.7, >= 0.7.7)
       enumerize (~> 1.0.0, ~> 1.0)
       rails (~> 4.2, >= 4.2.0)
       silencer (= 1.0.0.rc3)
-    jquery-rails (4.1.1)
+    jquery-rails (4.2.2)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -196,13 +196,13 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (11.1.2)
-    ransack (1.8.0)
+    ransack (1.8.2)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
       i18n
       polyamorous (~> 1.3)
-    responders (2.2.0)
+    responders (2.3.0)
       railties (>= 4.2.0, < 5.1)
     rspec-core (3.4.4)
       rspec-support (~> 3.4.0)
@@ -222,8 +222,8 @@ GEM
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
     rubyzip (1.2.0)
-    sass (3.4.22)
-    sass-rails (5.0.5)
+    sass (3.4.23)
+    sass-rails (5.0.6)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
@@ -237,20 +237,20 @@ GEM
       websocket (~> 1.0)
     silencer (1.0.0.rc3)
     slop (3.6.0)
-    sprockets (3.6.3)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.1.1)
+    sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.11)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (2.0.5)
+    tilt (2.0.6)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    warden (1.2.6)
+    warden (1.2.7)
       rack (>= 1.0)
     websocket (1.2.3)
     xdan-datetimepicker-rails (2.5.4)
@@ -268,6 +268,7 @@ DEPENDENCIES
   daemons
   database_cleaner
   delayed_job_active_record
+  jquery-ui-rails (~> 5.0.5)
   pry-rails
   quiet_assets
   rails-assets-growl (~> 1.3.1)!
@@ -276,4 +277,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.12.4
+   1.14.4

data/README.md

@@ -1,4 +1,4 @@
-# Active Admin Jobs
+# Active Admin Jobs [![Build Status](https://secure.travis-ci.org/platanus/activeadmin_jobs.svg?branch=master)](http://travis-ci.org/platanus/activeadmin_jobs)
 
 It's a Rails engine that allows you to play nice with [Active Job](https://github.com/rails/activejob) in [Active Admin](https://github.com/activeadmin/activeadmin) providing user feedback.
 

data/activeadmin_jobs.gemspec

@@ -31,4 +31,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "daemons"
   s.add_development_dependency "delayed_job_active_record"
   s.add_development_dependency "quiet_assets"
+  s.add_development_dependency "jquery-ui-rails", "~> 5.0.5"
 end

data/app/admin/jobs.rb

@@ -2,14 +2,12 @@ ActiveAdmin.register JobNotifier::Job, as: "Job" do
   actions :index, :show
 
   filter :status
-  filter :notified
   filter :created_at
 
   index do
     id_column
     tag_column :status
     column :description
-    bool_column :notified
     column :created_at
     actions
   end
@@ -19,12 +17,13 @@ ActiveAdmin.register JobNotifier::Job, as: "Job" do
       row :id
       tag_row :status
       row :description
-      bool_row :notified
       row :created_at
     end
 
-    panel JobNotifier::Job.human_attribute_name(:result) do
-      ActiveadminJobs::JobResultRenderer.new(self).render
-    end unless resource.result.blank?
+    if !resource.result.blank?
+      panel JobNotifier::Job.human_attribute_name(:result) do
+        ActiveadminJobs::JobResultRenderer.new(self).render
+      end
+    end
   end
 end

data/app/assets/javascripts/activeadmin_jobs/{growl_setup.js.erb → growl_setup.js}

@@ -1,7 +1,3 @@
-JobNotifier.translations = <%= I18nDictionary.translations.to_json %>;
-JobNotifier.jobsUrl = "<%= AdminHelpers.jobs_url %>";
-console.info('translations', JobNotifier.translations);
-
 JobNotifier.onNotify = function(result) {
   DEFAULT_MESSAGES = {
     finished: {
@@ -18,7 +14,8 @@ JobNotifier.onNotify = function(result) {
 
   function findTranslation(jobClass, status, key) {
     try {
-      return JobNotifier.translations[jobClass][status][key];
+      var translations = getTranslations();
+      return translations[jobClass][status][key];
     } catch(err) {
       console.info('Translation not found. Using default...', jobClass, status, key);
     }
@@ -30,9 +27,19 @@ JobNotifier.onNotify = function(result) {
      return str.replace(/\W+/g, '_').replace(/([a-z\d])([A-Z])/g, '$1_$2').toLowerCase();
   }
 
+  function getTranslations() {
+    var body = document.querySelector('body');
+    return JSON.parse(body.dataset.translations);
+  }
+
+  function getJobsUrl() {
+    var body = document.querySelector('body');
+    return body.dataset.jobsUrl;
+  }
+
   function prepareMessage(job, count) {
     var jobClass = camelToDash(job.job_class);
-    var jobsUrl = JobNotifier.jobsUrl;
+    var jobsUrl = getJobsUrl();
     var msg = '';
 
     if(count == 1) {

data/app/controllers/activeadmin_jobs/application_controller.rb

@@ -1,4 +1,5 @@
 module ActiveadminJobs
   class ApplicationController < ActionController::Base
+    protect_from_forgery with: :exception
   end
 end

data/lib/activeadmin_jobs/activeadmin_config.rb

@@ -26,6 +26,8 @@ class ActiveAdmin::Views::Pages::Base
       admins_job_identifier = send(current_user_method).job_identifier
       @body.set_attribute "data-identifier", admins_job_identifier
       @body.set_attribute "data-root-url", "/"
+      @body.set_attribute "data-jobs-url", AdminHelpers.jobs_url
+      @body.set_attribute "data-translations", I18nDictionary.translations.to_json
     end
   end
 end

data/lib/activeadmin_jobs/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminJobs
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_jobs
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Platanus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -232,6 +232,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jquery-ui-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.5
 description: It's a Rails engine that allows you to play nice with Active Job in Active
   Admin providing user feedback
 email:
@@ -245,6 +259,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -256,7 +271,7 @@ files:
 - app/assets/images/activeadmin_jobs/.keep
 - app/assets/javascripts/activeadmin_jobs/application.js
 - app/assets/javascripts/activeadmin_jobs/base.js
-- app/assets/javascripts/activeadmin_jobs/growl_setup.js.erb
+- app/assets/javascripts/activeadmin_jobs/growl_setup.js
 - app/assets/stylesheets/activeadmin_jobs/application.css
 - app/assets/stylesheets/activeadmin_jobs/base.scss
 - app/controllers/activeadmin_jobs/application_controller.rb
@@ -303,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Gem that allows you to play nice with Active Job in Active Admin providing