introspective_grape 0.3.7 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09b793ec0cbab1f44378e04625ebdc28c9d41b96
-  data.tar.gz: 50391f80743668ef3ce2d2e56ff03d58ba64fe7d
+  metadata.gz: 1effbc66aaa2ba49bd62f0e7605095c7e827bf83
+  data.tar.gz: baebbb68b35036a66a2ff041f80c17b2d47decd1
 SHA512:
-  metadata.gz: 82dfdfd7bab51b280f7c5c58e319f2798165cab22c92c69ebfecd5d1cfbf5f65cf156e8680594426ee130d1c57130ffa64694b2183a04e906953ccc883e9d936
-  data.tar.gz: c53697d28d804fd4443515c5c364c3aafc6f8fdc735f82dc56796f62de2a7597d84a029f7ffa51d85cba84a0877d2e1748323e08c0625dd62e487e97ad5ca2dc
+  metadata.gz: 65d0d34c627d73ecdf3a082bc45f6597f9ae22aa066c0fa0eaea379d04ff4e38d9eca6bd5a8ef4fdfe03c44da3869bda89b7814e5a84cac8b9c0144416ead2de
+  data.tar.gz: 3733b34a24eb28826f9ae455b3975b6a96b5796ca78d75486bd4ee18a761370ce2fa847c6dae080e8486b79d062c2f0fbbc60f33e9781b871d676e7edf3da927

data/.travis.yml

@@ -7,20 +7,12 @@ script:
   - bundle exec rspec
 
 rvm:
-  #  - 2.0.0
-  # - 2.1.0
-  - 2.2.2
   - 2.3.1
   - 2.4.0
+  - 2.5.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.5.0.0
   - gemfiles/Gemfile.rails.5.0.1
   - gemfiles/Gemfile.rails.5.1.0
   - gemfiles/Gemfile.rails.5.2.0
@@ -28,19 +20,6 @@ gemfile:
 
 matrix:
   exclude:
-    # We'll have to back up to grape-swagger 0.11 for earlier rubies.
-    - 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.5.0.1
-    - rvm: 2.1.0
-      gemfile: gemfiles/Gemfile.rails.master
-    - rvm: 2.2.0
-      gemfile: gemfiles/Gemfile.rails.5.0.1
-    - rvm: 2.2.0
-      gemfile: gemfiles/Gemfile.rails.master
     - rvm: jruby-9.0.4.0
       gemfile: gemfiles/Gemfile.rails.5.0.1
     - rvm: jruby-9.0.4.0

data/CHANGELOG.md

@@ -1,9 +1,33 @@
 
-0.3.6 09/14/2018
+0.3.9 04/01/2019
 ================
 
-Updated to support Rails 5+
+Add a note to the README that pagination will have to be supported via alexey-klimuk's fork of grape-kaminari from years ago because the middleware support gems have stopped being maintained, and rubygems doesn't support targeting github branches when adding dependencies.
 
+gem 'grape-kaminari', :github => 'alexey-klimuk/grape-kaminari'
+
+Probably we'll just fork it if nobody else can be bothered.
+
+0.3.8 03/27/2019
+================
+
+Support the latest Grape.
+
+0.3.7 03/26/2019
+================
+
+Updated to support Grape ~> 1.2.0. Ruby 2.2 no longer supported.
+
+
+0.3.7 03/25/2019
+================
+
+Updated to support Grape <~ 1.1.0.
+
+0.3.6 03/23/2019
+================
+
+Updated to support Rails 5+.
 
 
 0.3.5 09/14/2018

data/Gemfile

@@ -5,6 +5,8 @@ source 'https://rubygems.org'
 # development dependencies will be added by default to the :development group.
 gemspec
 
+gem 'grape-kaminari', :github => 'alexey-klimuk/grape-kaminari'
+
 gem 'coveralls', require: false
 
 # Declare any dependencies that are still in development here instead of in

data/README.md

@@ -40,6 +40,7 @@ can speak in their own idioms.
 In your Gemfile:
 
 ```
+gem 'grape-kaminari', :github => 'alexey-klimuk/grape-kaminari' # some middleware has fallen into deep disrepair
 gem 'introspective_grape'
 ```
 

data/gemfiles/Gemfile.rails.5.0.0

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

data/gemfiles/Gemfile.rails.5.0.1

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

data/gemfiles/Gemfile.rails.5.1.0

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

data/gemfiles/Gemfile.rails.5.2.0

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

data/gemfiles/Gemfile.rails.master

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

data/introspective_grape.gemspec

@@ -18,16 +18,16 @@ 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.1'
+  s.required_ruby_version = '>= 2.3'
 
   s.add_dependency "rails", '> 5.0.0'
 
   # grape 1.0.0 breaks the pagination solution
-  s.add_dependency 'grape', '< 1.2.0'
+  s.add_dependency 'grape', '~> 1.2.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'
+  s.add_dependency 'kaminari' #, '< 1.0' # version 1.0.0 breaks
+  #s.add_dependency 'grape-kaminari', :github => 'alexey-klimuk/grape-kaminari'
   # Pundit 2.0 mysteriously made authorize a protected method...
   s.add_dependency 'pundit' #, '<2.0'
   s.add_dependency 'camel_snake_keys', '>0.0.4'

data/lib/introspective_grape/api.rb

@@ -1,4 +1,5 @@
 require 'action_controller'
+require 'kaminari'
 require 'grape-kaminari'
 require 'introspective_grape/validators'
 
@@ -6,7 +7,7 @@ class IntrospectiveGrapeError < StandardError
 end
 
 module IntrospectiveGrape
-  class API < Grape::API
+  class API < Grape::API::Instance
     extend IntrospectiveGrape::Helpers
     extend IntrospectiveGrape::CreateHelpers
     extend IntrospectiveGrape::Filters

data/lib/introspective_grape/camel_snake.rb

@@ -28,7 +28,7 @@ if IntrospectiveGrape.config.camelize_parameters
       end
     end
 
-    Grape::API.singleton_class.send(:prepend, CreateCamelizedDocumentationClass)
+    Grape::API::Instance.singleton_class.send(:prepend, CreateCamelizedDocumentationClass)
   else
     module CallWithCamelized
       def call(*args)

data/lib/introspective_grape/version.rb

@@ -1,3 +1,3 @@
 module IntrospectiveGrape
-  VERSION = "0.3.7".freeze
+  VERSION = "0.3.9".freeze
 end

data/spec/dummy/Gemfile

@@ -10,11 +10,12 @@ gem 'delayed_paperclip'
 
 gem 'grape'
 gem 'grape-entity'
-gem 'grape-kaminari', '<1.8.0'
+gem 'grape-kaminari'
 gem 'grape-swagger'
-gem 'introspective_grape', git: 'https://github.com/buermann/introspective_grape', branch: 'rails.5'
+gem 'introspective_grape',  git: 'https://github.com/buermann/introspective_grape', branch: 'grape-1.2'
 
 gem 'paperclip'
 gem 'pundit'
 
+gem 'rack-cors'
 gem 'sqlite3', '< 1.4.0'

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

@@ -1,6 +1,8 @@
 module ApiHelpers
   def current_user
     params[:api_key].present? && @user = User.find_by_authentication_token(params[:api_key])
+    # for testing in situ
+    #@user = User.find_or_create_by(email: 'test@test.com', superuser: true, authentication_token: '1234567890', first_name: "First", last_name: "Last")
   end
 
   def authenticate!

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

@@ -5,7 +5,7 @@ class Dummy::CompanyAPI < IntrospectiveGrape::API
 
     desc "Test default values in an extra endpoint"
     params do
-      optional :boolean_default, type: Boolean, default: false
+      optional :boolean_default, type: Virtus::Attribute::Boolean, default: false
       optional :string_default, type: String, default: "foo"
       optional :integer_default, type: Integer, default: 123
     end

data/spec/dummy/config.ru

@@ -2,3 +2,15 @@
 
 require ::File.expand_path('../config/environment', __FILE__)
 run Rails.application
+
+require 'rack/cors'
+
+use Rack::Cors do
+  allow do
+    origins '*'
+    resource '*',
+      :headers => :any,
+      :methods => [:get, :post, :delete, :put, :options],
+      expose: %w(X-Server-Date X-Server-Epoch)
+  end
+end

data/spec/dummy/db/migrate/20190325231304_add_test_data.rb

@@ -0,0 +1,5 @@
+class AddTestData < ActiveRecord::Migration[5.2]
+  def change
+    User.create(email: 'test@test.com', superuser: true, authentication_token: '1234567890', first_name: "First", last_name: "Last")
+  end
+end

data/spec/dummy/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -11,269 +10,251 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150909225019) do
+ActiveRecord::Schema.define(version: 2019_03_25_231304) do
 
   create_table "active_admin_comments", force: :cascade do |t|
-    t.string   "namespace"
-    t.text     "body"
-    t.string   "resource_id",   null: false
-    t.string   "resource_type", null: false
-    t.integer  "author_id"
-    t.string   "author_type"
-    t.datetime "created_at",    null: false
-    t.datetime "updated_at",    null: false
+    t.string "namespace"
+    t.text "body"
+    t.string "resource_id", null: false
+    t.string "resource_type", null: false
+    t.integer "author_id"
+    t.string "author_type"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["author_type", "author_id"], name: "index_active_admin_comments_on_author_type_and_author_id"
+    t.index ["namespace"], name: "index_active_admin_comments_on_namespace"
+    t.index ["resource_type", "resource_id"], name: "index_active_admin_comments_on_resource_type_and_resource_id"
   end
 
-  add_index "active_admin_comments", ["author_type", "author_id"], name: "index_active_admin_comments_on_author_type_and_author_id"
-  add_index "active_admin_comments", ["namespace"], name: "index_active_admin_comments_on_namespace"
-  add_index "active_admin_comments", ["resource_type", "resource_id"], name: "index_active_admin_comments_on_resource_type_and_resource_id"
-
   create_table "admin_users", force: :cascade do |t|
-    t.string   "email",                  default: "", null: false
-    t.string   "encrypted_password",     default: "", null: false
-    t.string   "reset_password_token"
+    t.string "email", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          default: 0,  null: false
+    t.integer "sign_in_count", default: 0, null: false
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip"
-    t.datetime "created_at",                          null: false
-    t.datetime "updated_at",                          null: false
+    t.string "current_sign_in_ip"
+    t.string "last_sign_in_ip"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["email"], name: "index_admin_users_on_email", unique: true
+    t.index ["reset_password_token"], name: "index_admin_users_on_reset_password_token", unique: true
   end
 
-  add_index "admin_users", ["email"], name: "index_admin_users_on_email", unique: true
-  add_index "admin_users", ["reset_password_token"], name: "index_admin_users_on_reset_password_token", unique: true
-
   create_table "chat_message_users", force: :cascade do |t|
-    t.integer  "chat_message_id"
-    t.integer  "user_id"
+    t.integer "chat_message_id"
+    t.integer "user_id"
     t.datetime "read_at"
-    t.datetime "created_at",      null: false
-    t.datetime "updated_at",      null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["chat_message_id"], name: "index_chat_message_users_on_chat_message_id"
+    t.index ["user_id"], name: "index_chat_message_users_on_user_id"
   end
 
-  add_index "chat_message_users", ["chat_message_id"], name: "index_chat_message_users_on_chat_message_id"
-  add_index "chat_message_users", ["user_id"], name: "index_chat_message_users_on_user_id"
-
   create_table "chat_messages", force: :cascade do |t|
-    t.integer  "chat_id"
-    t.integer  "author_id"
-    t.text     "message"
+    t.integer "chat_id"
+    t.integer "author_id"
+    t.text "message"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.index ["author_id"], name: "index_chat_messages_on_author_id"
+    t.index ["chat_id"], name: "index_chat_messages_on_chat_id"
   end
 
-  add_index "chat_messages", ["author_id"], name: "index_chat_messages_on_author_id"
-  add_index "chat_messages", ["chat_id"], name: "index_chat_messages_on_chat_id"
-
   create_table "chat_users", force: :cascade do |t|
-    t.integer  "chat_id"
-    t.integer  "user_id"
+    t.integer "chat_id"
+    t.integer "user_id"
     t.datetime "departed_at"
-    t.datetime "created_at",  null: false
-    t.datetime "updated_at",  null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["chat_id"], name: "index_chat_users_on_chat_id"
+    t.index ["user_id"], name: "index_chat_users_on_user_id"
   end
 
-  add_index "chat_users", ["chat_id"], name: "index_chat_users_on_chat_id"
-  add_index "chat_users", ["user_id"], name: "index_chat_users_on_user_id"
-
   create_table "chats", force: :cascade do |t|
-    t.integer  "creator_id"
+    t.integer "creator_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
 
   create_table "companies", force: :cascade do |t|
-    t.string   "name",       limit: 256, null: false
-    t.string   "short_name", limit: 10,  null: false
-    t.datetime "created_at",             null: false
-    t.datetime "updated_at",             null: false
+    t.string "name", limit: 256, null: false
+    t.string "short_name", limit: 10, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["name"], name: "index_companies_on_name", unique: true
   end
 
-  add_index "companies", ["name"], name: "index_companies_on_name", unique: true
-
   create_table "images", force: :cascade do |t|
-    t.integer  "imageable_id"
-    t.string   "imageable_type"
-    t.string   "file_file_name"
-    t.string   "file_content_type"
-    t.integer  "file_file_size"
+    t.integer "imageable_id"
+    t.string "imageable_type"
+    t.string "file_file_name"
+    t.string "file_content_type"
+    t.integer "file_file_size"
     t.datetime "file_updated_at"
-    t.boolean  "file_processing",   default: false, null: false
-    t.text     "meta"
-    t.string   "source"
-    t.float    "lat"
-    t.float    "lng"
+    t.boolean "file_processing", default: false, null: false
+    t.text "meta"
+    t.string "source"
+    t.float "lat"
+    t.float "lng"
     t.datetime "taken_at"
-    t.datetime "created_at",        null: false
-    t.datetime "updated_at",        null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "jobs", force: :cascade do |t|
-    t.string   "title",      null: false
+    t.string "title", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
 
   create_table "locatables", force: :cascade do |t|
-    t.integer  "location_id"
-    t.integer  "locatable_id"
-    t.string   "locatable_type"
-    t.datetime "created_at",     null: false
-    t.datetime "updated_at",     null: false
+    t.integer "location_id"
+    t.integer "locatable_id"
+    t.string "locatable_type"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["locatable_type", "locatable_id"], name: "index_locatables_on_locatable_type_and_locatable_id"
   end
 
-  add_index "locatables", ["locatable_type", "locatable_id"], name: "index_locatables_on_locatable_type_and_locatable_id"
-
   create_table "location_beacons", force: :cascade do |t|
-    t.integer  "location_id"
-    t.integer  "company_id",             null: false
-    t.string   "mac_address", limit: 12
-    t.string   "uuid",        limit: 32, null: false
-    t.integer  "major",                  null: false
-    t.integer  "minor",                  null: false
-    t.datetime "created_at",             null: false
-    t.datetime "updated_at",             null: false
+    t.integer "location_id"
+    t.integer "company_id", null: false
+    t.string "mac_address", limit: 12
+    t.string "uuid", limit: 32, null: false
+    t.integer "major", null: false
+    t.integer "minor", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["company_id", "uuid", "major", "minor"], name: "index_location_beacons_unique_company_identifier", unique: true
   end
 
-  add_index "location_beacons", ["company_id", "uuid", "major", "minor"], name: "index_location_beacons_unique_company_identifier", unique: true
-
   create_table "location_gps", force: :cascade do |t|
-    t.integer  "location_id"
-    t.float    "lat",                       null: false
-    t.float    "lng",                       null: false
-    t.float    "alt",         default: 0.0
-    t.datetime "created_at",                null: false
-    t.datetime "updated_at",                null: false
+    t.integer "location_id"
+    t.float "lat", null: false
+    t.float "lng", null: false
+    t.float "alt", default: 0.0
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["location_id"], name: "index_location_gps_on_location_id"
   end
 
-  add_index "location_gps", ["location_id"], name: "index_location_gps_on_location_id"
-
   create_table "locations", force: :cascade do |t|
-    t.string   "name",               null: false
-    t.string   "kind"
-    t.integer  "parent_location_id"
-    t.datetime "created_at",         null: false
-    t.datetime "updated_at",         null: false
+    t.string "name", null: false
+    t.string "kind"
+    t.integer "parent_location_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["parent_location_id", "kind", "name"], name: "index_locations_on_parent_location_id_and_kind_and_name", unique: true
+    t.index ["parent_location_id"], name: "index_locations_on_parent_location_id"
   end
 
-  add_index "locations", ["parent_location_id", "kind", "name"], name: "index_locations_on_parent_location_id_and_kind_and_name", unique: true
-  add_index "locations", ["parent_location_id"], name: "index_locations_on_parent_location_id"
-
   create_table "project_jobs", force: :cascade do |t|
-    t.integer  "project_id", null: false
-    t.integer  "job_id",     null: false
+    t.integer "project_id", null: false
+    t.integer "job_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.index ["job_id"], name: "index_project_jobs_on_job_id"
+    t.index ["project_id", "job_id"], name: "index_project_jobs_on_project_id_and_job_id", unique: true
+    t.index ["project_id"], name: "index_project_jobs_on_project_id"
   end
 
-  add_index "project_jobs", ["job_id"], name: "index_project_jobs_on_job_id"
-  add_index "project_jobs", ["project_id", "job_id"], name: "index_project_jobs_on_project_id_and_job_id", unique: true
-  add_index "project_jobs", ["project_id"], name: "index_project_jobs_on_project_id"
-
   create_table "projects", force: :cascade do |t|
-    t.string   "name",             null: false
-    t.integer  "owner_id"
-    t.datetime "created_at",       null: false
-    t.datetime "updated_at",       null: false
-    t.string   "default_password"
+    t.string "name", null: false
+    t.integer "owner_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "default_password"
+    t.index ["owner_id"], name: "index_projects_on_owner_id"
   end
 
-  add_index "projects", ["owner_id"], name: "index_projects_on_owner_id"
-
   create_table "roles", force: :cascade do |t|
-    t.integer  "user_id",      null: false
-    t.integer  "ownable_id"
-    t.string   "ownable_type"
-    t.datetime "created_at",   null: false
-    t.datetime "updated_at",   null: false
+    t.integer "user_id", null: false
+    t.integer "ownable_id"
+    t.string "ownable_type"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["ownable_type", "ownable_id"], name: "index_roles_on_ownable_type_and_ownable_id"
+    t.index ["user_id", "ownable_type", "ownable_id"], name: "index_roles_on_user_id_and_ownable_type_and_ownable_id", unique: true
   end
 
-  add_index "roles", ["ownable_type", "ownable_id"], name: "index_roles_on_ownable_type_and_ownable_id"
-  add_index "roles", ["user_id", "ownable_type", "ownable_id"], name: "index_roles_on_user_id_and_ownable_type_and_ownable_id", unique: true
-
   create_table "team_users", force: :cascade do |t|
-    t.integer  "user_id"
-    t.integer  "team_id"
+    t.integer "user_id"
+    t.integer "team_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.index ["team_id"], name: "index_team_users_on_team_id"
+    t.index ["user_id", "team_id"], name: "index_team_users_on_user_id_and_team_id", unique: true
+    t.index ["user_id"], name: "index_team_users_on_user_id"
   end
 
-  add_index "team_users", ["team_id"], name: "index_team_users_on_team_id"
-  add_index "team_users", ["user_id", "team_id"], name: "index_team_users_on_user_id_and_team_id", unique: true
-  add_index "team_users", ["user_id"], name: "index_team_users_on_user_id"
-
   create_table "teams", force: :cascade do |t|
-    t.string   "name"
-    t.integer  "project_id"
-    t.integer  "creator_id"
+    t.string "name"
+    t.integer "project_id"
+    t.integer "creator_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.index ["creator_id"], name: "index_teams_on_creator_id"
+    t.index ["project_id"], name: "index_teams_on_project_id"
   end
 
-  add_index "teams", ["creator_id"], name: "index_teams_on_creator_id"
-  add_index "teams", ["project_id"], name: "index_teams_on_project_id"
-
   create_table "user_locations", force: :cascade do |t|
-    t.integer  "user_id"
-    t.integer  "location_id"
-    t.integer  "detectable_id"
-    t.string   "detectable_type"
-    t.float    "lat"
-    t.float    "lng"
-    t.float    "alt"
-    t.datetime "created_at",      null: false
-    t.datetime "updated_at",      null: false
+    t.integer "user_id"
+    t.integer "location_id"
+    t.integer "detectable_id"
+    t.string "detectable_type"
+    t.float "lat"
+    t.float "lng"
+    t.float "alt"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["detectable_type", "detectable_id"], name: "index_user_locations_on_detectable_type_and_detectable_id"
+    t.index ["location_id"], name: "index_user_locations_on_location_id"
+    t.index ["user_id"], name: "index_user_locations_on_user_id"
   end
 
-  add_index "user_locations", ["detectable_type", "detectable_id"], name: "index_user_locations_on_detectable_type_and_detectable_id"
-  add_index "user_locations", ["location_id"], name: "index_user_locations_on_location_id"
-  add_index "user_locations", ["user_id"], name: "index_user_locations_on_user_id"
-
   create_table "user_project_jobs", force: :cascade do |t|
-    t.integer  "user_id",    null: false
-    t.integer  "project_id", null: false
-    t.integer  "job_id",     null: false
+    t.integer "user_id", null: false
+    t.integer "project_id", null: false
+    t.integer "job_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.index ["job_id"], name: "index_user_project_jobs_on_job_id"
+    t.index ["project_id"], name: "index_user_project_jobs_on_project_id"
+    t.index ["user_id", "project_id", "job_id"], name: "index_user_project_jobs_on_user_id_and_project_id_and_job_id", unique: true
+    t.index ["user_id"], name: "index_user_project_jobs_on_user_id"
   end
 
-  add_index "user_project_jobs", ["job_id"], name: "index_user_project_jobs_on_job_id"
-  add_index "user_project_jobs", ["project_id"], name: "index_user_project_jobs_on_project_id"
-  add_index "user_project_jobs", ["user_id", "project_id", "job_id"], name: "index_user_project_jobs_on_user_id_and_project_id_and_job_id", unique: true
-  add_index "user_project_jobs", ["user_id"], name: "index_user_project_jobs_on_user_id"
-
   create_table "users", force: :cascade do |t|
-    t.string   "email",                  default: "", null: false
-    t.string   "encrypted_password",     default: "", null: false
-    t.string   "reset_password_token"
+    t.string "email", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          default: 0,  null: false
+    t.integer "sign_in_count", default: 0, null: false
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip"
-    t.datetime "created_at",                          null: false
-    t.datetime "updated_at",                          null: false
-    t.integer  "failed_attempts",        default: 0,  null: false
-    t.string   "unlock_token"
+    t.string "current_sign_in_ip"
+    t.string "last_sign_in_ip"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "failed_attempts", default: 0, null: false
+    t.string "unlock_token"
     t.datetime "locked_at"
-    t.boolean  "superuser",   default: false, null: false
-    t.string   "authentication_token"
-    t.string   "confirmation_token"
+    t.boolean "superuser", default: false, null: false
+    t.string "authentication_token"
+    t.string "confirmation_token"
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
-    t.string   "unconfirmed_email"
-    t.string   "first_name"
-    t.string   "last_name"
+    t.string "unconfirmed_email"
+    t.string "first_name"
+    t.string "last_name"
+    t.index ["authentication_token"], name: "index_users_on_authentication_token", unique: true
+    t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
+    t.index ["email"], name: "index_users_on_email", unique: true
+    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end
 
-  add_index "users", ["authentication_token"], name: "index_users_on_authentication_token", unique: true
-  add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
-  add_index "users", ["email"], name: "index_users_on_email", unique: true
-  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
-
 end

data/spec/requests/project_api_spec.rb

@@ -174,7 +174,7 @@ describe Dummy::ProjectAPI, type: :request do
     it "should respect the maximum number of results" do
       get '/api/v1/projects', params: { per_page: 20, offset: 0 }
       response.code.should eq "400"
-      json['error'].should eq "per_page must be less than 10"
+      json['error'].should eq "per_page must be less than or equal 10"
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: introspective_grape
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.9
 platform: ruby
 authors:
 - Josh Buermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2019-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,14 +28,14 @@ dependencies:
   name: grape
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
@@ -68,20 +68,6 @@ dependencies:
         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:
     - - ">="
@@ -246,14 +232,6 @@ files:
 - app/models/.keep
 - app/views/.keep
 - bin/rails
-- gemfiles/2.0.0-Gemfile
-- gemfiles/2.2.0-Gemfile
-- gemfiles/Gemfile.rails.3.2.22
-- gemfiles/Gemfile.rails.4.1.13
-- gemfiles/Gemfile.rails.4.2.10
-- 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
@@ -383,6 +361,7 @@ files:
 - spec/dummy/db/migrate/20150820190524_add_user_names.rb
 - spec/dummy/db/migrate/20150824215701_create_images.rb
 - spec/dummy/db/migrate/20150909225019_add_password_to_project.rb
+- spec/dummy/db/migrate/20190325231304_add_test_data.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.keep
 - spec/dummy/log/.keep
@@ -425,9 +404,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -551,6 +530,7 @@ test_files:
 - spec/dummy/db/migrate/20150820190524_add_user_names.rb
 - spec/dummy/db/migrate/20150824215701_create_images.rb
 - spec/dummy/db/migrate/20150909225019_add_password_to_project.rb
+- spec/dummy/db/migrate/20190325231304_add_test_data.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.keep
 - spec/dummy/log/.keep

data/gemfiles/2.0.0-Gemfile

@@ -1,22 +0,0 @@
-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.17'
-gem 'grape-swagger', '< 0.12.0'
-gem 'nokogiri', '< 1.6.9'
-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/gemfiles/2.2.0-Gemfile

@@ -1,21 +0,0 @@
-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', '< 1.0.0'
-gem 'grape-swagger'
-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 do
-#  gem 'byebug'
-end

data/gemfiles/Gemfile.rails.3.2.22

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

data/gemfiles/Gemfile.rails.4.1.13

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

data/gemfiles/Gemfile.rails.4.2.10

@@ -1,12 +0,0 @@
-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

@@ -1,14 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path => '../'
-
-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
-  gem 'rspec'
-end

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

@@ -1,13 +0,0 @@
-source 'https://rubygems.org'
-
-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
-  gem 'rspec'
-end

data/gemfiles/Gemfile.rails.4.2.8

@@ -1,14 +0,0 @@
-source 'https://rubygems.org'
-
-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
-  gem 'rspec'
-end