grape-entity 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: effe94d496aff5e6a72b380ddaac6daa7a12b07d
-  data.tar.gz: 324af303ff5358862861de75be31cb3b0d5d5eab
+  metadata.gz: 4165ed088e82e10584f53bf9436053d18c647b41
+  data.tar.gz: be2d0321743d7d27dcc1d3c1f30a9e5483e5c92d
 SHA512:
-  metadata.gz: 53357805d3b83631c727a22ce88d81ecb1fdba53a225a063bb67a68d711ac8c86ea67d6297938f4d2192dbf00f591833aff7f00e0af60b8ca984292840e09c9c
-  data.tar.gz: 02d43ad57fb18f7eb9b3927a346f447233fd42d6f73f0591a296c8f0378a5dc16c7ff8cbe53c606c6720b9040894ea917e530618c7738814d87f5ccb5ef30f1f
+  metadata.gz: 2059bf88e77709d197f923e0c4659747d83ed2a859325cecdcbb286cdc828a82a07a8c6571df886be941059b6c2c98110327c04809d453824ff377d387919c5e
+  data.tar.gz: e2c16d535392af2daf37b834589f63933f66f960c15e199956419dd894a3bd95ab06b76a53b3ca594714f854845c4137b65add706b8be02c8d6e580b7d3e2062

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.4.2 (2014-04-03)
+==================
+
+* [#60](https://github.com/intridea/grape-entity/issues/59): Performance issues introduced by nested exposures - [@AlexYankee](https://github.com/AlexYankee).
+* [#60](https://github.com/intridea/grape-entity/issues/57): Nested exposure double-exposes a field - [@AlexYankee](https://github.com/AlexYankee).
+
 0.4.1 (2014-02-13)
 ==================
 

data/lib/grape_entity/entity.rb

@@ -136,9 +136,13 @@ module Grape
       options[:proc] = block if block_given? && block.parameters.any?
 
       @nested_attributes ||= []
+
       args.each do |attribute|
         unless @nested_attributes.empty?
           attribute = "#{@nested_attributes.last}__#{attribute}"
+          options[:nested] = true
+          nested_exposures_hash[@nested_attributes.last.to_sym] ||= {}
+          nested_exposures_hash[@nested_attributes.last.to_sym][attribute.to_sym] = options
         end
 
         exposures[attribute.to_sym] = options
@@ -180,6 +184,24 @@ module Grape
       @exposures
     end
 
+    class << self
+      attr_accessor :_nested_exposures_hash
+
+      def nested_exposures_hash
+        self._nested_exposures_hash ||= {}
+      end
+
+      def nested_exposures
+        value = nested_exposures_hash
+
+        if superclass.respond_to? :nested_exposures
+          value = superclass.nested_exposures.deep_merge(value)
+        end
+
+        value
+      end
+    end
+
     # Returns a hash, the keys are symbolized references to fields in the entity,
     # the values are document keys in the entity's documentation key. When calling
     # #docmentation, any exposure without a documentation key will be ignored.
@@ -324,7 +346,7 @@ module Grape
     end
 
     def valid_exposures
-      exposures.select do |attribute, exposure_options|
+      exposures.reject { |a, options| options[:nested] }.select do |attribute, exposure_options|
         valid_exposure?(attribute, exposure_options)
       end
     end
@@ -390,7 +412,7 @@ module Grape
     end
 
     def self.nested_exposures_for(attribute)
-      exposures.select { |a, _| a.to_s =~ /^#{attribute}__/ }
+      nested_exposures[attribute] || {}
     end
 
     def value_for(attribute, options = {})

data/lib/grape_entity/version.rb

@@ -1,3 +1,3 @@
 module GrapeEntity
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

data/spec/grape_entity/entity_spec.rb

@@ -92,9 +92,9 @@ describe Grape::Entity do
 
             subject.exposures.should == {
               awesome: {},
-              awesome__nested: {},
-              awesome__nested__moar_nested: { as: 'weee' },
-              awesome__another_nested: { using: 'Awesome' }
+              awesome__nested: { nested: true },
+              awesome__nested__moar_nested: { as: 'weee', nested: true },
+              awesome__another_nested: { using: 'Awesome', nested: true }
             }
           end
 
@@ -110,6 +110,68 @@ describe Grape::Entity do
             }
           end
 
+          it 'does not represent attributes, declared inside nested exposure, outside of it' do
+            subject.expose :awesome do
+              subject.expose(:nested) { |_| "value" }
+              subject.expose(:another_nested) { |_| "value" }
+              subject.expose :second_level_nested do
+                subject.expose(:deeply_exposed_attr) { |_| "value" }
+              end
+            end
+
+            subject.represent({}).serializable_hash.should == {
+              awesome: {
+                nested: "value",
+                another_nested: "value",
+                second_level_nested: {
+                    deeply_exposed_attr: "value"
+                }
+              }
+            }
+          end
+
+          it "complex nested attributes" do
+            class ClassRoom < Grape::Entity
+              expose(:parents, using: 'Parent') { |_| [{}, {}] }
+            end
+
+            class Person < Grape::Entity
+              expose :user do
+                expose(:in_first) { |_| 'value' }
+              end
+            end
+
+            class Student < Person
+              expose :user do
+                expose(:user_id) { |_| 'value' }
+                expose(:user_display_id, as: :display_id) { |_| 'value' }
+              end
+            end
+
+            class Parent < Person
+              expose(:children, using: 'Student') { |_| [{}, {}] }
+            end
+
+            ClassRoom.represent({}).serializable_hash.should == {
+              parents: [
+                {
+                  user: { in_first: 'value' },
+                  children: [
+                    { user: { in_first: 'value', user_id: "value", display_id: "value" } },
+                    { user: { in_first: 'value', user_id: "value", display_id: "value" } }
+                  ]
+                },
+                {
+                  user: { in_first: 'value' },
+                  children: [
+                    { user: { in_first: 'value', user_id: "value", display_id: "value" } },
+                    { user: { in_first: 'value', user_id: "value", display_id: "value" } }
+                  ]
+                }
+              ]
+            }
+          end
+
           it 'is safe if its nested exposures are safe' do
             subject.with_options safe: true do
               subject.expose :awesome do
@@ -121,6 +183,7 @@ describe Grape::Entity do
             end
 
             valid_keys = subject.represent({}).valid_exposures.keys
+
             valid_keys.include?(:awesome).should == true && \
             valid_keys.include?(:not_awesome).should == false
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-entity
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Michael Bleigh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport