rspec-subject_call 1.0.1 → 1.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 172687869344e8e7da83eb7ea7af4de7c8606a875cde8d7e329a782d46de45f7
+  data.tar.gz: d31a16a91f755940f51516d054cc8b0bcb70e24deea47b6f0faf4df5c9869b36
+SHA512:
+  metadata.gz: 034f77cf2098c958e7af7ba4f614cec544d9d2e74078411fefc51d9f608f014cf0eb3d976913dc3a95c85a2759afa1767773b83cfa829ba45b117783d24ddbf3
+  data.tar.gz: b4f88c681e6a6fcb3ad81cdff93bc80e713d1db44db6fb77e0cf6f8392c36271e48935dd98c2e9eb69f01a34fa5250496b676d26e94ab942cd74b15786cf00c1

data/Gemfile

@@ -3,3 +3,6 @@ source 'https://rubygems.org'
 #gem 'pry-debugger'
 
 gemspec
+
+gem 'rspec'
+gem 'simplecov', require: false

data/README.md

@@ -19,36 +19,38 @@ make assertions about, such as caching, keeping counts or raising exceptions.
 To illustrate, here is a class that has all these types of methods.
 
 ```ruby
-class A
-  attr :x
+module ReadmeExample
+  class A
+    attr :x
 
-  def initialize(args = {})
-    @b = args[:b]
-    @x = 0
-  end
+    def initialize(b: nil)
+      @x = 0
+      @b = b
+    end
 
-  def query
-    1
-  end
+    def query
+      1
+    end
 
-  def command
-    @x = 1
-  end
+    def command
+      @x = 1
+    end
 
-  def query_command
-    @x = 1
-    1
-  end
+    def query_command
+      @x = 1
+      1
+    end
 
-  def query_command_side_effect
-    @b.command
-    @x = 1
-    1
+    def query_command_side_effect
+      @b.command
+      @x = 1
+      1
+    end
   end
-end
 
-class B
-  def command
+  class B
+    def command
+    end
   end
 end
 ```
@@ -60,21 +62,21 @@ anything elegantly. Right?
 With vanilla RSpec, I might test this method like this:
 
 ```ruby
-describe A do
-  let(:a) { A.new(b: b) }
+describe "ReadmeExample::A, vanilla" do
+  let(:a) { ReadmeExample::A.new(b: b) }
   let(:b) { double('b').as_null_object }
 
   describe '#query_command_side_effect' do
-    it 'should return 1' do
-      a.query_command_side_effect.should == 1
+    it 'is expected to return 1' do
+      expect(a.query_command_side_effect).to eq(1)
     end
 
-    it 'should update x' do
+    it 'is expected to update x' do
       expect { a.query_command_side_effect }.to change(a, :x)
     end
 
-    it 'should call command on b' do
-      b.should_receive(:command).once
+    it 'is expected to call command on b' do
+      expect(b).to receive(:command).once
       a.query_command_side_effect
     end
   end
@@ -91,15 +93,15 @@ This is how I would like to test this tricky method:
 ```ruby
 require 'rspec/subject_call'
 
-describe A do
-  let(:a) { A.new(b: b) }
+describe "ReadmeExample::A, subject_call style" do
+  let(:a) { ReadmeExample::A.new(b: b) }
   let(:b) { double('b').as_null_object }
 
   describe '#query_command_side_effect' do
     subject { a.query_command_side_effect }
-    it { should == 1 }
-    call { should change(a, :x) }
-    call { should meet_expectations { b.should_receive(:command) } }
+    it { is_expected.to eq(1) }
+    call { is_expected.to change(a, :x) }
+    call { is_expected.to meet_expectations { expect(b).to receive(:command) } }
   end
 end
 ```
@@ -111,5 +113,25 @@ already packaged up for you and ready to use.
 
 With this gem, the above example passes.
 
+## Installation
+
+```
+gem install rspec-subject_call
+```
+
+If you prefer, copy and paste this into your `Gemfile` and run `bundle`:
+
+```
+gem 'rspec-subject_call'
+```
+
+Later that day, ensure this line is included somehow before your spec:
+
+```
+require 'rspec/subject_call'
+```
+
+Now you can use your new powers for good or for awesome.
+
 
 [1]: http://en.wikipedia.org/wiki/Command%E2%80%93query_separation "Command-Query Separation"

data/lib/rspec/subject_call.rb

@@ -1,25 +1,21 @@
 require 'rspec/subject_call/matchers/meet_expectations_matcher'
-require 'rspec/subject_call/matchers/return_value_matcher'
 
 module RSpec
   module SubjectCall
     module ExampleGroupClassMethods
-      # Define a method +subject+ for use inside examples, and also a method
-      # +call+ which returns a lambda containing the subject, suitable for use
-      # with matchers that take lambdas.
+      # Define a method +subject+ for use inside example groups which provides
+      # a +call+ method for examples in this group which returns a lambda
+      # containing the subject, suitable for use with matchers that take
+      # lambdas, such as +change+.
       #
       # e.g.
       #
       #    subject { obj.my_method }
       #
-      #    it { should == some_result }
+      #    it { is_expected.to eq(some_result) }
       #
-      #    it 'should change something, should syntax' do
-      #       call.should change{something}
-      #    end
-      #
-      #    it 'should change something, expect syntax' do
-      #       expect(call).to change{something}
+      #    it 'is expected to change something' do
+      #       expect(call).to change { something }
       #    end
       #
       def subject(name=nil, &block)
@@ -36,39 +32,11 @@ module RSpec
         super(name, &block)
       end
 
-      # Allow for syntax similar to +its+:
-      #
-      #   its(:my_method) { should == 1 }
-      #   calling(:my_method) { should change{something} }
-      #
-      def calling(method_name, &block)
-        describe(method_name) do
-          let(:__its_subject) do
-            method_chain = method_name.to_s.split('.')
-            lambda do
-              method_chain.inject(subject) do |inner_subject, attr|
-                inner_subject.send(attr)
-              end
-            end
-          end
-
-          def should(matcher=nil, message=nil)
-            RSpec::Expectations::PositiveExpectationHandler.handle_matcher(__its_subject, matcher, message)
-          end
-
-          def should_not(matcher=nil, message=nil)
-            RSpec::Expectations::NegativeExpectationHandler.handle_matcher(__its_subject, matcher, message)
-          end
-
-          example(&block)
-        end
-      end
-
       # Like +it+ but sets the implicit subject to the lambda you supplied when
       # defining the subject, so that you can use it with matchers that take
       # blocks like +change+:
       #
-      #   call { should change{something} }
+      #   call { is_expected.to change { something } }
       #
       def call(desc=nil, *args, &block)
         # Create a new example, where the subject is set to the subject block,
@@ -76,11 +44,7 @@ module RSpec
         example do
           self.class.class_eval do
             define_method(:subject) do
-              if defined?(@_subject_call)
-                @_subject_call
-              else
-                @_subject_call = call
-              end
+              call # calls define_method(:call) inside def subject above
             end
           end
           instance_eval(&block)

data/lib/rspec/subject_call/matchers/meet_expectations_matcher.rb

@@ -1,15 +1,19 @@
 module RSpec
   module SubjectCall
     module Matchers
-      # A general purpose matcher that inverts order of operations
-      # allowing for one liners involving mock expectations.
+      # A general purpose matcher that inverts order of operations.
+      #
+      # e.g.
+      #
+      #     expect { A.new(b).method_call_with_side_effect }.to meet_expectations { expect(b).to receive(:command) } }
+      #
       class MeetExpectationsMatcher
         def initialize(&block)
-          @should_receives = block
+          @expected_receives = block
         end
 
         def matches?(subject)
-          @should_receives.call # e.g. x.should_receive(:y)
+          @expected_receives.call # e.g. expect(x).to receive(:y)
           subject.call # execute the subject (assumed to be a Proc)
         end
 

data/lib/rspec/subject_call/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module SubjectCall
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

data/rspec-subject_call.gemspec

@@ -4,14 +4,13 @@ Gem::Specification.new do |s|
   s.name                      = 'rspec-subject_call'
   s.version                   = RSpec::SubjectCall::VERSION
   s.platform                  = Gem::Platform::RUBY
+  s.license                   = 'MIT'
   s.authors                   = [ 'Gregory McIntyre' ]
   s.email                     = [ 'greg@gregorymcintyre.com' ]
-  s.homepage                  = 'http://github.com/rails-oceania/rspec-subject_call'
-  s.description               = 'Lets you use the subject in convenient ways with block matchers like "change" and "receive_error"'
+  s.homepage                  = 'http://github.com/puyo/rspec-subject_call'
+  s.description               = 'Use the rspec subject more conveniently'
   s.summary                   = "rspec-subject_call-#{s.version}"
-  s.required_rubygems_version = '> 1.3.6'
 
-  s.files = `git ls-files`.split($\)
-  s.executables = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
+  s.files = `git ls-files`.split($\) - ['.gitignore']
   s.require_path = 'lib'
 end

data/spec/readme_example_spec.rb

@@ -1,51 +1,55 @@
-class A
-  attr :x
+require 'spec_helper'
 
-  def initialize(args = {})
-    @b = args[:b]
-    @x = 0
-  end
+module ReadmeExample
+  class A
+    attr :x
 
-  def query
-    1
-  end
+    def initialize(b: nil)
+      @x = 0
+      @b = b
+    end
 
-  def command
-    @x = 1
-  end
+    def query
+      1
+    end
 
-  def query_command
-    @x = 1
-    1
-  end
+    def command
+      @x = 1
+    end
+
+    def query_command
+      @x = 1
+      1
+    end
 
-  def query_command_side_effect
-    @b.command
-    @x = 1
-    1
+    def query_command_side_effect
+      @b.command
+      @x = 1
+      1
+    end
   end
-end
 
-class B
-  def command
+  class B
+    def command
+    end
   end
 end
 
-describe A do
-  let(:a) { A.new(b: b) }
+describe "ReadmeExample::A, vanilla" do
+  let(:a) { ReadmeExample::A.new(b: b) }
   let(:b) { double('b').as_null_object }
 
   describe '#query_command_side_effect' do
-    it 'should return 1' do
-      a.query_command_side_effect.should == 1
+    it 'is expected to return 1' do
+      expect(a.query_command_side_effect).to eq(1)
     end
 
-    it 'should update x' do
+    it 'is expected to update x' do
       expect { a.query_command_side_effect }.to change(a, :x)
     end
 
-    it 'should call command on b' do
-      b.should_receive(:command).once
+    it 'is expected to call command on b' do
+      expect(b).to receive(:command).once
       a.query_command_side_effect
     end
   end
@@ -53,14 +57,14 @@ end
 
 require 'rspec/subject_call'
 
-describe A do
-  let(:a) { A.new(b: b) }
+describe "ReadmeExample::A, subject_call style" do
+  let(:a) { ReadmeExample::A.new(b: b) }
   let(:b) { double('b').as_null_object }
 
   describe '#query_command_side_effect' do
     subject { a.query_command_side_effect }
-    it { should == 1 }
-    call { should change(a, :x) }
-    call { should meet_expectations { b.should_receive(:command) } }
+    it { is_expected.to eq(1) }
+    call { is_expected.to change(a, :x) }
+    call { is_expected.to meet_expectations { expect(b).to receive(:command) } }
   end
 end

data/spec/rspec_subject_call_spec.rb

@@ -1,33 +1,37 @@
-class A
-  attr_reader :counter
+require 'spec_helper'
 
-  def initialize(args = {})
-    @b = args[:b]
-    @counter = 0
-  end
+module RSpecSubjectCallSpec
+  class A
+    attr_reader :counter
 
-  def query
-    1
-  end
+    def initialize(args = {})
+      @b = args[:b]
+      @counter = 0
+    end
 
-  def command
-    @b.command
-  end
+    def query
+      1
+    end
 
-  def query_command
-    @b.command
-    1
-  end
+    def command
+      @b.command
+    end
 
-  def query_command_side_effect
-    @b.command
-    @counter += 1
-    1
+    def query_command
+      @b.command
+      1
+    end
+
+    def query_command_side_effect
+      @b.command
+      @counter += 1
+      1
+    end
   end
-end
 
-class B
-  def command
+  class B
+    def command
+    end
   end
 end
 
@@ -35,45 +39,45 @@ end
 
 require 'rspec/subject_call'
 
-describe A do
-  subject(:a) { A.new(b: b) }
+describe RSpecSubjectCallSpec::A do
+  subject(:a) { RSpecSubjectCallSpec::A.new(b: b) }
   let(:b) { double('b').as_null_object }
 
   describe '#query' do
-    it 'should return 1' do
-      a.query.should == 1
+    it 'is expected to return 1' do
+      expect(a.query).to eq(1)
     end
   end
 
   describe '#command' do
-    it 'should call command on b' do
-      b.should_receive(:command).once
+    it 'is expected to call command on b' do
+      expect(b).to receive(:command).once
       a.command
     end
   end
 
   describe '#query_command' do
-    it 'should return 1' do
-      a.query_command.should == 1
+    it 'is expected to return 1' do
+      expect(a.query_command).to eq(1)
     end
 
-    it 'should call command on b' do
-      b.should_receive(:command).once
+    it 'is expected to call command on b' do
+      expect(b).to receive(:command).once
       a.query_command
     end
   end
 
   describe '#query_command_side_effect - vanilla' do
-    it 'should return 1' do
-      a.query_command_side_effect.should == 1
+    it 'is expected to return 1' do
+      expect(a.query_command_side_effect).to eq(1)
     end
 
-    it 'should call command on b' do
-      b.should_receive(:command).once
+    it 'is expected to call command on b' do
+      expect(b).to receive(:command).once
       a.query_command_side_effect
     end
 
-    it 'should increment counter' do
+    it 'is expected to increment counter' do
       expect { a.query_command_side_effect }.to change(a, :counter).by(1)
     end
   end
@@ -81,46 +85,39 @@ describe A do
   describe '#query_command_side_effect - subject_call with custom doc strings' do
     subject { a.query_command_side_effect }
 
-    it 'should return 1' do
-      subject.should == 1
+    it 'is expected to return 1' do
+      expect(subject).to eq(1)
     end
 
-    it 'should call b.command' do
-      b.should_receive(:command)
+    it 'is expected to call b.command' do
+      expect(b).to receive(:command).once
       call_subject
     end
 
-    it 'should increment counter by 1' do
-      call { should change(a, :counter).by(1) }
+    it 'is expected to increment counter by 1' do
+      call { is_expected.to change(a, :counter).by(1) }
     end
   end
 
   describe '#query_command_side_effect - subject_call with one liners' do
     subject { a.query_command_side_effect }
-    it { should == 1 }
-    call { should change(a, :counter).by(1) }
-    call { should meet_expectations { b.should_receive(:command) } }
-  end
-
-  describe '#query_command_side_effect - subject_call, its style' do
-    subject { a }
-    its(:query_command_side_effect) { should == 1 }
-    calling(:query_command_side_effect) { should change(a, :counter).by(1) }
-    calling(:query_command_side_effect) { should meet_expectations { b.should_receive(:command) } }
+    it { is_expected.to eq(1) }
+    call { is_expected.to change(a, :counter).by(1) }
+    call { is_expected.to meet_expectations { expect(b).to receive(:command).once } }
   end
 
   describe '#query_command_side_effect - expect syntax' do
     subject { a.query_command_side_effect }
 
-    it 'should return 1' do
+    it 'is expected to return 1' do
       expect(subject).to eq(1)
     end
 
-    it 'should call b.command' do
-      expect(call).to meet_expectations { b.should_receive(:command) }
+    it 'is expected to call b.command' do
+      expect(call).to meet_expectations { expect(b).to receive(:command).once }
     end
 
-    it 'should increment counter by 1' do
+    it 'is expected to increment counter by 1' do
       expect(call).to change(a, :counter).by(1)
     end
   end

data/spec/spec_helper.rb

@@ -0,0 +1,3 @@
+require 'simplecov'
+
+SimpleCov.start

metadata

@@ -1,58 +1,53 @@
 --- !ruby/object:Gem::Specification
 name: rspec-subject_call
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.0.2
 platform: ruby
 authors:
 - Gregory McIntyre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-04 00:00:00.000000000 Z
+date: 2020-04-27 00:00:00.000000000 Z
 dependencies: []
-description: Lets you use the subject in convenient ways with block matchers like
-  "change" and "receive_error"
+description: Use the rspec subject more conveniently
 email:
 - greg@gregorymcintyre.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .rspec
+- ".rspec"
 - Gemfile
-- Gemfile.lock
 - README.md
 - lib/rspec/subject_call.rb
 - lib/rspec/subject_call/matchers/meet_expectations_matcher.rb
-- lib/rspec/subject_call/matchers/return_value_matcher.rb
 - lib/rspec/subject_call/version.rb
 - rspec-subject_call.gemspec
 - spec/readme_example_spec.rb
 - spec/rspec_subject_call_spec.rb
-homepage: http://github.com/rails-oceania/rspec-subject_call
-licenses: []
+- spec/spec_helper.rb
+homepage: http://github.com/puyo/rspec-subject_call
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 3.1.2
 signing_key: 
-specification_version: 3
-summary: rspec-subject_call-1.0.1
+specification_version: 4
+summary: rspec-subject_call-1.0.2
 test_files: []
-has_rdoc: 

data/Gemfile.lock

@@ -1,14 +0,0 @@
-PATH
-  remote: .
-  specs:
-    rspec-subject_call (1.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rspec-subject_call!

data/lib/rspec/subject_call/matchers/return_value_matcher.rb

@@ -1,24 +0,0 @@
-require 'rspec/matchers/pretty'
-require 'rspec/matchers/built_in'
-
-module RSpec
-  module SubjectCall
-    module Matchers
-      class ReturnValueMatcher < RSpec::Matchers::BuiltIn::Eq
-        def matches?(subject)
-          @actual = subject.call
-        end
-
-        def description
-          "return #{expected.inspect}"
-        end
-      end
-    end
-  end
-
-  module Matchers
-    def return_value(expected)
-      ::RSpec::SubjectCall::Matchers::ReturnValueMatcher.new(expected)
-    end
-  end
-end