active_record_ignored_attributes 0.0.2 → 0.0.3

data/Readme.md

@@ -44,6 +44,16 @@ Using `same_as?`:
     b = Address.new(address: 'Nowhere Road')
     a.same_as?(b) # => false
 
+Using `has_attribute_values?`:
+
+    a = Address.new(address: 'A St.', city: "Don't care")
+    a.has_attribute_values?(address: 'A St.')                    # => true
+    a.has_attribute_values?(address: 'A St.', city: 'Different') # => false
+
+    b = Address.new(address: 'B St.', city: "Don't care")
+    b.has_attribute_values?(address: 'A St.')                    # => false
+    b.has_attribute_values?({})                                  # => true
+
 
 Installing
 ==========
@@ -128,7 +138,7 @@ or:
 RSpec
 =======
 
-This gem comes with a `be_same_as` matcher for RSpec.
+This gem comes with a `be_same_as` and `have_attribute_values` matcher for RSpec.
 
 Add this to your spec_helper.rb:
 
@@ -152,7 +162,15 @@ and it will lovingly do a diff for you and only show you the attributes in each
     expected: #<Address address: "Nowhere Road">
          got: #<Address address: "B St.">
 
+Or use `should have_attribute_values` whenever it's more convenient to specify the expected attributes with a hash instead of building a new model instance:
+
+    a = Address.new(               name: 'A', address: 'The Same Address', city: "Don't care")
+    a.should have_attribute_values name: 'A', address: 'A Slightly Different Address'
+
+will fail with:
 
+    expected: {:name=>"A", :address=>"A Slightly Different Address"}
+         got: {:name=>"A", :address=>"The Same Address"}
 
 Motivation
 ==========

data/lib/active_record_ignored_attributes/has_attribute_values.rb

@@ -0,0 +1,9 @@
+#require 'active_support/core_ext/hash/keys'
+
+module ActiveRecordIgnoredAttributes::HasAttributeValues
+  def has_attribute_values?(expected)
+    self.attributes.slice(*expected.stringify_keys.keys) == expected.stringify_keys
+  end
+  alias_method :has_attributes_hash?, :has_attribute_values?
+end
+

data/lib/active_record_ignored_attributes/matchers/have_attribute_values.rb

@@ -0,0 +1,15 @@
+RSpec::Matchers.define :have_attribute_values do |expected|
+  match do |actual|
+    actual.has_attribute_values?(expected)
+  end
+
+  failure_message_for_should do |actual|
+    %(expected: #{expected.symbolize_keys.inspect}\n) +
+    %(     got: #{actual.attributes.slice(*expected.stringify_keys.keys).symbolize_keys.inspect})
+  end
+
+  failure_message_for_should_not do |actual|
+    %(expected #{actual.inspect}\n) +
+    %(not to have attribute values #{expected.symbolize_keys.inspect})
+  end
+end

data/lib/active_record_ignored_attributes/matchers.rb

@@ -1 +1,2 @@
 require 'active_record_ignored_attributes/matchers/be_same_as'
+require 'active_record_ignored_attributes/matchers/have_attribute_values'

data/lib/active_record_ignored_attributes/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordIgnoredAttributes
-  Version = "0.0.2"
+  Version = "0.0.3"
 end

data/lib/active_record_ignored_attributes.rb

@@ -1,7 +1,8 @@
 require 'active_record'
 require "active_record_ignored_attributes/version"
-require "active_record_ignored_attributes/inspect"
 require "active_record_ignored_attributes/same_attributes_as"
+require "active_record_ignored_attributes/has_attribute_values"
+require "active_record_ignored_attributes/inspect"
 
 module ActiveRecordIgnoredAttributes
   extend ActiveSupport::Concern
@@ -22,5 +23,6 @@ end
 ActiveRecord::Base.class_eval do
   include ActiveRecordIgnoredAttributes
   include ActiveRecordIgnoredAttributes::SameAttributesAs
+  include ActiveRecordIgnoredAttributes::HasAttributeValues
   include ActiveRecordIgnoredAttributes::Inspect
 end

data/spec/has_attribute_values_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Address do
+  describe 'has_attribute_values?' do
+    let(:address) { Address.new }
+
+    it 'should return true if passed {}' do
+      a = Address.new(        name: 'A', address: 'The Same Address', city: "Don't care")
+      a.has_attribute_values?({}).should be_true
+    end
+
+    it 'should return true if the given attributes have the given values' do
+      a = Address.new(        name: 'A', address: 'The Same Address', city: "Don't care")
+      a.has_attribute_values?(name: 'A', address: 'The Same Address').should be_true
+    end
+
+    it 'should return false if any of the given attributes have different values than given' do
+      a = Address.new(        name: 'A', address: 'The Same Address', city: "Don't care")
+      a.has_attribute_values?(name: 'A', address: 'The Same Address', city: "I do care after all").should be_false
+      a.has_attribute_values?(name: 'B', address: 'The Same Address').should be_false
+    end
+  end
+end
+

data/spec/matchers/have_attribute_values_spec.rb

@@ -0,0 +1,38 @@
+require 'pathname'; __DIR__ = Pathname.new(__FILE__).dirname
+require __DIR__ + "../spec_helper"
+require 'active_support/core_ext/string/strip'
+
+describe "have_attribute_values" do
+  it "delegates to has_attribute_values?" do
+    object, other = Object.new, Object.new
+    mock(object).has_attribute_values?(other) { true }
+    object.should have_attribute_values(other)
+  end
+
+  it 'matches when it should match' do
+    object = Address.new(                 name: 'A', address: 'The Same Address', city: "Don't care")
+    expect do
+      (object.should have_attribute_values name: 'A', address: 'The Same Address').should be_true
+    end.to_not raise_error
+  end
+
+  it "reports a nice failure message for should" do
+    object = Address.new(                 name: 'A', address: 'The Same Address', city: "Don't care")
+    expect do
+      object.should have_attribute_values name: 'A', address: 'A Slightly Different Address'
+    end.to raise_error(<<-End.strip_heredoc.chomp)
+    expected: {:name=>"A", :address=>"A Slightly Different Address"}
+         got: {:name=>"A", :address=>"The Same Address"}
+    End
+  end
+
+  it "reports a nice failure message for should_not" do
+    object = Address.new(                 name: 'A', address: 'The Same Address', city: "Don't care")
+    expect do
+      object.should_not have_attribute_values name: 'A', address: 'The Same Address'
+    end.to raise_error(<<-End.strip_heredoc.chomp)
+    expected {Address id: nil, name: "A", address: "The Same Address", city: "Don't care", state: nil, postal_code: nil, country: nil}
+    not to have attribute values {:name=>"A", :address=>"The Same Address"}
+    End
+  end
+end

data/spec/{matchers_spec.rb → matchers/same_as_spec.rb}

@@ -12,7 +12,7 @@ describe "be_same_as" do
     object, other = Address.new(address: 'A Street'), Address.new(address: 'B Street')
     expect do
       object.should be_same_as(other)
-    end.should raise_error(<<-End.strip_heredoc.chomp)
+    end.to raise_error(<<-End.strip_heredoc.chomp)
     expected: #<Address address: "B Street">
          got: #<Address address: "A Street">
     End
@@ -22,7 +22,7 @@ describe "be_same_as" do
     object, other = Address.new(address: 'A Street'), Address.new(address: 'A Street')
     expect do
       object.should_not be_same_as(other)
-    end.should raise_error(<<-End.strip_heredoc.chomp)
+    end.to raise_error(<<-End.strip_heredoc.chomp)
          expected: {Address id: nil, name: nil, address: "A Street", city: nil, state: nil, postal_code: nil, country: nil}
 to not be same_as: {Address id: nil, name: nil, address: "A Street", city: nil, state: nil, postal_code: nil, country: nil}
     End

metadata

@@ -2,7 +2,7 @@
 name: active_record_ignored_attributes
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Tyler Rick
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-21 00:00:00 -07:00
+date: 2011-09-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -119,14 +119,18 @@ files:
 - active_record_ignored_attributes.gemspec
 - lib/active_record_ignored_attributes.rb
 - lib/active_record_ignored_attributes/comparison.rb
+- lib/active_record_ignored_attributes/has_attribute_values.rb
 - lib/active_record_ignored_attributes/inspect.rb
 - lib/active_record_ignored_attributes/matchers.rb
 - lib/active_record_ignored_attributes/matchers/be_same_as.rb
+- lib/active_record_ignored_attributes/matchers/have_attribute_values.rb
 - lib/active_record_ignored_attributes/same_attributes_as.rb
 - lib/active_record_ignored_attributes/version.rb
 - spec/attributes_spec.rb
+- spec/has_attribute_values_spec.rb
 - spec/inspect_spec.rb
-- spec/matchers_spec.rb
+- spec/matchers/have_attribute_values_spec.rb
+- spec/matchers/same_as_spec.rb
 - spec/same_as_spec.rb
 - spec/spec_helper.rb
 - spec/support/database.mysql2.yml