virtus-matchers 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52e8338d991fb465d12e9ab65a69e8f61015b8d2
-  data.tar.gz: b17b4acc8f0f20047d3cada608cfe58ab8ad56b2
+  metadata.gz: 97b686cd951cd3ea9ffda93559f825c5fa077443
+  data.tar.gz: 39020162c5f9df630eef2a2f83b347452c920eec
 SHA512:
-  metadata.gz: 007a99b23c490bcdf51462a1f0fb17a362a5d4780d5739186f54fda254fdf5e6e1393a6fdf7e1b4483b7113a35674358e4c14afbf04229437331ee5e1e0321fb
-  data.tar.gz: d4ce5da2e13df2c46eabc2a17936a7358ec6fdf64b4584752e81805df5761b35daf801b328ce3cb6d29b76c2b99f449e111c28c92fa450567550366461fa9ad5
+  metadata.gz: 17f3cb5243479df8a5be34ec1bd735aba7e61fed638795349e5a786f8a72a03f448e7b6316a928f714f525b4fa694e8c19479eb468210fc7eace0a91a7bb624f
+  data.tar.gz: 7b75a66e9eb008db3bec0eed281df21eb25c4a3a9973baabc9859c82549633bf0e58d89492e17fc81eb061e705199c4ac70224aa850e9f38ae95cccd2d56f21c

data/lib/virtus/matchers.rb

@@ -3,4 +3,3 @@
 require 'virtus/matchers/version'
 require 'virtus/matchers/be_value_object_matcher'
 require 'virtus/matchers/have_attribute_matcher'
-require 'virtus/matchers/integrations'

data/lib/virtus/matchers/have_attribute_matcher.rb

@@ -23,8 +23,10 @@ module Virtus
         self
       end
 
-      def matches?(klass)
-        @klass = klass
+      def matches?(klass_or_instance)
+        @instance = instance_from(klass_or_instance)
+        @klass = @instance.class
+
         @attribute = @klass.attribute_set[@name]
         return false unless @attribute
 
@@ -70,6 +72,22 @@ module Virtus
       def coercer_description
         @custom_coercer && " coerced with #{@attribute.coercer}"
       end
+
+      def instance_from(klass_or_instance)
+        unless klass_or_instance.respond_to?(:attribute_set)
+          return klass_or_instance
+        end
+
+        klass = klass_or_instance
+        strict_attributes = klass.attribute_set.select(&:strict?)
+        attributes = strict_attributes.each_with_object({}) do |attribute, hash|
+          hash[attribute.name] = "val"
+        end.merge(@name => "val")
+        klass.new(attributes)
+      rescue => e
+        warn "NOTE: Due to the complexity of putting the right value for the attributes, please pass in an instance that has already been properly initialized"
+        raise e
+      end
     end
 
     def have_attribute(name, type = nil)

data/lib/virtus/matchers/rspec.rb

@@ -0,0 +1,5 @@
+require "virtus/matchers"
+
+RSpec.configure do |config|
+  config.include Virtus::Matchers, type: :virtus
+end

data/lib/virtus/matchers/version.rb

@@ -2,6 +2,6 @@
 
 module Virtus
   module Matchers
-    VERSION = '0.3.0'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

data/spec/virtus/matchers/be_value_object_matcher_spec.rb

@@ -13,23 +13,23 @@ RSpec.describe Virtus::Matchers::BeAValueObjectMatcher do
 
   context 'when Virtus::ValueObject is included' do
     it 'should match' do
-      matcher.matches?(ExampleValueObject).should be_true
+      expect(matcher.matches?(ExampleValueObject)).to be true
     end
 
     it 'should have a description' do
       matcher.matches?(ExampleValueObject)
-      matcher.description.should == 'be a value object'
+      expect(matcher.description).to eq 'be a value object'
     end
   end
 
   context 'when Virtus::ValueObject is not included' do
     it 'should not match' do
-      matcher.matches?(Example).should be_false
+      expect(matcher.matches?(Example)).to be false
     end
 
     it 'should have a failure message' do
       matcher.matches?(Example)
-      matcher.failure_message.should == "expected #{Example} to be a value object"
+      expect(matcher.failure_message).to eq "expected #{Example} to be a value object"
     end
   end
 end

data/spec/virtus/matchers/have_attribute_matcher_spec.rb

@@ -2,7 +2,11 @@
 require 'spec_helper'
 
 RSpec.describe Virtus::Matchers::HaveAttributeMatcher do
-  class FakeCoercer; end
+  class FakeCoercer
+    def self.call(val)
+
+    end
+  end
 
   class Example
     include Virtus.model
@@ -19,46 +23,46 @@ RSpec.describe Virtus::Matchers::HaveAttributeMatcher do
     attribute :lenient, String
   end
 
-  context 'when attribute is defined', 'with no type' do
+  context 'when attribute is defined with no type' do
     let(:matcher) { described_class.new(:any) }
 
     it 'should match' do
-      matcher.matches?(Example).should be_true
+      expect(matcher.matches?(Example)).to be true
     end
 
     it 'should have a description' do
       matcher.matches?(Example)
-      matcher.description.should == 'have attribute any'
+      expect(matcher.description).to eq 'have attribute any'
     end
   end
 
-  context 'when attribute is defined', 'with simple type' do
+  context 'when attribute is defined with simple type' do
     let(:matcher) { described_class.new(:foo, String) }
 
     it 'should match' do
-      matcher.matches?(Example).should be_true
+      expect(matcher.matches?(Example)).to be true
     end
 
     it 'should have a description' do
       matcher.matches?(Example)
-      matcher.description.should == 'have attribute foo of type String'
+      expect(matcher.description).to eq 'have attribute foo of type String'
     end
   end
 
-  context 'when attribute is defined', 'with array type', 'and correct member type' do
+  context 'when attribute is defined with array type and correct member type' do
     let(:matcher) { described_class.new(:bar, Array[String]) }
 
     it 'should match' do
-      matcher.matches?(Example).should be_true
+      expect(matcher.matches?(Example)).to be true
     end
 
     it 'should have a description' do
       matcher.matches?(Example)
-      matcher.description.should == 'have attribute bar of type Array[String]'
+      expect(matcher.description).to eq 'have attribute bar of type Array[String]'
     end
   end
 
-  context 'when attribute is defined', 'with array type', 'with default' do
+  context 'when attribute is defined with array type with default' do
     let(:matcher) do
       described_class.
         new(:array_attribute_with_default, Array[String]).
@@ -67,84 +71,84 @@ RSpec.describe Virtus::Matchers::HaveAttributeMatcher do
     let(:array_default) { ['hello', 'world'] }
 
     it 'should match' do
-      matcher.matches?(Example).should be_true
+      expect(matcher.matches?(Example)).to be true
     end
 
     context 'different array default' do
       let(:array_default) { ['different', 'default'] }
       it 'should not match' do
-        matcher.matches?(Example).should be_false
+        expect(matcher.matches?(Example)).to be false
       end
     end
 
     it 'should have a description' do
       matcher.matches?(Example)
-      matcher.description.should == "have attribute array_attribute_with_default of type Array[String] with default \"[\"hello\", \"world\"]\""
+      expect(matcher.description).to eq "have attribute array_attribute_with_default of type Array[String] with default \"[\"hello\", \"world\"]\""
     end
   end
 
-  context 'when attribute is defined', 'with a valid coercer' do
+  context 'when attribute is defined with a valid coercer' do
     let(:matcher) { described_class.new(:lol, DateTime).coerced_with(FakeCoercer) }
 
     it 'should match' do
-      matcher.matches?(Example).should be_true
+      expect(matcher.matches?(Example)).to be true
     end
 
     it 'should have a description' do
       matcher.matches?(Example)
-      matcher.description.should == 'have attribute lol of type DateTime coerced with FakeCoercer'
+      expect(matcher.description).to eq 'have attribute lol of type DateTime coerced with FakeCoercer'
     end
   end
 
-  context 'when attribute is defined', 'with invalid coercer' do
+  context 'when attribute is defined with invalid coercer' do
     let(:matcher) { described_class.new(:lol, DateTime).coerced_with(String) }
 
     it 'should not match' do
-      matcher.matches?(Example).should be_false
+      expect(matcher.matches?(Example)).to be false
     end
 
     it 'should have a failure message' do
       matcher.matches?(Example)
-      matcher.failure_message.should == "expected #{Example} to have attribute lol of type DateTime coerced with FakeCoercer"
+      expect(matcher.failure_message).to eq "expected #{Example} to have attribute lol of type DateTime coerced with FakeCoercer"
     end
   end
 
-  context 'when attribute is defined', 'with array type', 'and no member type' do
+  context 'when attribute is defined with array type and no member type' do
     let(:matcher) { described_class.new(:baz, Array) }
 
     it 'should match' do
-      matcher.matches?(Example).should be_true
+      expect(matcher.matches?(Example)).to be true
     end
 
     it 'should have a description' do
       matcher.matches?(Example)
-      matcher.description.should == 'have attribute baz of type Array'
+      expect(matcher.description).to eq 'have attribute baz of type Array'
     end
   end
 
-  context 'when attribute is defined', 'with array type', 'but wrong member type' do
+  context 'when attribute is defined with array type but wrong member type' do
     let(:matcher) { described_class.new(:bar, Array[Integer]) }
 
     it 'should not match' do
-      matcher.matches?(Example).should be_false
+      expect(matcher.matches?(Example)).to be false
     end
 
     it 'should have a failure message' do
       matcher.matches?(Example)
-      matcher.failure_message.should == "expected #{Example} to have attribute bar of type Array[Integer]"
+      expect(matcher.failure_message).to eq "expected #{Example} to have attribute bar of type Array[Integer]"
     end
   end
 
-  context 'when attribute is defined', 'with wrong type' do
+  context 'when attribute is defined with wrong type' do
     let(:matcher) { described_class.new(:foo, Hash) }
 
     it 'should not match' do
-      matcher.matches?(Example).should be_false
+      expect(matcher.matches?(Example)).to be false
     end
 
     it 'should have a failure message' do
       matcher.matches?(Example)
-      matcher.failure_message.should == "expected #{Example} to have attribute foo of type Hash"
+      expect(matcher.failure_message).to eq "expected #{Example} to have attribute foo of type Hash"
     end
   end
 
@@ -152,12 +156,12 @@ RSpec.describe Virtus::Matchers::HaveAttributeMatcher do
     let(:matcher) { described_class.new(:baz, String) }
 
     it 'should not match' do
-      matcher.matches?(Example).should be_false
+      expect(matcher.matches?(Example)).to be false
     end
 
     it 'should have a failure message' do
       matcher.matches?(Example)
-      matcher.failure_message.should == "expected #{Example} to have attribute baz of type String"
+      expect(matcher.failure_message).to eq "expected #{Example} to have attribute baz of type String"
     end
   end
 
@@ -228,4 +232,11 @@ RSpec.describe Virtus::Matchers::HaveAttributeMatcher do
       expect(matcher.description).to eq 'have attribute lenient of type String and is strict'
     end
   end
+
+  context "subject is an instance" do
+    it "matches" do
+      matcher = described_class.new(:strict, String)
+      expect(matcher.matches?(Example.new(strict: "strict"))).to be true
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: virtus-matchers
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Tomas Mattia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-12 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
 description: RSpec matchers for Virtus
 email: tomas.mattia@gmail.com
 executables: []
@@ -76,7 +76,7 @@ files:
 - lib/virtus/matchers.rb
 - lib/virtus/matchers/be_value_object_matcher.rb
 - lib/virtus/matchers/have_attribute_matcher.rb
-- lib/virtus/matchers/integrations.rb
+- lib/virtus/matchers/rspec.rb
 - lib/virtus/matchers/version.rb
 - spec/spec_helper.rb
 - spec/virtus/matchers/be_value_object_matcher_spec.rb
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: RSpec matchers for Virtus

data/lib/virtus/matchers/integrations.rb

@@ -1,5 +0,0 @@
-if defined?(RSpec)
-  RSpec.configure do |config|
-    config.include Virtus::Matchers, type: :virtus
-  end
-end