introspective_grape 0.5.4 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18e335c3487696da5b56e184df1b4ad6495c890e72e2652ee3ef14841a786f94
-  data.tar.gz: a18f28ce34addce187ed64af8273c5866c68a63463456dc1acc101a2cab349eb
+  metadata.gz: d29e073d96e9a6f2569eeaec65ece289f344fd5f0b6ea88a0dfb345d36d51052
+  data.tar.gz: dac77dd6bc6812de00ec06ee5299c5cea5ff0f3539a304e6a1d1335f72e69f36
 SHA512:
-  metadata.gz: 77b1c4910e315342e2febc3bcca3a0b7b2eb59d1c7b762325a7da6bc60f0f8e69e34ddb2907b2cc76ce0b824367f10d365c7899ffb1f95f3f10444173c9bd3c8
-  data.tar.gz: b13267c8b605afa2a4daa6b5620f87e628a105f9271cb8bc437e579bbf3a4f9fe451f4e1935623338c0bd1ec2a205c72275fce27e0b1cf7e2124cc4232553e25
+  metadata.gz: 118befdc8fca693dd91610d8c0ecff86ca2e297cdb1b3817384b1fa78958a5949f1d252cc70eadf2187bee87080fb9949382e656b6765f259f4d23bba7fd2c47
+  data.tar.gz: 21f3339a6e874bca7d94fa3efcd92812afbbc0e9b74371cafc8eb3e1644334930671ee59841a13237998272acc06954916a5b09ccd9eb760df38c8b3a28557f9

data/.ruby-version

@@ -1 +1 @@
-2.5.0
+2.7.3

data/CHANGELOG.md

@@ -1,7 +1,23 @@
 
-0.5.3 02/07/2022
+0.5.7 03/10/2022
 ================
 
+Handle the switch from Grape::Validations::Base to Grape::Validations::Validators::Base.
+
+0.5.6 03/09/2022
+================
+
+On the DELETE endpoint the primary key with its type was undeclared, creating conflicts with user-defined delete endpoints.
+
+0.5.5 02/24/2022
+================
+
+Update the local ruby in the gem to 2.7.3 to clear security warning cruft.
+
+Sanitize some sql.
+
+Target the still-supported 'kt-paperclip' in the gemspec (many pardons while we're planning the switch over to activestorage support).
+
 Fix bug from looking for the ActiveRecord columns_hash on non-ActiveRecord objects.
 
 0.5.2 02/07/2022

data/introspective_grape.gemspec

@@ -22,7 +22,7 @@ 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.5'
+  s.required_ruby_version = '> 2.5'
 
   s.add_runtime_dependency 'rails', '~> 5.2'
   s.add_runtime_dependency 'schema_validations'
@@ -57,7 +57,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'machinist_redux'
 
   # dummy app dependencies
-  s.add_development_dependency 'paperclip'
+  s.add_development_dependency 'kt-paperclip'
   s.add_development_dependency 'rufus-mnemo'
   s.add_development_dependency 'devise'
 end

data/lib/introspective_grape/api.rb

@@ -99,13 +99,15 @@ module IntrospectiveGrape
         # As routes are nested keep track of the routes, we are preventing siblings from
         # appending to the routes array here:
         routes = build_routes(routes, model)
-        define_routes(routes, whitelist)
 
         # Top level declaration of the Grape::API namespace for the resource:
         resource routes.first.name.pluralize do
-          # yield to append additional routes under the root namespace
+          # yield to prepend user-defined routes under the root namespace first,
           yield if block_given?
         end
+
+        # Then define IntrospectiveGrape's routes:
+        define_routes(routes, whitelist)
       end
 
       def define_routes(routes, api_params)
@@ -209,12 +211,15 @@ module IntrospectiveGrape
       end
 
       # rubocop:enable Metrics/AbcSize
-      def define_destroy(dsl, routes, _model, _api_params)
+      def define_destroy(dsl, routes, model, _api_params)
         klass = routes.first.klass
-        name = routes.last.name.singularize
+        name  = routes.last.name.singularize
         dsl.desc "destroy a #{name}" do
           detail klass.destroy_documentation(name)
         end
+        dsl.params do
+          requires routes.last.swagger_key, type: klass.param_type(model, model.primary_key)
+        end
         dsl.delete ":#{routes.last.swagger_key}" do
           authorize @model, :destroy?
           present status: (klass.find_leaf(routes, @model, params).destroy ? true : false)

data/lib/introspective_grape/filters.rb

@@ -91,7 +91,7 @@ module IntrospectiveGrape
 
       if timestamp_filter(klass, model, field)
         op      = field.ends_with?('_start') ? '>=' : '<='
-        records.where("#{timestamp_filter(klass, model, field)} #{op} ?", Time.zone.parse(params[field]))
+        records.where(ActiveRecord::Base.sanitize_sql_array(["#{timestamp_filter(klass, model, field)} #{op} ?", Time.zone.parse(params[field])]))
       elsif model.respond_to?("#{field}=")
         records.send("#{field}=", params[field])
       else

data/lib/introspective_grape/validators.rb

@@ -1,7 +1,9 @@
 require 'grape/validations'
 module Grape
   module Validators
-    class Json < Grape::Validations::Base
+    # Validations::Base becomes Validators::Base somewhere between 1.6.0 and 1.6.2
+    validation_class = defined?(Grape::Validations::Base) ? Grape::Validations::Base : Grape::Validations::Validators::Base
+    class Json < validation_class
       def validate_param!(field, params)
         begin
           JSON.parse( params[field] )
@@ -11,7 +13,7 @@ module Grape
       end
     end
 
-    class JsonArray < Grape::Validations::Base
+    class JsonArray < validation_class
       def validate_param!(field, params)
         begin
           raise unless JSON.parse( params[field] ).is_a? Array
@@ -21,7 +23,7 @@ module Grape
       end
     end
 
-    class JsonHash < Grape::Validations::Base
+    class JsonHash < validation_class
       def validate_param!(field, params)
         begin
           raise unless JSON.parse( params[field] ).is_a? Hash

data/lib/introspective_grape/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IntrospectiveGrape
-  VERSION = '0.5.4'
+  VERSION = '0.5.7'
 end

data/spec/dummy/Gemfile

@@ -1,19 +1,19 @@
 source 'https://rubygems.org'
-gem 'rails', '5.2.6'
+gem 'rails', '5.2.6.2'
 
 gem 'byebug'
 gem 'camel_snake_keys'
 
 gem 'devise'
 gem 'delayed_paperclip'
-#gem 'devise-async'
+gem 'kt-paperclip'
 
 gem 'grape'
 gem 'grape-entity'
 gem 'grape-kaminari'
 gem 'grape-swagger'
 gem 'grape-swagger-entity'
-gem 'introspective_grape', path: '~/Dropbox/contrib/introspective_grape'
+gem 'introspective_grape' #, path: '~/Dropbox/contrib/introspective_grape'
 
 gem 'paperclip'
 gem 'pundit'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: introspective_grape
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.7
 platform: ruby
 authors:
 - Josh Buermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-24 00:00:00.000000000 Z
+date: 2022-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -291,7 +291,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: paperclip
+  name: kt-paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -531,7 +531,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -540,8 +540,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Quickly configure Grape APIs around your database schema and models.