Merge branch 'master' into http_basic_auth

.gitignore

@@ -6,5 +6,3 @@ spec/dummy/tmp/
 coverage
 spec/dummy/.sass-cache
 Gemfile.lock
-.ruby-version
-.ruby-gemset

.rubocop.yml

@@ -1,279 +1,16 @@
-AllCops:
-  Exclude:
-    - spec/dummy/bin/**/*
-    - spec/dummy/config/**/*
-    - spec/dummy/Rakefile
-    - tmp/**/*
-
-AccessorMethodName:
-  Enabled: false
-
-ActionFilter:
-  Enabled: false
-
-Alias:
-  Enabled: false
-
-ArrayJoin:
-  Enabled: false
-
-AsciiComments:
-  Enabled: false
-
-AsciiIdentifiers:
-  Enabled: false
-
-Attr:
-  Enabled: false
-
-BlockNesting:
-  Enabled: false
-
-CaseEquality:
-  Enabled: false
-
-CharacterLiteral:
-  Enabled: false
-
-ClassAndModuleChildren:
-  Enabled: false
-
-ClassLength:
-  Enabled: false
-
-ClassVars:
-  Enabled: false
-
-CollectionMethods:
-  Enabled: true
-  PreferredMethods:
-    find: detect
-    reduce: inject
-    collect: map
-    find_all: select
-
-ColonMethodCall:
-  Enabled: false
-
-CommentAnnotation:
-  Enabled: false
-
-CyclomaticComplexity:
-  Enabled: false
-
-Delegate:
-  Enabled: false
-
-DeprecatedHashMethods:
-  Enabled: false
-
-Documentation:
-  Enabled: false
-
-DotPosition:
-  EnforcedStyle: trailing
-
-DoubleNegation:
-  Enabled: false
-
-EachWithObject:
-  Enabled: false
-
-EmptyLiteral:
-  Enabled: false
-
-Encoding:
-  Enabled: false
-
-EvenOdd:
-  Enabled: false
-
-ExtraSpacing:
-  Enabled: true
-
-FileName:
-  Enabled: false
-
-FlipFlop:
-  Enabled: false
-
-FormatString:
-  Enabled: false
-
-GlobalVars:
-  Enabled: false
-
-GuardClause:
-  Enabled: false
-
-IfUnlessModifier:
-  Enabled: false
-
-IfWithSemicolon:
-  Enabled: false
-
-InlineComment:
-  Enabled: false
-
-Lambda:
-  Enabled: false
-
-LambdaCall:
-  Enabled: false
-
-LineEndConcatenation:
-  Enabled: false
-
-LineLength:
-  Max: 80
-
-MethodLength:
-  Enabled: false
-
-ModuleFunction:
-  Enabled: false
-
-NegatedIf:
-  Enabled: false
-
-NegatedWhile:
-  Enabled: false
+inherit_gem:
+  rubocop-rails_config:
+    - config/rails.yml
 
-Next:
-  Enabled: false
-
-NilComparison:
-  Enabled: false
-
-Not:
-  Enabled: false
-
-NumericLiterals:
-  Enabled: false
-
-OneLineConditional:
-  Enabled: false
-
-OpMethod:
-  Enabled: false
-
-ParameterLists:
-  Enabled: false
-
-PercentLiteralDelimiters:
-  Enabled: false
-
-PerlBackrefs:
-  Enabled: false
-
-PredicateName:
-  NamePrefixBlacklist:
-    - is_
-
-Proc:
-  Enabled: false
-
-RaiseArgs:
-  Enabled: false
-
-RegexpLiteral:
-  Enabled: false
-
-SelfAssignment:
-  Enabled: false
-
-SingleLineBlockParams:
-  Enabled: false
-
-SingleLineMethods:
-  Enabled: false
-
-SignalException:
-  Enabled: false
+inherit_mode:
+  merge:
+    - Exclude
 
-SpecialGlobalVars:
+Style/FrozenStringLiteralComment:
   Enabled: false
 
-StringLiterals:
-  EnforcedStyle: double_quotes
-
-VariableInterpolation:
-  Enabled: false
-
-TrailingComma:
-  Enabled: false
-
-TrivialAccessors:
-  Enabled: false
-
-VariableInterpolation:
-  Enabled: false
-
-WhenThen:
-  Enabled: false
+Layout/DefEndAlignment:
+  EnforcedStyleAlignWith: def
 
-WhileUntilModifier:
-  Enabled: false
-
-WordArray:
-  Enabled: false
-
-# Lint
-
-AmbiguousOperator:
-  Enabled: false
-
-AmbiguousRegexpLiteral:
-  Enabled: false
-
-AssignmentInCondition:
-  Enabled: false
-
-ConditionPosition:
-  Enabled: false
-
-DeprecatedClassMethods:
-  Enabled: false
-
-ElseLayout:
-  Enabled: false
-
-HandleExceptions:
-  Enabled: false
-
-InvalidCharacterLiteral:
-  Enabled: false
-
-LiteralInCondition:
-  Enabled: false
-
-LiteralInInterpolation:
-  Enabled: false
-
-Loop:
-  Enabled: false
-
-ParenthesesAsGroupedExpression:
-  Enabled: false
-
-RequireParentheses:
-  Enabled: false
-
-UnderscorePrefixedVariableName:
-  Enabled: false
-
-Void:
-  Enabled: false
-
-
-LineLength:
-  Description: Limit lines to 120 characters, which is what github can display.
-  Max: 120
-
-ExtraSpacing:
-  Description: Sometimes it's ok to line up some things for readability -- though it's bad for diffs.
-  Enabled: false
-
-UnneededPercentX:
-  Description: It's easier to search for %x than it is to search for `.
-  Enabled: false
+AllCops:
+  TargetRubyVersion: 2.6.2

.ruby-version

@@ -0,0 +1 @@
+2.6.2

.travis.yml

@@ -1,14 +1,18 @@
+language: ruby
 rvm:
-  - 2.3.0
   - 2.4.0
   - 2.5.0
+  - 2.6.0
 addons:
   chrome: stable
 before_script:
   - sh -e /etc/init.d/xvfb start
-env:
-  global:
-    - TRAVIS=true
-    - DISPLAY=:99.0
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
 before_install:
   - gem install bundler
+script:
+  - bundle exec rspec
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

Gemfile

@@ -1,20 +1,19 @@
 source "https://rubygems.org"
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec
 
-group :development, :test do
-  # dummy app dependencies
-  gem "rails"
+gem "rails"
+gem "puma"
 
-  # test dependencies
-  gem "rspec-rails"
-  gem "capybara"
-  gem "puma"
-  gem "aruba"
-  gem "selenium-webdriver"
-  gem "chromedriver-helper"
+# test dependencies
+gem "rspec-rails"
+gem "capybara"
+gem "aruba", "~> 0.14.9"
+gem "selenium-webdriver"
+gem "chromedriver-helper"
+gem "simplecov"
 
-  # io services
-  gem "rubocop", require: false
-  gem "codeclimate-test-reporter", require: false
-end
+# services
+gem "rubocop", require: false
+gem "rubocop-rails_config"

MIT.LICENSE

@@ -1,6 +1,6 @@
-Copyright 2013 Jeremy Jackson / ModeSet
+Copyright 2019 Jeremy Jackson / ModeSet
 
-https://github.com/modeset/teaspoon
+https://github.com/jejacks0n/apitome
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the