que-web 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 672166ccf3fefe35330d64b781e67e4e1068076e
-  data.tar.gz: 7f7ef4053bc098ef284f86784945924bae920372
+  metadata.gz: 70f3a29ddd4f76bdfb0a2aa84d663874366639a4
+  data.tar.gz: e6887380327c8e50a8a4e3aeb682d4d7408c81f9
 SHA512:
-  metadata.gz: 5bdf1e394129ed1091206499b50e976894786e59a7cc064b6e2d54e84143ff2c9dd520942809dc823fd4d39a60420c8b1340a3c9288e5a705b68bde6797c601f
-  data.tar.gz: 42784229848c993f5c38ca09e2dc9a057c35a4a348aaccab84202edcff43a89ebde97448bb67901616a8753b80951a41e29916fb5d1dc1c3b8aa3a085997236a
+  metadata.gz: 90343c4a7898f6085ae331a3062006032ff299704431f6e255818b9325423c54902df5f52191574bd840617953e1b6a21477083ca7c47f8922c6cd82403e6025
+  data.tar.gz: e2b62a44728afe7c43c3d5f14fc873e3c090c792de35a589d7c1dc57df98b2bee8808bd61b88b6d4ed26cf9f4cf8a7ff25597e420fb10a0a3a78e9040a4698e1

data/lib/que/web.rb

@@ -140,21 +140,6 @@ module Que
       Pager.new(page, PAGE_SIZE, record_count)
     end
 
-    def search
-      return '%' unless search_param.present?
-      "%#{search_param}%"
-    end
-
-    def search_running(jobs)
-      return jobs unless search_param.present?
-      jobs.select { |job| job.job_class.include? search_param }
-    end
-
-    def search_param
-      return unless params['search'].present?
-      params['search'].gsub(/[^0-9A-Za-z:]/, '')
-    end
-
     after { session[FLASH_KEY] = {} if @sweep_flash }
 
     module Helpers
@@ -167,10 +152,26 @@ module Que
       end
 
       def path_with_search(path)
-        path += "?search=#{search_param}" if search_param.present?
+        path += "?search=#{search_param}" if search_param
         path
       end
 
+      def search
+        return '%' unless search_param
+        "%#{search_param}%"
+      end
+
+      def search_running(jobs)
+        return jobs unless search_param
+        jobs.select { |job| job.fetch('job_class').include? search_param }
+      end
+
+      def search_param
+        sanitised = (params['search'] || '').gsub(/[^0-9a-z:]i/, '')
+        return if sanitised.empty?
+        sanitised
+      end
+
       def active_class(pattern)
         if request.path.match pattern
           "active"

data/que-web.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "que-web"
-  spec.version       = "0.7.1"
+  spec.version       = "0.7.2"
   spec.authors       = ["Jason Staten"]
   spec.email         = ["jstaten07@gmail.com"]
   spec.summary       = %q{A web interface for the que queue}

data/spec/web_spec.rb

@@ -1,8 +1,18 @@
 require 'spec_helper'
 
 describe Que::Web::Helpers do
+  let(:search) { '' }
+  let(:params) { { 'search' => search } }
+
   subject do
-    Class.new { include Que::Web::Helpers }.new
+    # Capture the params into an ivar so the params method block below captures it
+    params_to_use = params
+
+    Class.new do
+      include Que::Web::Helpers
+
+      define_method(:params) { params_to_use }
+    end.new
   end
 
   def error_job(last_error)
@@ -22,4 +32,44 @@ describe Que::Web::Helpers do
       subject.format_error(error_job('')).must_equal ''
     end
   end
+
+  describe '#search_running' do
+    let(:jobs) do
+      [
+        { 'job_class' => 'JobClassA' },
+        { 'job_class' => 'JobClassB' },
+        { 'job_class' => 'JobClassA2' },
+        { 'job_class' => 'JobClassC' }
+      ]
+    end
+
+    describe 'when the search param is not supplied' do
+      let(:params) { {} }
+
+      it 'returns all the jobs' do
+        subject.search_running(jobs).must_equal(jobs)
+      end
+    end
+
+    describe 'when the search param is blank' do
+      let(:search) { '' }
+
+      it 'returns all the jobs' do
+        subject.search_running(jobs).must_equal(jobs)
+      end
+    end
+
+    describe 'when the search param is present' do
+      let(:search) { 'A' }
+
+      it 'returns only the jobs whose class matches the search' do
+        subject.search_running(jobs).must_equal(
+          [
+            { 'job_class' => 'JobClassA' },
+            { 'job_class' => 'JobClassA2' }
+          ]
+        )
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: que-web
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Jason Staten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-02 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: que