attribute_matcher 0.0.4 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc23f4e6106aa331f25240fde33cac763b8c3df8
-  data.tar.gz: 51de53282e826a0020ba13c68425a4982eb3ddd3
+  metadata.gz: 0d30c684acab47d8d9d0f1f203aa324586c2e104
+  data.tar.gz: 5e9a7533456b4911c3b00c19c4a750fec309a8e9
 SHA512:
-  metadata.gz: 51c252381c04d4c76d4c41edc2e049382d6ca4eb8cdb628a912020a90e1d48aa54e5d8e0a7a5bb064d81e4dbf1e7403511a249bc3cfdbd13b1c2acd9a5ddc40f
-  data.tar.gz: d148cda1e11614e1ed015cb940ecaaa41966b82e7308bd12f5d0103978972a382807f402f698de7cbf23162c0be0adca7425a93b86381663b558b1dfe763809a
+  metadata.gz: 54b935465a6409f7afd3853f2bdfddef7f8e32a345dfb32153739fdd2227b7de491c130d0a36c53eb7e7e391bcd30cfbd80eaf0919ba01ffeb90e5815b8cce42
+  data.tar.gz: 8fca475ef188732f034879f467c9a38a1bd86ebe5135e302557a3939f84a2ad4d60350d93b8561847db4d8981723909ea452f65c4139434ba633a9251504c356

data/.guard.rb

@@ -0,0 +1 @@
+notification :terminal_notifier

data/.rubocop.yml

@@ -21,3 +21,9 @@ Style/SingleSpaceBeforeFirstArg:
 
 Style/Documentation:
   Enabled: false
+
+Style/Semicolon:
+  Enabled: false
+
+Style/SpaceAroundOperators:
+  Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    attribute_matcher (0.0.3)
+    attribute_matcher (0.3)
 
 GEM
   remote: https://rubygems.org/
@@ -9,26 +9,69 @@ GEM
     ast (2.1.0)
     astrolabe (1.3.1)
       parser (~> 2.2)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
+    coderay (1.1.0)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
     coveralls (0.8.2)
       json (~> 1.8)
       rest-client (>= 1.6.8, < 2)
       simplecov (~> 0.10.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
     docile (1.1.5)
     domain_name (0.5.24)
       unf (>= 0.0.5, < 1.0.0)
+    equalizer (0.0.11)
+    ffi (1.9.10)
+    formatador (0.2.5)
+    guard (2.13.0)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, <= 4.0)
+      lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.6.4)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
+    ice_nine (0.11.1)
     json (1.8.3)
+    listen (3.0.3)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.9)
+    method_source (0.8.2)
     mime-types (2.6.2)
+    nenv (0.2.0)
     netrc (0.10.3)
+    notiffany (0.0.8)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
     parser (2.2.2.6)
       ast (>= 1.1, < 3.0)
     powerpack (0.1.1)
+    pry (0.10.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
     rainbow (2.0.0)
     rake (10.4.2)
+    rb-fsevent (0.9.6)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
@@ -56,18 +99,27 @@ GEM
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
     ruby-progressbar (1.7.5)
+    shellany (0.0.1)
     simplecov (0.10.0)
       docile (~> 1.1.0)
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
+    slop (3.6.0)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
+    terminal-notifier-guard (1.6.4)
     thor (0.19.1)
+    thread_safe (0.3.5)
     tins (1.6.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.1)
+    virtus (1.0.5)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+      equalizer (~> 0.0, >= 0.0.9)
 
 PLATFORMS
   ruby
@@ -76,11 +128,15 @@ DEPENDENCIES
   attribute_matcher!
   bundler (~> 1.7)
   coveralls (~> 0.8)
+  guard (~> 2.13)
+  guard-rspec (~> 4.6)
   rake (~> 10.0)
   rspec (~> 3.0)
   rspec-its (~> 1.2)
   rubocop (~> 0.30)
   simplecov (~> 0.9)
+  terminal-notifier-guard (~> 1.6)
+  virtus (~> 1.0)
 
 BUNDLED WITH
    1.10.6

data/Guardfile

@@ -0,0 +1,5 @@
+guard :rspec, cmd: 'bundle exec rspec' do
+  watch(%r{^lib/(.+)\.rb$})        { 'spec' }
+  watch(%r{^spec/spec_helper.rb$}) { 'spec' }
+  watch(%r{^spec/.+_spec\.rb$})
+end

data/README.md

@@ -25,7 +25,11 @@ Or install it yourself as:
 
 ## Usage
 
+### With Ruby attr methods
+
 ```ruby
+require 'spec_helper'
+
 class Person
   attr_accessor :name
   attr_reader   :age
@@ -66,6 +70,49 @@ describe Person do
     it { is_expected.to have_attribute(:name).with_value('Joe') }
     it { is_expected.to have_attribute(:age).with_value(nil)    }
   end
+
+  describe 'type' do
+    it { is_expected.to have_attribute(:name).of_type(String) }
+  end
+end
+```
+
+### With Virtus
+```ruby
+require 'spec_helper'
+require 'virtus'
+
+class VirtusPerson
+  include Virtus.model
+
+  attribute :name, String, default: 'Joe'
+  attribute :age
+  attribute :status
+
+  attribute :ssn,     String, reader: :private,   writer: :private
+  attribute :address, String, reader: :protected, writer: :protected
+end
+
+describe VirtusPerson do
+  it { is_expected.to have_attribute(:name)   }
+  it { is_expected.to have_attribute(:age)    }
+  it { is_expected.to have_attribute(:status) }
+
+  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
+
+  describe 'type' do
+    it { is_expected.to have_attribute(:name).of_type(String) }
+  end
 end
 ```
 

data/attribute_matcher.gemspec

@@ -19,11 +19,15 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_development_dependency 'bundler',                   '~>  1.7'
-  gem.add_development_dependency 'coveralls',                 '~>  0.8'
-  gem.add_development_dependency 'rake',                      '~> 10.0'
-  gem.add_development_dependency 'rspec',                     '~>  3.0'
-  gem.add_development_dependency 'rspec-its',                 '~>  1.2'
-  gem.add_development_dependency 'rubocop',                   '~>  0.30'
-  gem.add_development_dependency 'simplecov',                 '~>  0.9'
+  gem.add_development_dependency 'bundler',                 '~>  1.7'
+  gem.add_development_dependency 'coveralls',               '~>  0.8'
+  gem.add_development_dependency 'guard',                   '~>  2.13'
+  gem.add_development_dependency 'guard-rspec',             '~>  4.6'
+  gem.add_development_dependency 'rake',                    '~> 10.0'
+  gem.add_development_dependency 'rspec',                   '~>  3.0'
+  gem.add_development_dependency 'rspec-its',               '~>  1.2'
+  gem.add_development_dependency 'rubocop',                 '~>  0.30'
+  gem.add_development_dependency 'simplecov',               '~>  0.9'
+  gem.add_development_dependency 'terminal-notifier-guard', '~>  1.6'
+  gem.add_development_dependency 'virtus',                  '~>  1.0'
 end

data/lib/attribute_matcher.rb

@@ -1,4 +1,4 @@
-require 'attribute_matcher/ext/rspec/chain_group'
+require 'attribute_matcher/ext/rspec/chain_value'
 require 'attribute_matcher/ext/rspec/failure_messages'
 
 require 'attribute_matcher/attribute_matcher'

data/lib/attribute_matcher/attribute_matcher.rb

@@ -1,36 +1,31 @@
 RSpec::Matchers.define(:have_attribute) do
   match do
-    exists? && access_match? && visibility_match?(:reader) && visibility_match?(:writer) && value_match?
+    exists? && all_values_match?
   end
 
-  chain_group :access, :read_only, :write_only, :read_write
+  chain_value('with_reader') { |expected_value| ensure_valid_visibility(expected_value); visibility(reader) }
+  chain_value('with_writer') { |expected_value| ensure_valid_visibility(expected_value); visibility(writer) }
 
-  chain(:with_reader) { |visibility| self.reader_visibility = ensure_valid_visibility(visibility) }
-  chain(:with_writer) { |visibility| self.writer_visibility = ensure_valid_visibility(visibility) }
+  chain_value('read_write') {  reader_ok? &&  writer_ok? }
+  chain_value('read_only')  {  reader_ok? && !writer_ok? }
+  chain_value('write_only') { !reader_ok? &&  writer_ok? }
 
-  chain(:with_value) do |value|
-    self.value     = value
-    self.value_set = true
-  end
+  chain_value('with_value') { attribute_value }
+  chain_value('of_type')    { attribute_type }
 
   private
 
-  attr_accessor :value, :value_set, :reader_visibility, :writer_visibility
-
-  def exists?
-    reader || writer
+  def attribute_value
+    actual.send(expected)
   end
 
-  def read_only_match?
-    reader_ok? && writer.nil?
+  def attribute_type
+    return attribute_value.class if attribute_value
+    actual.send(:attribute_set)[expected].primitive if actual.respond_to?(:attribute_set, true)
   end
 
-  def write_only_match?
-    writer_ok? && reader.nil?
-  end
-
-  def read_write_match?
-    reader_ok? && writer_ok?
+  def exists?
+    reader || writer
   end
 
   def reader_ok?
@@ -66,13 +61,6 @@ RSpec::Matchers.define(:have_attribute) do
     format('%s() takes %d argument%s instead of %d', method.name, method.arity, method.arity == 1 ? '' : 's', expected_arity) if method && method.arity != expected_arity
   end
 
-  def visibility_match?(accessor)
-    method = accessor == :reader ? reader : writer
-    expected_visibility = send("#{accessor}_visibility")
-
-    method.nil? || expected_visibility.nil? || expected_visibility == visibility(method)
-  end
-
   def visibility(method)
     klass = method.receiver.class
 
@@ -90,10 +78,5 @@ RSpec::Matchers.define(:have_attribute) do
 
   def ensure_valid_visibility(visibility)
     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/chain_value.rb

@@ -0,0 +1,44 @@
+# An RSpec extension for chained methods that check single values
+module RSpec
+  module Matchers
+    module DSL
+      class Matcher
+        class << self
+          def chain_value(value, &actual_definition)
+            attr_accessor :chained_values, :"expected_#{value}", :"expected_#{value}_set"
+
+            create_chain_method(value)
+            create_all_values_match_method
+            create_value_match_method(value, actual_definition)
+          end
+
+          private
+
+          def create_chain_method(value)
+            chain(value) do |expected_value = true|
+              self.chained_values ||= []
+              chained_values << :"#{value}_match?"
+
+              send(:"expected_#{value}=", expected_value)
+              send(:"expected_#{value}_set=", true)
+            end
+          end
+
+          def create_all_values_match_method
+            return if instance_methods(false).include?(:values_match?)
+
+            define_method(:all_values_match?) do
+              chained_values.nil? || chained_values.map { |m| send(m) }.all?
+            end
+          end
+
+          def create_value_match_method(value, actual_definition)
+            define_method :"#{value}_match?" do
+              send(:"expected_#{value}_set").nil? || send(:"expected_#{value}").eql?(instance_exec(send(:"expected_#{value}"), &actual_definition))
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/attribute_matcher/version.rb

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

data/spec/lib/attribute_matcher/attribute_matcher_spec.rb

@@ -154,13 +154,13 @@ describe 'have_attribute matcher' do
     end
 
     it 'should fail if the reader visibility is invalid' do
-      expect { have_attribute(:private_reader).with_reader(:foo) }.to raise_error do |error|
+      expect { should have_attribute(:private_reader).with_reader(:foo) }.to raise_error do |error|
         expect(error.message).to match /foo is an invalid visibility; should be one of private, protected, public/
       end
     end
 
     it 'should fail if the write visibility is invalid' do
-      expect { have_attribute(:private_writer).with_writer(:foo) }.to raise_error do |error|
+      expect { should have_attribute(:private_writer).with_writer(:foo) }.to raise_error do |error|
         expect(error.message).to match /foo is an invalid visibility; should be one of private, protected, public/
       end
     end
@@ -178,7 +178,40 @@ describe 'have_attribute matcher' do
       end
     end
 
+    it { is_expected.to have_attribute(:name) }
     it { is_expected.to have_attribute(:name).with_value('John') }
     it { is_expected.not_to have_attribute(:name).with_value(nil) }
+
+    it { is_expected.to have_attribute(:address) }
+    it { is_expected.to have_attribute(:address).with_value(nil) }
+    it { is_expected.not_to have_attribute(:address).with_value('123 Main St') }
+
+    it_behaves_like 'matcher messages' do
+      {
+        :'have_attribute(:name).with_value("John")' => 'have attribute :name with value "John"',
+        :'have_attribute(:name).with_value(nil)'    => 'have attribute :name with value nil',
+      }.each do |expectation, expected_description|
+        describe(expectation) do
+          its(:description)                  { is_expected.to eql expected_description }
+          its(:failure_message)              { is_expected.to match /expected .+ to #{expected_description}/ }
+          its(:failure_message_when_negated) { is_expected.to match /expected .+ not to #{expected_description}/ }
+        end
+      end
+    end
+  end
+
+  describe 'of_type' do
+    let(:klass) do
+      Class.new do
+        def initialize
+          @name = 'John'
+        end
+
+        attr_reader :name
+      end
+    end
+
+    it { is_expected.to have_attribute(:name).of_type(String) }
+    it { is_expected.not_to have_attribute(:name).of_type(Integer) }
   end
 end

data/spec/lib/attribute_matcher/usage_spec.rb

@@ -40,4 +40,8 @@ describe Person do
     it { is_expected.to have_attribute(:name).with_value('Joe') }
     it { is_expected.to have_attribute(:age).with_value(nil)    }
   end
+
+  describe 'type' do
+    it { is_expected.to have_attribute(:name).of_type(String) }
+  end
 end

data/spec/lib/attribute_matcher/virtus_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+require 'virtus'
+
+class VirtusPerson
+  include Virtus.model
+
+  attribute :name, String, default: 'Joe'
+  attribute :age
+  attribute :status
+
+  attribute :ssn,     String, reader: :private,   writer: :private
+  attribute :address, String, reader: :protected, writer: :protected
+end
+
+describe VirtusPerson do
+  it { is_expected.to have_attribute(:name)   }
+  it { is_expected.to have_attribute(:age)    }
+  it { is_expected.to have_attribute(:status) }
+
+  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
+
+  describe 'type' do
+    it { is_expected.to have_attribute(:name).of_type(String) }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attribute_matcher
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: '0.3'
 platform: ruby
 authors:
 - Declan Whelan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.13'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +136,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: terminal-notifier-guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: virtus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: A matcher for testing object attributes.
 email:
 - declan@pleanintuit.com
@@ -116,22 +172,25 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".guard.rb"
 - ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - attribute_matcher.gemspec
 - lib/attribute_matcher.rb
 - lib/attribute_matcher/attribute_matcher.rb
-- lib/attribute_matcher/ext/rspec/chain_group.rb
+- lib/attribute_matcher/ext/rspec/chain_value.rb
 - lib/attribute_matcher/ext/rspec/failure_messages.rb
 - lib/attribute_matcher/version.rb
 - spec/lib/attribute_matcher/attribute_matcher_spec.rb
 - spec/lib/attribute_matcher/usage_spec.rb
 - spec/lib/attribute_matcher/version_spec.rb
+- spec/lib/attribute_matcher/virtus_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/dwhelan/attribute_matcher
 licenses:
@@ -161,4 +220,5 @@ test_files:
 - spec/lib/attribute_matcher/attribute_matcher_spec.rb
 - spec/lib/attribute_matcher/usage_spec.rb
 - spec/lib/attribute_matcher/version_spec.rb
+- spec/lib/attribute_matcher/virtus_spec.rb
 - spec/spec_helper.rb

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

@@ -1,30 +0,0 @@
-# An RSpec extension for mutually exclusive chained methods
-module RSpec
-  module Matchers
-    module DSL
-      class Matcher
-        class << self
-          def chain_group(group_name, *method_names)
-            create_match_method(group_name, *method_names)
-            chain_methods(method_names)
-          end
-
-          private
-
-          def create_match_method(group_name, *method_names)
-            define_method :"#{group_name}_match?" do
-              active_method_name = method_names.find { |method_name| instance_variable_get("@#{method_name}") }
-              active_method_name ? send("#{active_method_name}_match?") : true
-            end
-          end
-
-          def chain_methods(method_names)
-            method_names.each do |method_name|
-              chain(method_name) { instance_variable_set("@#{method_name}", true) }
-            end
-          end
-        end
-      end
-    end
-  end
-end