active_record_block_matchers 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcffbe7450c275e8f73887b109de06322a94a8f4
-  data.tar.gz: 5446e27ecf51297ba5a652776b957422118c6013
+  metadata.gz: 0d4300a69d179e6d1179829142e265a79dfca842
+  data.tar.gz: bd6f73e84dc9d9530d6f7771f478e413b68ba91f
 SHA512:
-  metadata.gz: 091547dfd038261e271f38391d842261e955f5f44f0ac55631bc1ec4d330bcaa203387a97bc8cf257fdfba2a55066922875aacbbc9acc51fbec4d464fa6fa474
-  data.tar.gz: d39f564c0f58925ae8bec51c5a0d6073a3fea5be6fc74a1c40456806a2443a4f4315ba02428e1793164e9b8284ada9562ba9adbe9a9df13cca42d2dc781c2c01
+  metadata.gz: 764d8f289679718c85409795111582ed667c7c6e0844cace7a402829f4dace7e63b7e94b12b70e0761e4bb80b99acae71ce6ae96e57348a3bf27b021c365064c
+  data.tar.gz: 700dbeb4e9890cb99da19301725c2fbd723edaa5e8aabf127e7157429dc5862314339e3543ad00f896656cfece516b3a838cfb55086d898239fde578dd9b780f

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 
 *.sqlite3
+.idea/

data/.travis.yml

@@ -1,3 +1,7 @@
 language: ruby
 rvm:
   - 2.2.0
+  - 2.2.1
+before_install:
+  - gem install bundler -v 1.8
+script: rake travis

data/README.md

@@ -1,3 +1,6 @@
+# Build Status
+[![Build Status](https://travis-ci.org/nwallace/active_record_block_matchers.svg)](https://travis-ci.org/nwallace/active_record_block_matchers)
+
 # ActiveRecordBlockMatchers
 
 Custom RSpec matchers for ActiveRecord record creation
@@ -52,6 +55,14 @@ expect { User.create!(username: "BOB") }
   .with_attributes(username: "bob")
 ```
 
+You can even use RSpec's [composable matchers][1]:
+
+```ruby
+expect { User.create!(username: "bob") }
+  .to create_a_new(User)
+  .with_attributes(username: a_string_starting_with("b"))
+```
+
 If you need to make assertions about things other than attribute equality, you can also chain `.which` with a block, and your block will receive the newly created record:
 
 ```ruby
@@ -71,7 +82,7 @@ This matcher relies on a `created_at` column existing on the given model class.
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`.
 
 ## Contributing
 
@@ -80,3 +91,6 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
+
+
+[1]: https://www.relishapp.com/rspec/rspec-expectations/v/3-3/docs/composing-matchers

data/Rakefile

@@ -1,4 +1,16 @@
 require "bundler/gem_tasks"
 require "standalone_migrations"
+require 'rspec/core/rake_task'
 
 StandaloneMigrations::Tasks.load_tasks
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = Dir.glob('spec/**/*_spec.rb')
+  t.rspec_opts = '--format documentation'
+end
+
+task :travis do
+  Rake::Task['db:setup'].invoke
+  Rake::Task[:spec].invoke
+end
+

data/bin/setup

@@ -4,4 +4,4 @@ IFS=$'\n\t'
 
 bundle install
 
-# Do any other automated setup that you need to do here
+RAILS_ENV=test rake db:setup

data/lib/active_record_block_matchers/create_a_matcher.rb

@@ -27,7 +27,7 @@ RSpec::Matchers.define :create_a_new do |klass|
     @attribute_mismatches = []
 
     @attributes && @attributes.each do |field, value|
-      unless record.public_send(field) == value
+      unless values_match?(value, record.public_send(field))
         @attribute_mismatches << [field, value, record.public_send(field)]
       end
     end
@@ -48,7 +48,8 @@ RSpec::Matchers.define :create_a_new do |klass|
       "the block should have created 1 #{klass}, but created #{@created_records.count}"
     elsif @attribute_mismatches.any?
       @attribute_mismatches.map do |field, expected, actual|
-        "Expected #{field.inspect} to be #{expected.inspect}, but was #{actual.inspect}"
+        expected_description = is_composable_matcher?(expected) ? expected.description : expected.inspect
+        "Expected #{field.inspect} to be #{expected_description}, but was #{actual.inspect}"
       end.join("\n")
     else
       @which_failure.message
@@ -57,7 +58,7 @@ RSpec::Matchers.define :create_a_new do |klass|
 
   failure_message_when_negated do
     if @created_records.count == 1 && @attributes && @attribute_mismatches.none?
-      "the block should not have created a #{klass} with attributes #{@attributes.inspect}, but did"
+      "the block should not have created a #{klass} with attributes #{format_attributes_hash(@attributes).inspect}, but did"
     elsif @created_records.count == 1 && @which_block && !@which_failure
       "the newly created #{klass} should have failed an expectation in the given block, but didn't"
     elsif @created_records.count == 1
@@ -66,6 +67,16 @@ RSpec::Matchers.define :create_a_new do |klass|
       "the block created a #{klass} that matched all given criteria"
     end
   end
+
+  def is_composable_matcher?(value)
+    value.respond_to?(:failure_message_when_negated)
+  end
+
+  def format_attributes_hash(attributes)
+    attributes.each_with_object({}) do |(field,value), memo|
+      memo[field] = is_composable_matcher?(value) ? value.description : value
+    end
+  end
 end
 
 RSpec::Matchers.alias_matcher :create_a,  :create_a_new

data/lib/active_record_block_matchers/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordBlockMatchers
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_block_matchers
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Nathan Wallace
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Additional RSpec custom matchers for ActiveRecord