grape-app 0.6.4 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ceb5d9f75dd6d5db403dce33d2a5d3e1c6aca71848a04a37ed99f8fde0f037ed
-  data.tar.gz: ae1ae575667dae62ec3139c3c91d3a396f32fb821885fdf0f0ee30c50db9ff1d
+  metadata.gz: b57e351adc50118035370d237ef50414ce15c5937ddac3304b724932c9a8cda9
+  data.tar.gz: 36dfd3eac4d65e5264feb16240f565120c40ee964866eb57755b358f75b1a942
 SHA512:
-  metadata.gz: 72273165dfaf50b2004c47a4e73ff7c6f64ded19e8ec8d34ef0efd578a3f9846bd409e3f9b227d834b30bc1fd1fbccb4767f53545388476db69fefd5813629c9
-  data.tar.gz: 1c4bc4ea19dda75930bf9ba6e63aa04e2b39462497488ddce45e25219d503af872aea37d0a7447f2a20f5a12bb04a5991454747438b1d8eb76f40ea983d80c02
+  metadata.gz: a8d09f18885b43fa835eaa37adb3b33b0f064b5665dde1cdd2bcc278ea87aca4f99784b4f734abb8e8ce9bdc30def55c40ff33663ff884036475c8f6d7ca1207
+  data.tar.gz: 9ff549eb0e0d16eca3caa2a42ed80834436e8ba0252835f25e7891e5baa7eddff72544cf68706b2225839064c57c28650f53bcdb598efcbb818ae43bdd13c6e9

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    grape-app (0.6.4)
+    grape-app (0.7.1)
       activesupport
       grape (>= 1.2.0)
       grape-entity
       rack-cors
       rack-ssl-enforcer
       thor
+      zeitwerk
 
 GEM
   remote: https://rubygems.org/
@@ -37,7 +38,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
     equalizer (0.0.11)
-    grape (1.2.2)
+    grape (1.2.3)
       activesupport
       builder
       mustermann-grape (~> 1.0.0)
@@ -47,17 +48,17 @@ GEM
     grape-entity (0.7.1)
       activesupport (>= 4.0)
       multi_json (>= 1.3.2)
-    i18n (1.4.0)
+    i18n (1.5.3)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    jaro_winkler (1.5.1)
+    jaro_winkler (1.5.2)
     minitest (5.11.3)
     multi_json (1.13.1)
     mustermann (1.0.3)
     mustermann-grape (1.0.0)
       mustermann (~> 1.0.0)
-    parallel (1.12.1)
-    parser (2.5.3.0)
+    parallel (1.13.0)
+    parser (2.6.0.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
     rack (2.0.6)
@@ -82,7 +83,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.62.0)
+    rubocop (0.63.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
@@ -102,6 +103,7 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
+    zeitwerk (1.0.0.beta2)
 
 PLATFORMS
   ruby

data/grape-app.gemspec

@@ -1,6 +1,6 @@
-Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
+Gem::Specification.new do |s|
   s.name          = 'grape-app'
-  s.version       = '0.6.4'
+  s.version       = '0.7.1'
   s.authors       = ['Black Square Media Ltd']
   s.email         = ['info@blacksquaremedia.com']
   s.summary       = %(Stanalone Grape API apps)
@@ -20,6 +20,7 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
   s.add_dependency 'rack-cors'
   s.add_dependency 'rack-ssl-enforcer'
   s.add_dependency 'thor'
+  s.add_dependency 'zeitwerk'
 
   s.add_development_dependency 'activerecord'
   s.add_development_dependency 'bundler'

data/lib/grape/app.rb

@@ -3,10 +3,10 @@ require 'pathname'
 require 'grape'
 require 'active_support/string_inquirer'
 require 'active_support/configurable'
-require 'active_support/inflector/methods'
 require 'active_support/core_ext/time/zones'
 require 'rack/cors'
 require 'rack/ssl-enforcer'
+require 'zeitwerk'
 
 class Grape::App < Grape::API::Instance
   class << self
@@ -20,8 +20,10 @@ class Grape::App < Grape::API::Instance
 
       # Update load path
       $LOAD_PATH.push self.root.join('lib').to_s
-      $LOAD_PATH.push self.root.join('app').to_s
-      $LOAD_PATH.push self.root.join('app', 'models').to_s
+
+      # Push dirs to loader
+      push_dir? self.root.join('app')
+      push_dir? self.root.join('app', 'models')
 
       # Load initializers
       require 'grape/app/initializers/pre'
@@ -29,8 +31,10 @@ class Grape::App < Grape::API::Instance
       require_all 'config', 'initializers'
       require 'grape/app/initializers/post'
 
+      # Setup loader
+      loader.setup
+
       # Load app
-      require_one 'app', 'models'
       require_one 'app', 'api'
     end
 
@@ -58,9 +62,10 @@ class Grape::App < Grape::API::Instance
       @env ||= ActiveSupport::StringInquirer.new(ENV['GRAPE_ENV'] || ENV['RACK_ENV'] || 'development')
     end
 
-    def autoload(paths)
-      paths.each do |path|
-        Object.autoload ActiveSupport::Inflector.classify(path), path
+    # @return [Zeitwerk::Loader] loader
+    def loader
+      @loader ||= Zeitwerk::Loader.new.tap do |l|
+        l.inflector = Grape::App::Inflector.new
       end
     end
 
@@ -79,6 +84,10 @@ class Grape::App < Grape::API::Instance
 
     private
 
+    def push_dir?(dir)
+      loader.push_dir(dir) if dir.exist?
+    end
+
     def require_all(*args)
       args += ['**', '*.rb']
       Dir[root.join(*args).to_s].sort.each {|f| require f }
@@ -88,9 +97,9 @@ class Grape::App < Grape::API::Instance
       path = root.join(*args).to_s
       require path if File.exist?("#{path}.rb")
     end
-
   end
 end
 
 require 'grape/app/configuration'
 require 'grape/app/helpers'
+require 'grape/app/inflector'

data/lib/grape/app/inflector.rb

@@ -0,0 +1,13 @@
+require 'zeitwerk'
+require 'active_support/inflector'
+
+class Grape::App::Inflector < Zeitwerk::Inflector
+  def camelize(basename, _abspath)
+    case basename
+    when 'api'
+      'API'
+    else
+      ActiveSupport::Inflector.camelize(basename)
+    end
+  end
+end

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

@@ -10,7 +10,7 @@ ActiveRecord::Tasks::DatabaseTasks.tap do |config|
   end
 end
 
-namespace :db do # rubocop:disable Metrics/BlockLength
+namespace :db do
 
   Rake::Task['load_config'].clear
 

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

@@ -1,8 +1,4 @@
 module API
-  extend ActiveSupport::Autoload
-
-  # Autoload API components
-  autoload :V1
 end
 
 # Mount root API to app

data/spec/scenario/app/api.rb

@@ -1,8 +1,4 @@
 module API
-  extend ActiveSupport::Autoload
-
-  # Autoload API components
-  autoload :V1
 end
 
 # Mount root API to app

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

@@ -0,0 +1,5 @@
+class API::Posts < Grape::API::Instance
+  get '/posts' do
+    []
+  end
+end

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

@@ -13,4 +13,6 @@ class API::V1 < Grape::API::Instance
   get '/failing' do
     raise MyLib::BadRequest, 'bad request'
   end
+
+  mount API::Posts
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-app
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.1
 platform: ruby
 authors:
 - Black Square Media Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-03 00:00:00.000000000 Z
+date: 2019-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  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: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -218,6 +232,7 @@ files:
 - lib/grape/app/helpers.rb
 - lib/grape/app/helpers/params.rb
 - lib/grape/app/helpers/respond_with.rb
+- lib/grape/app/inflector.rb
 - lib/grape/app/initializers/post.rb
 - lib/grape/app/initializers/pre.rb
 - lib/grape/app/tasks.rb
@@ -227,7 +242,6 @@ files:
 - lib/grape/app/templates/Rakefile
 - lib/grape/app/templates/app/api.rb
 - lib/grape/app/templates/app/api/v1.rb
-- lib/grape/app/templates/app/models.rb
 - lib/grape/app/templates/config.ru
 - lib/grape/app/templates/config/environment.rb
 - lib/grape/app/templates/config/environments/development.rb
@@ -241,6 +255,7 @@ files:
 - spec/grape/app_spec.rb
 - spec/scenario/Gemfile
 - spec/scenario/app/api.rb
+- spec/scenario/app/api/posts.rb
 - spec/scenario/app/api/v1.rb
 - spec/scenario/config/database.yml
 - spec/scenario/config/environments/test.rb
@@ -274,6 +289,7 @@ test_files:
 - spec/grape/app_spec.rb
 - spec/scenario/Gemfile
 - spec/scenario/app/api.rb
+- spec/scenario/app/api/posts.rb
 - spec/scenario/app/api/v1.rb
 - spec/scenario/config/database.yml
 - spec/scenario/config/environments/test.rb

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

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