Merge pull request #48 from QueueClassic/get-ready-for-qc4

magni- · web-flow · commit a75a14a53dfd · 2019-10-25T09:56:41.000+09:00
Get ready for QC 4
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,11 @@
 language: ruby
+services:
+  - postgresql
 before_script:
-  - "bundle exec rake db:create"
+  - psql -c 'create database dummy_qc_admin_test;' -U postgres
   - "bundle exec rake db:schema:load RAILS_ENV=test"
+  - "bundle exec rake db:migrate RAILS_ENV=test"
 rvm:
-  - 2.4.1
-  - 2.3.4
-  - 2.2.7
-addons:
-  postgresql: "9.3"
+  - 2.6.5
+  - 2.5.7
+  - 2.4.9
diff --git a/Gemfile b/Gemfile
@@ -10,6 +10,7 @@ gem "jquery-rails"
 gem "rspec-rails"
 
 group :development, :test do
+  gem 'rails-controller-testing'
   gem "pry"
   gem "pry-remote"
 end
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 An admin interface for the [queue_classic](https://github.com/QueueClassic/queue_classic) gem.
 
-**IMPORTANT**: this branch is for queue_classic 3.1. Support for queue_classic-later has been removed and replaced by queue_classic 3.1's implementation of scheduling instead.  See the [queueclassic-2-support](https://github.com/QueueClassic/queue_classic_admin/tree/queueclassic-2-support) and [queueclassic-3-support](https://github.com/QueueClassic/queue_classic_admin/tree/queueclassic-3-support) branches for prior version support.
+**IMPORTANT**: this branch is for queue_classic 4.0. Support for queue_classic-later has been removed and replaced by queue_classic 3.1's implementation of scheduling instead.  See the [queueclassic-2-support](https://github.com/QueueClassic/queue_classic_admin/tree/queueclassic-2-support) and [queueclassic-3-support](https://github.com/QueueClassic/queue_classic_admin/tree/queueclassic-3-support) branches for prior version support.
 
 ![qc admin](https://f.cloud.github.com/assets/148622/865030/9b1b2610-f62e-11e2-8908-8c271bfe0f6c.png)
 
diff --git a/app/controllers/queue_classic_admin/queue_classic_jobs_controller.rb b/app/controllers/queue_classic_admin/queue_classic_jobs_controller.rb
@@ -10,7 +10,7 @@ def index
 
     def destroy
       @queue_classic_job.destroy
-      redirect_to :back
+      redirect_back fallback_location: {action: :index}
     end
 
     def destroy_all
@@ -33,7 +33,7 @@ def bulk_custom_action
     def unlock
       @queue_classic_job.locked_at = nil
       @queue_classic_job.save
-      redirect_to :back
+      redirect_back fallback_location: {action: :index}
     end
 
     def show
@@ -44,7 +44,7 @@ def show
     def custom
       custom_action = QueueClassicAdmin.custom_actions[params[:custom_action]]
       custom_action.action.call(@queue_classic_job)
-      redirect_to :back
+      redirect_back fallback_location: {action: :index}
     end
 
     private
diff --git a/app/models/queue_classic_admin/job_common.rb b/app/models/queue_classic_admin/job_common.rb
@@ -30,7 +30,8 @@ def search(query)
       end
 
       def args_is_json?
-        self.column_types["args"].type == :json
+        type = self.type_for_attribute('args').type
+        type.in?(%i(json jsonb))
       end
     end
 
diff --git a/app/views/queue_classic_admin/shared/_job_list.html.erb b/app/views/queue_classic_admin/shared/_job_list.html.erb
@@ -1,5 +1,5 @@
 <div id="search">
-  <%= form_tag(url_for(params), method: 'GET') do %>
+  <%= form_tag(url_for(params.permit!), method: 'GET') do %>
     <%= hidden_field_tag :q_name, params[:q_name] %>
     <input class="search-query" name="search" placeholder="Search jobs" value="<%= params[:search] %>"/>
   <% end %>
diff --git a/db/migrate/20130626182618_add_id_to_later.rb b/db/migrate/20130626182618_add_id_to_later.rb
@@ -1,4 +1,4 @@
-class AddIdToLater < ActiveRecord::Migration
+class AddIdToLater < ActiveRecord::Migration[4.2]
   def change
     if ActiveRecord::Base.connection.table_exists?(:queue_classic_later_jobs)
       add_column :queue_classic_later_jobs, :id, :primary_key
diff --git a/db/migrate/20130627175128_add_created_column.rb b/db/migrate/20130627175128_add_created_column.rb
@@ -1,4 +1,4 @@
-class AddCreatedColumn < ActiveRecord::Migration
+class AddCreatedColumn < ActiveRecord::Migration[4.2]
   def up
     %w(queue_classic_later_jobs).each do |table|
       if ActiveRecord::Base.connection.table_exists?(table)
diff --git a/lib/queue_classic_admin/version.rb b/lib/queue_classic_admin/version.rb
@@ -1,3 +1,3 @@
 module QueueClassicAdmin
-  VERSION = "1.0.0.beta2"
+  VERSION = "4.0.0.alpha1"
 end
diff --git a/queue_classic_admin.gemspec b/queue_classic_admin.gemspec
@@ -17,11 +17,11 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib,vendor}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.md"]
   s.test_files = Dir["test/**/*"]
 
-  s.add_dependency "rails", ">= 4.0.9"
-  s.add_dependency "queue_classic", "~> 3.0"
-  s.add_dependency "pg"
-  s.add_dependency "will_paginate", ">= 3.0.0"
-  s.add_dependency "will_paginate-bootstrap", ">= 0.2.0"
+  s.add_runtime_dependency "rails", ">= 5.0.0", "< 6.0"
+  s.add_runtime_dependency "queue_classic", "4.0.0.pre.alpha1"
+  s.add_runtime_dependency "pg"
+  s.add_runtime_dependency "will_paginate", ">= 3.0.0"
+  s.add_runtime_dependency "will_paginate-bootstrap", ">= 0.2.0"
 
   s.add_development_dependency "sqlite3"
 end
diff --git a/spec/controllers/queue_classic_admin/queue_classic_admin/queue_classic_jobs_controller_spec.rb b/spec/controllers/queue_classic_admin/queue_classic_admin/queue_classic_jobs_controller_spec.rb
@@ -9,40 +9,40 @@ module QueueClassicAdmin
       @request.env['HTTP_REFERER'] = 'http://example.org'
     end
 
-    it "should get index" do
-      get :index, use_route: "queue_classic_admin"
-      response.should be_success
-      assigns(:queue_classic_jobs).should_not be_nil
+    it "gets index" do
+      get :index, params: { use_route: "queue_classic_admin" }
+      expect(response).to be_successful
+      expect(assigns(:queue_classic_jobs)).to_not be_nil
     end
 
     context "#destroy" do
-      it "should destroy queue_classic_job" do
+      it "destroys queue_classic_job" do
         queue_classic_job
         expect do
-          delete :destroy, id: queue_classic_job.id, use_route: "queue_classic_admin"
+          delete :destroy, params: { id: queue_classic_job.id, use_route: "queue_classic_admin" }
         end.to change(QueueClassicJob, :count).by(-1)
 
         expect(QueueClassicJob.where(id: scheduled_job.id).count).to eq 1
-        response.code.to_i.should == 302
+        expect(response.code.to_i).to eq(302)
       end
     end
 
     context "#destroy_all" do
-      it "should destroy everything that is not scheduled" do
-        QueueClassicJob.ready.count.should == 1
-        QueueClassicJob.scheduled.count.should == 1
-        delete :destroy_all, use_route: "queue_classic_admin"
-        QueueClassicJob.ready.count.should == 0
-        QueueClassicJob.scheduled.count.should == 1
+      it "destroys everything that is not scheduled" do
+        expect(QueueClassicJob.ready.count).to eq(1)
+        expect(QueueClassicJob.scheduled.count).to eq(1)
+        delete :destroy_all, params: { use_route: "queue_classic_admin" }
+        expect(QueueClassicJob.ready.count).to eq(0)
+        expect(QueueClassicJob.scheduled.count).to eq(1)
       end
 
-      it "should destroy all in the filtered queue" do
+      it "destroys all in the filtered queue" do
         QueueClassicJob.create! q_name: 'foo', method: 'Time.now', args: []
         QueueClassicJob.create! q_name: 'bar', method: 'Time.now', args: []
 
-        delete :destroy_all, use_route: "queue_classic_admin", q_name: 'foo'
-        QueueClassicJob.where(q_name: 'foo').count.should == 0
-        QueueClassicJob.where(q_name: 'bar').count.should == 1
+        delete :destroy_all, params: { use_route: "queue_classic_admin", q_name: 'foo' }
+        expect(QueueClassicJob.where(q_name: 'foo').count).to eq(0)
+        expect(QueueClassicJob.where(q_name: 'bar').count).to eq(1)
       end
     end
 
@@ -61,17 +61,17 @@ def lock_job job, lock_time
         lock_job(QueueClassicJob.create!(q_name: 'foo', method: 'Time.now', args: []), in_progress_time)
       end
 
-      it "should unlock everything not currently running" do
-        delete :unlock_all, use_route: "queue_classic_admin"
-        QueueClassicJob.where(locked_at: nil).count.should == 4
-        QueueClassicJob.where(locked_at: in_progress_time).count.should == 1
+      it "unlocks everything not currently running" do
+        delete :unlock_all, params: { use_route: "queue_classic_admin" }
+        expect(QueueClassicJob.where(locked_at: nil).count).to eq(4)
+        expect(QueueClassicJob.where(locked_at: in_progress_time).count).to eq(1)
       end
 
-      it "should unlock all not currently running in the filtered queue" do
-        delete :unlock_all, use_route: "queue_classic_admin", q_name: 'foo'
-        QueueClassicJob.where(q_name: 'foo').where('locked_at IS NULL').count.should == 1
-        QueueClassicJob.where(q_name: 'foo', locked_at: in_progress_time).count.should == 1
-        QueueClassicJob.where(q_name: 'bar', locked_at: broken_time).count.should == 1
+      it "unlocks all not currently running in the filtered queue" do
+        delete :unlock_all, params: { use_route: "queue_classic_admin", q_name: 'foo' }
+        expect(QueueClassicJob.where(q_name: 'foo').where('locked_at IS NULL').count).to eq(1)
+        expect(QueueClassicJob.where(q_name: 'foo', locked_at: in_progress_time).count).to eq(1)
+        expect(QueueClassicJob.where(q_name: 'bar', locked_at: broken_time).count).to eq(1)
       end
     end
 
@@ -81,7 +81,7 @@ def lock_job job, lock_time
         QueueClassicAdmin.add_custom_bulk_action("Test") { |jobs| custom_jobs = jobs }
         job = queue_classic_job
 
-        post :bulk_custom_action, use_route: "queue_classic_admin", custom_action: "test"
+        post :bulk_custom_action, params: { use_route: "queue_classic_admin", custom_action: "test" }
 
         expect(custom_jobs).to_not be_empty
       end
@@ -93,8 +93,8 @@ def lock_job job, lock_time
         locked_job = queue_classic_job
         locked_job.locked_at = Time.now
         locked_job.save!
-        post :unlock, use_route: "queue_classic_admin", id: locked_job
-        locked_job.reload.locked_at.should be_nil
+        post :unlock, params: { use_route: "queue_classic_admin", id: locked_job }
+        expect(locked_job.reload.locked_at).to be_nil
       end
     end
 
@@ -104,7 +104,7 @@ def lock_job job, lock_time
         QueueClassicAdmin.add_custom_action("Test") { |job| custom_job = job }
         job = queue_classic_job
 
-        post :custom, use_route: "queue_classic_admin", id: job, custom_action: "test"
+        post :custom, params: { use_route: "queue_classic_admin", id: job, custom_action: "test" }
 
         expect(custom_job).to_not be_nil
         expect(custom_job).to eql(job)
diff --git a/spec/controllers/queue_classic_admin/queue_classic_admin/queue_classic_scheduled_jobs_controller_spec.rb b/spec/controllers/queue_classic_admin/queue_classic_admin/queue_classic_scheduled_jobs_controller_spec.rb
@@ -5,38 +5,38 @@ module QueueClassicAdmin
     let!(:queue_classic_job) { create_job_qc_job }
     let!(:scheduled_job) { create_job_qc_job scheduled_at: 1.minute.from_now }
 
-    it "should get index" do
-      get :index, use_route: "queue_classic_admin"
-      response.should be_success
-      assigns(:queue_classic_jobs).should_not be_nil
+    it "gets index" do
+      get :index, params: { use_route: "queue_classic_admin" }
+      expect(response).to be_successful
+      expect(assigns(:queue_classic_jobs)).to_not be_nil
     end
 
-    it "should destroy queue_classic_job" do
+    it "destroys queue_classic_job" do
       expect do
-        delete :destroy, id: queue_classic_job.id, use_route: "queue_classic_admin"
+        delete :destroy, params: { id: queue_classic_job.id, use_route: "queue_classic_admin" }
       end.to change(QueueClassicJob, :count).by(-1)
 
-      response.code.to_i.should == 302
+      expect(response.code.to_i).to eq(302)
     end
 
     context "#destroy_all" do
-      it "should destroy only scheduled jobs" do
-        QueueClassicJob.ready.count.should == 1
-        QueueClassicJob.scheduled.count.should == 1
-        delete :destroy_all, use_route: "queue_classic_admin"
-        QueueClassicJob.ready.count.should == 1
-        QueueClassicJob.scheduled.count.should == 0
+      it "destroys only scheduled jobs" do
+        expect(QueueClassicJob.ready.count).to eq(1)
+        expect(QueueClassicJob.scheduled.count).to eq(1)
+        delete :destroy_all, params: { use_route: "queue_classic_admin" }
+        expect(QueueClassicJob.ready.count).to eq(1)
+        expect(QueueClassicJob.scheduled.count).to eq(0)
       end
 
-      it "should destroy the contents of the selected queue but only scheduled jobs" do
+      it "destroys the contents of the selected queue but only scheduled jobs" do
         create_job_qc_job q_name: 'foo'
         create_job_qc_job q_name: 'foo', scheduled_at: 1.minute.from_now
         create_job_qc_job q_name: 'bar'
 
 
-        delete :destroy_all, use_route: "queue_classic_admin", q_name: 'foo'
-        QueueClassicJob.where(q_name: 'foo').count.should == 1
-        QueueClassicJob.where(q_name: 'bar').count.should == 1
+        delete :destroy_all, params: { use_route: "queue_classic_admin", q_name: 'foo' }
+        expect(QueueClassicJob.where(q_name: 'foo').count).to eq(1)
+        expect(QueueClassicJob.where(q_name: 'bar').count).to eq(1)
       end
     end
   end
diff --git a/spec/dummy/app/assets/config/manifest.js b/spec/dummy/app/assets/config/manifest.js
@@ -0,0 +1,2 @@
+//= link queue_classic_admin/application.css
+//= link queue_classic_admin/application.js
diff --git a/spec/dummy/config/initializers/qc.rb b/spec/dummy/config/initializers/qc.rb
@@ -1,2 +1,2 @@
 require 'queue_classic'
-QC.default_conn_adapter = QC::ConnAdapter.new(ActiveRecord::Base.connection.raw_connection)
+QC.default_conn_adapter = QC::ConnAdapter.new(active_record_connection_share: true)
diff --git a/spec/dummy/config/initializers/secret_token.rb b/spec/dummy/config/initializers/secret_token.rb
@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = '838575853236b63dfcc84392be46cc916fe629fbf632132f411af1e81c9ad23abc4512c9fc6c1c939932cad5420f0e33d102388bc17802513c0f9dd70cdd59b7'
+Dummy::Application.config.secret_key_base = '57a7a24eb5d93ebbf1268329360bd8e382556abda3b67343f5af3249b9b255222bed1bc5bfe1418c82ecd70d32580f3e595790bee17ece99404c495b534b0c9b'
diff --git a/spec/dummy/db/migrate/20130626005404_setup_q_classic.rb b/spec/dummy/db/migrate/20130626005404_setup_q_classic.rb
@@ -1,4 +1,4 @@
-class SetupQClassic < ActiveRecord::Migration
+class SetupQClassic < ActiveRecord::Migration[4.2]
   def up
     QC::Setup.create
   end
diff --git a/spec/dummy/db/schema.rb b/spec/dummy/db/schema.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -11,22 +10,21 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20130627175128) do
+ActiveRecord::Schema.define(version: 2013_06_27_175128) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
-  create_table "queue_classic_jobs", id: :bigserial, force: :cascade do |t|
-    t.text     "q_name",                         null: false
-    t.text     "method",                         null: false
-    t.json     "args",                           null: false
+  create_table "queue_classic_jobs", force: :cascade do |t|
+    t.text "q_name", null: false
+    t.text "method", null: false
+    t.jsonb "args", null: false
     t.datetime "locked_at"
-    t.integer  "locked_by"
-    t.datetime "created_at",   default: "now()"
-    t.datetime "scheduled_at", default: "now()"
+    t.integer "locked_by"
+    t.datetime "created_at", default: -> { "now()" }
+    t.datetime "scheduled_at", default: -> { "now()" }
+    t.index ["q_name", "id"], name: "idx_qc_on_name_only_unlocked", where: "(locked_at IS NULL)"
+    t.index ["scheduled_at", "id"], name: "idx_qc_on_scheduled_at_only_unlocked", where: "(locked_at IS NULL)"
   end
 
-  add_index "queue_classic_jobs", ["q_name", "id"], name: "idx_qc_on_name_only_unlocked", where: "(locked_at IS NULL)", using: :btree
-  add_index "queue_classic_jobs", ["scheduled_at", "id"], name: "idx_qc_on_scheduled_at_only_unlocked", where: "(locked_at IS NULL)", using: :btree
-
 end
diff --git a/spec/models/queue_classic_admin/queue_classic_job_spec.rb b/spec/models/queue_classic_admin/queue_classic_job_spec.rb
@@ -17,7 +17,7 @@ module QueueClassicAdmin
     end
 
     it "list extra columns" do
-      QueueClassicJob.extra_columns.should == ["test_column"]
+      expect(QueueClassicJob.extra_columns).to contain_exactly('test_column')
     end
 
     describe '.ready' do
@@ -42,9 +42,9 @@ module QueueClassicAdmin
       let!(:job1) { create_job_qc_job method: "thing1foo", q_name: 'high' }
       let!(:job2) { create_job_qc_job method: "thing2bar", q_name: 'low' }
 
-      it "should work" do
+      it "works" do
         results = QueueClassicJob.search "foo"
-        results.should == [job1]
+        expect(results).to contain_exactly(job1)
       end
 
       context "custom extra column" do
@@ -57,9 +57,9 @@ module QueueClassicAdmin
           described_class.searchable_columns.replace(@old_columns)
         end
 
-        it "should support extra columns" do
+        it "supports extra columns" do
           results = described_class.search('low')
-          results.should == [job2]
+          expect(results).to contain_exactly(job2)
         end
       end
     end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -2,7 +2,6 @@
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require 'rspec/rails'
-require 'rspec/autorun'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-class AddIdToLater < ActiveRecord::Migration`
	`1`	`+class AddIdToLater < ActiveRecord::Migration[4.2]`
`2`	`2`	`def change`
`3`	`3`	`if ActiveRecord::Base.connection.table_exists?(:queue_classic_later_jobs)`
`4`	`4`	`add_column :queue_classic_later_jobs, :id, :primary_key`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-class AddCreatedColumn < ActiveRecord::Migration`
	`1`	`+class AddCreatedColumn < ActiveRecord::Migration[4.2]`
`2`	`2`	`def up`
`3`	`3`	`%w(queue_classic_later_jobs).each do \|table\|`
`4`	`4`	`if ActiveRecord::Base.connection.table_exists?(table)`