grape-starter 2.1.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c50b0ef0ce589ca3088cb3121a58283efe78668452f701828bad102dc4741c09
-  data.tar.gz: 7812b85b1af2049f0b8ff27f164f687d4344b9ad7e55a4af94c4b9c6c9264cdc
+  metadata.gz: 16ec3abd585c9a25a9fdf30d877561ccbd9b7c1b848b539cd8c63ec648492c60
+  data.tar.gz: f98a11d9d911ca17d66a69302067f110431dd423224a0104ca5649f9268e9c76
 SHA512:
-  metadata.gz: 6e2be7745d04670d560980c10ae2749821642f9daf13157a225fa21849ec1062ed0730e50f901446fdc88f6a42cf07c36bdac5ab10d97e5f6d13b47fad105555
-  data.tar.gz: 459e4012b8cdce1a924fb58d8738d77e61d325fc958f836ab83dd55ed4179dc64795cb50cda78c5d3fd9d2ea19ab07b33087da700ae76e78229b7664462f1eb6
+  metadata.gz: 2d2e6eff8352128af22fa344d6d7ddf80b208b3a2ecb65077023fffe6b5b0a5199d09958a70b586c79f94479bda70b69e80e0a5c2a3b599326b7d8a1a5cf0514
+  data.tar.gz: fab8485bdc93e8853e37e6fc345eb87da1f281d78584fe88d50a90706adf1876b7d9fcd3d0d4ed732333415cf0d34c877822a64ac3438e5e9175cadb58337add

data/.github/workflows/pipeline.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.2'
+          ruby-version: '3.4'
           bundler-cache: true
       - name: Run rubocop
         run: bundle exec rubocop --parallel --format progress
@@ -28,7 +28,7 @@ jobs:
       RACK_ENV: test
     strategy:
       matrix:
-        ruby-version: ['3.1', '3.2', head]
+        ruby-version: ['3.2', '3.3', '3.4', head]
 
     steps:
     - uses: actions/checkout@v3

data/.rubocop.yml

@@ -15,8 +15,8 @@ AllCops:
     - api/**/*
   UseCache: true
   NewCops: enable
-  TargetRubyVersion: 3.2
   SuggestExtensions: false
+  TargetRubyVersion: 3.4
 
 Layout/IndentationWidth:
   Exclude:

data/.ruby-version

@@ -0,0 +1 @@
+3.4.2

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 - contributions
 
+### v3.0.0 / 2025-04-14
+
+
+- [(bb23d)](https://github.com/LeFnord/grape-starter/commit/bb23d62cbd04b445c616565c6788b28cde03507c) Updates grape requirement to ~> 2.0 [LeFnord](https://github.com/LeFnord)
+- [(#50)](https://github.com/LeFnord/grape-starter/pull/50) Adds Ruby 3.4, drops 3.1 [LeFnord](https://github.com/LeFnord)
+
+### v2.1.3 / 2023-10-31
+
+- [(#47)](https://github.com/LeFnord/grape-starter/pull/47) Minor Fixes. [LeFnord](https://github.com/LeFnord)
+
 ### v2.1.2 / 2023-10-30
 
 - [(#45)](https://github.com/LeFnord/grape-starter/pull/45) Corrects AR file name, to load correct. [LeFnord](https://github.com/LeFnord)

data/Gemfile

@@ -5,7 +5,7 @@ source 'http://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'grape', '~> 1.5'
+  gem 'grape', '~> 2.0'
   gem 'pry', require: false
   gem 'pry-byebug', require: false
   gem 'rack-cors', require: false

data/grape-starter.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 3.1'
+  spec.required_ruby_version = '>= 3.2'
 
   spec.add_dependency 'gli', '~> 2.20'
   spec.add_dependency 'activesupport', '>= 6', '< 8'

data/lib/starter/builder/active_record.rb

@@ -26,7 +26,7 @@ module Starter
         logger = if %w[development test].include? env
                   log_dir = File.join(Dir.getwd, 'log')
                   log_file = File.join(log_dir, 'db.log')
-                  FileUtils.mkdir(log_dir) unless Dir.exist?(log_dir)
+                  FileUtils.mkdir_p(log_dir)
                   Logger.new(File.open(log_file, 'a'))
                 else
                   Logger.new($stdout)
@@ -46,12 +46,12 @@ module Starter
               def call(env)
                 response = @app.call(env)
                 response[2] = ::Rack::BodyProxy.new(response[2]) do
-                  ActiveRecord::Base.clear_active_connections!
+                  ActiveRecord::Base.connection_handler.clear_active_connections!
                 end
 
                 return response
               rescue StandardError
-                ActiveRecord::Base.clear_active_connections!
+                ActiveRecord::Base.connection_handler.clear_active_connections!
                 raise
               end
             end

data/lib/starter/importer/parameter.rb

@@ -95,7 +95,7 @@ module Starter
       #
       def object?(definition:)
         definition['type'] == 'object' ||
-          definition['content']&.keys&.first&.include?('application/json')
+          definition['content']&.keys&.first&.include?('application/json') # rubocop:disable Style/SafeNavigationChainLength
       end
 
       def simple_object?(properties:)
@@ -135,7 +135,7 @@ module Starter
 
       def serialized
         type = definition['type'] || definition['schema']['type']
-        type.scan(/\w+/).each { |x| type.match?('JSON') ? type : type.sub!(x, x.capitalize) }
+        type.scan(/\w+/).each { |x| type.match?('JSON') ? type : type.sub!(x, x.capitalize) } # rubocop:disable Lint/Void
 
         if type == 'Array' && definition.key?('items')
           sub = definition.dig('items', 'type').to_s.capitalize

data/lib/starter/orms.rb

@@ -36,21 +36,18 @@ module Starter
           adapter: #{adapter}
           encoding: unicode
           timeout: 5000
-          user: postgres
           database: #{@name}_development
 
         test:
           adapter: #{adapter}
           encoding: unicode
           timeout: 5000
-          user: postgres
           database: #{@name}_test
 
         production:
           adapter: #{adapter}
           encoding: unicode
           timeout: 5000
-          user: postgres
           database: #{@name}_production
         FILE
       end

data/lib/starter/version.rb

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

data/template/.rubocop.yml

@@ -7,6 +7,7 @@ AllCops:
   UseCache: true
   NewCops: enable
   SuggestExtensions: false
+  TargetRubyVersion: 3.4
 
 Layout/LineLength:
   Max: 120

data/template/Gemfile

@@ -2,14 +2,17 @@
 
 source 'http://rubygems.org'
 
+# moved from StdLib to gems
+gem 'ostruct', require: false
+
 # Server stuff
 gem 'puma'
 
-gem 'rack', '< 3.0'
+gem 'rack'
 gem 'rack-cors'
 
 # API stuff
-gem 'grape'
+gem 'grape', '~> 2.0'
 gem 'grape-entity'
 gem 'grape-swagger'
 gem 'grape-swagger-entity'

data/template/config/boot.rb

@@ -10,18 +10,18 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'api'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-Dir[File.expand_path('../config/initializers/*.rb', __dir__)].sort.each do |initializer|
+Dir[File.expand_path('../config/initializers/*.rb', __dir__)].each do |initializer|
   require initializer
 end
 
-Dir[File.expand_path('../lib/**/*.rb', __dir__)].sort.each do |lib|
+Dir[File.expand_path('../lib/**/*.rb', __dir__)].each do |lib|
   require lib
 end
 
-Dir[File.expand_path('../api/entities/*.rb', __dir__)].sort.each do |entity|
+Dir[File.expand_path('../api/entities/*.rb', __dir__)].each do |entity|
   require entity
 end
 
-Dir[File.expand_path('../api/endpoints/*.rb', __dir__)].sort.each do |endpoint|
+Dir[File.expand_path('../api/endpoints/*.rb', __dir__)].each do |endpoint|
   require endpoint
 end

data/template/script/console

@@ -1,4 +1,9 @@
 #!/usr/bin/env ruby
+
+ENV['RACK_ENV'] = 'development'
+
+require File.expand_path('../config/application', __dir__)
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'bundler/setup'

data/template/spec/spec_helper.rb

@@ -6,7 +6,7 @@ require 'rack/test'
 require File.expand_path('../config/application', __dir__)
 
 grape_starter_gem = Gem::Specification.find_by_name('grape-starter').gem_dir
-Dir["#{grape_starter_gem}/lib/starter/rspec/**/*.rb"].sort.each { |f| require f }
+Dir["#{grape_starter_gem}/lib/starter/rspec/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
   include Rack::Test::Methods

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: grape-starter
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 3.0.0
 platform: ruby
 authors:
 - LeFnord
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-30 00:00:00.000000000 Z
+date: 2025-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -101,6 +100,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -162,7 +162,6 @@ homepage: https://github.com/LeFnord/grape-starter
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -170,15 +169,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Creates a Grape Rack skeleton
 test_files: []