rspec_structure_matcher 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fb0fc227e1a009bbe666485d60aeb329c78ff6c
-  data.tar.gz: b7e36de60437a273d5ded1290866adc3b4eb9c2d
+  metadata.gz: 97089c3a4fd2b002689a6a2a3e09de64aa3ee1eb
+  data.tar.gz: 5ad3e4fddee55e825f44b509991fef636743d8c3
 SHA512:
-  metadata.gz: c3f225d4d26bd54841fe03a715fd0d405c6f0e4f3c11eee0a5defaf38191b8b08ceb9c6703f9ba497d4edd77145a17f9382df500e7ddca74c904abea869e39a1
-  data.tar.gz: a55bc1b8acb51515980cb55c42ec2afab7ab928c0b1b43faddb3460de7d10267830c4d583a721858a52642415f688d0ac507be04d81e9b4529f8c7b680d5abc3
+  metadata.gz: a68a9bc2ab6232520560706094bad4694babf7ec0e2f9097f1648e74f210333101cd082a281aa04400fbc63e3dd602e8837c1fc2a67d7220bad967db3b64f530
+  data.tar.gz: 01b45d272f2e2069bfd914aa067ab20bbe76c0a130e807cbb32e6724761f25a254e94145be616ef301e5279331b7da4e276bf5f8a4000b8864a5a0442cddd9e0

data/README.md

@@ -61,12 +61,12 @@ This will pass if `video['episode_number']` is either `null` or `is_a?(Integer)`
 Similar to optional values, testing deep strucutres has been kept as simple as possible. Simply define a new expected structure:
 
     tv_show_expected_structure = {
-      title: string
+      title: String
     }
 
 And then compare the structure as normal:
 
-    expect(video['tv_show']) to have_structure(tv_show_expected_structure)
+    expect(video['tv_show']).to have_structure(tv_show_expected_structure)
 
 ## Contributing
 

data/lib/have_structure_matcher.rb

@@ -1,23 +1,19 @@
 RSpec::Matchers.define :have_structure do |expected|
   match do |actual|
-    missing_items(actual, expected).empty?
+    invalid_items(actual, expected).empty?
   end
 
-  failure_message_for_should do |actual|
-    missing = missing_items(actual, expected)
-    "missing or invalid keys: #{missing.join(', ')}\n\n#{actual.slice(*missing)}"
+  failure_message do |actual|
+    invalid = invalid_items(actual, expected)
+    "missing or invalid keys: #{invalid.keys.join(', ')}\n\n#{invalid}"
   end
 
-  def missing_items(actual, expected)
-    missing_items = []
-
-    expected.each do |key, value|
+  def invalid_items(actual, expected)
+    expected.each_with_object({}) do |(key, value), memo|
       if !actual.has_key?(key.to_s) || !value_match(actual[key.to_s], value)
-        missing_items << key.to_s
+        memo[key] = value
       end
     end
-
-    missing_items
   end
 
   def value_match(actual_value, expected_value)

data/lib/version.rb

@@ -1,3 +1,3 @@
 module RspecStructureMatcher
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/rspec_structure_matcher.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rspec", "~> 2.0"
+  spec.add_dependency "rspec", "~> 3.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/spec/lib/have_structure_matcher_spec.rb

@@ -0,0 +1,54 @@
+require 'rspec_structure_matcher'
+
+describe 'have_structure' do
+  let(:expected_structure) {
+    {
+      'foo' => String,
+      'bar' => String
+    }
+  }
+
+  context 'when there are missing keys' do
+    let(:structure) {
+      {
+        'foo' => 'baz'
+      }
+    }
+
+    it 'raises the correct error' do
+      expect {
+        expect(structure).to have_structure(expected_structure)
+      }.to raise_error(RSpec::Expectations::ExpectationNotMetError, /missing or invalid keys: bar/)
+    end
+  end
+
+  context 'when there are invalid keys' do
+    let(:structure) {
+      {
+        'foo' => 1,
+        'bar' => 'baz'
+      }
+    }
+
+    it 'raises the correct error' do
+      expect {
+        expect(structure).to have_structure(expected_structure)
+      }.to raise_error(RSpec::Expectations::ExpectationNotMetError, /missing or invalid keys: foo/)
+    end
+  end
+
+  context 'when there are no missing keys' do
+    let(:structure) {
+      {
+        'foo' => 'baz',
+        'bar' => 'baz'
+      }
+    }
+
+    it 'raise no error' do
+      expect {
+        expect(structure).to have_structure(expected_structure)
+      }.not_to raise_error
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec_structure_matcher
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Tony Marklove
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -70,6 +70,7 @@ files:
 - lib/rspec_structure_matcher.rb
 - lib/version.rb
 - rspec_structure_matcher.gemspec
+- spec/lib/have_structure_matcher_spec.rb
 homepage: https://github.com/jjbananas/rspec_structure_matcher
 licenses:
 - MIT
@@ -94,4 +95,5 @@ rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Rspec matchers for structured JSON responses.
-test_files: []
+test_files:
+- spec/lib/have_structure_matcher_spec.rb