attribute_matcher 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d9fe1a54b6439a4d7990d7ce99a9de95299e8dc
-  data.tar.gz: 02bf7adf7356c9aa7d0ce97308c592c89a74adf4
+  metadata.gz: bc23f4e6106aa331f25240fde33cac763b8c3df8
+  data.tar.gz: 51de53282e826a0020ba13c68425a4982eb3ddd3
 SHA512:
-  metadata.gz: c6dcbb2fbc6a87e0e951f792a910d003edf06bdca4a8121324807b4bc3e96a7ac92f019c4bedb034a75f9aa1748361f62391c833ca2b391f7f1e7e05d230826e
-  data.tar.gz: 0db41f2d5ee2e53da1308723393d67dd83ec6009deca585c7637eff7dda98fb86cc6487ee6c428f3941a410d7ba35561c1e8866b50438fdc90d62de12a48464d
+  metadata.gz: 51c252381c04d4c76d4c41edc2e049382d6ca4eb8cdb628a912020a90e1d48aa54e5d8e0a7a5bb064d81e4dbf1e7403511a249bc3cfdbd13b1c2acd9a5ddc40f
+  data.tar.gz: d148cda1e11614e1ed015cb940ecaaa41966b82e7308bd12f5d0103978972a382807f402f698de7cbf23162c0be0adca7425a93b86381663b558b1dfe763809a

data/README.md

@@ -31,6 +31,10 @@ class Person
   attr_reader   :age
   attr_writer   :status
 
+  def initialize
+    self.name = 'Joe'
+  end
+
   protected
 
   attr_accessor :address
@@ -41,19 +45,27 @@ class Person
 end
 
 describe Person do
-  it { is_expected.to have_attribute(:name) }
-  it { is_expected.to have_attribute(:age) }
+  it { is_expected.to have_attribute(:name)   }
+  it { is_expected.to have_attribute(:age)    }
   it { is_expected.to have_attribute(:status) }
 
-  it { is_expected.to have_attribute(:name).read_write }
-  it { is_expected.to have_attribute(:age).read_only }
-  it { is_expected.to have_attribute(:status).write_only }
-
-  it { is_expected.to have_attribute(:address).with_reader(:protected) }
-  it { is_expected.to have_attribute(:address).with_writer(:protected) }
-
-  it { is_expected.to have_attribute(:ssn).with_reader(:private) }
-  it { is_expected.to have_attribute(:ssn).with_writer(:private) }
+  describe 'accessors' do
+    it { is_expected.to have_attribute(:name).read_write   }
+    it { is_expected.to have_attribute(:age).read_only     }
+    it { is_expected.to have_attribute(:status).write_only }
+  end
+
+  describe 'visibility' do
+    it { is_expected.to have_attribute(:address).with_reader(:protected) }
+    it { is_expected.to have_attribute(:address).with_writer(:protected) }
+    it { is_expected.to have_attribute(:ssn).with_reader(:private)       }
+    it { is_expected.to have_attribute(:ssn).with_writer(:private)       }
+  end
+
+  describe 'values' do
+    it { is_expected.to have_attribute(:name).with_value('Joe') }
+    it { is_expected.to have_attribute(:age).with_value(nil)    }
+  end
 end
 ```
 

data/lib/attribute_matcher/attribute_matcher.rb

@@ -1,15 +1,22 @@
 RSpec::Matchers.define(:have_attribute) do
   match do
-    exists? && access_match? && visibility_match?(:reader) && visibility_match?(:writer)
+    exists? && access_match? && visibility_match?(:reader) && visibility_match?(:writer) && value_match?
   end
 
   chain_group :access, :read_only, :write_only, :read_write
 
-  chain(:with_reader) { |visibility| @reader_visibility = ensure_valid_visibility(visibility) }
-  chain(:with_writer) { |visibility| @writer_visibility = ensure_valid_visibility(visibility) }
+  chain(:with_reader) { |visibility| self.reader_visibility = ensure_valid_visibility(visibility) }
+  chain(:with_writer) { |visibility| self.writer_visibility = ensure_valid_visibility(visibility) }
+
+  chain(:with_value) do |value|
+    self.value     = value
+    self.value_set = true
+  end
 
   private
 
+  attr_accessor :value, :value_set, :reader_visibility, :writer_visibility
+
   def exists?
     reader || writer
   end
@@ -61,7 +68,7 @@ RSpec::Matchers.define(:have_attribute) do
 
   def visibility_match?(accessor)
     method = accessor == :reader ? reader : writer
-    expected_visibility = instance_variable_get(:"@#{accessor}_visibility")
+    expected_visibility = send("#{accessor}_visibility")
 
     method.nil? || expected_visibility.nil? || expected_visibility == visibility(method)
   end
@@ -85,4 +92,8 @@ RSpec::Matchers.define(:have_attribute) do
     fail format('%s is an invalid visibility; should be one of %s', visibility, VALID_VISIBILITIES.join(', ')) unless VALID_VISIBILITIES.include?(visibility)
     visibility
   end
+
+  def value_match?
+    value_set.nil? || actual.send(expected).eql?(value)
+  end
 end

data/lib/attribute_matcher/ext/rspec/failure_messages.rb

@@ -7,7 +7,7 @@ module RSpec
           def failure_messages(&block)
             define_method :failure_message do
               failures = instance_eval(&block).compact.join(' and ')
-              [super(), failures].join(' but ')
+              [super(), failures].reject(&:empty?).join(' but ')
             end
           end
         end

data/lib/attribute_matcher/version.rb

@@ -1,3 +1,3 @@
 module HaveAttributeMatcher
-  VERSION ||= '0.0.3'
+  VERSION ||= '0.0.4'
 end

data/spec/lib/{have_attribute_matcher/have_attribute_matcher_spec.rb → attribute_matcher/attribute_matcher_spec.rb}

@@ -41,14 +41,14 @@ describe 'have_attribute matcher' do
 
     it_behaves_like 'matcher messages' do
       {
-        :'have_attribute(:name)' => 'have attribute :name',
-        :'have_attribute(:name).read_only' => 'have attribute :name read only',
+        :'have_attribute(:name)'            => 'have attribute :name',
+        :'have_attribute(:name).read_only'  => 'have attribute :name read only',
         :'have_attribute(:name).write_only' => 'have attribute :name write only',
         :'have_attribute(:name).read_write' => 'have attribute :name read write',
-        :'have_attribute(:rw).read_only' => 'have attribute :rw read only',
-        :'have_attribute(:rw).write_only' => 'have attribute :rw write only',
-        :'have_attribute(:w).read_only' => 'have attribute :w read only',
-        :'have_attribute(:r).write_only' => 'have attribute :r write only',
+        :'have_attribute(:rw).read_only'    => 'have attribute :rw read only',
+        :'have_attribute(:rw).write_only'   => 'have attribute :rw write only',
+        :'have_attribute(:w).read_only'     => 'have attribute :w read only',
+        :'have_attribute(:r).write_only'    => 'have attribute :r write only',
       }.each do |expectation, expected_description|
         describe(expectation) do
           its(:description)                  { is_expected.to eql expected_description }
@@ -58,8 +58,8 @@ describe 'have_attribute matcher' do
       end
 
       {
-        :'have_attribute(:rw)' => 'expected .+ not to have attribute :rw',
-        :'have_attribute(:r).read_only' => 'expected .+ not to have attribute :r read only',
+        :'have_attribute(:rw)'           => 'expected .+ not to have attribute :rw',
+        :'have_attribute(:r).read_only'  => 'expected .+ not to have attribute :r read only',
         :'have_attribute(:w).write_only' => 'expected .+ not to have attribute :w write only',
       }.each do |expectation, expected_description|
         describe(expectation) do
@@ -97,8 +97,8 @@ describe 'have_attribute matcher' do
     it_behaves_like 'matcher messages' do
       {
         :'have_attribute(:no_args).write_only' => 'have attribute :no_args write only but no_args=\(\) takes 0 arguments instead of 1',
-        :'have_attribute(:one_arg).read_only' => 'have attribute :one_arg read only but one_arg\(\) takes 1 argument instead of 0',
-        :'have_attribute(:two_args)' => 'have attribute :two_args but two_args\(\) takes 2 arguments instead of 0 and two_args=\(\) takes 2 arguments instead of 1',
+        :'have_attribute(:one_arg).read_only'  => 'have attribute :one_arg read only but one_arg\(\) takes 1 argument instead of 0',
+        :'have_attribute(:two_args)'           => 'have attribute :two_args but two_args\(\) takes 2 arguments instead of 0 and two_args=\(\) takes 2 arguments instead of 1',
       }.each do |expectation, expected_description|
         describe(expectation) do
           its(:failure_message) { is_expected.to match /expected .+ to #{expected_description}/ }
@@ -141,10 +141,9 @@ describe 'have_attribute matcher' do
 
     it_behaves_like 'matcher messages' do
       {
-        :'have_attribute(:private_reader).with_reader(:private)' => 'have attribute :private_reader with reader :private',
+        :'have_attribute(:private_reader).with_reader(:private)'     => 'have attribute :private_reader with reader :private',
         :'have_attribute(:protected_reader).with_reader(:protected)' => 'have attribute :protected_reader with reader :protected',
-        :'have_attribute(:public_reader).with_reader(:public)' => 'have attribute :public_reader with reader :public',
-
+        :'have_attribute(:public_reader).with_reader(:public)'       => 'have attribute :public_reader with reader :public',
       }.each do |expectation, expected_description|
         describe(expectation) do
           its(:description)     { is_expected.to eql expected_description }
@@ -166,4 +165,20 @@ describe 'have_attribute matcher' do
       end
     end
   end
+
+  describe 'with_value' do
+    let(:klass) do
+      Class.new do
+        def initialize
+          @name = 'John'
+        end
+
+        attr_reader :name
+        attr_reader :address
+      end
+    end
+
+    it { is_expected.to have_attribute(:name).with_value('John') }
+    it { is_expected.not_to have_attribute(:name).with_value(nil) }
+  end
 end

data/spec/lib/attribute_matcher/usage_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+class Person
+  attr_accessor :name
+  attr_reader   :age
+  attr_writer   :status
+
+  def initialize
+    self.name = 'Joe'
+  end
+
+  protected
+
+  attr_accessor :address
+
+  private
+
+  attr_accessor :ssn
+end
+
+describe Person do
+  it { is_expected.to have_attribute(:name)   }
+  it { is_expected.to have_attribute(:age)    }
+  it { is_expected.to have_attribute(:status) }
+
+  describe 'accessors' do
+    it { is_expected.to have_attribute(:name).read_write   }
+    it { is_expected.to have_attribute(:age).read_only     }
+    it { is_expected.to have_attribute(:status).write_only }
+  end
+
+  describe 'visibility' do
+    it { is_expected.to have_attribute(:address).with_reader(:protected) }
+    it { is_expected.to have_attribute(:address).with_writer(:protected) }
+    it { is_expected.to have_attribute(:ssn).with_reader(:private)       }
+    it { is_expected.to have_attribute(:ssn).with_writer(:private)       }
+  end
+
+  describe 'values' do
+    it { is_expected.to have_attribute(:name).with_value('Joe') }
+    it { is_expected.to have_attribute(:age).with_value(nil)    }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attribute_matcher
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Declan Whelan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,9 +129,9 @@ files:
 - lib/attribute_matcher/ext/rspec/chain_group.rb
 - lib/attribute_matcher/ext/rspec/failure_messages.rb
 - lib/attribute_matcher/version.rb
-- spec/lib/have_attribute_matcher/have_attribute_matcher_spec.rb
-- spec/lib/have_attribute_matcher/usage_spec.rb
-- spec/lib/have_attribute_matcher/version_spec.rb
+- spec/lib/attribute_matcher/attribute_matcher_spec.rb
+- spec/lib/attribute_matcher/usage_spec.rb
+- spec/lib/attribute_matcher/version_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/dwhelan/attribute_matcher
 licenses:
@@ -158,7 +158,7 @@ signing_key:
 specification_version: 4
 summary: A matcher for testing object attributes.
 test_files:
-- spec/lib/have_attribute_matcher/have_attribute_matcher_spec.rb
-- spec/lib/have_attribute_matcher/usage_spec.rb
-- spec/lib/have_attribute_matcher/version_spec.rb
+- spec/lib/attribute_matcher/attribute_matcher_spec.rb
+- spec/lib/attribute_matcher/usage_spec.rb
+- spec/lib/attribute_matcher/version_spec.rb
 - spec/spec_helper.rb

data/spec/lib/have_attribute_matcher/usage_spec.rb

@@ -1,31 +0,0 @@
-require 'spec_helper'
-
-class Person
-  attr_accessor :name
-  attr_reader   :age
-  attr_writer   :status
-
-  protected
-
-  attr_accessor :address
-
-  private
-
-  attr_accessor :ssn
-end
-
-describe Person do
-  it { is_expected.to have_attribute(:name) }
-  it { is_expected.to have_attribute(:age) }
-  it { is_expected.to have_attribute(:status) }
-
-  it { is_expected.to have_attribute(:name).read_write }
-  it { is_expected.to have_attribute(:age).read_only }
-  it { is_expected.to have_attribute(:status).write_only }
-
-  it { is_expected.to have_attribute(:address).with_reader(:protected) }
-  it { is_expected.to have_attribute(:address).with_writer(:protected) }
-
-  it { is_expected.to have_attribute(:ssn).with_reader(:private) }
-  it { is_expected.to have_attribute(:ssn).with_writer(:private) }
-end