introspective_grape 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a3c90f61cd6c0cfcc681b4c4c37f1b888bfe7fd
-  data.tar.gz: 26e6dcb9a96899eaaf5c298d9ffe7c48e6d43ea4
+  metadata.gz: daa5779c5e6121c36862f5c3158c1b8d5cf5ebdd
+  data.tar.gz: d48b10b855364975e10bb605ef4a005cd9231dac
 SHA512:
-  metadata.gz: a11bec2f1cde26753b08898c14ba54339f6a984be48f1eea1090c4f585146d2db4c35980481852f02b4f1c1a78090a7ff0da25238dd4b27da76281c1ae0e9080
-  data.tar.gz: d1e1a33bbab8952ca376c1ebc52a9c55c379405698c2479af8898500ff924437578fedb37b1743dc3494674fa5fc6b81d8486d7dfbbcb2637515afe05c2e51e2
+  metadata.gz: b96dcd7acfecfbc9e84b05560f878bbbbab5eecf7c2deb5072551449ccb64dea6c5171585782ebf5274915c71bc95288984d9cf496979cd864466f78d326dfd1
+  data.tar.gz: 9d73edaf90c44038289bae9dd5f8391519830f9646cbef922d4a0a28a9b0d425c1b29cf6ca2a685eddc0ce0c10eef4f941fec39963b09d6d0e9f6e56e9c4742f

data/.travis.yml

@@ -1,77 +1,53 @@
 language: ruby
 before_install:
-  - gem install bundler
+  - gem install bundler -v 1.17.3
 install: bundle install --jobs=1 --retry=1
 script:
   - bundle install
   - bundle exec rspec
 
 rvm:
-  - 2.0.0
-  - 2.1.0
-  - 2.2.0
-  - 2.2.6
-  - 2.3.0
+  #  - 2.0.0
+  # - 2.1.0
+  - 2.2.2
+  - 2.3.1
   - 2.4.0
   - ruby-head
   - jruby-head
 gemfile:
 #  - gemfiles/Gemfile.rails.3.2.22
 #  - gemfiles/Gemfile.rails.4.1.13
-  - gemfiles/Gemfile.rails.4.2.7.1
-  - gemfiles/Gemfile.rails.4.2.7.1.new.swagger
-  - gemfiles/Gemfile.rails.4.2.8
+#  - gemfiles/Gemfile.rails.4.2.7.1
+#  - gemfiles/Gemfile.rails.4.2.7.1.new.swagger
+#  - gemfiles/Gemfile.rails.4.2.8
+#  - gemfiles/Gemfile.rails.5.0.0
   - gemfiles/Gemfile.rails.5.0.1
+  - gemfiles/Gemfile.rails.5.1.0
+  - gemfiles/Gemfile.rails.5.2.0
   - gemfiles/Gemfile.rails.master
+  - gemfiles/Gemfile.6.0.0.beta
 
 matrix:
   exclude:
     # We'll have to back up to grape-swagger 0.11 for earlier rubies.
-    - rvm: 2.0.0
-      gemfile: gemfiles/Gemfile.rails.4.2.7.1.new.swagger
-    - rvm: 2.0.0
-      gemfile: gemfiles/Gemfile.rails.4.2.8
     - rvm: 2.0.0
       gemfile: gemfiles/Gemfile.rails.5.0.1
     - rvm: 2.0.0
       gemfile: gemfiles/Gemfile.rails.master
-    - rvm: 2.1.0
-      gemfile: gemfiles/Gemfile.rails.4.2.7.1.new.swagger
-    - rvm: 2.1.0
-      gemfile: gemfiles/Gemfile.rails.4.2.8
     - rvm: 2.1.0
       gemfile: gemfiles/Gemfile.rails.5.0.1
     - rvm: 2.1.0
       gemfile: gemfiles/Gemfile.rails.master
-    - rvm: 2.2.0
-      gemfile: gemfiles/Gemfile.rails.4.2.7.1.new.swagger
-    - rvm: 2.2.0
-      gemfile: gemfiles/Gemfile.rails.4.2.8
     - rvm: 2.2.0
       gemfile: gemfiles/Gemfile.rails.5.0.1
     - rvm: 2.2.0
       gemfile: gemfiles/Gemfile.rails.master
-    - rvm: 2.4.0
-      gemfile: gemfiles/Gemfile.rails.4.2.7.1
-    - rvm: 2.4.0
-      gemfile: gemfiles/Gemfile.rails.4.2.7.1.new.swagger
-    - rvm: jruby-9.0.4.0
-      gemfile: gemfiles/Gemfile.rails.4.2.7.1.new.swagger
-    - rvm: jruby-9.0.4.0
-      gemfile: gemfiles/Gemfile.rails.4.2.8
     - rvm: jruby-9.0.4.0
       gemfile: gemfiles/Gemfile.rails.5.0.1
     - rvm: jruby-9.0.4.0
       gemfile: gemfiles/Gemfile.rails.master
-    - rvm: ruby-head
-      gemfile: gemfiles/Gemfile.rails.4.2.7.1
-    - rvm: ruby-head
-      gemfile: gemfiles/Gemfile.rails.4.2.7.1.new.swagger
-    - rvm: jruby-head
-      gemfile: gemfiles/Gemfile.rails.4.2.7.1
-    - rvm: jruby-head
-      gemfile: gemfiles/Gemfile.rails.4.2.7.1.new.swagger
   allow_failures:
+    - gemfile: gemfiles/Gemfile.6.0.0.beta1
     - rvm: ruby-head
     - rvm: jruby-head
 

data/CHANGELOG.md

@@ -1,4 +1,11 @@
 
+0.3.6 09/14/2018
+================
+
+Updated to support Rails 5+
+
+
+
 0.3.5 09/14/2018
 ================
 

data/gemfiles/2.2.0-Gemfile

@@ -6,7 +6,7 @@ source 'https://rubygems.org'
 
 gemspec :path => '../'
 
-gem 'grape'
+gem 'grape', '< 1.0.0'
 gem 'grape-swagger'
 gem 'coveralls', require: false
 

data/gemfiles/Gemfile.rails.4.2.10

@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'rails', '4.2.10'
+gem 'grape', '> 0.17'
+gem 'grape-swagger', '> 0.12.0'
+gem 'coveralls', require: false
+
+group :development,:test do
+  gem 'rspec'
+end

data/gemfiles/Gemfile.rails.4.2.7.1

@@ -6,6 +6,7 @@ gem 'rails', '4.2.7.1'
 gem 'grape', '< 0.17'
 gem 'grape-swagger', '< 0.12.0'
 gem 'nokogiri', '< 1.6.9'
+gem 'machinist'
 gem 'coveralls', require: false
 
 group :development,:test do

data/gemfiles/Gemfile.rails.4.2.7.1.new.swagger

@@ -5,6 +5,7 @@ gemspec :path => '../'
 gem 'rails', '4.2.7.1'
 gem 'grape', '> 0.17'
 gem 'grape-swagger', '> 0.12.0'
+gem 'machinist'
 gem 'coveralls', require: false
 
 group :development,:test do

data/gemfiles/Gemfile.rails.4.2.8

@@ -5,6 +5,8 @@ gemspec :path => '../'
 gem 'rails', '4.2.8'
 gem 'grape', '> 0.17'
 gem 'grape-swagger', '> 0.12.0'
+gem 'machinist'
+gem 'nokogiri', '< 1.10.1'
 gem 'coveralls', require: false
 
 group :development,:test do

data/gemfiles/Gemfile.rails.5.0.0

@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'rails', '5.0.0'
+gem 'grape', '< 1.0.0'
+gem 'grape-swagger'
+gem 'nokogiri'
+gem 'coveralls', require: false
+
+group :development,:test do
+  gem 'rspec'
+end

data/gemfiles/Gemfile.rails.5.0.1

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec :path => '../'
 
 gem 'rails', '5.0.1'
-gem 'grape'
+gem 'grape', '< 1.0.0'
 gem 'grape-swagger'
 gem 'nokogiri'
 gem 'coveralls', require: false

data/gemfiles/Gemfile.rails.5.1.0

@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'rails', '5.1.0'
+gem 'grape', '< 1.0.0'
+gem 'grape-swagger'
+gem 'nokogiri'
+gem 'coveralls', require: false
+
+group :development,:test do
+  gem 'rspec'
+end

data/gemfiles/Gemfile.rails.5.2.0

@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'rails', '5.2.0'
+gem 'grape', '< 1.0.0'
+gem 'grape-swagger'
+gem 'nokogiri'
+gem 'coveralls', require: false
+
+group :development,:test do
+  gem 'rspec'
+end

data/gemfiles/Gemfile.rails.6.0.0.beta1

@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'rails', '6.0.0.beta1'
+gem 'grape', '< 1.0.0'
+gem 'grape-swagger'
+gem 'nokogiri'
+gem 'coveralls', require: false
+
+group :development,:test do
+  gem 'rspec'
+end

data/gemfiles/Gemfile.rails.master

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec :path => '../'
 
 gem 'rails'
-gem 'grape'
+gem 'grape', '< 1.0.0'
 gem 'grape-swagger'
 gem 'nokogiri'
 gem 'coveralls', require: false

data/introspective_grape.gemspec

@@ -18,25 +18,25 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n").sort
   s.test_files    = `git ls-files -- spec/*`.split("\n")
 
-  s.required_ruby_version = '~> 2.0'
+  s.required_ruby_version = '~> 2.1'
 
-  # not yet 5+ compatible
-  s.add_dependency "rails", '>= 3.0.0', '<5.0'
+  s.add_dependency "rails", '> 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 'kaminari', '< 1.0' # There's a version 1.0.0 out there that breaks everything
+  # grape 1.0.0 breaks the pagination solution
+  s.add_dependency 'grape', '< 1.0.0'
+  s.add_dependency 'grape-entity'
+  s.add_dependency 'grape-swagger'
+  s.add_dependency 'kaminari', '< 1.0' # version 1.0.0 breaks
   s.add_dependency 'grape-kaminari'
   # Pundit 2.0 mysteriously made authorize a protected method...
-  s.add_dependency 'pundit', '<2.0'
+  s.add_dependency 'pundit' #, '<2.0'
   s.add_dependency 'camel_snake_keys', '>0.0.4'
 
   if RUBY_PLATFORM == 'java'
     #s.add_development_dependency "jdbc-sqlite3"
     s.add_development_dependency "activerecord-jdbcsqlite3-adapter"
   else
-    s.add_development_dependency "sqlite3"
+    s.add_development_dependency "sqlite3", '<1.4.0' #'< 1.3.14'
   end
 
   #s.add_development_dependency "byebug"
@@ -44,8 +44,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-rails", '>= 3.0'
   s.add_development_dependency 'devise'
   #s.add_development_dependency 'devise-async'
-  s.add_development_dependency 'paperclip', '< 5.0'
-  s.add_development_dependency 'machinist'
+  s.add_development_dependency 'paperclip', ">= 5.2.0" #'< 5.0'
+  s.add_development_dependency 'machinist_redux'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'rufus-mnemo'
 

data/lib/introspective_grape/api.rb

@@ -125,6 +125,34 @@ module IntrospectiveGrape
         end
       end
 
+      def convert_nested_params_hash(dsl, routes)
+        root  = routes.first
+        klass = root.klass
+        dsl.after_validation do
+          # After Grape validates its parameters:
+          # 1) Find the root model instance for the API if its passed (implicitly either
+          #    an update/destroy on the root node or it's a nested route
+          # 2) For nested endpoints convert the params hash into Rails-compliant nested
+          #    attributes, to be passed to the root instance for update. This keeps
+          #    behavior consistent between bulk and single record updates.
+
+          if params[root.key]
+            @model = root.model.includes( klass.default_includes(root.model) ).find(params[root.key])
+          end
+
+          if routes.size > 1
+            nested_attributes = klass.build_nested_attributes(routes[1..-1], params.except(root.key,:api_key) )
+            @params.merge!( nested_attributes ) if nested_attributes.kind_of?(Hash)
+          end
+        end
+      end
+
+      def define_restful_api(dsl, routes, model, api_params)
+        # declare index, show, update, create, and destroy methods:
+        API_ACTIONS.each do |action|
+          send("define_#{action}", dsl, routes, model, api_params) unless exclude_actions(model).include?(action)
+        end
+      end
 
       def define_endpoints(routes,api_params)
         # De-reference these as local variables from their class scope, or when we make
@@ -145,13 +173,6 @@ module IntrospectiveGrape
         end
       end
 
-      def define_restful_api(dsl, routes, model, api_params)
-        # declare index, show, update, create, and destroy methods:
-        API_ACTIONS.each do |action|
-          send("define_#{action}", dsl, routes, model, api_params) unless exclude_actions(model).include?(action)
-        end
-      end
-
       def define_index(dsl, routes, model, api_params)
         include Grape::Kaminari
         root  = routes.first
@@ -244,28 +265,6 @@ module IntrospectiveGrape
         end
       end
 
-      def convert_nested_params_hash(dsl, routes)
-        root  = routes.first
-        klass = root.klass
-        dsl.after_validation do
-          # After Grape validates its parameters:
-          # 1) Find the root model instance for the API if its passed (implicitly either
-          #    an update/destroy on the root node or it's a nested route
-          # 2) For nested endpoints convert the params hash into Rails-compliant nested
-          #    attributes, to be passed to the root instance for update. This keeps
-          #    behavior consistent between bulk and single record updates.
-
-          if params[root.key]
-            @model = root.model.includes( klass.default_includes(root.model) ).find(params[root.key])
-          end
-
-          if routes.size > 1
-            nested_attributes = klass.build_nested_attributes(routes[1..-1], params.except(root.key,:api_key) )
-            @params.merge!( nested_attributes ) if nested_attributes.kind_of?(Hash)
-          end
-        end
-      end
-
 
       def build_routes(routes, model, reflection_name=nil)
         routes = routes.clone

data/lib/introspective_grape/camel_snake.rb

@@ -5,49 +5,48 @@ require 'active_support/inflector/methods'
 if IntrospectiveGrape.config.camelize_parameters
   # Camelize the parameters in the swagger documentation.
   if Gem::Version.new( GrapeSwagger::VERSION ) <= Gem::Version.new('0.11.0')
-    Grape::API.class_eval do
-      class << self
-        private
-        def create_documentation_class_with_camelized
-          doc = create_documentation_class_without_camelized
-          doc.class_eval do
-            class << self
-              def parse_params_with_camelized(params, path, method, _options = {})
-                parsed_params = parse_params_without_camelized(params, path, method)
-                parsed_params.each_with_index do |param|
-                  param[:name] = param[:name]
-                                 .camelize(:lower)
-                                 .gsub(/Destroy/,'_destroy')
-                end
-                parsed_params
-              end
+    module ParseParamsWithCamelized
+      def parse_params(params, path, method, _options = {})
+        parsed_params = parse_params_without_camelized(params, path, method)
+        parsed_params.each_with_index do |param|
+          param[:name] = param[:name]
+            .camelize(:lower)
+            .gsub(/Destroy/,'_destroy')
+        end
+        super(params, path, method, _options = {})
+      end
+    end
 
-              alias_method_chain :parse_params, :camelized
-            end
-          end
-          doc
+    module CreateCamelizedDocumentationClass
+      private
+      def create_documentation_class
+        doc = super
+        doc.class_eval do
+          doc.singleton_class.send(:prepend, ParseParamsWithCamelized)
         end
-        alias_method_chain :create_documentation_class, :camelized
+        doc
       end
     end
+
+    Grape::API.singleton_class.send(:prepend, CreateCamelizedDocumentationClass)
   else
+    module CallWithCamelized
+      def call(*args)
+        param = super(*args)
+        param[:name] = param[:name].camelize(:lower).gsub(/Destroy/, '_destroy')
+        param
+      end
+    end
+
+    GrapeSwagger::DocMethods::ParseParams.singleton_class.send(:prepend, CallWithCamelized)
     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