grape-starter 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b323c32a3c1afc5ae8b8cc1f7eab25db1c40f455c1ffa41b6c7fed3e0cb7508f
-  data.tar.gz: 0d21fd9eb025d27b59274188c6535926c8f6a9e7ac524026db3702232b58e822
+  metadata.gz: 286a5030a03e22e1da481e6acd099fee4372e293fa299599872a0045949718f4
+  data.tar.gz: 16855e3e132f08248ec3fe1bd8c04a0e0850a51f330462010e896cdac46f5721
 SHA512:
-  metadata.gz: 9bd05d4f7f1b953ead3fb74bf1b8aa839ee084e06cf0b9f0febc9745702cdcd2f3a0c1280e336e11c0c55a63750afdc60ece4595fff804bc5e4cf1e5c92ed618
-  data.tar.gz: 689d91b58317758cc629ae46d617ab36c82714415cf10852317d05b37437b11248b28b44a4fb0a975f9b62758e4ed77376226b43b24b577e7d096a58bf3359dc
+  metadata.gz: 4362af960d305232d718184faf5406740f0e6331a91e17e256171609871c21c9a7a25176c164d4998a56dca3aa745eadf44016c3e4d4ed270de5c5d816b98bc0
+  data.tar.gz: 1576e5b5b7f6b0db966a208ebe6b1c4e676d8d625cd365c68ed92d911a240a65459a59bd17c5bfab686e309800b95e65237ec4c2ffebcbb866b8b50b9f171eef

data/.rubocop.yml

@@ -9,7 +9,7 @@ AllCops:
     - '**/template/api/**'
     - grape-starter.gemspec
   UseCache: true
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.6
 
 Layout/IndentationWidth:
   Exclude:
@@ -23,6 +23,12 @@ Metrics/BlockLength:
 Metrics/LineLength:
   Max: 120
 
+Metrics/AbcSize:
+  Max: 20
+
+Metrics/MethodLength:
+  Max: 20
+
 Naming/AccessorMethodName:
   Exclude:
     - 'lib/starter/builder/templates/files.rb'

data/.travis.yml

@@ -16,3 +16,4 @@ matrix:
 
   allow_failures:
     - rvm: ruby-head
+    - rvm: 2.4.5

data/CHANGELOG.md

@@ -2,8 +2,15 @@
 
 - contributions
 
-### 1.0.1
+### v1.1.0 / 2019-02-22
+- Replaces own migration tasks through [standalone-migrations](https://github.com/thuss/standalone-migrations)
+
+### v1.0.3 / 2019-02-10
+- Loosens reuby version to 2.4
+- prepare release 1.0.2
+- Cleans up travis ci.
 
+### 1.0.1
 - [00993](https://github.com/LeFnord/grape-starter/commit/6fef3812fd587ea61c29b9eacde1fb856ad00993) - adds a rudimentary Dockerfile as starting point
 
 ### 1.0.0
@@ -69,33 +76,3 @@
 **breaking changes** renames all api stuff under lib to models (includes, of course, the namespace):
   - `lib/api.rb` -> `lib/models.rb`
   - `lib/api/` -> `lib/models/`
-
-### < 0.5.4
-
-- simplyfies request specs, **breaking change**: takes route from spec description
-- adds option to set prefix, defaults to api
-- sets prefix after project name
-- refactores rack api mounting
-- adds ruby 2.4.0 support
-- server command supports port, thin tag would be named after project
-- adds redoc oapi documentation viewer
-- default rake task now only spec, rubocop would be done via hound
-- adds hound ci service
-- fix: add mount point to api base
-- adds inch.yml
-- improves specs
-- fix: removes mount point from api base
-- renames `remove` to `rm`
-- adds params to POST, PUT and PATCH specs
-- removes duplication and warning
-- allows entity removing
-- adds `remove` command
-- adds request specs shared examples
-- corrects path param for specific endpoints
-- corrects adding of endpoints, if no http verb was given
-- adds flag for entity creating
-- moves back dependencies to gemspec
-- adds rubygems badge
-- cleans up dependencies
-- adds `force` option to add
-- adds specifying http verbs

data/Gemfile

@@ -11,6 +11,6 @@ group :development, :test do
   gem 'rack-cors', require: false
   gem 'rack-test', require: false
   gem 'rake', '~> 12.0'
-  gem 'rspec', '~> 3.7'
+  gem 'rspec', '~> 3.8'
   gem 'rspec-command'
 end

data/lib/starter/builder/orms.rb

@@ -10,6 +10,7 @@ module Starter
         if @orm == 'ar' || @orm == 'activerecord'
           # Fixes pooling
           add_middleware(dest, 'ActiveRecord::Rack::ConnectionManagement')
+          build_standalone_migrations(File.join(dest, '.standalone_migrations'))
         end
 
         build_initializer(File.join(dest, 'config', 'initializers'))
@@ -19,32 +20,36 @@ module Starter
         prepare_for_migrations(File.join(dest, 'db'))
       end
 
+      def standalone_migrations
+        <<-FILE.strip_heredoc
+        config:
+          database: config/database.yml
+        FILE
+      end
+
       def config
         <<-FILE.strip_heredoc
         # ActiveRecord Database Configuration
         development:
-          adapter: '#{adapter}'
-          host: localhost
-          port: 27017
-          database: "db/development.sqlite3"
-          username:
-          password:
+          adapter: #{adapter}
+          encoding: unicode
+          timeout: 5000
+          user: postgres
+          database: name_development
 
         test:
-          adapter: '#{adapter}'
-          host: localhost
-          port: 27017
-          database: "db/test.sqlite3"
-          username:
-          password:
+          adapter: #{adapter}
+          encoding: unicode
+          timeout: 5000
+          user: postgres
+          database: name_test
 
         production:
-          adapter: '#{adapter}'
-          host: localhost
-          port: 27017
-          database: "db/production.sqlite3"
-          username:
-          password:
+          adapter: #{adapter}
+          encoding: unicode
+          timeout: 5000
+          user: postgres
+          database: name_production
         FILE
       end
 
@@ -53,7 +58,7 @@ module Starter
         return if @orm.nil?
 
         file_name = "#{Time.now.strftime('%Y%m%d%H%m%S')}_Create#{klass_name}.rb"
-        migration_dest = File.join(Dir.pwd, 'db', 'migrations', file_name)
+        migration_dest = File.join(Dir.pwd, 'db', 'migrate', file_name)
         FileFoo.write_file(migration_dest, migration(klass_name, resource))
       end
 
@@ -75,7 +80,7 @@ module Starter
       private
 
       def adapter
-        @orm == 'sequel' ? 'sqlite' : 'sqlite3'
+        'postgresql'
       end
 
       def build_initializer(dest)
@@ -87,6 +92,10 @@ module Starter
         FileFoo.write_file(File.join(dest, 'database.yml'), config)
       end
 
+      def build_standalone_migrations(dest)
+        FileFoo.write_file(dest, standalone_migrations)
+      end
+
       # adds a middleware to config.ru
       def add_middleware(dest, middleware)
         replacement = "use #{middleware}\n\n\\1"
@@ -99,9 +108,9 @@ module Starter
       end
 
       def prepare_for_migrations(dest)
-        migrations = File.join(dest, 'migrations')
-        FileUtils.mkdir_p(migrations)
-        `touch #{migrations}/.keep`
+        migrate = File.join(dest, 'migrate')
+        FileUtils.mkdir_p(migrate)
+        `touch #{migrate}/.keep`
       end
     end
   end

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

@@ -58,38 +58,27 @@ module Starter
 
       def rakefile
         <<-FILE.strip_heredoc
-        # ActiveRecord DB tasks
 
-        task :load_config do
-          config_dir = File.expand_path('../config', __FILE__)
-          config_content = File.read(File.join(config_dir, 'database.yml'))
-
-          DatabaseTasks.env = ENV['RACK_ENV'] || 'development'
-          DatabaseTasks.db_dir = db_dir
-          config = YAML.safe_load(ERB.new(config_content).result)
-          DatabaseTasks.database_configuration = config
-          DatabaseTasks.migrations_paths = File.join(db_dir, 'migrate')
-
-          ActiveRecord::Base.configurations = DatabaseTasks.database_configuration
-          ActiveRecord::Base.establish_connection DatabaseTasks.env.to_sym
-        end
-
-        # Loads AR tasks like db:create, db:drop etc..
-        load 'active_record/railties/databases.rake'
+        # ActiveRecord migration tasks
+        require 'standalone_migrations'
+        StandaloneMigrations::Tasks.load_tasks
         FILE
       end
 
       def gemfile
         <<-FILE.strip_heredoc
-        # DB stack
+        # BE stuff
+        gem 'standalone_migrations'
+
+        # DB stuff
         gem 'activerecord', '~> 5.2'
-        gem 'sqlite3', '~> 1.3', '< 1.4'
+        gem 'pg'
         FILE
       end
 
       def migration(klass_name, resource)
         <<-FILE.strip_heredoc
-        class Create#{klass_name} < ActiveRecord::Migration[5.1]
+        class Create#{klass_name} < ActiveRecord::Migration[5.2]
           def change
             create_table :#{resource} do |t|
 

data/lib/starter/builder.rb

@@ -81,11 +81,9 @@ module Starter
         @entity = options[:entity]
 
         file_list.map { |x| send("#{x}_name") }.each do |file_to_remove|
-          begin
-            FileUtils.rm file_to_remove
-          rescue StandardError => error
-            $stdout.puts error.to_s
-          end
+          FileUtils.rm file_to_remove
+        rescue StandardError => error
+          $stdout.puts error.to_s
         end
 
         remove_mount_point

data/lib/starter/version.rb

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

data/template/.rubocop.yml

@@ -7,10 +7,16 @@ AllCops:
     - Rakefile
     - Gemfile
   UseCache: true
-  TargetRubyVersion: 2.4
-
-Metrics/BlockLength:
-  Enabled: false
+  TargetRubyVersion: 2.6
 
 Metrics/LineLength:
   Max: 120
+
+Metrics/AbcSize:
+  Max: 20
+
+Metrics/MethodLength:
+  Max: 20
+
+Style/AsciiComments:
+  Enabled: false

data/template/.rubocop_todo.yml

@@ -9,19 +9,6 @@
 # Offense count: 1
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
 # URISchemes: http, https
-Metrics/LineLength:
-  Max: 120
-
-Metrics/AbcSize:
-  Max: 20
-
-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 20
-
-Style/AsciiComments:
-  Enabled: false
 
 # Offense count: 6
 Style/Documentation:

data/template/Gemfile

@@ -2,11 +2,13 @@
 
 source 'http://rubygems.org'
 
+# Server stuff
 gem 'thin'
 
 gem 'rack'
 gem 'rack-cors'
 
+# API stuff
 gem 'grape'
 gem 'grape-entity'
 gem 'grape-swagger'

data/template/Rakefile

@@ -23,5 +23,6 @@ task default: %i[spec rubocop]
 require 'grape-swagger/rake/oapi_tasks'
 GrapeSwagger::Rake::OapiTasks.new(::Api::Base)
 
+# starter tasks
 require 'starter/rake/grape_tasks'
 Starter::Rake::GrapeTasks.new(::Api::Base)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-starter
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - LeFnord
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-10 00:00:00.000000000 Z
+date: 2019-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli