grape-entity-matchers 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4a77ad8de5fcd52e5779362cb357986aa797ae5
-  data.tar.gz: b215fa9e8c378c4693f219bbdeab5ecff6451ebe
+  metadata.gz: edb2095f5507a42699c1f5562b058a2cead368f4
+  data.tar.gz: 9a719010ef85bfcc0ab589c35ca29c8b6f8bf245
 SHA512:
-  metadata.gz: 494d033ea301b521801be9e73c426b98a6d73f7f875a6256347c0568e5c4c29beddfad12f8815d41d79ce1c042fcff0442d2c5b4670b42178b2ba8eedabcf96f
-  data.tar.gz: bde091cdeaf87af6b12b4ab69801111472bba8bb864d5f7e5bb3a35cc7d4bff28b4a1a727369f7c48917817bfd1ff2162ed3a5997321af802ee8cfae78cf3627
+  metadata.gz: 6ec81ccd12efb64cc01f36c6e97930c53f2df3cc7673846b4036482dd2a91f2215886a5d8bc8a55d166c1d0f37f39c720a3b5c697c0729137850eaefcf167840
+  data.tar.gz: 2cce47ef4587a766e58f9106b8e1f31c370abab053fd2b7ae64df9dbd7956fe09a68a6a2b092130ea306eba8335cd28bfe929ae5b52b2529932530bee77d4a40

data/.travis.yml

@@ -1,8 +1,6 @@
 rvm:
-  - 1.8.7
-  - 1.9.2
+  - 2.1.0
+  - 2.0.0
   - 1.9.3
   - jruby
   - rbx
-  - ree
-

data/CHANGELOG.markdown

@@ -3,6 +3,10 @@ Next Release
 * move support from rspec 2.x to rspec 3.x
 * add support for minitest
 
+0.4.1 (02/22/2014)
+============
+* fix error when an entity contains itself nested by nil-ing out the nested version.
+
 0.4.0 (02/22/2014)
 ============
 * Support grape-entity 0.4.0.

data/lib/grape_entity_matchers/represent_matcher.rb

@@ -32,7 +32,9 @@ 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)}
+        @other_entity.exposures.keys.each do |key| 
+          allow(@represented_attribute ).to receive(key).and_return( @other_entity.exposures[key].nil? ? :value : nil)
+        end
         self
       end
 
@@ -126,7 +128,11 @@ module GrapeEntityMatchers
       def check_value
         if @other_entity
           other_representation = @other_entity.represent(@represented_attribute)
-          other_representation.exposures.keys.each {|key| allow(other_representation).to receive(key).and_return(:value)}
+
+          other_representation.exposures.keys.each do |key| 
+            allow(other_representation).to receive(key).and_return( other_representation.exposures[key].nil? ? :value : nil)
+          end
+
           @serialized_hash[@actual_representation || @expected_representable] ==  other_representation.serializable_hash
         else
           @serialized_hash[@actual_representation || @expected_representable] == :value

data/lib/grape_entity_matchers/version.rb

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

data/spec/grape_entity_matchers/represent_matcher_spec.rb

@@ -10,7 +10,7 @@ describe GrapeEntityMatchers do
       include Grape::Entity::DSL
       entity :name, :age do
         expose :date_of_birth, :as => :birthday
-        expose :cat, :as => :cat, :using => PetEntity
+        expose :cat, :as => :feline, :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? }
@@ -20,6 +20,11 @@ describe GrapeEntityMatchers do
       root 'vets', 'vet'
       expose :name
     end
+    class ItemEntity < Grape::Entity
+      expose :name
+      expose :name, as: :title
+      expose :sub_items, as: :children, using: ItemEntity
+    end
     nil
   end
 
@@ -49,7 +54,7 @@ describe GrapeEntityMatchers do
     it { should_not represent(:super_dooper_secret).when( :authorized? => true ) }
     
     it { should represent(:dog).using(PetEntity) }
-    it { should represent(:cat).as(:cat).using(PetEntity) }
+    it { should represent(:cat).as(:feline).using(PetEntity) }
     it { should_not represent(:cat).using(PetEntity) }
 
   end
@@ -58,4 +63,10 @@ describe GrapeEntityMatchers do
     subject(:entity) { Vet }
     it { should represent(:name).with_root('vet') }
   end
+
+  context 'matchers with with a tree structure' do
+    subject(:entity) { ItemEntity }
+    it { should represent(:name).as(:title) }
+    it { should represent(:sub_items).as(:children).using(ItemEntity) }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-entity-matchers
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Mark Madsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-23 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape-entity