grape-app 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 472b616863a504f05315156ed843872014bf5844
-  data.tar.gz: 75f5393b220476236734c9c72497a2a166465023
+SHA256:
+  metadata.gz: 41f23bad1b0bde492375ac52d86c29e03b20e85d5c976a24b5bf647eacfc8f27
+  data.tar.gz: b5a923a5a8ceadc42254b495abe6e7ef5735cbaf3a7d5f4a0325d809bfcf7c4b
 SHA512:
-  metadata.gz: 65b524cec227f6879bba0febd037e3ba83afbda7e223711397636141eb76d77026186899de21e6bfa732bcafb442b1664d1153948943a6f670e062d08e1b4a5c
-  data.tar.gz: 19155e2bf07d4089e16f49446a77e503b21749cce64aeb3799f08ffd340e4f61210d49d406f07326df81964162047826fc90a4feceaaf5710ffba2a277d27823
+  metadata.gz: c2dcfcd9cc76a9eb5512324b2f726a84efeab43c324d07b0c513c2857a4148d0c63580203c6aef4a81bb1b882e07176ed902aed2f9fb95cedd01009f4a8301e0
+  data.tar.gz: 3eea8678d1dfcccbbbe1d98ad352187fb889d52f511785eb819e67c5a35aab2f2e8396abaf502464c4558df4b7c56d11295a65d05071328d96d14a4bcd0bd308

data/.gitignore

@@ -1 +1,2 @@
 *.gem
+.rubocop-*

data/.rubocop.yml

@@ -0,0 +1,7 @@
+inherit_from:
+  - https://storage.googleapis.com/bsm-misc/rubocop.yml
+
+AllCops:
+  TargetRubyVersion: 2.2
+  Exclude:
+    - vendor/**/*

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grape-app (0.5.1)
+    grape-app (0.5.3)
       activesupport
       grape (>= 1.0.0)
       grape-entity
@@ -12,18 +12,19 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.1.4)
-      activesupport (= 5.1.4)
-    activerecord (5.1.4)
-      activemodel (= 5.1.4)
-      activesupport (= 5.1.4)
-      arel (~> 8.0)
-    activesupport (5.1.4)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activesupport (5.2.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (8.0.0)
+    arel (9.0.0)
+    ast (2.4.0)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
@@ -36,7 +37,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
     equalizer (0.0.11)
-    grape (1.0.2)
+    grape (1.0.3)
       activesupport
       builder
       mustermann-grape (~> 1.0.0)
@@ -46,22 +47,27 @@ GEM
     grape-entity (0.7.1)
       activesupport (>= 4.0)
       multi_json (>= 1.3.2)
-    i18n (0.9.3)
+    i18n (1.0.1)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     minitest (5.11.3)
     multi_json (1.13.1)
-    mustermann (1.0.1)
+    mustermann (1.0.2)
     mustermann-grape (1.0.0)
       mustermann (~> 1.0.0)
-    rack (2.0.4)
+    parallel (1.12.1)
+    parser (2.5.1.0)
+      ast (~> 2.4.0)
+    powerpack (0.1.1)
+    rack (2.0.5)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-cors (1.0.2)
     rack-ssl-enforcer (0.2.9)
-    rack-test (0.8.2)
+    rack-test (1.0.0)
       rack (>= 1.0, < 3)
-    rake (12.3.0)
+    rainbow (3.0.0)
+    rake (12.3.1)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
@@ -75,11 +81,20 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
+    rubocop (0.55.0)
+      parallel (~> 1.10)
+      parser (>= 2.5)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.9.0)
     sqlite3 (1.3.13)
     thor (0.20.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
+    unicode-display_width (1.3.2)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -96,6 +111,7 @@ DEPENDENCIES
   rack-test
   rake
   rspec
+  rubocop
   sqlite3
 
 BUNDLED WITH

data/Rakefile

@@ -1,6 +1,10 @@
 require 'bundler/setup'
 require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
 
+require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
-task default: :spec
+
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new(:rubocop)
+
+task default: %i[spec rubocop]

data/bin/grape-app

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
 
-if File.exist?(File.expand_path('../../.git', __FILE__))
-  $:.unshift(File.expand_path('../../lib', __FILE__))
-end
+$LOAD_PATH.unshift(File.expand_path('../lib', __dir__)) if File.exist?(File.expand_path('../.git', __dir__))
 require "grape/app/cli"

data/grape-app.gemspec

@@ -1,12 +1,10 @@
-# encoding: utf-8
-
-Gem::Specification.new do |s|
+Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
   s.name          = 'grape-app'
-  s.version       = '0.5.1'
+  s.version       = '0.5.3'
   s.authors       = ['Black Square Media Ltd']
   s.email         = ['info@blacksquaremedia.com']
-  s.summary       = %{Stanalone Grape API apps}
-  s.description   = %{}
+  s.summary       = %(Stanalone Grape API apps)
+  s.description   = %()
   s.homepage      = 'https://github.com/bsm/grape-app'
   s.license       = 'MIT'
 
@@ -16,18 +14,18 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.required_ruby_version = '>= 2.2'
 
+  s.add_dependency 'activesupport'
   s.add_dependency 'grape', '>= 1.0.0'
   s.add_dependency 'grape-entity'
-  s.add_dependency 'activesupport'
   s.add_dependency 'rack-cors'
   s.add_dependency 'rack-ssl-enforcer'
   s.add_dependency 'thor'
 
+  s.add_development_dependency 'activerecord'
   s.add_development_dependency 'bundler'
+  s.add_development_dependency 'rack-test'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'activerecord'
+  s.add_development_dependency 'rubocop'
   s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'rack-test'
 end
-

data/lib/grape-app.rb

@@ -1 +1 @@
-require 'grape/app'
+require 'grape/app' # rubocop:disable Naming/FileName

data/lib/grape/app.rb

@@ -12,7 +12,7 @@ class Grape::App < Grape::API
   class << self
 
     # Run initializers
-    def init!(root = nil)
+    def init!(root=nil) # rubocop:disable Metrics/AbcSize
       @root = Pathname.new(root) if root
 
       # Require bundle
@@ -36,11 +36,11 @@ class Grape::App < Grape::API
 
     # @return [Grape::App::Configuration] the configuration
     def config
-      @_config ||= if respond_to?(:superclass) && superclass.respond_to?(:config)
-        superclass.config.inheritable_copy
-      else
-        Class.new(Grape::App::Configuration).new
-      end
+      @config ||= if respond_to?(:superclass) && superclass.respond_to?(:config)
+                    superclass.config.inheritable_copy
+                  else
+                    Class.new(Grape::App::Configuration).new
+                  end
     end
 
     # Configure the app
@@ -78,13 +78,13 @@ class Grape::App < Grape::API
     private
 
     def require_all(*args)
-      args = args + ['**', '*.rb']
+      args += ['**', '*.rb']
       Dir[root.join(*args).to_s].sort.each {|f| require f }
     end
 
     def require_one(*args)
       path = root.join(*args).to_s
-      require path if File.exists?("#{path}.rb")
+      require path if File.exist?("#{path}.rb")
     end
 
   end

data/lib/grape/app/cli.rb

@@ -2,7 +2,6 @@ require 'grape/app'
 require 'thor'
 
 module Grape::App::CLI
-
   class Builder < Thor::Group
     include Thor::Actions
     argument :name, required: true
@@ -30,8 +29,19 @@ module Grape::App::CLI
 
   class Runner < Thor
     register Builder, :new, "new NAME", "create a new application"
-  end
 
+    desc 'console ENV', 'Launch console'
+    def console(env='development')
+      ENV['GRAPE_ENV'] = env
+      require File.expand_path('config/environment', Dir.pwd)
+
+      require 'irb'
+      require 'irb/completion'
+
+      ARGV.clear
+      IRB.start
+    end
+  end
 end
 
 Grape::App::CLI::Runner.start

data/lib/grape/app/configuration.rb

@@ -11,13 +11,13 @@ class Grape::App::Configuration < ActiveSupport::InheritableOptions
   end
 
   def cors_allow_origins=(value)
-    warn "[DEPRECATION] setting `config.cors_allow_origins` is deprecated. Please use `config.cors` with a block instead. [#{caller[0]}]"
+    warn "[DEPRECATION] setting `config.cors_allow_origins` is deprecated. Please use `config.cors` with a block instead. [#{caller(1..1).first}]"
 
     value = Array.wrap(value)
-    self.cors do
+    cors do
       allow do
-        origins   *value
-        resource  '*', headers: :any, methods: [:get, :post, :options, :delete, :put]
+        origins *value # rubocop:disable Lint/AmbiguousOperator
+        resource '*', headers: :any, methods: %i[get post options delete put]
       end
     end
   end

data/lib/grape/app/helpers/params.rb

@@ -1,9 +1,7 @@
 module Grape::App::Helpers::Params
-
   # Scope declared params
   # @return [ActiveSupport::HashWithIndifferentAccess] declared params only
   def declared_params
     declared(params, include_missing: false)
   end
-
 end

data/lib/grape/app/helpers/respond_with.rb

@@ -1,18 +1,16 @@
 require 'grape_entity'
 
 module Grape::App::Helpers::RespondWith
-
   class Errors < Grape::Entity
     expose :errors
   end
 
   # @param [ActiveRecord::Base] record validated record
-  def respond_with(record, opts = {})
+  def respond_with(record, opts={})
     unless record.errors.empty?
       opts[:with] = Errors
       status 400
     end
     present record, opts
   end
-
 end

data/lib/grape/app/initializers/post.rb

@@ -1,5 +1,5 @@
 if Grape::App.config.raise_on_missing_translations
-  handler = lambda {|exception, *| exception = exception.to_exception if exception.respond_to?(:to_exception); raise exception }
+  handler = ->(exception, *) { exception = exception.to_exception if exception.respond_to?(:to_exception); raise exception }
   I18n.exception_handler = handler
 end
 
@@ -7,7 +7,7 @@ if defined?(ActiveRecord)
   require 'yaml'
   require 'erb'
 
-  configurations = YAML.load(ERB.new(Grape::App.root.join('config', 'database.yml').read).result) || {}
+  configurations = YAML.safe_load(ERB.new(Grape::App.root.join('config', 'database.yml').read).result) || {}
   if ENV['DATABASE_URL']
     configurations[Grape::App.env.to_s] ||= {}
     configurations[Grape::App.env.to_s]['url'] ||= ENV['DATABASE_URL']
@@ -17,7 +17,5 @@ if defined?(ActiveRecord)
   ActiveRecord::Base.default_timezone = :utc
   ActiveRecord::Base.establish_connection(Grape::App.env.to_sym)
 
-  if defined?(ActiveRecord::ConnectionAdapters::ConnectionManagement)
-    Grape::App.middleware.use ActiveRecord::ConnectionAdapters::ConnectionManagement
-  end
+  Grape::App.middleware.use ActiveRecord::ConnectionAdapters::ConnectionManagement if defined?(ActiveRecord::ConnectionAdapters::ConnectionManagement)
 end

data/lib/grape/app/tasks.rb

@@ -1,7 +1,8 @@
-load File.expand_path("../tasks/core.rake", __FILE__)
+load File.expand_path('tasks/core.rake', __dir__)
 
 begin
   require 'active_record'
-  load File.expand_path("../tasks/databases.rake", __FILE__)
+  load File.expand_path('tasks/databases.rake', __dir__)
 rescue LoadError
+  nil
 end

data/lib/grape/app/tasks/core.rake

@@ -1,3 +1,22 @@
 task :environment do
   require Bundler.root.join("config", "environment").to_s
 end
+
+desc 'Launch console'
+task console: :environment do
+  ::ARGV.clear
+
+  require 'irb'
+  require 'irb/completion'
+
+  IRB.start(Grape::App.root.to_s)
+end
+
+desc 'List all routes'
+task routes: :environment do
+  Grape::App.routes.each do |route|
+    method = route.request_method.ljust(7)
+    path   = route.path.sub(":version", route.version.to_s)
+    puts "  #{method} #{path}"
+  end
+end

data/lib/grape/app/tasks/databases.rake

@@ -10,7 +10,7 @@ ActiveRecord::Tasks::DatabaseTasks.tap do |config|
   end
 end
 
-namespace :db do
+namespace :db do # rubocop:disable Metrics/BlockLength
 
   Rake::Task['load_config'].clear
 
@@ -31,9 +31,11 @@ namespace :db do
     name = ENV["NAME"]
     path = File.join(migrations_path, "#{Time.now.utc.strftime('%Y%m%d%H%M%S')}_#{name}.rb")
 
+    ar_version = [ActiveRecord::VERSION::MAJOR, ActiveRecord::VERSION::MINOR].join('.')
+
     FileUtils.mkdir_p(migrations_path)
     File.write path, <<-MIGRATION.strip_heredoc
-      class #{name.camelize} < ActiveRecord::Migration
+      class #{name.camelize} < ActiveRecord::Migration[#{ar_version}]
         def change
         end
       end

data/lib/grape/app/templates/Gemfile

@@ -13,7 +13,7 @@ end
 group 'test' do
   gem 'airborne'
   gem 'database_cleaner'
-  gem 'factory_girl'
+  gem 'factory_bot'
   gem 'faker'
   gem 'rspec-collection_matchers'
   gem 'rspec-its'

data/lib/grape/app/templates/Rakefile

@@ -1,6 +1,11 @@
 require 'bundler/setup'
-require 'rspec/core/rake_task'
 require 'grape/app/tasks'
 
-RSpec::Core::RakeTask.new(:spec)
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+rescue LoadError
+  nil # so it won't fail in production env, where rspec is usually not installed
+end
+
 task default: :spec

data/lib/grape/app/templates/app/api.rb

@@ -6,6 +6,5 @@ module API
   autoload :Base
 end
 
-
 # Mount root API to app
 Grape::App.mount API::V1

data/lib/grape/app/templates/app/models.rb

@@ -1,4 +1,4 @@
 # Add your model names below
-Grape::App.autoload %w|
+Grape::App.autoload %w[
 
-|
+]

data/lib/grape/app/templates/config.ru

@@ -1,4 +1,3 @@
-require File.expand_path('../config/environment', __FILE__)
+require File.expand_path('config/environment', __dir__)
 
 run Grape::App.middleware
-

data/lib/grape/app/templates/config/environment.rb

@@ -1,4 +1,4 @@
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
 require 'grape/app'
 Grape::App.init!

data/lib/grape/app/templates/config/environments/production.rb

@@ -1,5 +1,4 @@
 Grape::App.configure do |config|
-
   # Force SSL
   # config.force_ssl = true
 
@@ -22,5 +21,4 @@ Grape::App.configure do |config|
 
   # Don't raise errors on missing translations
   # config.raise_on_missing_translations = false
-
 end

data/lib/grape/app/templates/spec/spec_helper.rb

@@ -1,7 +1,11 @@
 ENV['RACK_ENV'] ||= 'test'
-require File.expand_path('../../config/environment', __FILE__)
+require File.expand_path('../config/environment', __dir__)
 
 RSpec.configure do |config|
+  # ActiveRecord::Migration
+  config.before :suite do
+    ActiveRecord::Migration.maintain_test_schema!
+  end if defined?(ActiveRecord)
 
   # DatabaseCleaner
   config.before :suite do
@@ -12,12 +16,11 @@ RSpec.configure do |config|
     DatabaseCleaner.cleaning { example.run }
   end
 
-  # FactoryGirl
-  config.include FactoryGirl::Syntax::Methods
+  # FactoryBot
+  config.include FactoryBot::Syntax::Methods
   config.before :suite do
-    FactoryGirl.find_definitions
+    FactoryBot.find_definitions
   end
-
 end
 
 # Test with Airborne

data/spec/grape/app_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe Grape::App do
   include Rack::Test::Methods
 
   subject { described_class }
-  before  { subject.init! File.expand_path('../../scenario', __FILE__) }
+  before  { subject.init! File.expand_path('../scenario', __dir__) }
 
   def app
     subject.middleware
@@ -56,7 +56,7 @@ RSpec.describe Grape::App do
     expect(last_response.body).to eq(%({"status":"OK"}))
     expect(last_response.headers).to include(
       "Access-Control-Allow-Origin" => "*",
-      "X-MyApp" => "true",
+      "X-MyApp"                     => "true",
     )
 
     header 'Origin', 'test.host'
@@ -65,7 +65,7 @@ RSpec.describe Grape::App do
     expect(last_response.body).to eq(%({"error":"bad request"}))
     expect(last_response.headers).to include(
       "Access-Control-Allow-Origin" => "*",
-      "X-MyApp" => "true",
+      "X-MyApp"                     => "true",
     )
   end
 

data/spec/scenario/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'grape-app', path: '../../'
 gem 'activerecord', require: 'active_record'
+gem 'grape-app', path: '../../'

data/spec/scenario/app/api/v1.rb

@@ -3,11 +3,11 @@ class API::V1 < Grape::API
   format  :json
 
   rescue_from MyLib::BadRequest do |e|
-    error!({error: e}, 400)
+    error!({ error: e }, 400)
   end
 
   get '/ok' do
-    {status: 'OK'}
+    { status: 'OK' }
   end
 
   get '/failing' do

data/spec/scenario/config/environments/test.rb

@@ -4,7 +4,7 @@ Grape::App.configure do |c|
   c.cors do
     allow do
       origins '*'
-      resource '*', headers: :any, methods: [:get, :post, :options]
+      resource '*', headers: :any, methods: %i[get post options]
     end
   end
   c.middleware do

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: grape-app
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Black Square Media Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rack-cors
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-cors
+  name: rack-ssl-enforcer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-ssl-enforcer
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,13 +95,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -109,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -188,6 +202,7 @@ extra_rdoc_files: []
 files:
 - ".editorconfig"
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -253,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Stanalone Grape API apps