grape-swagger-entity 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09004935e0da7b2d424d04a85feb7d0b7e4f5665
-  data.tar.gz: 13531135fa1fd80e04a9f0677bbf95cd9034e4aa
+  metadata.gz: 09decfdceca7643d9cf6df2f34843a5643d62a56
+  data.tar.gz: ab8bbcc2c2d29802747f35848165abcf85407a4d
 SHA512:
-  metadata.gz: e605ba8293b54f14ca786afe7c2c5f5e478042889c37aee3e2dd98e61f8149e4e5f3b1545a6d7d373542f679f4e8fbdbae48511de6b1a8465508b9c1c9ecfbec
-  data.tar.gz: 49da1141e3a3b413b893db0c0f4d1755e3a6dd516d05ffea0f367388f5cfba7130d103c8cfe349273c98f577a6302ef80e9b46b56cd76486c471184374a5ec94
+  metadata.gz: 5eeada88bb46cdc9b84157c0bc75b207f6f05f99fc9378c8c73a8d03d08ac83192a91d3cefab8a996d60ffb57e3b5ac51d1caee25c8692b845d9068616da9de1
+  data.tar.gz: 6847991544fa81362e9deab7df204f38059fb49dca0f72a84ff94d6179d2f9ce7416262b138f30bc1fce0b3cb2e74439a5ed4f8da88cbafc5a58e328be4a7592

data/.travis.yml

@@ -5,13 +5,26 @@ cache: bundler
 matrix:
   include:
     - rvm: 2.3.0
+      script:
+        - bundle exec danger
+    - rvm: 2.3.0
+      env:
+        - GRAPE_ENTITY="~> 0.4.0"
+    - rvm: 2.3.0
+      env:
+        - GRAPE_ENTITY="~> 0.5.0"
+    - rvm: 2.3.0
+      env:
+        - GRAPE_ENTITY="~> 0.6.0"
     - rvm: 2.2
     - rvm: 2.1
+    - rvm: jruby-9.1.2.0
     - rvm: ruby-head
     - rvm: jruby-head
-    - rvm: jruby-19mode
     - rvm: rbx-2
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
+    - rvm: rbx-2
+
 before_install: gem install bundler -v 1.12.1

data/CHANGELOG.md

@@ -8,8 +8,20 @@
 
 * Your contribution here.
 
+### 0.1.5 (November 21, 2016)
+
+#### Features
+
+* [#11](https://github.com/ruby-grape/grape-swagger-entity/pull/11): Use an automated PR linter, [danger.systems](http://danger.systems) - [@Bugagazavr](https://github.com/Bugagazavr).
+* [#12](https://github.com/ruby-grape/grape-swagger-entity/pull/12): Allow parsing Entity with no endpoint - [@lordnibbler](https://github.com/lordnibbler).
+
+#### Fixes
+
+* [#8](https://github.com/ruby-grape/grape-swagger-entity/pull/8): Generate enum property if values key is passed in documentation - [@lordnibbler](https://github.com/lordnibbler).
+* [#15](https://github.com/ruby-grape/grape-swagger-entity/pull/15): Support grape entity 0.6.x and later - [@Bugagazavr](https://github.com/Bugagazavr).
+
 ### 0.1.4 (June 7, 2016)
 
 #### Fixes
 
-* [#7](https://github.com/ruby-grape/grape-swagger-entity/pull/7) Fixed array support for primitive types - [@Bugagazavr](https://github.com/Bugagazavr).
+* [#7](https://github.com/ruby-grape/grape-swagger-entity/pull/7): Fixed array support for primitive types - [@Bugagazavr](https://github.com/Bugagazavr).

data/Dangerfile

@@ -0,0 +1 @@
+danger.import_dangerfile(gem: 'ruby-grape-danger')

data/Gemfile

@@ -3,4 +3,11 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in grape-swagger-entity.gemspec
 gemspec
 
+gem 'grape-entity', ENV.fetch('GRAPE_ENTITY', '0.5.0')
 gem 'grape-swagger', github: 'ruby-grape/grape-swagger'
+gem 'ruby-grape-danger', '~> 0.1.0', require: false
+
+if RUBY_VERSION < '2.2.2'
+  gem 'rack', '<2.0.0'
+  gem 'activesupport', '<5.0.0'
+end

data/grape-swagger-entity.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email         = ['kirik910@gmail.com']
 
   s.summary       = 'Grape swagger adapter to support grape-entity object parsing'
-  s.homepage      = 'https://github.com/Bugagazavr/grape-swagger-entity'
+  s.homepage      = 'https://github.com/ruby-grape/grape-swagger-entity'
   s.license       = 'MIT'
 
   s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rack-test'
   s.add_development_dependency 'rack-cors'
-  s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'rubocop', '0.40.0'
   s.add_development_dependency 'redcarpet' unless RUBY_PLATFORM.eql?('java') || RUBY_ENGINE.eql?('rbx')
   s.add_development_dependency 'rouge' unless RUBY_PLATFORM.eql?('java') || RUBY_ENGINE.eql?('rbx')
   s.add_development_dependency 'pry' unless RUBY_PLATFORM.eql?('java') || RUBY_ENGINE.eql?('rbx')

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

@@ -13,7 +13,7 @@ module GrapeSwagger
         # TODO: this should only be a temporary hack ;)
         if ::GrapeEntity::VERSION =~ /0\.4\.\d/
           parameters = model.exposures ? model.exposures : model.documentation
-        elsif ::GrapeEntity::VERSION =~ /0\.5\.\d/
+        else
           parameters = model.root_exposures.each_with_object({}) do |value, memo|
             memo[value.attribute] = value.send(:options)
           end
@@ -38,7 +38,7 @@ module GrapeSwagger
           end
 
           if model
-            name = endpoint.send(:expose_params_from_model, model)
+            name = endpoint.nil? ? model.to_s.demodulize : endpoint.send(:expose_params_from_model, model)
             memo[entity_name] = entity_model_type(name, entity_options)
           else
             documented_type = entity_options[:type]
@@ -62,8 +62,9 @@ module GrapeSwagger
               }
             end
 
-            if entity_options[:values] && entity_options[:values].is_a?(Array)
-              memo[entity_name][:enum] = entity_options[:values]
+            if entity_options[:documentation] && entity_options[:documentation][:values]
+              values = entity_options[:documentation][:values]
+              memo[entity_name][:enum] = values if values.is_a?(Array)
             end
 
             if entity_options[:documentation] && entity_options[:documentation][:is_array]

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

@@ -1,5 +1,5 @@
 module GrapeSwagger
   module Entity
-    VERSION = '0.1.4'.freeze
+    VERSION = '0.1.5'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-swagger-entity
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Kirill Zaitsev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape-swagger
@@ -112,16 +112,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.40.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.40.0
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -191,6 +191,7 @@ files:
 - ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
+- Dangerfile
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -202,7 +203,7 @@ files:
 - lib/grape-swagger/entity.rb
 - lib/grape-swagger/entity/parser.rb
 - lib/grape-swagger/entity/version.rb
-homepage: https://github.com/Bugagazavr/grape-swagger-entity
+homepage: https://github.com/ruby-grape/grape-swagger-entity
 licenses:
 - MIT
 metadata: {}