grape-entity-matchers 0.0.2 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e4a77ad8de5fcd52e5779362cb357986aa797ae5
+  data.tar.gz: b215fa9e8c378c4693f219bbdeab5ecff6451ebe
+SHA512:
+  metadata.gz: 494d033ea301b521801be9e73c426b98a6d73f7f875a6256347c0568e5c4c29beddfad12f8815d41d79ce1c042fcff0442d2c5b4670b42178b2ba8eedabcf96f
+  data.tar.gz: bde091cdeaf87af6b12b4ab69801111472bba8bb864d5f7e5bb3a35cc7d4bff28b4a1a727369f7c48917817bfd1ff2162ed3a5997321af802ee8cfae78cf3627

data/CHANGELOG.markdown

@@ -1,8 +1,17 @@
 Next Release
 ============
-* Your contribution here.
+* move support from rspec 2.x to rspec 3.x
+* add support for minitest
 
-0.1.0 (01/11/2013)
+0.4.0 (02/22/2014)
+============
+* Support grape-entity 0.4.0.
+
+0.0.2 (01/17/2013)
+============
+* Fixed error in error messages.
+
+0.0.1 (01/11/2013)
 ==================
 
 * Initial Release

data/Gemfile

@@ -3,14 +3,11 @@ source 'http://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'pry'
-  gem 'guard'
   gem 'guard-rspec'
   gem 'guard-bundler'
+  gem 'terminal-notifier-guard'
   gem 'rb-fsevent'
-  gem 'growl'
   gem 'json'
-  gem 'rspec'
   gem 'rack-test', "~> 0.6.2", :require => "rack/test"
   gem 'github-markup'
 end

data/Guardfile

@@ -1,15 +1,15 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
+notification :terminal_notifier
 
-guard 'rspec', :version => 2 do
+guard 'bundler' do
+  watch('Gemfile')
+  # Uncomment next line if Gemfile contain `gemspec' command
+  # watch(/^.+\.gemspec/)
+end
+
+guard :rspec, cmd: 'bundle exec rspec'  do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch(%r{^spec/support/shared_versioning_examples.rb$}) { |m| "spec/" }
   watch('spec/spec_helper.rb')  { "spec/" }
 end
 
-
-guard 'bundler' do
-  watch('Gemfile')
-  watch(/^.+\.gemspec/)
-end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Mark Madsen, and AGiLE ANiMAL INC.
+Copyright (c) 2014 Mark Madsen, and AGiLE ANiMAL INC.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -6,6 +6,8 @@
 
 This gem provides shoulda-style matchers for Rspec to [GrapeEntity](https://github.com/agileanimal/grape-entity).
 
+Currently compatible with Rspec 2. For Rspec 3 use the rspec3 branch.
+
 ## Using the Matchers
 
 Here are some examples of the matchers in use:
@@ -25,6 +27,14 @@ it { should represent(:dog).using(PetEntity) }
 it { should represent(:cat).as(:kitty).using(PetEntity) }
 ```
 
+## Support Rspec 3.0.0
+
+Rspec 3.0.0 is in beta 2 at the time of writing this. Support for Rspec will be added on the ```rspec3``` branch.
+
+## Minitest
+
+It's coming next.
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/grape-entity-matchers.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "grape-entity-matchers"
 
-  s.add_runtime_dependency 'grape-entity', '>= 0.2.0'
-  s.add_runtime_dependency 'rspec', '~> 2.9'
+  s.add_runtime_dependency 'grape-entity', '~> 0.4.0'
+  s.add_runtime_dependency 'rspec', '~> 2.6'
 
   
   s.add_development_dependency 'rake'

data/lib/grape_entity_matchers/represent_matcher.rb

@@ -1,4 +1,5 @@
-require 'rspec/mocks'
+require "rspec/mocks"
+require "rspec/mocks/standalone"
 
 module GrapeEntityMatchers
   module RepresentMatcher
@@ -30,6 +31,13 @@ module GrapeEntityMatchers
       
       def using(other_entity)
         @other_entity = other_entity
+        @represented_attribute  = double("RepresetedAttribute")      
+        @other_entity.exposures.keys.each {|key| allow(@represented_attribute ).to receive(key).and_return(:value)}
+        self
+      end
+
+      def with_root(root)
+        @root = root
         self
       end
 
@@ -41,15 +49,23 @@ module GrapeEntityMatchers
         message = ""
         message << "#{@subject} didn't expose #{@expected_representable} as expected: #{@subject.exposures[@expected_representable]}" unless verify_exposure
         message << "#{@subject} didn't call the method #{@actual_representation || @expected_representable} to get #{@expected_representable} from the test class.\n" unless check_methods
-        message << "#{@subject} return the correct value for #{@expected_representable}." unless check_value
+        message << "#{@subject} didn't return the correct value for #{@expected_representable}. (#{@serialized_hash[@actual_representation || @expected_representable] } != #{@represented_attribute || :value})" unless check_value
         message
       end
       
+      def failure_message_when_negated
+        message = ""
+        message << "Didn't expect #{@subject} to expose #{@expected_representable} correctly: #{@subject.exposures[@expected_representable]} \n" if verify_exposure
+        message << "Didn't expect #{@subject} to call #{@actual_representation || @expected_representable} to get #{@expected_representable} from the test class.\n" if check_methods
+        message << "Didn't expect #{@subject} to return the correct value for #{@expected_representable}. (#{@serialized_hash[@actual_representation || @expected_representable] } != #{@represented_attribute || :value})" if check_value
+        message
+      end
+
       def negative_failure_message
         message = ""
         message << "Didn't expect #{@subject} to expose #{@expected_representable} correctly: #{@subject.exposures[@expected_representable]} \n" if verify_exposure
         message << "Didn't expect #{@subject} to call #{@actual_representation || @expected_representable} to get #{@expected_representable} from the test class.\n" if check_methods
-        message << "Didn't expect #{@subject} to return the correct value for #{@expected_representable}.\n" if check_value
+        message << "Didn't expect #{@subject} to return the correct value for #{@expected_representable}. (#{@serialized_hash[@actual_representation || @expected_representable] } != #{@represented_attribute || :value})" if check_value
         message
       end
 
@@ -58,14 +74,30 @@ module GrapeEntityMatchers
       end
       
       private
+
+      def limit_exposure_to_method(entity, method)
+        allow(entity).to receive(:valid_exposures).and_return(  
+          entity.exposures.slice(method)
+        )
+      end
       
       def check_methods
-        representee = mock("RepresetedObject")
-        representee.should_receive(@expected_representable).and_return(:value)       
-        representee.should_receive(@conditions.keys.first).and_return(@conditions.values.first) unless @conditions.nil?
+        @representee = double("RepresetedObject")
+        @represented_attribute ||= :value
+
+        expect(@representee).to receive(@expected_representable).and_return(@represented_attribute)       
+        expect(@representee).to receive(@conditions.keys.first).and_return(@conditions.values.first) unless @conditions.nil?
         
-        @serialized_hash = @subject.represent(representee).serializable_hash
-          
+        representation = @subject.represent(@representee)
+
+        @serialized_hash = if @root
+                             limit_exposure_to_method(representation[@root.to_s], @expected_representable)        
+                             representation[@root.to_s].serializable_hash
+                           else        
+                             limit_exposure_to_method(representation, @expected_representable)
+                             representation.serializable_hash
+                           end
+
         begin
           RSpec::Mocks::verify  # run mock verifications
           methods_called = true
@@ -85,6 +117,7 @@ module GrapeEntityMatchers
         if @conditions.nil?
           @subject.exposures[@expected_representable] == hash
         else
+          #@representee.call(@conditions.keys.first)
           exposures = @subject.exposures[@expected_representable].dup
           exposures.delete(:if) != nil && exposures == hash
         end
@@ -92,13 +125,13 @@ module GrapeEntityMatchers
       
       def check_value
         if @other_entity
-          # we aren't setting a value here, so it's going to be empty
-          @serialized_hash[@actual_representation || @expected_representable] == {}
+          other_representation = @other_entity.represent(@represented_attribute)
+          other_representation.exposures.keys.each {|key| allow(other_representation).to receive(key).and_return(:value)}
+          @serialized_hash[@actual_representation || @expected_representable] ==  other_representation.serializable_hash
         else
           @serialized_hash[@actual_representation || @expected_representable] == :value
         end
       end
-      
     end
   end
 end

data/lib/grape_entity_matchers/version.rb

@@ -1,3 +1,3 @@
 module GrapeEntityMatchers
-  VERSION = '0.0.2'
+  VERSION = '0.4.0'
 end

data/spec/grape_entity_matchers/represent_matcher_spec.rb

@@ -9,36 +9,41 @@ describe GrapeEntityMatchers do
     class Person
       include Grape::Entity::DSL
       entity :name, :age do
-        expose :date_of_birth, :as => :brithday
+        expose :date_of_birth, :as => :birthday
         expose :cat, :as => :cat, :using => PetEntity
         expose :dog, :using => PetEntity
         expose :secret, :if => lambda{ |person, options| person.authorized? }
         expose :super_dooper_secret, :as => :top_secret, :if => lambda{ |person, options| person.authorized? }
       end
     end
+    class Vet < Grape::Entity
+      root 'vets', 'vet'
+      expose :name
+    end
+    nil
   end
 
   context 'matchers' do
-    subject(:entity){ Person::Entity }
+    subject(:entity) { Person::Entity }
 
     # TODO: move the tests to this format to shadow the thoughtbot tests.
     # it { should represent(:name) }
-    it "should ensure the representation includes the specified property" do
-      entity.should represent :name
+    context "should ensure the representation includes the specified property" do
+      it { should represent :name}
     end
     
+    it { should represent :name}
     
-    
-    it { should represent(:date_of_birth).as(:brithday) }
+    it { should represent(:date_of_birth).as(:birthday) }
     
     it { should_not represent(:t_shirt_size) }
-    it { should_not represent(:t_shirt_size).as(:brithday) }
+    it { should_not represent(:t_shirt_size).as(:birthday) }
     it { should_not represent(:name).as(:brithday) }
     it { should_not represent(:date_of_birth) }
     
     it { should represent(:secret).when( :authorized? => true ) }
     it { should_not represent(:secret).when( :authorized? => false ) }
-    
+
     it { should represent(:super_dooper_secret).as(:top_secret).when( :authorized? => true ) }
     it { should_not represent(:super_dooper_secret).as(:top_secret).when( :authorized? => false ) }
     it { should_not represent(:super_dooper_secret).when( :authorized? => true ) }
@@ -48,4 +53,9 @@ describe GrapeEntityMatchers do
     it { should_not represent(:cat).using(PetEntity) }
 
   end
+
+  context 'matchers within a root' do
+    subject(:entity) { Vet }
+    it { should represent(:name).with_root('vet') }
+  end
 end

data/spec/spec_helper.rb

@@ -7,4 +7,9 @@ require 'bundler'
 
 Bundler.require :default, :test
 
-require 'pry'
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end

metadata

@@ -1,110 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: grape-entity-matchers
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.0.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Mark Madsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
+date: 2014-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: grape-entity
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
   type: :runtime
   prerelease: false
-  name: grape-entity
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
-- !ruby/object:Gem::Dependency
+        version: '2.6'
   type: :runtime
   prerelease: false
-  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.9'
-- !ruby/object:Gem::Dependency
+        version: '0'
   type: :development
   prerelease: false
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: maruku
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   type: :development
   prerelease: false
-  name: maruku
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   type: :development
   prerelease: false
-  name: yard
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   type: :development
   prerelease: false
-  name: bundler
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Shoulda-like matchers for Grape Entity.
@@ -135,33 +122,26 @@ files:
 homepage: https://github.com/agileanimal/grape-entity-matchers
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 186511890577646696
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 186511890577646696
       version: '0'
 requirements: []
 rubyforge_project: grape-entity-matchers
-rubygems_version: 1.8.24
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Shoulda-like matchers for Grape Entity.
 test_files:
 - spec/grape_entity_matchers/represent_matcher_spec.rb