grape-starter 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 866bbd29cba332a5e801e76518c378cbdcf00a2f8a6b7502b8d9d65b8517ee95
-  data.tar.gz: 6fb1e47d74e5de0094f66cd68b350d7c33c2057da54a29ec06d700b84c5716fc
+  metadata.gz: fc328d324baf16a4ca6d533598944cef904a4a23c754cf2dec79a1d38e31f401
+  data.tar.gz: dfb725234b40172de9cc66ac47cac5a5d7ab40e958d70618409fcbe2b5d47a6f
 SHA512:
-  metadata.gz: 637cabc191b53fe8374b26ff692b24db9c18fa0d2dba52ea5542c31c81dedca817222d4cb5da6ed6fcdb097e00b0b38c868784f722847115a57cb330c735482d
-  data.tar.gz: 06dc0ab6931edc6673d14d3f06867a1594f20f88fb32f9b38eba9156e9d36ef7317bd3504366d995e6ec2250b93ddfa84a2c464e5e66457c0bdc4690ec2ac14a
+  metadata.gz: 8a981c268e2591b126090c46d3776f84f1346a6ec25a21d0ff43941b8e4bafb27bd13fc7579de1ce0b48be34b3606bd2f04d641be083480692ec8c2a60e88456
+  data.tar.gz: e19a5b4b46853f692f95c1b067312d2d83470a4c0114f88cadda612b1143f049a4da3f20acb30c3e205ab3c90cef274814814dabe568cba7fa2e10aa78cadc14

data/.github/workflows/ruby.yml

@@ -9,10 +9,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
-    - name: Set up Ruby 2.6
+    - name: Set up Ruby 2.7
       uses: actions/setup-ruby@v1
       with:
-        ruby-version: 2.6.x
+        ruby-version: 2.7.1
     - name: Build and test with Rake
       run: |
         gem install bundler

data/.rubocop.yml

@@ -38,7 +38,33 @@ Style/AsciiComments:
   Enabled: false
 
 Style/Documentation:
-  Exclude:
-    - 'template/**/*'
-    - 'lib/**/*'
-    - 'spec/**/*'
+  Enabled: false
+
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+Lint/RaiseException:
+  Enabled: true
+Lint/StructNewOverride:
+  Enabled: true
+Style/ExponentialNotation:
+  Enabled: true
+Style/HashEachMethods:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true
+Style/RedundantFetchBlock:
+  Enabled: true
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+Style/RedundantRegexpEscape:
+  Enabled: true
+Style/SlicingWithRange:
+  Enabled: true

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
-
+os: linux
 sudo: false
 
 before_install:
@@ -11,7 +11,7 @@ rvm:
   - 2.6.5
   - 2.5.7
 
-matrix:
+jobs:
   fast_finish: true
 
   allow_failures:

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ### NEXT
 
+- Fixes gems for sequel. [LeFnord](https://github.com/LeFnord)
+- Minor template improvements. [LeFnord](https://github.com/LeFnord)
+
 ### v1.2.3 / 2019-12-15
 
 - Removes require pry. [LeFnord](LeFnord) closes [!21](https://github.com/LeFnord/grape-starter/issues/21)
@@ -7,7 +10,7 @@
 
 ### v1.2.2 / 2019-02-28
 
-- Fixes loading of `aaplication` instead of `evironment` in `config.ru`
+- Fixes loading of `aplication` instead of `environment` in `config.ru`
 - [#19](https://github.com/LeFnord/grape-starter/pull/19) - Adds a module under lib as namespace. [LeFnord](https://github.com/LeFnord)
 
 ### v1.2.1 / 2019-02-24

data/grape-starter.gemspec

@@ -24,8 +24,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.5'
 
-  spec.add_dependency 'gli', '~> 2.18'
-  spec.add_dependency 'activesupport', '>= 5.0.0'
-  spec.add_dependency 'rubocop', '~> 0.78'
-  spec.add_dependency 'awesome_print', '~> 1.7'
+  spec.add_dependency 'gli', '~> 2.19'
+  spec.add_dependency 'activesupport', '~> 6.0'
+  spec.add_dependency 'rubocop', '~> 0.86'
+  spec.add_dependency 'awesome_print', '~> 1.8'
 end

data/lib/starter/builder.rb

@@ -18,6 +18,7 @@ module Starter
 
     class << self
       attr_reader :prefix, :resource, :set, :force, :entity, :destination, :orm
+
       #
       # public methods
       #
@@ -41,8 +42,10 @@ module Starter
         config_static.each do |config|
           replace_static(File.join(config[:file]), config[:pattern])
         end
+
         add_namespace_with_version
-        Orms.build(destination, options[:orm]) if options[:orm]
+
+        Orms.build(name, destination, options[:orm]) if options[:orm]
 
         Starter::Config.save(
           dest: destination,
@@ -125,9 +128,9 @@ module Starter
       #
       # replace something in static files
       def replace_static(file, replacement)
-        server_file = File.join(destination, file)
+        file_path = File.join(destination, file)
 
-        FileFoo.call!(server_file) { |content| content.gsub!('{{{grape-starter}}}', replacement.to_s) }
+        FileFoo.call!(file_path) { |content| content.gsub!('{{{grape-starter}}}', replacement.to_s) }
       end
 
       # #add! a new resource releated helper methods

data/lib/starter/builder/orms.rb

@@ -3,10 +3,12 @@
 module Starter
   class Orms
     class << self
-      def build(dest, orm)
+      def build(name, dest, orm)
         load_orm(orm: orm)
         return if @orm.nil?
 
+        @name = name
+
         if @orm == 'ar' || @orm == 'activerecord'
           # Fixes pooling
           add_middleware(dest, 'ActiveRecord::Rack::ConnectionManagement')
@@ -35,21 +37,21 @@ module Starter
           encoding: unicode
           timeout: 5000
           user: postgres
-          database: name_development
+          database: #{@name}_development
 
         test:
           adapter: #{adapter}
           encoding: unicode
           timeout: 5000
           user: postgres
-          database: name_test
+          database: #{@name}_test
 
         production:
           adapter: #{adapter}
           encoding: unicode
           timeout: 5000
           user: postgres
-          database: name_production
+          database: #{@name}_production
         FILE
       end
 

data/lib/starter/builder/templates/endpoints.rb

@@ -29,7 +29,9 @@ module Starter
       # POST
       def post
         "
-        desc 'create #{resource.singularize}'
+        desc 'create #{resource.singularize}' do
+          tags %w[#{resource.singularize}]
+        end
         params do
           # TODO: specify the parameters
         end
@@ -41,8 +43,10 @@ module Starter
       # GET
       def get_all
         "
-        desc 'get all of #{resource.pluralize}',
-        is_array: true
+        desc 'get all of #{resource.pluralize}' do
+          is_array true
+          tags %w[#{resource.singularize}]
+        end
         get do
           # your code goes here
         end"
@@ -51,7 +55,9 @@ module Starter
       %w[get put patch delete].each do |verb|
         define_method(:"#{verb}_one") do
           "
-          desc '#{verb} #{resource.singularize}'
+          desc '#{verb} #{resource.singularize}' do
+            tags %w[#{resource.singularize}]
+          end
           #{verb} do
             # your code goes here
           end"
@@ -61,7 +67,9 @@ module Starter
       %w[get put patch delete].each do |verb|
         define_method(:"#{verb}_specific") do
           "
-          desc '#{verb} specific #{resource.singularize}'
+          desc '#{verb} specific #{resource.singularize}' do
+            tags %w[#{resource.singularize}]
+          end
           params do
             requires :id
           end

data/lib/starter/builder/templates/sequel.rb

@@ -83,7 +83,7 @@ module Starter
         <<-FILE.strip_heredoc
         # DB stack
         gem 'sequel'
-        gem 'sqlite3'
+        gem 'pg'
         FILE
       end
 

data/lib/starter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Starter
-  VERSION = '1.2.4'
+  VERSION = '1.2.5'
 end

data/template/.rubocop.yml

@@ -1,5 +1,3 @@
-inherit_from: .rubocop_todo.yml
-
 AllCops:
   Exclude:
     - '**/tmp/**/*'
@@ -15,8 +13,43 @@ Layout/LineLength:
 Metrics/AbcSize:
   Max: 20
 
+Metrics/BlockLength:
+  Exclude:
+    - 'api/endpoints/**/*'
 Metrics/MethodLength:
   Max: 20
 
 Style/AsciiComments:
   Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+Lint/RaiseException:
+  Enabled: true
+Lint/StructNewOverride:
+  Enabled: true
+Style/ExponentialNotation:
+  Enabled: true
+Style/HashEachMethods:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true
+Style/RedundantFetchBlock:
+  Enabled: true
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+Style/RedundantRegexpEscape:
+  Enabled: true
+Style/SlicingWithRange:
+  Enabled: true

data/template/Gemfile

@@ -20,5 +20,5 @@ group :development, :test do
   gem 'rack-test'
   gem 'rake'
   gem 'rspec'
-  gem 'rubocop', '~> 0.77'
+  gem 'rubocop', '~> 0.86'
 end

data/template/api/endpoints/root.rb

@@ -6,9 +6,10 @@ module Api
   module Endpoints
     class Root < Grape::API
       namespace :root do
-        desc 'Exposes all routes',
-             success: Entities::Route,
-             is_array: true
+        desc 'Exposes all routes' do
+          success Entities::Route
+          is_array true
+        end
         get do
           api_routes = Starter::Rake::GrapeTasks.new(::Api::Base).api_routes
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-starter
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - LeFnord
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-18 00:00:00.000000000 Z
+date: 2020-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.18'
+        version: '2.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.18'
+        version: '2.19'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.78'
+        version: '0.86'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.78'
+        version: '0.86'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
 description: CLI to create a API skeleton based on Grape and Rack
 email:
 - pscholz.le@gmail.com
@@ -105,7 +105,6 @@ files:
 - lib/starter/version.rb
 - template/.gitignore
 - template/.rubocop.yml
-- template/.rubocop_todo.yml
 - template/Dockerfile
 - template/Gemfile
 - template/LICENSE
@@ -137,7 +136,7 @@ homepage: https://github.com/LeFnord/grape-starter
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -152,8 +151,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Creates a Grape Rack skeleton
 test_files: []

data/template/.rubocop_todo.yml

@@ -1,18 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2016-10-18 20:40:59 +0200 using RuboCop version 0.44.1.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 1
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
-# URISchemes: http, https
-
-# Offense count: 6
-Style/Documentation:
-  Exclude:
-    - 'spec/**/*'
-    - 'api/**/*'
-    - 'lib/**/*'