introspective_grape 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a21e9540c7f4929e4dced1d88eb599edb4e887b
-  data.tar.gz: e97148d4dd00bba79807d6b52a79a29073fbbc9f
+  metadata.gz: d8dc4cc268e2946259654e5b44eb1841afb3a2a1
+  data.tar.gz: 4110a9992a24fb544a58c3185abce336694499f0
 SHA512:
-  metadata.gz: 4236508d67aac2b65c1ed4123c4bfd63ab76851c1a4cbc17d943326bc01530ac9cc57f336954cfde83713fbb4020751a1e201dbe58a585e919aa3a7c23a7f7aa
-  data.tar.gz: d80ccf25f1db8187717fb57f6e8a8f82f2fb8889154efc0b96121bdf5a022f193de94380fc222ec8aeecc19d1041f99edbbd10234a2ba8ca50e1c4c15ee03ee1
+  metadata.gz: 9ed73bf254659358fba6e9635ed8bf4d38fbba2349e42a9636bd7a99b38d87f854ee05c6fb3430b94c899f641ebd62f31189a957d86ab1b55de60b3e2fff1872
+  data.tar.gz: aa5b91683e4f66eb1de93cb08fb537127aa3bc109c4388d6c60b266edbf1ca079527fbcbaa2d024e834e2d1cb3cf66bef6a9757bcd0f1a44e56b69609a9c5734

data/.gitignore

@@ -2,7 +2,7 @@
 .DS_Store
 .byebug_history
 log/*.log
-Gemfile.lock
+*Gemfile.lock
 pkg/
 spec/dummy/db/*.sqlite3
 spec/dummy/db/*.sqlite3-journal

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+2.3.0

data/.travis.yml

@@ -8,14 +8,21 @@ script:
 
 rvm:
   - 2.3.0
-  - 2.2
-  - 2.1
-  - 2.0.0
-  - jruby-9.0.4.0
+  - 2.2.6
   - ruby-head
   - jruby-head
-
 matrix:
+  include:
+    # We'll have to back up to grape-swagger 0.11 for earlier rubies.
+    - rvm: 2.0.0
+      gemfile: gemfiles/2.0.0-Gemfile
+    - rvm: 2.1.0
+      gemfile: gemfiles/2.0.0-Gemfile
+    - rvm: 2.2.0
+      gemfile: gemfiles/2.0.0-Gemfile
+    - rvm: jruby-9.0.4.0
+      gemfile: gemfiles/2.0.0-Gemfile
+
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
@@ -25,6 +32,7 @@ env:
     - RAILS=3.2.22
     - RAILS=4.1.13
     - RAILS=4.2.5.1
+    - RAILS=5.0.1
     - RAILS=master
   global:
     - JRUBY_OPTS="-J-Xmx1024m --debug"

data/CHANGELOG.md

@@ -1,4 +1,10 @@
 
+0.2.7 01/18/2017
+==============
+
+Add support for Swagger 2+, we can now support the latest versions of grape and other dependencies.
+
+
 0.2.6 11/01/2016
 ==============
 

data/README.md

@@ -152,7 +152,7 @@ class MyModelAPI < IntrospectiveGrape::API
 end
 ```
 
-Multiple values can be specified at once for Integer attributes that end in "id" (i.e. conventional primary and foreign keys) at once by passing a comma separated list of IDs.
+Multiple values can be specified at once for Integer attributes that end in "id" (i.e. conventional primary and foreign keys) by passing a comma separated list of IDs.
 
 For timestamp attributes it will generate `<name_of_timestamp>_start` and `<name_of_timestamp>_end` constraints.
 

data/gemfiles/2.0.0-Gemfile

@@ -0,0 +1,22 @@
+source 'https://rubygems.org'
+
+# Declare your gem's dependencies in introspective_grape.gemspec.
+# Bundler will treat runtime dependencies like base dependencies, and
+# development dependencies will be added by default to the :development group.
+
+gemspec :path => '../'
+
+gem 'grape', '0.16.2'
+gem 'grape-swagger', '~> 0.11.0'
+gem 'nokogiri', '~> 1.6.8'
+gem 'coveralls', require: false
+
+# Declare any dependencies that are still in development here instead of in
+# your gemspec. These might include edge Rails or gems from your path or
+# Git. Remember to move these dependencies to your gemspec before releasing
+# your gem to rubygems.org.
+
+group :development,:test do
+  gem 'rspec' 
+#  gem 'byebug'
+end

data/introspective_grape.gemspec

@@ -22,12 +22,13 @@ Gem::Specification.new do |s|
 
   s.add_dependency "rails", '>= 3.0.0', '< 5.0.0'
 
-  s.add_dependency 'grape',          '~> 0.16.2'
-  s.add_dependency 'grape-entity',   '< 0.5.0'
-  s.add_dependency 'grape-swagger',  '~>0.11.0'
-  s.add_dependency 'grape-kaminari', '~>0.1.9'
+  s.add_dependency 'grape'          #, '~> 0.16.2'
+  s.add_dependency 'grape-entity'   #, '< 0.5.0'
+  s.add_dependency 'grape-swagger'  #, '~>0.11.0'
+  s.add_dependency 'kaminari', '< 1.0' # There's a version 1.0.0 out there that breaks everything
+  s.add_dependency 'grape-kaminari'
   s.add_dependency 'pundit'
-  s.add_dependency 'camel_snake_keys', '~>0.0.4'
+  s.add_dependency 'camel_snake_keys'
 
   if RUBY_PLATFORM == 'java'
     #s.add_development_dependency "jdbc-sqlite3"

data/lib/introspective_grape/camel_snake.rb

@@ -1,7 +1,6 @@
 require 'grape-swagger'
 require 'active_support' #/core_ext/module/aliasing'
 require 'camel_snake_keys'
-
 if IntrospectiveGrape.config.camelize_parameters 
   # Camelize the parameters in the swagger documentation.
   if Gem::Version.new( GrapeSwagger::VERSION ) <= Gem::Version.new('0.11.0')
@@ -31,10 +30,23 @@ if IntrospectiveGrape.config.camelize_parameters
       end
     end
   else Gem::Version.new( GrapeSwagger::VERSION ) > Gem::Version.new('0.11.0')
-    # Grape::Swagger 0.20.xx is not yet compatible with Grape >0.14 and will alter
-    # the way it parses params, so will not be compatible with introspective_grape,
-    # and produces swagger docs for SwaggerUI 2.1.4 that don't appear to be
-    # backwards compatible swagger.js 2.0.41, so this is pending.
+    module GrapeSwagger
+      module DocMethods
+        def self.extended(mod)
+          # Do not camelize the grape-swagger documentation endpoints.
+          mod.formatter :json, Grape::Formatter::Json
+        end
+        class ParseParams
+          class << self
+            def call_with_camelized(*args)
+              param = call_without_camelized(*args)
+              param[:name] = param[:name].camelize(:lower).gsub(/Destroy/, '_destroy')
+              param
+            end
+            alias_method_chain :call, :camelized
+          end
+        end
+      end
+    end
   end
-
 end

data/lib/introspective_grape/validators.rb

@@ -16,7 +16,7 @@ module Grape::Validators
       begin
         raise unless JSON.parse( params[field] ).kind_of? Array 
       rescue
-        fail Grape::Exceptions::Validation, params: [@scope.full_name(field)], message: 'must be valid JSON array!'
+        fail Grape::Exceptions::Validation, params: [@scope.full_name(field)], message: 'must be a valid JSON array!'
       end
     end
   end
@@ -26,7 +26,7 @@ module Grape::Validators
       begin
         raise unless JSON.parse( params[field] ).kind_of? Hash
       rescue
-        fail Grape::Exceptions::Validation, params: [@scope.full_name(field)], message: 'must be valid JSON hash!'
+        fail Grape::Exceptions::Validation, params: [@scope.full_name(field)], message: 'must be a valid JSON hash!'
       end
     end
   end

data/lib/introspective_grape/version.rb

@@ -1,3 +1,3 @@
 module IntrospectiveGrape
-  VERSION = "0.2.6".freeze
+  VERSION = "0.2.7".freeze
 end

data/spec/dummy/Gemfile

@@ -1,6 +1,19 @@
 source 'https://rubygems.org'
+gem 'rails', '<5.0'
+
+#gem 'byebug'
+
+gem 'grape'
+gem 'grape-entity'
+gem 'grape-swagger'
 gem 'grape-kaminari'
+
 gem 'pundit'
-#gem 'byebug'
 gem 'paperclip'
 gem 'delayed_paperclip'
+gem 'devise-async'
+gem 'activerecord-tableless'
+
+gem 'camel_snake_keys'
+
+gem 'sqlite3'

data/spec/dummy/app/api/dummy_api.rb

@@ -46,12 +46,18 @@ class DummyAPI < Grape::API
   # configure grape-swagger to auto-generate swagger docs
   protocol = Rails.application.config.force_ssl ? 'https' : 'http'
   add_swagger_documentation({
-    base_path:                "#{protocol}://localhost:3000/api",
-    api_version:              'v1',
-      hide_documentation_path:  true,
-      format:                   :json,
-      hide_format:              true
-     #markdown:                 true
+    base_path:                "/api",
+    doc_version:              'v1',
+    hide_documentation_path:  true,
+    format:                   :json,
+    hide_format:              true,
+    security_definitions: {
+      api_key: {
+        type: "apiKey",
+        name: "api_key",
+        in: "header"
+      }
+    }
   })
 
 end

data/spec/dummy/config/application.rb

@@ -33,6 +33,6 @@ module Dummy
 
     # Do not swallow errors in after_commit/after_rollback callbacks.
     config.active_record.raise_in_transactional_callbacks = true
+
   end
 end
-

data/spec/requests/company_api_spec.rb

@@ -93,12 +93,12 @@ describe Dummy::CompanyAPI, type: :request do
 
   it "should validate json array parameters" do
     put "/api/v1/companies/#{company.id}", { widgets: "[garbage[\"A\",\"B\"]" }
-    json["error"].should eq "widgets must be valid JSON array!"
+    json["error"].should eq "widgets must be a valid JSON array!"
   end
 
   it "should validate json hash parameters" do
     put "/api/v1/companies/#{company.id}", { sprockets: "{\"foo\":\"bar\"}garbage}" }
-    json["error"].should eq "sprockets must be valid JSON hash!"
+    json["error"].should eq "sprockets must be a valid JSON hash!"
   end
 
 end

data/spec/requests/swagger_spec.rb

@@ -7,8 +7,14 @@ describe GrapeSwagger, type: :request do
       get '/api/v1/swagger_doc'
       response.should be_success
       json =  JSON.parse( response.body )
-      json['apiVersion'].should == 'v1'
+      if Gem::Version.new( GrapeSwagger::VERSION ) <= Gem::Version.new('0.11.0')
+        json['apiVersion'].should == '0.1'
+      else
+        json['paths'].map {|p| p[1].values }.flatten.map{|p| p['parameters']}.flatten.compact.map{|p| p['name']}.each do |name|
+          name.should eq name.camelize(:lower).gsub(/Destroy/,'_destroy')
+        end
+      end
     end
-  end
 
+  end
 end

data/spec/support/blueprints.rb

@@ -29,7 +29,7 @@ Company.blueprint do
 end
 
 User.blueprint do
-  email       { "test-"+word(5)+'@springshot.com' }
+  email       { "test-"+word(10)+'@springshot.com' }
   first_name  { word(4) }
   last_name   { word(5) }
   password    { 'abc12345' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: introspective_grape
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Josh Buermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,58 +34,72 @@ dependencies:
   name: grape
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: grape-entity
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: grape-swagger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: grape-kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pundit
   requirement: !ruby/object:Gem::Requirement
@@ -104,16 +118,16 @@ dependencies:
   name: camel_snake_keys
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -266,6 +280,7 @@ files:
 - app/models/.keep
 - app/views/.keep
 - bin/rails
+- gemfiles/2.0.0-Gemfile
 - introspective_grape.gemspec
 - lib/.DS_Store
 - lib/introspective_grape.rb
@@ -444,7 +459,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Introspectively configure deeply nested RESTful Grape APIs for ActiveRecord