grape-swagger-entity 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 229df240d0c267af65e856319d3841ccb52c1fed
-  data.tar.gz: 2fb820079fb37401469d32f4f9bd605096ac3754
+SHA256:
+  metadata.gz: 719e50145ee34ef39de1daf50a3d495ff0221d07ee7688fea3df86c503e5de16
+  data.tar.gz: 3c470cba6e089f1e7ffa1b5139de981ee84f5d7d3e005a464d57c8b7f54a0e02
 SHA512:
-  metadata.gz: fde61dee3fdb8d2d180511d04d63f740bcdfb50c4ecd6f32ff4714ac09829259be2af375955a914a37423ea35023b8bfc79b79b1695db9ebb073401e9500536c
-  data.tar.gz: 3f462c64b9d539a1246ffbb32238bcc86c7f6e6f5ee5c448e15c7b02a584c917751de574045026ac5ad9ba80d5c9104a878c333d785f6cc3497b69ae51402a35
+  metadata.gz: fc20da740449366c3df92f5850ac36865cb4d0f0404a6cb2069e82cc94ceb71f2d32b5c3ba12d4a440676e8d053402a8e60de2ac8a62504e624c574ef126dac2
+  data.tar.gz: 7b281a8feeadbed1ff4651c92168783eaa6e7d3c5ae3e56970696c0096b7011f8a2e79d67b0cead55bab677f89788afde7ae1320ec5d5cc8ab5086416fefdd07

data/CHANGELOG.md

@@ -8,6 +8,12 @@
 
 * Your contribution here.
 
+### 0.2.5 (April 26, 2018)
+
+#### Features
+
+* [#33](https://github.com/ruby-grape/grape-swagger-entity/pull/33): Update parser to respect merge option for entities - [@b-boogaard](https://github.com/b-boogaard).
+
 ### 0.2.4 (April 3, 2018)
 
 #### Fixes

data/lib/grape-swagger/entity/parser.rb

@@ -12,15 +12,23 @@ module GrapeSwagger
       end
 
       def call
-        parameters = model.root_exposures.each_with_object({}) do |value, memo|
-          memo[value.attribute] = value.send(:options)
-        end
-
-        parse_grape_entity_params(parameters)
+        parse_grape_entity_params(extract_params(model))
       end
 
       private
 
+      def extract_params(exposure)
+        exposure.root_exposures.each_with_object({}) do |value, memo|
+          if value.for_merge && (value.respond_to?(:entity_class) || value.respond_to?(:using_class_name))
+            entity_class = value.respond_to?(:entity_class) ? value.entity_class : value.using_class_name
+
+            memo.merge!(extract_params(entity_class))
+          else
+            memo[value.attribute] = value.send(:options)
+          end
+        end
+      end
+
       def parse_grape_entity_params(params, parent_model = nil)
         return unless params
 

data/lib/grape-swagger/entity/version.rb

@@ -1,5 +1,5 @@
 module GrapeSwagger
   module Entity
-    VERSION = '0.2.4'.freeze
+    VERSION = '0.2.5'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-swagger-entity
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Kirill Zaitsev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2018-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape-entity
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Grape swagger adapter to support grape-entity object parsing