rspec-expect_it 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51ec398861a336d50321dab80df562099db054be
-  data.tar.gz: 4b84547c0eb3cf94a52264a854f7b60dff291b0c
+  metadata.gz: c0aa79562e13f859d4812639821f2e31652dc826
+  data.tar.gz: 634f4d65356c1068afdd3967839433380f05bfc9
 SHA512:
-  metadata.gz: 615686cff1d8f349b6e15dca8bc139a8582ed7a0849eb576a146bc2bf580f63d16e84efbea8450206aed20513333346390540044572788114bc6cd101025a3dc
-  data.tar.gz: c0a801aafc942040c0b7aa979e85cb1adebb84e837af4199f7fcd9a7f612c53695df351b76c30c3ce55a264484bcf16b59f27a8d084090b16749823b0f8037f6
+  metadata.gz: 2cf5c066d0d079cbbd9d5332fcfd765e235b007066a85a92074e6277f94553431c0c3978f427761015a402ed7b2748a1f905c22a0f45b1d4b6ef147f2872fcef
+  data.tar.gz: 159feba7f88dbd388a0fced4692acc4ef4b4e9c188881f06292bab07440c79701ceea11cb48690d03850c0ab86320462a5356e98f8dde8176d0699f3ae301b65

data/.rspec

@@ -1,2 +1,2 @@
 --color
---format progress
+--format Fuubar

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0-p353
+ruby-2.1.0

data/.travis.yml

@@ -4,4 +4,5 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+bundler_args: --without tools
 script: rspec

data/Gemfile

@@ -1,4 +1,9 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in rspec-expect_it.gemspec
 gemspec
+
+group :tools do
+  gem "guard"
+  gem "guard-rspec"
+  gem "byebug"
+end

data/Guardfile

@@ -0,0 +1,5 @@
+guard :rspec do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end

data/README.md

@@ -1,8 +1,11 @@
 # RSpec::ExpectIt
 
-[![Build Status](https://travis-ci.org/thomasfedb/rspec-expect_it.png?branch=master)](https://travis-ci.org/thomasfedb/rspec-expect_it) [![Gem Version](https://badge.fury.io/rb/rspec-expect_it.png)](http://badge.fury.io/rb/rspec-expect_it)
+[![Build Status](https://travis-ci.org/thomasfedb/rspec-expect_it.png?branch=master)](https://travis-ci.org/thomasfedb/rspec-expect_it)
+[![Gem Version](https://badge.fury.io/rb/rspec-expect_it.png)](http://badge.fury.io/rb/rspec-expect_it)
+[![Code Climate](https://codeclimate.com/github/thomasfedb/rspec-expect_it.png)](https://codeclimate.com/github/thomasfedb/rspec-expect_it)
 
-Makes writing nice RSpec tests a little easier by providing expect_it helpers.
+Makes writing nice RSpec tests a little easier by providing `expect_it` helpers.
+These helpers are equivalent to `expect(subject)` and also provide useful variations.
 
 Compatible with Ruby 1.9.2 and greater.
 
@@ -63,7 +66,6 @@ specify { expect_it{}.to change{@value}.by(1) }
 ### expect_its
 
 Calling `expect_its(:method)` is equivalent to `expect(subject.method)`.
-There is no `_safe` version of this helper.
 
 ```ruby
 subject { "foobar" }
@@ -74,7 +76,6 @@ specify { expect_its(:length).to eq 6 }
 ### expect_its!
 
 If you want eager evaluation of the subject and method call, use `expect_its!`.
-There is no `_safe` version of this helper.
 
 ```ruby
 subject { @value += 1 }
@@ -82,32 +83,11 @@ subject { @value += 1 }
 specify { expect_its!(:to_s).to eq @value.to_s }
 ```
 
-### expect_it_safe
-
-The `expect_it_safe` helper is the same as `expect_it`, except that it will
-swallow any exceptions and return `nil`.
-
-```ruby
-subject { raise Exception }
-
-specify { expect_it_safe.to eq nil }
-```
-
-### expect_it_safe!
-
-The `expect_it_safe!` helper is the same as `expect_it!`, except that it will
-swallow any exceptions and return `nil`.
-
-```ruby
-subject { raise Exception }
-
-specify { expect_it_safe!.to eq nil }
-```
-
 ### expect_it_safe{}
 
 The `expect_it_safe{}` helper is the same as `expect_it{}`, except that it will
-swallow any exceptions and return `nil`.
+swallow any exceptions. This can be helpful when checking that error scenarios
+do not lead to changes that should only occur when the system is successful.
 
 ```ruby
 subject { raise Exception; @value = 12 }
@@ -122,4 +102,4 @@ specify { expect_it_safe{}.to_not change{@value} }
 3. Add your feature and specs.
 4. Commit your changes (`git commit -am 'Add some feature'`)
 5. Push to the branch (`git push origin my-new-feature`)
-6. Create new Pull Request
+6. Create new Pull Request

data/lib/rspec/expect_it.rb

@@ -2,6 +2,8 @@ require "rspec"
 
 require "rspec/expect_it/version"
 require "rspec/expect_it/helpers"
+require "rspec/expect_it/expectation_targets/expect_it"
+require "rspec/expect_it/expectation_targets/expect_its"
 
 RSpec.configure do |config|
   config.include RSpec::ExpectIt::Helpers

data/lib/rspec/expect_it/expectation_targets/expect_it.rb

@@ -0,0 +1,28 @@
+module RSpec
+  module ExpectIt
+    module ExpectationTargets
+      class ExpectIt
+        attr_accessor :context, :subject
+
+        def initialize(context, subject = nil)
+          self.context = context
+          self.subject = subject
+        end
+
+        def to(matcher)
+          context.expect(get_subject).to(matcher)
+        end
+
+        def to_not(matcher)
+          context.expect(get_subject).to_not(matcher)
+        end
+
+        private
+
+        def get_subject
+          subject || context.subject
+        end
+      end
+    end
+  end
+end

data/lib/rspec/expect_it/expectation_targets/expect_its.rb

@@ -0,0 +1,20 @@
+module RSpec
+  module ExpectIt
+    module ExpectationTargets
+      class ExpectIts < ExpectIt
+        attr_accessor :method
+
+        def initialize(context, method)
+          super(context)
+          self.method = method
+        end
+
+        private
+
+        def get_subject
+          context.subject.send(method)
+        end
+      end
+    end
+  end
+end

data/lib/rspec/expect_it/helpers.rb

@@ -3,9 +3,9 @@ module RSpec
     module Helpers
       def expect_it
         if block_given?
-          ExpectItExpectationTarget.new(self, lambda { self.subject })
+          RSpec::ExpectIt::ExpectationTargets::ExpectIt.new(self, lambda { self.subject })
         else
-          ExpectItExpectationTarget.new(self)
+          RSpec::ExpectIt::ExpectationTargets::ExpectIt.new(self)
         end
       end
 
@@ -14,7 +14,7 @@ module RSpec
       end
 
       def expect_its(method)
-        ExpectItsExpectationTarget.new(self, method)
+        RSpec::ExpectIt::ExpectationTargets::ExpectIts.new(self, method)
       end
 
       def expect_its!(method)
@@ -30,69 +30,9 @@ module RSpec
               nil
             end
           end
-          ExpectItExpectationTarget.new(self, safe_lambda)
+          RSpec::ExpectIt::ExpectationTargets::ExpectIt.new(self, safe_lambda)
         else
-          ExpectItSafeExpectationTarget.new(self)
-        end
-      end
-
-      def expect_it_safe!
-        result = begin
-          self.subject
-        rescue Exception
-          nil
-        end
-
-        expect(result)
-      end
-
-      class ExpectItExpectationTarget
-        attr_accessor :context, :subject
-
-        def initialize(context, subject = nil)
-          self.context = context
-          self.subject = subject
-        end
-
-        def to(matcher)
-          context.expect(get_subject).to(matcher)
-        end
-
-        def to_not(matcher)
-          context.expect(get_subject).to_not(matcher)
-        end
-
-        private
-
-        def get_subject
-          subject || context.subject
-        end
-      end
-
-      class ExpectItSafeExpectationTarget < ExpectItExpectationTarget
-        private
-
-        def get_subject
-          begin
-            subject || context.subject
-          rescue Exception
-            nil
-          end
-        end
-      end
-
-      class ExpectItsExpectationTarget < ExpectItExpectationTarget
-        attr_accessor :method
-
-        def initialize(context, method)
-          super(context)
-          self.method = method
-        end
-
-        private
-
-        def get_subject
-          context.subject.send(method)
+          raise ArgumentError, "method must be called as expect_it_safe{}"
         end
       end
     end

data/lib/rspec/expect_it/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module ExpectIt
-    VERSION = "1.1.0"
+    VERSION = "2.0.0"
   end
 end

data/rspec-expect_it.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "fuubar"
 end

data/spec/rspec/expect_it/expectation_targets/expect_it_spec.rb

@@ -0,0 +1,42 @@
+require "spec_helper"
+
+describe RSpec::ExpectIt::ExpectationTargets::ExpectIt do
+  let(:context) do
+    double("context").tap do |context|
+      context.stub(:expect) {|arg| expect(arg) }
+      context.stub(:subject) { context_subject }
+    end
+  end
+
+  let(:passed_subject) { nil }
+
+  subject { RSpec::ExpectIt::ExpectationTargets::ExpectIt.new(context, passed_subject) }
+
+  describe "#to" do
+    context "when the subject is passed" do
+      let(:passed_subject) { Object.new }
+
+      specify { subject.to eq passed_subject }
+    end
+
+    context "when the subject is not passed" do
+      let(:context_subject) { Object.new }
+
+      specify { subject.to eq context_subject }
+    end
+  end
+
+  describe "#not_to" do
+    context "when the subject is passed" do
+      let(:passed_subject) { Object.new }
+
+      specify { expect{ subject.to_not eq passed_subject }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
+    end
+
+    context "when the subject is not passed" do
+      let(:context_subject) { Object.new }
+
+      specify { expect{ subject.to_not eq context_subject }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
+    end
+  end
+end

data/spec/rspec/expect_it/expectation_targets/expect_its_spec.rb

@@ -0,0 +1,29 @@
+require "spec_helper"
+
+describe RSpec::ExpectIt::ExpectationTargets::ExpectIts do
+  let(:context) do
+    double("context").tap do |context|
+      context.stub(:expect) {|arg| expect(arg) }
+      context.stub(:subject) { context_subject }
+    end
+  end
+
+  let(:context_subject) do
+    double("subject").tap do |subject|
+      subject.stub(method) { method_return_value }
+    end
+  end
+
+  let(:method) { :a_method }
+  let(:method_return_value) { Object.new }
+
+  subject { RSpec::ExpectIt::ExpectationTargets::ExpectIts.new(context, method) }
+
+  describe "#to" do
+    specify { subject.to eq method_return_value }
+  end
+
+  describe "#not_to" do
+    specify { expect{ subject.to_not eq method_return_value }.to raise_error(RSpec::Expectations::ExpectationNotMetError) }
+  end
+end

data/spec/rspec/expect_it/helpers_spec.rb

@@ -111,46 +111,8 @@ describe RSpec::ExpectIt::Helpers do
   end
 
   describe "expect_it_safe" do
-    describe "equalivalence" do
-      subject { Object.new }
-
-      specify { expect_it_safe.to eq subject }
-    end
-
-    describe "lazy evaluation" do
-      before { @value = 0 }
-
-      subject { @value = 1 }
-
-      specify { expect_it_safe.to eq (@value + 1) }
-    end 
-
-    describe "saftey" do
-      subject { raise Exception }
-
-      specify { expect_it_safe.to eq nil }
-    end
-  end
-
-  describe "expect_it_safe!" do
-    describe "equalivalence" do
-      subject { Object.new }
-
-      specify { expect_it_safe!.to eq subject }
-    end
-
-    describe "unlazy evaluation" do
-      before { @value = 0 }
-
-      subject { @value = 1 }
-
-      specify { expect_it_safe!.to eq @value }
-    end 
-
-    describe "saftey" do
-      subject { raise Exception }
-
-      specify { expect_it_safe!.to eq nil }
+    describe "not avaliable" do
+      specify { expect{ expect_it_safe }.to raise_error(ArgumentError) }
     end
   end
 

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: rspec-expect_it
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Thomas Drake-Brockman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-28 00:00:00.000000000 Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Provides expect_it helpers for RSpec.
@@ -73,19 +73,24 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
 - lib/rspec/expect_it.rb
+- lib/rspec/expect_it/expectation_targets/expect_it.rb
+- lib/rspec/expect_it/expectation_targets/expect_its.rb
 - lib/rspec/expect_it/helpers.rb
 - lib/rspec/expect_it/version.rb
 - rspec-expect_it.gemspec
+- spec/rspec/expect_it/expectation_targets/expect_it_spec.rb
+- spec/rspec/expect_it/expectation_targets/expect_its_spec.rb
 - spec/rspec/expect_it/helpers_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -98,20 +103,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Provides a expect_it helpers for RSpec.
 test_files:
+- spec/rspec/expect_it/expectation_targets/expect_it_spec.rb
+- spec/rspec/expect_it/expectation_targets/expect_its_spec.rb
 - spec/rspec/expect_it/helpers_spec.rb
 - spec/spec_helper.rb