shaf 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f71cd9b7d938bb9cf8c6cabb87dc85bd912052e371884ac253ec20afe8657c90
-  data.tar.gz: e09e82d1f026f3d00e9a849b7ff65c04479940838f0f45bbdfa644ecdc47ef81
+  metadata.gz: 63fafb2ab34a4535e8d5ff38476ffcd43051bdcbeb397b9e9b06bc2c5fa855af
+  data.tar.gz: 8ce6362451525448857762bbfb016c80d698615dbf436549b3a600cf2521e72a
 SHA512:
-  metadata.gz: 4140819946300e345ad2898212241275017c57f586c5dc47d51872047e2a9d4dd48e2d5e06662e83b98ba8963b6c7e87d69d7cae0fe4e79b11ecf0639f739d42
-  data.tar.gz: 3a75893536dd2a17edcdacb8aaba291baa0ecbebc33d2b16b79015d80f922de0f3af79264f87b8acdf0c5b98f6285c6289d2e1e9db419e62cc7af5341620d7e0
+  metadata.gz: 1f9fdf99ec948ac02e171efdb6be8d0f71c6e8231e8f9e27546f97f62c38b1d3365716d6e14a51f01676a0432e4b09be06db70a3ba8df571118dc2d8bba2266f
+  data.tar.gz: 737e3f828105a47ff124a02d0ccff2f8c9f2b60ec1202fab9ac695a860d3444a31147a90d6b3faa8120e1effe15f849941d883bc7f4d0e23d46e1ef8fa0302c2

data/lib/shaf/command/test.rb

@@ -1,7 +1,4 @@
-require 'rubygems'
-require 'bundler'
 require 'set'
-Bundler.require :development, :test
 require 'shaf/command/test/filter'
 require 'shaf/command/test/runner'
 require 'shaf/command/test/runnable_method'

data/lib/shaf/command/upgrade.rb

@@ -5,20 +5,42 @@ module Shaf
     class Upgrade < Base
 
       class UnknownShafVersionError < CommandError; end
-      class UpgradeFailedError < CommandError; end
+      class UpgradeFailedError < CommandError
+        attr_reader :version
+
+        def initialize(version)
+          @version = version
+        end
+      end
 
       identifier %r(\Aupgrade\Z)
       usage 'upgrade'
 
+      def self.options(parser, options)
+        parser.on('--skip VERSION', String, 'Skip version') do |v|
+          options[:skip_version] = Shaf::Upgrade::Version.new(v)
+        end
+      end
+
       def call
         in_project_root do
           upgrade_packages.each { |package| apply(package) }
           puts "\nProject is up-to-date! Shaf version: #{current_version}"
         end
+      rescue UpgradeFailedError => e
+        puts <<~ERR
+        
+          Failed to upgrade project to version #{e.version}
+          Please try resolve these issues manually and try again.
+          For more info see:
+          https://github.com/sammyhenningsson/shaf/blob/master/doc/UPGRADE.md
+        ERR
       end
 
       def apply(package)
-        package.load.apply or raise UpgradeFailedError
+        unless skip? package
+          package.load.apply or raise UpgradeFailedError.new(package.version)
+        end
         write_shaf_version package.version.to_s
       rescue Errno::ENOENT
         raise UpgradeFailedError,
@@ -26,12 +48,27 @@ module Shaf
           " (E.g. `sudo apt install patch` for Ubuntu)"
       end
 
+      def skip?(package)
+        return false unless options[:skip_version]
+        package.version == options[:skip_version]
+      end
+
       def upgrade_packages
-        Shaf::Upgrade::Package.all.select { |package| package > current_version }
+        current = current_version
+        target = target_version
+
+        Shaf::Upgrade::Package.all.select do |package|
+          current < package.version && package.version <= target
+        end
       end
 
       def current_version
-        read_shaf_version or raise UnknownShafVersionError
+        version = read_shaf_version or raise UnknownShafVersionError
+        Shaf::Upgrade::Version.new(version)
+      end
+
+      def target_version
+        Shaf::Upgrade::Version.new(ENV.fetch('UPGRADE_TARGET', '99.9.9'))
       end
     end
   end

data/lib/shaf/generator/serializer.rb

@@ -69,7 +69,7 @@ module Shaf
       end
 
       def links
-        %w(doc:up self doc:edit-form doc:delete)
+        %w(collection self doc:edit-form doc:delete)
       end
 
       def curies_with_doc
@@ -103,7 +103,7 @@ module Shaf
 
       def collection_link
         link(
-          rel: "doc:up",
+          rel: "collection",
           desc: "Link to the collection of all #{plural_name}. " \
           "Send a POST request to this uri to create a new #{name}",
           method: "GET or POST",

data/lib/shaf/generator/templates/api/policy.rb.erb

@@ -8,7 +8,7 @@ class <%= policy_class_name %> < BasePolicy
 
   <%= attributes.join("\n  ") %>
 
-  link :up
+  link :collection
 
   link :'create-form', :'edit-form', :delete do
     write?

data/lib/shaf/generator/templates/spec/integration_spec.rb.erb

@@ -5,11 +5,11 @@ describe <%= model_class_name %>, type: :integration do
   it "returns a <%= name %>" do
     <%= name %> = <%= model_class_name %>.create
     get <%= name %>_uri(<%= name %>)
-    status.must_equal 200
-    link_rels.must_include(:self)
-    links[:self][:href].must_equal <%= name %>_uri(<%= name %>)
+    _(status).must_equal 200
+    _(link_rels).must_include(:self)
+    _(links[:self][:href]).must_equal <%= name %>_uri(<%= name %>)
 <% params.each do |param| -%>
-    attributes.must_include(:'<%= param[0] %>')
+    _(attributes).must_include(:'<%= param[0] %>')
 <% end -%>
   end
 
@@ -18,15 +18,15 @@ describe <%= model_class_name %>, type: :integration do
     <%= model_class_name %>.create
 
     get <%= plural_name %>_uri
-    status.must_equal 200
-    link_rels.must_include(:self)
-    links[:self][:href].must_include <%= plural_name %>_uri
-    embedded(:'<%= plural_name %>').size.must_equal 2
+    _(status).must_equal 200
+    _(link_rels).must_include(:self)
+    _(links[:self][:href]).must_include <%= plural_name %>_uri
+    _(embedded(:'<%= plural_name %>').size).must_equal 2
 
     each_embedded :'<%= plural_name %>' do
-      link_rels.must_include(:self)
+      _(link_rels).must_include(:self)
 <% params.each do |param| -%>
-      attributes.must_include(:'<%= param[0] %>')
+      _(attributes).must_include(:'<%= param[0] %>')
 <% end -%>
     end
   end
@@ -34,34 +34,34 @@ describe <%= model_class_name %>, type: :integration do
   it "can create <%= plural_name %>" do
     get <%= plural_name %>_uri
 
-    link_rels.must_include(:'doc:create-form')
+    _(link_rels).must_include(:'doc:create-form')
     follow_rel :'doc:create-form'
-    links[:self][:href].must_equal new_<%= name %>_uri
-    attributes[:href].must_equal <%= plural_name %>_uri
-    attributes[:method].must_equal "POST"
-    attributes[:name].must_equal "create-<%= name %>"
-    attributes[:title].must_equal "Create <%= model_class_name %>"
-    attributes[:type].must_equal "application/json"
-    attributes[:fields].size.must_equal <%= params.size %>
+    _(links[:self][:href]).must_equal new_<%= name %>_uri
+    _(attributes[:href]).must_equal <%= plural_name %>_uri
+    _(attributes[:method]).must_equal "POST"
+    _(attributes[:name]).must_equal "create-<%= name %>"
+    _(attributes[:title]).must_equal "Create <%= model_class_name %>"
+    _(attributes[:type]).must_equal "application/json"
+    _(attributes[:fields].size).must_equal <%= params.size %>
 
     payload = fill_form attributes[:fields]
     post attributes[:href], payload
-    status.must_equal 201
-    link_rels.must_include(:self)
-    headers["Location"].must_equal links[:self][:href]
+    _(status).must_equal 201
+    _(link_rels).must_include(:self)
+    _(headers["Location"]).must_equal links[:self][:href]
 
     get <%= plural_name %>_uri
-    status.must_equal 200
-    links[:self][:href].must_include <%= plural_name %>_uri
-    embedded(:'<%= plural_name %>').size.must_equal 1
+    _(status).must_equal 200
+    _(links[:self][:href]).must_include <%= plural_name %>_uri
+    _(embedded(:'<%= plural_name %>').size).must_equal 1
 
     embedded :'<%= plural_name %>' do
       <%= name %> = last_payload.first
 <% params.each do |param| -%>
 <% if param[1] == 'string' -%>
-      <%= name %>[:<%= param[0] %>].must_equal "value for <%= param[0] %>"
+      _(<%= name %>[:<%= param[0] %>]).must_equal "value for <%= param[0] %>"
 <% elsif param[1] == 'integer' -%>
-      <%= name %>[:<%= param[0] %>].must_equal "<%= param[0] %>".size
+      _(<%= name %>[:<%= param[0] %>]).must_equal "<%= param[0] %>".size
 <% end -%>
 <% end -%>
     end
@@ -70,37 +70,37 @@ describe <%= model_class_name %>, type: :integration do
   it "<%= plural_name %> can be updated" do
     <%= name %> = <%= model_class_name %>.create
     get <%= name %>_uri(<%= name %>)
-    status.must_equal 200
+    _(status).must_equal 200
 
-    link_rels.must_include(:'doc:edit-form')
+    _(link_rels).must_include(:'doc:edit-form')
     follow_rel :'doc:edit-form'
 
-    links[:self][:href].must_equal edit_<%= name %>_uri(<%= name %>)
-    attributes[:href].must_equal <%= name %>_uri(<%= name %>)
-    attributes[:method].must_equal "PUT"
-    attributes[:name].must_equal "update-<%= name %>"
-    attributes[:title].must_equal "Update <%= model_class_name %>"
-    attributes[:type].must_equal "application/json"
-    attributes[:fields].size.must_equal <%= params.size %>
+    _(links[:self][:href]).must_equal edit_<%= name %>_uri(<%= name %>)
+    _(attributes[:href]).must_equal <%= name %>_uri(<%= name %>)
+    _(attributes[:method]).must_equal "PUT"
+    _(attributes[:name]).must_equal "update-<%= name %>"
+    _(attributes[:title]).must_equal "Update <%= model_class_name %>"
+    _(attributes[:type]).must_equal "application/json"
+    _(attributes[:fields].size).must_equal <%= params.size %>
 
     payload = fill_form attributes[:fields]
     put attributes[:href], payload
-    status.must_equal 200
-    link_rels.must_include(:self)
+    _(status).must_equal 200
+    _(link_rels).must_include(:self)
   end
 <% end -%>
 
   it "<%= plural_name %> can be deleted" do
     <%= name %> = <%= model_class_name %>.create
     get <%= name %>_uri(<%= name %>)
-    status.must_equal 200
-    link_rels.must_include(:'doc:delete')
+    _(status).must_equal 200
+    _(link_rels).must_include(:'doc:delete')
 
     follow_rel(:'doc:delete', method: :delete)
-    status.must_equal 204
+    _(status).must_equal 204
 
     get <%= name %>_uri(<%= name %>)
-    status.must_equal 404
+    _(status).must_equal 404
   end
 
 end

data/lib/shaf/generator/templates/spec/serializer_spec.rb.erb

@@ -16,13 +16,13 @@ describe <%= class_name %> do
 
     it "serializes attributes" do
 <% attributes.each do |attr| -%>
-      attributes.keys.must_include(<%= attr %>)
+      _(attributes.keys).must_include(<%= attr %>)
 <% end -%>
     end
 
     it "serializes links" do
-<% ['self', 'doc:up'].each do |rel| -%>
-      link_rels.must_include(:'<%= rel %>')
+<% ['self', 'collection'].each do |rel| -%>
+      _(link_rels).must_include(:'<%= rel %>')
 <% end -%>
     end
   end
@@ -34,13 +34,13 @@ describe <%= class_name %> do
 
     it "serializes attributes" do
 <% attributes.each do |attr| -%>
-      attributes.keys.must_include(<%= attr %>)
+      _(attributes.keys).must_include(<%= attr %>)
 <% end -%>
     end
 
     it "serializes links" do
 <% links.each do |rel| -%>
-      link_rels.must_include(:'<%= rel %>')
+      _(link_rels).must_include(:'<%= rel %>')
 <% end -%>
     end
   end

data/lib/shaf/rake/db.rb

@@ -1,7 +1,7 @@
 Shaf::DbTask.new(:version, description: "Prints current schema version") do
   if migrations.any?
     version, filename = extract_version_and_filename(last_migration)
-    puts "Schema version: #{version} (#{filename})"
+    puts "Schema version: #{version} (#{filename}) [#{ENV['RACK_ENV']}]"
   else
     puts "No migrations found"
   end

data/lib/shaf/settings.rb

@@ -19,20 +19,10 @@ module Shaf
     class << self
       def load
         @settings = DEFAULTS.dup
-        config = read_config(SETTINGS_FILE)
+        config = Utils.read_config(SETTINGS_FILE, erb: true)
         @settings.merge! config.fetch(env, {})
       end
 
-      def read_config(file)
-        return {} unless File.exist? file
-
-        yaml = File.read(file)
-        if RUBY_VERSION < '2.6.0'
-          Utils.deep_symbolize_keys(YAML.safe_load(yaml, [], [], true))
-        else
-          YAML.safe_load(yaml, aliases: true, symbolize_names: true)
-        end
-      end
 
       def env
         (ENV['APP_ENV'] || ENV['RACK_ENV'] || 'development').to_sym

data/lib/shaf/spec/http_method_utils.rb

@@ -1,3 +1,5 @@
+require 'rack/test'
+
 module Shaf
   module Spec
     module HttpUtils

data/lib/shaf/tasks/api_doc_task.rb

@@ -106,19 +106,19 @@ module Shaf
       end
 
       def attribute(line)
-        line[/\A\s*attribute[^s]\s*\(?\s*:(\w+)/, 1]
+        line[/\A\s*attribute[^s]\s*\(?:(\w+)/, 1]
       end
 
       def link(line)
-        line[/\A\s*link\s*\(?\s*:'?([-:\w]+)'?/, 1]
+        line[/\A\s*link\s*\(?:?['"]?([-:\w]+)['"]?/, 1]
       end
 
       def curie(line)
-        line[/\A\s*curie\s*\(?\s*:'?([-\w]+)'?/, 1]
+        line[/\A\s*curie\s*\(?:'?([-\w]+)'?/, 1]
       end
 
       def embed(line)
-        line[/\A\s*embed\s*\(?\s*:'?([-:\w]+)'?/, 1]
+        line[/\A\s*embed\s*\(?:'?([-:\w]+)'?/, 1]
       end
     end
   end

data/lib/shaf/upgrade/package.rb

@@ -21,6 +21,7 @@ module Shaf
 
       UPGRADE_FILES_PATH = File.join(Utils.gem_root, 'upgrades').freeze
       MANIFEST_FILENAME = 'manifest'.freeze
+      IGNORE_FILE_PATTERNS = [/.rej\z/, /.orig\z/]
 
       attr_reader :version
 
@@ -76,10 +77,13 @@ module Shaf
       end
 
       def apply(dir = nil)
-        apply_patches(dir)
-        apply_drops(dir)
-        apply_additions
-        apply_substitutes(dir)
+        puts "Applying changes for version #{version}" if ENV["VERBOSE"] == "1"
+        [
+          apply_patches(dir),
+          apply_drops(dir),
+          apply_additions,
+          apply_substitutes(dir),
+        ].all?
       end
 
       def to_s
@@ -139,12 +143,20 @@ module Shaf
 
       def files_in(dir)
         dir += '/' if !dir.nil? && dir[-1] != '/'
-        Dir["#{dir}**/*"]
+        Dir["#{dir}**/*"].reject do |file|
+          ignore? file
+        end
+      end
+
+      def ignore?(file)
+        IGNORE_FILE_PATTERNS.any? do |pattern|
+          file.match? pattern
+        end
       end
 
       def apply_patches(dir = nil)
-        files_in(dir).each do |file|
-          @manifest.patches_for(file).each do |name|
+        files_in(dir).all? do |file|
+          @manifest.patches_for(file).all? do |name|
             patch = @files[name]
             apply_patch(file, patch)
           end
@@ -158,27 +170,37 @@ module Shaf
           puts o.read
           err = e.read
           puts err unless err.empty?
-          next if t.value.success?
-          STDERR.puts "Failed to apply patch for: #{file}\n"
+          t.value.success?.tap do |patch_succeeded|
+            next if patch_succeeded
+            STDERR.puts "Failed to apply patch for: #{file}\n"
+          end
         end
       end
 
       def apply_additions
         puts '' unless @manifest.additions.empty?
-        @manifest.additions.each do |chksum, filename|
+        @manifest.additions.all? do |chksum, filename|
           content = @files[chksum]
           FileUtils.mkdir_p File.dirname(filename)
           puts "adding file: #{filename}"
           File.open(filename, 'w') { |file| file.write(content) }
+          true
+        rescue StandardError => e
+          STDERR.puts "Failed to add '#{filename}': #{e.message}\n"
+          false
         end
       end
 
       def apply_drops(dir = nil)
         puts '' unless @manifest.removals.empty?
-        files_in(dir).map do |file|
-          next unless @manifest.drop?(file)
+        files_in(dir).all? do |file|
+          next true unless @manifest.drop?(file)
           puts "removing file: #{file}"
           File.unlink(file)
+          true
+        rescue StandardError => e
+          STDERR.puts "Failed to unlink '#{file}': #{e.message}\n"
+          false
         end
       end
 

data/lib/shaf/upgrade/version.rb

@@ -14,11 +14,13 @@ module Shaf
       end
 
       def initialize(version)
-        if self.class === version
+        case version
+        when Version
           @major, @minor, @patch = [:major, :minor, :patch].map { |m| version.send m }
-        else
-          raise UpgradeVersionError.new(version) unless version =~ /\d+\.\d+\.\d+/
+        when /\d+\.\d+(\.\d+)?/
           @major, @minor, @patch = split_version(version)
+        else
+          raise UpgradeVersionError.new(version)
         end
       end
 
@@ -37,7 +39,9 @@ module Shaf
       private
 
       def split_version(str)
-        str.split('.').map(&:to_i)
+        str.split('.').map(&:to_i).tap do |list|
+          list << 0 while list.size < 3
+        end
       end
 
       def compare_version(other_major, other_minor, other_patch)

data/lib/shaf/utils.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
+require 'erb'
 require 'forwardable'
+require 'yaml'
 require 'shaf/version'
+require 'sinatra/base'
 
 module Shaf
   module Utils
@@ -41,6 +44,10 @@ module Shaf
         symbolize(str).inspect
       end
 
+      def environment
+        Sinatra::Application.settings.environment
+      end
+
       def rackify_header(str)
         return if str.nil?
         str.upcase.tr('-', '_').tap do |key|
@@ -60,6 +67,24 @@ module Shaf
           value
         end
       end
+
+      def read_config(file, erb: false, erb_binding: nil)
+        return {} unless File.exist? file
+
+        yaml = File.read(file)
+        yaml = erb(yaml, binding: erb_binding) if erb || erb_binding
+        if RUBY_VERSION < '2.6.0'
+          Utils.deep_symbolize_keys(YAML.safe_load(yaml, [], [], true))
+        else
+          YAML.safe_load(yaml, aliases: true, symbolize_names: true)
+        end
+      end
+
+      def erb(content, binding: nil)
+        bindings = binding ? [binding] : []
+        return ERB.new(content, 0, '%-<>').result(*bindings) if RUBY_VERSION < '2.6.0'
+        ERB.new(content, trim_mode: '-<>').result(*bindings)
+      end
     end
 
     def_delegators Utils, :pluralize, :singularize, :symbolize, :symbol_string, :gem_root, :rackify_header
@@ -95,7 +120,7 @@ module Shaf
 
     def bootstrap(env: 'development')
       in_project_root do
-        ENV['RACK_ENV'] ||= env
+        ENV['RACK_ENV'] = env
         require 'config/bootstrap'
         yield if block_given?
       end

data/lib/shaf/version.rb

@@ -1,3 +1,3 @@
 module Shaf
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/templates/Rakefile

@@ -1,7 +1,7 @@
-require 'rubygems'
-require 'bundler'
-Bundler.setup(:default, :development)
-$:.unshift __dir__
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift __dir__ unless $LOAD_PATH.include? __dir__
+
 require 'shaf/rake'
 require 'shaf/settings'
 

data/templates/api/controllers/base_controller.rb

@@ -39,6 +39,14 @@ class BaseController < Sinatra::Base
   before do
     log.info "Processing: #{request.request_method} #{request.path_info}"
     log.debug "Payload: #{payload || 'empty'}"
+    set_vary_header
+  end
+
+  def set_vary_header
+    return unless settings.auth_token_header
+    return unless [:get, :head].include? request.request_method.downcase.to_sym
+
+    headers('Vary' => Shaf::Settings.auth_token_header)
   end
 
   not_found do

data/templates/config/bootstrap.rb

@@ -1,11 +1,15 @@
 # frozen_string_literal: true
 
-require 'rubygems'
-require 'bundler'
-Bundler.require(:default, ENV['RACK_ENV'])
-
 $logger = nil
-require 'shaf/settings'
+
+require 'shaf'
+if ENV['RACK_ENV'] == 'test'
+  require 'minitest'
+  require 'minitest/autorun'
+  require 'minitest/hooks'
+  require 'shaf/spec'
+end
+
 require 'config/paths'
 require 'config/database'
 require 'config/initializers'

data/templates/config/database.rb

@@ -1,39 +1,45 @@
 # frozen_string_literal: true
 
-require 'sinatra/base'
 require 'sequel'
 require 'fileutils'
-
-config = {
-
-  production: {
-    adapter: 'postgres',
-    host: ENV['SHAF_DB_HOST'],
-    database: ENV['SHAF_DB_NAME'],
-    user: ENV['SHAF_DB_USER'],
-    password: ENV['SHAF_DB_PASS']
-  }.freeze,
-
-  development: {
-    adapter: 'sqlite',
-    database: 'db/development.sqlite3'
-  }.freeze,
-
-  test: {
-    adapter: 'sqlite',
-    database: 'db/test.sqlite3'
-  }.freeze
-
-}.freeze
-
-env = Sinatra::Application.settings.environment
-
-unless config[env]
-  STDERR.puts "No Database config for environment '#{env}'"
-  exit 1
+require 'yaml'
+require 'shaf/utils'
+
+class Database
+  CONFIG_FILE = File.expand_path("../database.yml", __FILE__)
+  MIGRATIONS_DIR = 'db/migrations'
+
+  class << self
+    def get_connection
+      ensure_config
+      ensure_migrations_dir
+
+      connect
+    end
+
+    def config
+      @config ||= Shaf::Utils.read_config(CONFIG_FILE, erb: true)
+    end
+
+    def env
+      Shaf::Utils.environment
+    end
+
+    def connect
+      Sequel.connect config[env]
+    end
+
+    def ensure_config
+      return if config[env]
+      STDERR.puts "No Database config for environment '#{env}'"
+      exit 1
+    end
+
+    def ensure_migrations_dir
+      return if Dir.exist?(MIGRATIONS_DIR)
+      FileUtils.mkdir_p(MIGRATIONS_DIR)
+    end
+  end
 end
 
-migrations_dir = 'db/migrations'
-FileUtils.mkdir_p(migrations_dir) unless Dir.exist?(migrations_dir)
-
-DB = Sequel.connect(config[env])
+DB = Database.get_connection

data/templates/config/database.yml

@@ -0,0 +1,14 @@
+production:
+  adapter: postgres
+  host: <%= ENV['SHAF_DB_HOST'] %>
+  database: <%= ENV['SHAF_DB_NAME'] %>
+  user: <%= ENV['SHAF_DB_USER'] %>
+  password: <%= ENV['SHAF_DB_PASS'] %>
+
+development:
+  adapter: sqlite
+  database: db/development.sqlite3
+
+test:
+  adapter: sqlite
+  database: db/test.sqlite3

data/templates/config/initializers/db_migrations.rb

@@ -3,30 +3,43 @@ require 'config/database'
 
 Sequel.extension :migration
 
-def current?
-  return true unless Dir[migrations_dir_glob].any?
-  Sequel::Migrator.is_current?(DB, migrations_dir)
-end
+class DbMigrations
+  def self.verify
+    new.verify
+  end
 
-def migrations_dir
-  File.join(Shaf::Settings.app_root, Shaf::Settings.migrations_dir)
-end
+  def verify
+    return if fully_migrated?
+    run_migrations? ? migrate : show_warning
+  end
 
-def migrations_dir_glob
-  File.join(migrations_dir, '*')
-end
+  def fully_migrated?
+    return true unless Dir[migrations_dir_glob].any?
+    Sequel::Migrator.is_current?(DB, migrations_dir)
+  end
 
-def environment
-  ENV['RACK_ENV']
-end
+  def migrations_dir
+    File.join(Shaf::Settings.app_root, Shaf::Settings.migrations_dir)
+  end
 
-def init
-  return if current?
+  def migrations_dir_glob
+    File.join(migrations_dir, '*')
+  end
+
+  def environment
+    ENV['RACK_ENV']
+  end
 
-  if environment == 'test'
-    $logger.info "Running migrations in 'test' environment.."
+  def run_migrations?
+    environment == 'test'
+  end
+
+  def migrate
+    $logger&.info "Running migrations in #{environment} environment.."
     Sequel::Migrator.run(DB, migrations_dir)
-  else
+  end
+
+  def show_warning
     msg = "Database for environment '#{environment}' is not " \
       'updated to the latest migration'
     STDERR.puts msg
@@ -34,4 +47,4 @@ def init
   end
 end
 
-init
+DbMigrations.verify

data/templates/config/initializers/hal_presenter.rb

@@ -1 +1,3 @@
+require 'hal_presenter'
+
 HALPresenter.paginate = true

data/templates/spec/integration/root_spec.rb

@@ -4,11 +4,11 @@ describe "Root", type: :integration do
 
   before do
     get root_uri
-    status.must_equal 200
+    _(status).must_equal 200
   end
 
   it "returns links" do
-    links.must_include :self
+    _(links).must_include :self
   end
 
 end

data/templates/spec/serializers/root_serializer_spec.rb

@@ -7,6 +7,6 @@ describe RootSerializer do
   end
 
   it "serializes links" do
-    links.keys.must_include(:self)
+    _(links.keys).must_include(:self)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shaf
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Sammy Henningsson
@@ -30,7 +30,7 @@ cert_chain:
   ZMhjYR7sRczGJx+GxGU2EaR0bjRsPVlC4ywtFxoOfRG3WaJcpWGEoAoMJX6Z0bRv
   M40=
   -----END CERTIFICATE-----
-date: 2019-08-31 00:00:00.000000000 Z
+date: 2019-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -41,7 +41,7 @@ dependencies:
         version: '5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
         version: '5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '5.11'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
 description: A framework for building hypermedia driven APIs with sinatra and sequel.
 email: sammy.henningsson@gmail.com
 executables:
@@ -238,6 +252,7 @@ files:
 - templates/config/bootstrap.rb
 - templates/config/customize.rb
 - templates/config/database.rb
+- templates/config/database.yml
 - templates/config/directories.rb
 - templates/config/helpers.rb
 - templates/config/initializers.rb
@@ -260,6 +275,7 @@ files:
 - upgrades/1.0.0.tar.gz
 - upgrades/1.0.4.tar.gz
 - upgrades/1.1.0.tar.gz
+- upgrades/1.2.0.tar.gz
 homepage: 
 licenses:
 - MIT
@@ -281,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Sinatra Hypermedia Api Framework