grape-swagger-entity 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 728921dd6134e0517a9d041b71ad9eb576cbf69d
-  data.tar.gz: f5a194a8dfff4a6d26283fdc52dbb75e0530e19a
+  metadata.gz: 902654d02c87dd42858477d4696a7696593800b0
+  data.tar.gz: 6c26a84436da085cc180e0cbd8fd4e3563d3874b
 SHA512:
-  metadata.gz: 6cde2391099a8e9347d51330d750148aa6d197d6aab5e3d369b1a864ebfe397f26aa42ac4ca1e7d388415f6956b250f491dfa480629899b13ed66a8e9e41fa7a
-  data.tar.gz: 3936253b710cae0bdde531efa60bdc90e3f6c3063c990748c1f4d026cc4f94e9f3c8a0e3e73ed479898a5fbdfaf8bf83c1c5852dfefb0cf1288c2aac7c429394
+  metadata.gz: 5e2251aa39d752f7c791c4d7d933fc3844f1be16308ea083a16fc6d86c6dea5b161f3e806fc8a051ffbe31636ce6399d97a664b7175daee5f2b4fa4af09cc09c
+  data.tar.gz: 36ff527340980f5368feb9ed2fb057236d316b4b4e3f3a4a90054ea046a596914c42165aa0388cae852205e12f3c7dc83a1276f8bebd0c7c08569a4569f3cdf8

data/.travis.yml

@@ -10,18 +10,19 @@ after_success:
   - bundle exec danger
 
 rvm:
-  - 2.4.2
-  - 2.3.5
+  - 2.4.5
+  - 2.5.3
+  - 2.6.0
 
 env:
-  - GRAPE_ENTITY=0.5.2
   - GRAPE_ENTITY=0.6.1
+  - GRAPE_ENTITY=0.7.1
 
 matrix:
   fast_finish: true
 
   include:
-    - rvm: 2.2.8
+    - rvm: 2.3.8
       env:
     - rvm: ruby-head
       env:
@@ -31,7 +32,7 @@ matrix:
       env:
 
   allow_failures:
-    - rvm: 2.2.8
+    - rvm: 2.3.8
     - rvm: ruby-head
     - rvm: jruby-head
     - rvm: rbx-2

data/CHANGELOG.md

@@ -8,6 +8,12 @@
 
 * Your contribution here.
 
+### 0.3.3 (Fabruary 22, 2019)
+
+#### Features
+
+* [#39](https://github.com/ruby-grape/grape-swagger-entity/pull/39): Fix to avoid conflict with polymorphic model - [@kinoppyd](https://github.com/kinoppyd).
+
 ### 0.3.2 (January 15, 2019)
 
 #### Features

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

@@ -17,6 +17,14 @@ module GrapeSwagger
 
       private
 
+      class Alias
+        attr_reader :original, :renamed
+        def initialize(original, renamed)
+          @original = original
+          @renamed = renamed
+        end
+      end
+
       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))
@@ -25,7 +33,8 @@ module GrapeSwagger
             extracted_params = extract_params(entity_class)
             memo.merge!(extracted_params)
           else
-            memo[value.attribute] = value.send(:options)
+            opts = value.send(:options)
+            opts[:as] ? memo[Alias.new(value.attribute, opts[:as])] = opts : memo[value.attribute] = opts
           end
         end
       end
@@ -39,6 +48,7 @@ module GrapeSwagger
           hidden_option = documentation_options.fetch(:hidden, nil)
           next if in_option == 'header' || hidden_option == true
 
+          entity_name = entity_name.original if entity_name.is_a?(Alias)
           final_entity_name = entity_options.fetch(:as, entity_name)
           documentation = entity_options[:documentation]
 

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

@@ -1,5 +1,5 @@
 module GrapeSwagger
   module Entity
-    VERSION = '0.3.2'.freeze
+    VERSION = '0.3.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-swagger-entity
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Kirill Zaitsev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-15 00:00:00.000000000 Z
+date: 2019-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape-entity