rspec-que 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6a12c44d1b6bad7658728316b396cb78200148d
-  data.tar.gz: 189ad9ef1800b8af4c2d0d3507e91b8f2f7885fa
+  metadata.gz: 9ae7da24696fff896e0e4a085e3722eace94a83b
+  data.tar.gz: b86fcdab6635157b959931ab95d53d46bdeba98f
 SHA512:
-  metadata.gz: 8a93dd08c6c065956a0bfafcc7652c45752dbe9e07b59f5b7379b386e1265b3621232c81bc438fb001ca3cd64aba14b53f21fc2933f59615b8b954940f110a91
-  data.tar.gz: caa89b6ce6ba4fbef248ce61ac66ade1ef0b74fe007c3ea813ff8c2579907a3dedd4e6cc78b8a287f67a778d760fdb1dfd885b113404a5634fcb599042216178
+  metadata.gz: a97cad4ef4a5229b2f8308fe48deef30b64bb7d51798f9e27827214111ed575749ea409d2813148bf27c15360cdca11e8e20275d8dbf8382a4034888699663c7
+  data.tar.gz: a5476696af273b6852ecd8dbfbd5142d91ac9d61e2f23c6052ba34546e6f41ea608762f446c00e682d2fd91b24f5e8da9f06f90dd4b733924ca4784d606fa464

data/lib/rspec/que/queue_up.rb

@@ -1,15 +1,25 @@
 require 'rspec/mocks/argument_list_matcher'
 require 'time'
+require 'forwardable'
+
+require_relative 'queue_up/queued_something'
+require_relative 'queue_up/queued_priority'
+require_relative 'queue_up/queued_class'
+require_relative 'queue_up/queued_args'
+require_relative 'queue_up/queued_at'
+require_relative 'queue_up/queue_count'
 
 module RSpec
   module Que
     module Matchers
       class QueueUp
         include RSpec::Matchers::Composable
+        extend Forwardable
 
         def initialize(job_class = nil)
           @matchers = [QueuedSomething.new]
           @matchers << QueuedClass.new(job_class) if job_class
+          @count_matcher = QueueCount.new(self, QueueCount::EXACTLY, 1)
           @job_class = job_class
           @stages = []
         end
@@ -23,7 +33,10 @@ module RSpec
             @stages << { matcher: matcher, candidates: @matched_jobs.dup }
             @matched_jobs.delete_if { |job| !matcher.matches?(job) }
           end
-          @matched_jobs.any?
+
+          @stages << { matcher: @count_matcher, candidates: @matched_jobs.dup }
+
+          @count_matcher.matches?(@matched_jobs.count)
         end
 
         def with(*args)
@@ -41,6 +54,13 @@ module RSpec
           self
         end
 
+        def_delegators :@count_matcher,
+                       :exactly,
+                       :at_least,
+                       :at_most,
+                       :once,
+                       :twice
+
         def failure_message
           # last stage to have any candidate jobs
           failed_stage = @stages.reject do |s|
@@ -76,118 +96,16 @@ module RSpec
         end
 
         def job_description
-          @matchers.map(&:desc).join(" ")
+          if @count_matcher.default?
+            @matchers.map(&:desc).join(" ")
+          else
+            [*@matchers, @count_matcher].map(&:desc).join(" ")
+          end
         end
 
         def format_job(job)
           "#{job[:job_class]}[" + job[:args].join(", ") + "]"
         end
-
-        class QueuedSomething
-          def matches?(_job)
-            true
-          end
-
-          def desc
-            "a job"
-          end
-
-          def failed_msg(_last_found)
-            "nothing"
-          end
-        end
-
-        class QueuedClass
-          attr_reader :job_class
-          def initialize(job_class)
-            @job_class = job_class
-          end
-
-          def matches?(job)
-            job[:job_class] == job_class.to_s
-          end
-
-          def desc
-            "of class #{job_class}"
-          end
-
-          def failed_msg(candidates)
-            classes = candidates.map { |c| c[:job_class] }
-            if classes.length == 1
-              classes.first
-            else
-              "#{classes.length} jobs of class [#{classes.join(', ')}]"
-            end
-          end
-        end
-
-        class QueuedArgs
-          def initialize(args)
-            @args = args
-            @argument_list_matcher = RSpec::Mocks::ArgumentListMatcher.new(*args)
-          end
-
-          def matches?(job)
-            @argument_list_matcher.args_match?(*job[:args])
-          end
-
-          def desc
-            "with args #{@args}"
-          end
-
-          def failed_msg(candidates)
-            if candidates.length == 1
-              "job enqueued with #{candidates.first[:args]}"
-            else
-              "#{candidates.length} jobs with args: " +
-                candidates.map { |j| j[:args] }.to_s
-            end
-          end
-        end
-
-        class QueuedAt
-          def initialize(the_time)
-            @time = the_time
-          end
-
-          def matches?(job)
-            job[:run_at] == @time
-          end
-
-          def desc
-            "at #{@time}"
-          end
-
-          def failed_msg(candidates)
-            if candidates.length == 1
-              "job at #{candidates.first[:run_at]}"
-            else
-              "jobs at #{candidates.map { |c| c[:run_at] }}"
-            end
-          end
-        end
-
-        class QueuedPriority
-          def initialize(priority)
-            @priority = priority
-          end
-
-          def matches?(job)
-            job[:priority] == @priority
-          end
-
-          def desc
-            "of priority #{@priority}"
-          end
-
-          def failed_msg(candidates)
-            if candidates.length == 1
-              "job of priority #{candidates.first[:priority]}"
-            else
-              "jobs of priority #{candidates.map { |c| c[:priority] }}"
-            end
-          end
-        end
       end
     end
   end

data/lib/rspec/que/queue_up/queue_count.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module RSpec
+  module Que
+    module Matchers
+      class QueueUp
+        class QueueCount
+          EXACTLY = :==
+          AT_LEAST = :>=
+          AT_MOST = :<=
+
+          def initialize(parent_matcher, comparator, number)
+            @number = number
+            @comparator = comparator
+            @parent = parent_matcher
+          end
+
+          def once
+            exactly(1)
+            @parent
+          end
+
+          def twice
+            exactly(2)
+            @parent
+          end
+
+          def exactly(n)
+            set(EXACTLY, n)
+          end
+
+          def at_least(n)
+            set(AT_LEAST, n)
+          end
+
+          def at_most(n)
+            set(AT_MOST, n)
+          end
+
+          def times
+            @parent
+          end
+
+          def matches?(actual_number)
+            actual_number.send(@comparator, @number)
+          end
+
+          def desc
+            case @comparator
+            when EXACTLY then "exactly #{@number} times"
+            when AT_LEAST then "at least #{@number} times"
+            when AT_MOST then "at most #{@number} times"
+            end
+          end
+
+          def failed_msg(candidates)
+            "#{candidates.length} jobs"
+          end
+
+          def default?
+            @comparator == EXACTLY && @number == 1
+          end
+
+          private
+
+          def set(comparator, number)
+            @comparator = comparator
+            @number = number
+            self
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec/que/queue_up/queued_args.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module RSpec
+  module Que
+    module Matchers
+      class QueueUp
+        class QueuedArgs
+          def initialize(args)
+            @args = args
+            @argument_list_matcher = RSpec::Mocks::ArgumentListMatcher.new(*args)
+          end
+
+          def matches?(job)
+            @argument_list_matcher.args_match?(*job[:args])
+          end
+
+          def desc
+            "with args #{@args}"
+          end
+
+          def failed_msg(candidates)
+            if candidates.length == 1
+              "job enqueued with #{candidates.first[:args]}"
+            else
+              "#{candidates.length} jobs with args: " +
+                candidates.map { |j| j[:args] }.to_s
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec/que/queue_up/queued_at.rb

@@ -0,0 +1,29 @@
+module RSpec
+  module Que
+    module Matchers
+      class QueueUp
+        class QueuedAt
+          def initialize(the_time)
+            @time = the_time
+          end
+
+          def matches?(job)
+            job[:run_at] == @time
+          end
+
+          def desc
+            "at #{@time}"
+          end
+
+          def failed_msg(candidates)
+            if candidates.length == 1
+              "job at #{candidates.first[:run_at]}"
+            else
+              "jobs at #{candidates.map { |c| c[:run_at] }}"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec/que/queue_up/queued_class.rb

@@ -0,0 +1,31 @@
+module RSpec
+  module Que
+    module Matchers
+      class QueueUp
+        class QueuedClass
+          attr_reader :job_class
+          def initialize(job_class)
+            @job_class = job_class
+          end
+
+          def matches?(job)
+            job[:job_class] == job_class.to_s
+          end
+
+          def desc
+            "of class #{job_class}"
+          end
+
+          def failed_msg(candidates)
+            classes = candidates.map { |c| c[:job_class] }
+            if classes.length == 1
+              classes.first
+            else
+              "#{classes.length} jobs of class [#{classes.join(', ')}]"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec/que/queue_up/queued_priority.rb

@@ -0,0 +1,29 @@
+module RSpec
+  module Que
+    module Matchers
+      class QueueUp
+        class QueuedPriority
+          def initialize(priority)
+            @priority = priority
+          end
+
+          def matches?(job)
+            job[:priority] == @priority
+          end
+
+          def desc
+            "of priority #{@priority}"
+          end
+
+          def failed_msg(candidates)
+            if candidates.length == 1
+              "job of priority #{candidates.first[:priority]}"
+            else
+              "jobs of priority #{candidates.map { |c| c[:priority] }}"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec/que/queue_up/queued_something.rb

@@ -0,0 +1,22 @@
+module RSpec
+  module Que
+    module Matchers
+      class QueueUp
+        class QueuedSomething
+          def matches?(_job)
+            true
+          end
+
+          def desc
+            "a job"
+          end
+
+          def failed_msg(_last_found)
+            "nothing"
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/rspec/que/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Que
-    VERSION = '1.1.0'.freeze
+    VERSION = '2.0.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-que
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - GoCardless Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
@@ -79,6 +79,12 @@ files:
 - README.md
 - lib/rspec/que.rb
 - lib/rspec/que/queue_up.rb
+- lib/rspec/que/queue_up/queue_count.rb
+- lib/rspec/que/queue_up/queued_args.rb
+- lib/rspec/que/queue_up/queued_at.rb
+- lib/rspec/que/queue_up/queued_class.rb
+- lib/rspec/que/queue_up/queued_priority.rb
+- lib/rspec/que/queue_up/queued_something.rb
 - lib/rspec/que/version.rb
 - rspec-que.gemspec
 homepage: http://github.com/gocardless/rspec-que
@@ -101,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: RSpec matchers to test Que