shaf 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45e90f32663688a63993bcf1aa79c6c9b8667d11dbfc9a5fdba50141e983ea53
-  data.tar.gz: 919292b331cc09ce95031e4d1e723371114fef9e86b6d97c2e90e816befb0d77
+  metadata.gz: d610f6b52c0b849399c31536099eb1aecfde8b0907ee7bb1839b3430b0ccdb12
+  data.tar.gz: '069c31284757c68cf40538cbf623e3767847420b67cef09084f7461360978508'
 SHA512:
-  metadata.gz: 788b01fd3f933f9e86ef99c9b51c14768208f73c5dc3cf4fe0a39fcb19078f82eb7eaaa2a1dcfc33d4d1a44980dc66254693a240b2e2b28d4a6e6b0d0383b676
-  data.tar.gz: a07510311e28e5008991d5461f9c2e97485640cd146a8304874bc216888eb722c941c266dc74b59b184ca3ea302b6a508a315421ed040dd64c2d111ea80548c7
+  metadata.gz: b0b6fa7cf8e841b6791bfe2aa271ce3cb752c8efd603299d56c999b8b86df0d62ff03bd8b8cf00ab215bdaab17178b8ced05af25da5f7298bd998b79c404eed4
+  data.tar.gz: dedfaac82ee3fb083733354d41e4fb1417484868afb8ab956e072bf436b6035ac02287abb3b5a82d69af77b6d91da47e6eade4463dd13f1ef1c7ff98e72a429d

data/lib/shaf/api_doc.rb

@@ -1,124 +1,3 @@
 require 'shaf/api_doc/document'
-
-module Shaf
-  module ApiDoc
-    class Task
-      include Rake::DSL
-
-      attr_accessor :document_class, :source_dir, :html_output_dir, :yaml_output_dir
-
-      def initialize
-        yield self if block_given?
-        validate_attributes!
-        @document_class ||= Document
-        define_tasks
-      end
-
-      def validate_attributes!
-        raise "source_dir must be set!" unless source_dir
-        raise "html_output_dir must be configured in ApiDocTask" unless html_output_dir
-        raise "yaml_output_dir must be configured in ApiDocTask" unless yaml_output_dir
-      end
-
-      def define_tasks
-        namespace :doc do
-          desc "Generate API documentation"
-          task :generate do
-            files = Dir.glob(File.join(source_dir, "*.rb"))
-            files.each do |file|
-              read_file file do |doc|
-                next unless doc.has_enough_info?
-                doc.write_html @html_output_dir
-                doc.write_yaml @yaml_output_dir
-              end
-            end
-          end
-
-          desc "Remove generated documentation"
-          task :clean do
-            [
-              Dir.glob(File.join(@yaml_output_dir, "*.yml")),
-              Dir.glob(File.join(@html_output_dir, "*.html"))
-            ].flatten.each do |file|
-              File.unlink file
-            end
-          end
-        end
-      end
-
-      def read_file(file)
-        doc = document_class.new
-        comment = Comment.new
-
-        File.readlines(file).each do |line|
-          next if empty_line?(line)
-
-          if c = comment(line)
-            comment << c
-            next
-          end
-
-          parse_line(line, doc, comment)
-          comment = Comment.new
-        end
-
-        return doc unless block_given?
-        yield doc
-      end
-
-      def parse_line(line, doc, comment)
-        if model = model(line)
-          doc.model = model
-        elsif serializer_class = serializer_class(line)
-          doc.serializer_class = serializer_class
-        elsif policy = policy(line)
-          doc.policy = policy
-        elsif attr = attribute(line)
-          doc.attribute(attr, comment)
-        elsif rel = link(line)
-          doc.link(rel, comment)
-        elsif rel = curie(line)
-          doc.curie(rel, comment)
-        elsif name = embed(line)
-          doc.embedded(name, comment)
-        end
-      end
-
-      def empty_line?(line)
-        true if line[/\A[#\s*]*\Z/]
-      end
-
-      def serializer_class(line)
-        line[/\A\s*class\s*(\w+)\Z/, 1]
-      end
-
-      def model(line)
-        line[/\A\s*model\s*(?:::)?(\w+)/, 1]
-      end
-
-      def policy(line)
-        line[/\A\s*policy\s*(?:::)?(\w+)/, 1]
-      end
-
-      def comment(line)
-        line[/\A\s*#(.*)/, 1]
-      end
-
-      def attribute(line)
-        line[/\A\s*attribute[^s]\s*\(?\s*:(\w+)/, 1]
-      end
-
-      def link(line)
-        line[/\A\s*link\s*\(?\s*:'?([-:\w]+)'?/, 1]
-      end
-
-      def curie(line)
-        line[/\A\s*curie\s*\(?\s*:'?([-\w]+)'?/, 1]
-      end
-
-      def embed(line)
-        line[/\A\s*embed\s*\(?\s*:'?([-:\w]+)'?/, 1]
-      end
-    end
-  end
-end
+require 'shaf/api_doc/comment'
+require 'shaf/api_doc/task'

data/lib/shaf/api_doc/task.rb

@@ -0,0 +1,124 @@
+require 'shaf/api_doc/document'
+
+module Shaf
+  module ApiDoc
+    class Task
+      include Rake::DSL
+
+      attr_accessor :document_class, :source_dir, :html_output_dir, :yaml_output_dir
+
+      def initialize
+        yield self if block_given?
+        validate_attributes!
+        @document_class ||= Document
+        define_tasks
+      end
+
+      def validate_attributes!
+        raise "source_dir must be set!" unless source_dir
+        raise "html_output_dir must be configured in ApiDocTask" unless html_output_dir
+        raise "yaml_output_dir must be configured in ApiDocTask" unless yaml_output_dir
+      end
+
+      def define_tasks
+        namespace :doc do
+          desc "Generate API documentation"
+          task :generate do
+            files = Dir.glob(File.join(source_dir, "*.rb"))
+            files.each do |file|
+              read_file file do |doc|
+                next unless doc.has_enough_info?
+                doc.write_html @html_output_dir
+                doc.write_yaml @yaml_output_dir
+              end
+            end
+          end
+
+          desc "Remove generated documentation"
+          task :clean do
+            [
+              Dir.glob(File.join(@yaml_output_dir, "*.yml")),
+              Dir.glob(File.join(@html_output_dir, "*.html"))
+            ].flatten.each do |file|
+              File.unlink file
+            end
+          end
+        end
+      end
+
+      def read_file(file)
+        doc = document_class.new
+        comment = Comment.new
+
+        File.readlines(file).each do |line|
+          next if empty_line?(line)
+
+          if c = comment(line)
+            comment << c
+            next
+          end
+
+          parse_line(line, doc, comment)
+          comment = Comment.new
+        end
+
+        return doc unless block_given?
+        yield doc
+      end
+
+      def parse_line(line, doc, comment)
+        if model = model(line)
+          doc.model = model
+        elsif serializer_class = serializer_class(line)
+          doc.serializer_class = serializer_class
+        elsif policy = policy(line)
+          doc.policy = policy
+        elsif attr = attribute(line)
+          doc.attribute(attr, comment)
+        elsif rel = link(line)
+          doc.link(rel, comment)
+        elsif rel = curie(line)
+          doc.curie(rel, comment)
+        elsif name = embed(line)
+          doc.embedded(name, comment)
+        end
+      end
+
+      def empty_line?(line)
+        true if line[/\A[#\s*]*\Z/]
+      end
+
+      def serializer_class(line)
+        line[/\A\s*class\s*(\w+)\Z/, 1]
+      end
+
+      def model(line)
+        line[/\A\s*model\s*(?:::)?(\w+)/, 1]
+      end
+
+      def policy(line)
+        line[/\A\s*policy\s*(?:::)?(\w+)/, 1]
+      end
+
+      def comment(line)
+        line[/\A\s*#(.*)/, 1]
+      end
+
+      def attribute(line)
+        line[/\A\s*attribute[^s]\s*\(?\s*:(\w+)/, 1]
+      end
+
+      def link(line)
+        line[/\A\s*link\s*\(?\s*:'?([-:\w]+)'?/, 1]
+      end
+
+      def curie(line)
+        line[/\A\s*curie\s*\(?\s*:'?([-\w]+)'?/, 1]
+      end
+
+      def embed(line)
+        line[/\A\s*embed\s*\(?\s*:'?([-:\w]+)'?/, 1]
+      end
+    end
+  end
+end

data/lib/shaf/extensions/resource_uris.rb

@@ -76,22 +76,30 @@ module Shaf
     attr_reader :name, :base, :plural_name
 
     def register_resources_uri
-      uri = "#{base}/#{plural_name}".freeze
+      uri = "#{base}/#{plural_name}"
+      helper_name = "#{plural_name}_uri"
 
-      UriHelperMethods.register("#{plural_name}_uri") { uri }
-      UriHelperMethods.register("#{plural_name}_uri_template") { uri }
+      UriHelperMethods.register(helper_name) do |**query|
+        query_string = MethodBuilder.query_string(query)
+        "#{uri}#{query_string}".freeze
+      end
+      UriHelperMethods.register("#{helper_name}_template") { uri.freeze }
     end
 
     def register_resource_uri
       uri = "#{base}/#{plural_name}"
+      helper_name = "#{name}_uri"
 
-      UriHelperMethods.register "#{name}_uri" do |resrc|
+      UriHelperMethods.register helper_name do |resrc, **query|
         id = resrc.is_a?(Integer) ? resrc : resrc&.id
-        raise ArgumentError, "id must be an integer! was #{id.class}" unless id.is_a?(Integer)
-        "#{uri}/#{id}".freeze
+        query_string = MethodBuilder.query_string(query)
+
+        next "#{uri}/#{id}#{query_string}".freeze if id.is_a?(Integer)
+        raise ArgumentError,
+          "In #{helper_name}: id must be an integer! was #{id.class}"
       end
 
-      UriHelperMethods.register "#{name}_uri_template" do
+      UriHelperMethods.register "#{helper_name}_template" do
         "#{uri}/:id".freeze
       end
     end
@@ -101,37 +109,52 @@ module Shaf
     # as argument and the resources uri when no arguments are provided.
     def register_resource_uri_by_arg
       uri = "#{base}/#{plural_name}"
-      UriHelperMethods.register "#{plural_name}_uri" do |resrc = nil|
+      helper_name = "#{plural_name}_uri"
+
+      UriHelperMethods.register helper_name do |resrc = nil, **query|
+        query_string = MethodBuilder.query_string(query)
+
         if resrc.nil?
-          uri.freeze
+          "#{uri}#{query_string}".freeze
         else
           id = (resrc.is_a?(Integer) ? resrc : resrc.id).to_i
-          raise ArgumentError, "id must be an integer! was #{id.class}" unless id.is_a?(Integer)
-          "#{uri}/#{id}".freeze
+
+          next "#{uri}/#{id}#{query_string}".freeze if id.is_a?(Integer)
+          raise ArgumentError,
+            "In #{helper_name}: id must be an integer! was #{id.class}"
         end
       end
 
-      UriHelperMethods.register "#{plural_name}_uri_template" do |collection = false|
+      UriHelperMethods.register "#{helper_name}_template" do |collection = false|
         (collection ? uri : "#{uri}/:id").freeze
       end
     end
 
     def register_new_resource_uri
-      uri = "#{base}/#{plural_name}/form".freeze
+      uri = "#{base}/#{plural_name}/form"
+      helper_name = "new_#{name}_uri"
 
-      UriHelperMethods.register("new_#{name}_uri") { uri }
-      UriHelperMethods.register("new_#{name}_uri_template") { uri }
+      UriHelperMethods.register(helper_name) do |**query|
+        query_string = MethodBuilder.query_string(query)
+        "#{uri}#{query_string}".freeze
+      end
+      UriHelperMethods.register("#{helper_name}_template") { uri.freeze }
     end
 
     def register_edit_resource_uri
       uri = "#{base}/#{plural_name}"
+      helper_name = "edit_#{name}_uri"
 
-      UriHelperMethods.register "edit_#{name}_uri" do |resrc|
+      UriHelperMethods.register helper_name do |resrc, **query|
         id = resrc.is_a?(Integer) ? resrc : resrc&.id
-        "#{uri}/#{id}/edit".freeze unless id.nil?
+        query_string = MethodBuilder.query_string(query)
+
+        next "#{uri}/#{id}/edit#{query_string}".freeze if id.is_a?(Integer)
+        raise ArgumentError,
+          "In #{helper_name}: id must be an integer! was #{id.class}"
       end
 
-      UriHelperMethods.register "edit_#{name}_uri_template" do
+      UriHelperMethods.register "#{helper_name}_template" do
         "#{uri}/:id/edit".freeze
       end
     end
@@ -149,18 +172,23 @@ module Shaf
 
       def signature(name, uri)
         args = extract_symbols(uri)
-        s = method_name(name)
-        s << "(#{args.join(', ')})" unless args.empty?
-        s
+        s = "#{method_name(name)}("
+        s << (args.empty? ? "**query)" : "#{args.join(', ')}, **query)")
+      end
+
+      def query_string(query)
+        return "" unless query.any?
+        "?#{query.map { |key,value| "#{key}=#{value}" }.join("&")}"
       end
 
       def as_string(name, uri)
         signature = signature(name, uri)
-        <<~EOM
+        <<~Ruby
       def #{signature}
-        \"#{interpolated_uri_string(uri)}\".freeze
+        query_string = MethodBuilder.query_string(query)
+        \"#{interpolated_uri_string(uri)}\#{query_string}\".freeze
       end
-        EOM
+        Ruby
       end
 
       private

data/lib/shaf/generator/controller.rb

@@ -6,28 +6,34 @@ module Shaf
       usage 'generate controller RESOURCE_NAME [attribute:type] [..]'
 
       def call
-        if name.empty?
-          raise Command::ArgumentError,
-            "Please provide a controller name when using the controller generator!"
-        end
-
         create_controller
         create_integration_spec
         add_link_to_root
       end
 
+      def params
+        args[1..-1].map { |param| param.split(':')}
+      end
+
       def name
-        args.first || ""
+        n = args.first || ""
+        return n unless n.empty?
+        raise Command::ArgumentError,
+          "Please provide a controller name when using the controller generator!"
       end
 
-      def params
-        args[1..-1].map { |param| param.split(':')}
+      def model_class_name
+        Utils::model_name(name)
       end
 
       def plural_name
         Utils::pluralize(name)
       end
 
+      def pluralized_model_name
+        Utils::pluralize(model_class_name)
+      end
+
       def template
         'api/controller.rb'
       end
@@ -58,10 +64,10 @@ module Shaf
         {
           name: name,
           plural_name: plural_name,
-          serializer_class_name: "#{name.capitalize}Serializer",
-          model_class_name: name.capitalize,
-          controller_class_name: "#{plural_name.capitalize}Controller",
-          policy_class_name: "#{name.capitalize}Policy",
+          serializer_class_name: "#{model_class_name}Serializer",
+          model_class_name: model_class_name,
+          controller_class_name: "#{pluralized_model_name}Controller",
+          policy_class_name: "#{model_class_name}Policy",
           policy_file: "policies/#{name}_policy",
           params: params
         }
@@ -94,9 +100,9 @@ module Shaf
           # Method: GET  
           # Example:
           # ```
-          # curl -H "Accept: application/json" \\
+          # curl -H "Accept: application/hal+json" \\
           #      -H "Authorization: abcdef" \\
-          #      /#{plural_name}/5
+          #      /#{plural_name}
           #```
           link :#{plural_name}, #{plural_name}_uri
         EOS

data/lib/shaf/generator/model.rb

@@ -6,17 +6,20 @@ module Shaf
       usage 'generate model MODEL_NAME [attribute:type] [..]'
 
       def call
-        if model_name.empty?
-          raise "Please provide a model name when using the model generator!"
-        end
-
         create_model
         create_migration
         create_serializer
       end
 
       def model_name
-        args.first || ""
+        n = args.first || ""
+        return n unless n.empty?
+        raise Command::ArgumentError,
+          "Please provide a model name when using the model generator!"
+      end
+
+      def model_class_name
+        Utils::model_name(model_name)
       end
 
       def table_name
@@ -48,7 +51,7 @@ module Shaf
       def opts
         {
           model_name: model_name,
-          class_name: model_name.capitalize,
+          class_name: model_class_name,
           form_fields: form_fields
         }
       end

data/lib/shaf/generator/policy.rb

@@ -5,14 +5,18 @@ module Shaf
       usage 'generate policy MODEL_NAME [attribute] [..]'
 
       def call
-        if policy_name.empty?
-          raise "Please provide a policy name when using the policy generator!"
-        end
         create_policy
       end
 
       def policy_name
-        args.first || ""
+        n = args.first || ""
+        return n unless n.empty?
+        raise Command::ArgumentError,
+          "Please provide a policy name when using the policy generator!"
+      end
+
+      def model_class_name
+        Utils::model_name(policy_name)
       end
 
       def template
@@ -34,7 +38,7 @@ module Shaf
 
       def opts
         {
-          policy_class_name: "#{policy_name.capitalize}Policy",
+          policy_class_name: "#{model_class_name}Policy",
           name: policy_name,
           attributes: attributes,
         }

data/lib/shaf/generator/serializer.rb

@@ -5,17 +5,16 @@ module Shaf
       usage 'generate serializer MODEL_NAME [attribute] [..]'
 
       def call
-        if name.empty?
-          raise "Please provide a model name when using the serializer generator!"
-        end
-
         create_serializer
         create_serializer_spec
         create_policy
       end
 
       def name
-        args.first || ""
+        n = args.first || ""
+        return n unless n.empty?
+        raise Command::ArgumentError,
+          "Please provide a model name when using the serializer generator!"
       end
 
       def plural_name
@@ -23,11 +22,11 @@ module Shaf
       end
 
       def model_class_name
-        "::#{name.capitalize}"
+        Utils::model_name(name)
       end
 
       def policy_class_name
-        "::#{name.capitalize}Policy"
+        "#{model_class_name}Policy"
       end
 
       def template
@@ -83,7 +82,7 @@ module Shaf
             # Method: GET  
             # Example:
             # ```
-            # curl -H "Accept: application/json" \\
+            # curl -H "Accept: application/hal+json" \\
             #      /doc/#{name}/rels/edit
             #```
             curie :doc do
@@ -188,7 +187,7 @@ module Shaf
         <<~EOS.chomp
           # Example:
           # ```
-          # curl -H "Accept: application/json" \\
+          # curl -H "Accept: application/hal+json" \\
           #      -H "Authorization: abcdef" \\#{method_args}
           #      #{uri}
           #```
@@ -234,7 +233,7 @@ module Shaf
       def opts
         {
           name: name,
-          class_name: "#{name.capitalize}Serializer",
+          class_name: "#{model_class_name}Serializer",
           model_class_name: model_class_name,
           policy_class_name: policy_class_name,
           policy_name: "#{name}_policy",

data/lib/shaf/helpers/payload.rb

@@ -47,7 +47,7 @@ module Shaf
       input = read_input
       return {} if input.empty?
 
-      if request.env['CONTENT_TYPE'] =~ %r(\Aapplication/json)
+      if request.env['CONTENT_TYPE'] =~ %r(\Aapplication/(hal\+)?json)
         JSON.parse(input)
       else
         raise ::UnsupportedMediaTypeError.new(request: request)

data/lib/shaf/spec.rb

@@ -2,5 +2,7 @@ require 'minitest/autorun'
 require 'minitest/hooks'
 require 'shaf/spec/http_method_utils'
 require 'shaf/spec/payload_utils'
+require 'shaf/spec/fixture'
+require 'shaf/spec/base'
 require 'shaf/spec/integration_spec'
 require 'shaf/spec/serializer_spec'

data/lib/shaf/spec/base.rb

@@ -0,0 +1,26 @@
+module Shaf
+  module Spec
+    class Base < Minitest::Spec
+      include Minitest::Hooks
+      include PayloadUtils
+      include Fixtures
+
+      TRANSACTION_OPTIONS = {
+        rollback: :always,
+        savepoint: true,
+        auto_savepoint: true
+      }.freeze
+
+      around(:all) do |&block|
+        DB.transaction(TRANSACTION_OPTIONS) do
+          Shaf::Spec::Fixtures.load
+          super(&block)
+        end
+      end
+
+      around do |&block|
+        DB.transaction(TRANSACTION_OPTIONS) { super(&block) }
+      end
+    end
+  end
+end

data/lib/shaf/spec/fixture.rb

@@ -0,0 +1,62 @@
+require 'shaf/spec/fixtures'
+require 'shaf/utils'
+
+module Shaf
+  module Spec
+    class Fixture
+      include Fixtures
+
+      def self.define(collection_name, &block)
+        return unless block_given?
+        collection = Fixtures.add_collection(collection_name)
+        new(collection_name, collection, block).run
+      end
+
+      def initialize(collection_name, collection, block)
+        @collection_name = collection_name
+        @collection = collection
+        @block = block
+      end
+
+      def run
+        instance_exec(&@block)
+      end
+
+      def resource(name, resrc = nil, &block)
+        @collection[name.to_sym] = resrc || instance_exec(&block)
+      end
+
+      private
+
+      def method_missing(method, *args, &block)
+        if load_fixture_if_missing_method_is_fixture?(method, args.size)
+          send(method, args.first)
+        elsif resource_name?(args.size, block_given?)
+          resource(method, args.first, &block)
+        else
+          super
+        end
+      end
+
+      def load_fixture_if_missing_method_is_fixture?(method, arg_count)
+        return false if arg_count > 1 # Fixtures should only be called with one argument
+
+        fixture_files = Fixtures.fixture_files
+        fixtures = fixture_files.map { |f| File.basename(f, ".rb") }
+        i = fixtures.index(method.to_s)
+        return false unless i
+
+        require fixture_files[i]
+        respond_to? method
+      end
+
+      def resource_name?(arg_count, block_given)
+        if block_given
+          arg_count == 0
+        else
+          arg_count == 1
+        end
+      end
+    end
+  end
+end

data/lib/shaf/spec/fixtures.rb

@@ -0,0 +1,34 @@
+module Shaf
+  module Spec
+
+    class FixtureNotFound < StandardError; end
+
+    module Fixtures
+      def self.load
+        fixture_files.map { |file| require file }
+      end
+
+      def self.fixture_files
+        dir = Shaf::Settings.fixtures_dir || 'spec/fixtures'
+        Dir[File.join(dir, '**', '*.rb')]
+      end
+
+      def self.add_collection(collection_name)
+        @collections ||= {}
+        collection_name = collection_name.to_sym unless collection_name.is_a? Symbol
+        return if @collections.key? collection_name
+
+        @collections[collection_name] = {}
+        collection = @collections[collection_name]
+        create_accessor(collection, collection_name)
+        collection
+      end
+
+      def self.create_accessor(collection, collection_name)
+        define_method(collection_name) do |name|
+          collection[name.to_sym] or raise FixtureNotFound
+        end
+      end
+    end
+  end
+end

data/lib/shaf/spec/integration_spec.rb

@@ -1,26 +1,14 @@
 module Shaf
   module Spec
-    class IntegrationSpec < Minitest::Spec
-      include Minitest::Hooks
+    class IntegrationSpec < Base
       include HttpUtils
-      include PayloadUtils
       include UriHelper
 
-      TRANSACTION_OPTIONS = {
-        rollback: :always,
-        savepoint: true,
-        auto_savepoint: true
-      }.freeze
-
       register_spec_type self do |desc, args|
         next unless args && args.is_a?(Hash)
         args[:type]&.to_s == 'integration'
       end
 
-      around do |&block|
-        DB.transaction(TRANSACTION_OPTIONS) { super(&block) }
-      end
-
       def set_headers
         if defined?(@__integration_test_auth_token) && @__integration_test_auth_token
           header 'X-AUTH-TOKEN', @__integration_test_auth_token

data/lib/shaf/spec/serializer_spec.rb

@@ -1,24 +1,11 @@
 module Shaf
   module Spec
-    class SerializerSpec < Minitest::Spec
-      include Minitest::Hooks
-      include PayloadUtils
-
-      TRANSACTION_OPTIONS = {
-        rollback: :always,
-        savepoint: true,
-        auto_savepoint: true
-      }.freeze
-
+    class SerializerSpec < Base
       register_spec_type self do |desc, args|
         next true if desc.to_s =~ /Serializer$/
         next unless args && args.is_a?(Hash)
         args[:type]&.to_s == 'serializer'
       end
-
-      around do |&block|
-        DB.transaction(TRANSACTION_OPTIONS) { super(&block) }
-      end
     end
   end
 end

data/lib/shaf/tasks/db.rb

@@ -43,12 +43,32 @@ namespace :db do
     end
   end
 
-  desc "Perform rollback to specified target or full rollback as default"
+  desc "Perform rollback to specified number of steps back or to the previous version"
   task :rollback, :target do |t, args|
-    args.with_defaults(target: 0)
+    args.with_defaults(target: 1)
     require 'config/database'
     Sequel.extension :migration
-    Sequel::Migrator.run(DB, MIGRATIONS_DIR, target: args[:target].to_i)
+    all_migrations = DB[:schema_migrations].all
+    target = -(args[:target].to_i + 1)
+    target = 0 if -target > all_migrations.size
+    filename = all_migrations.dig(target, :filename)
+    version = filename[/(\d*)_.*.rb/, 1].to_i
+
+    warn_if_rolling_back_more_than = 5
+    if target == 0 || -target > warn_if_rolling_back_more_than
+      puts "This would migrate the Database to version: #{version}. Continue [N/y]?"
+      next unless /\Ay/i =~ STDIN.gets.chomp&.downcase
+    end
+    Sequel::Migrator.run(DB, MIGRATIONS_DIR, target: version)
+  end
+
+  desc "Reset the database by deleting all rows in all columns"
+  task :reset do
+    require 'config/database'
+    Sequel.extension :migration
+    version = 0
+    Sequel::Migrator.run(DB, MIGRATIONS_DIR, target: version)
+    Sequel::Migrator.run(DB, MIGRATIONS_DIR)
   end
 
   Rake::Task["db:migrate"].enhance do

data/lib/shaf/utils.rb

@@ -2,8 +2,20 @@ module Shaf
   module Utils
     class ProjectRootNotFound < StandardError; end
 
+    # FIXME!!!
     def self.pluralize(noun)
-      noun + 's' #FIXME
+      noun + 's' # FIXME!!
+    end
+
+    def self.model_name(name)
+      name.capitalize.gsub(/[_-](\w)/) { $1.upcase }
+    end
+
+    # FIXME!!!
+    def self.singularize(noun)
+      return singularize(noun.to_s).to_sym if noun.is_a? Symbol
+      return noun unless noun.end_with? 's'
+      noun[0..-2]
     end
 
     def project_root

data/lib/shaf/version.rb

@@ -1,3 +1,3 @@
 module Shaf
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/templates/config/settings.yml

@@ -5,6 +5,7 @@ default: &default
   views_folder: frontend/views
   documents_dir: doc/api
   migrations_dir: db/migrations
+  fixtures_dir: spec/fixtures
   paginate_per_page: 25
 
 production:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shaf
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Sammy Henningsson
@@ -31,7 +31,7 @@ cert_chain:
   CNZdF8Vavp6xMQbPHZwqjaeZz2WRXYS7jyYSvCunjwa3OtvXtfbIEGEWE6IM+t9k
   H1g6Q+B6qk9O6g==
   -----END CERTIFICATE-----
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -241,6 +241,7 @@ files:
 - lib/shaf/api_doc.rb
 - lib/shaf/api_doc/comment.rb
 - lib/shaf/api_doc/document.rb
+- lib/shaf/api_doc/task.rb
 - lib/shaf/app.rb
 - lib/shaf/command.rb
 - lib/shaf/command/console.rb
@@ -284,6 +285,9 @@ files:
 - lib/shaf/registrable_factory.rb
 - lib/shaf/settings.rb
 - lib/shaf/spec.rb
+- lib/shaf/spec/base.rb
+- lib/shaf/spec/fixture.rb
+- lib/shaf/spec/fixtures.rb
 - lib/shaf/spec/http_method_utils.rb
 - lib/shaf/spec/integration_spec.rb
 - lib/shaf/spec/model.rb
@@ -325,7 +329,8 @@ files:
 homepage: https://github.com/sammyhenningsson/shaf
 licenses:
 - MIT
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/sammyhenningsson/shaf/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -334,7 +339,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="