shaf 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec94396d12fceb99bdb58bcb8a11ec6851b730cd2dad7c1dd19b320f340dd48b
-  data.tar.gz: edab56921f648eeaa6532499a7b4892e86bc493fcbb7513d8736b6b0cdc5d7c3
+  metadata.gz: f71cd9b7d938bb9cf8c6cabb87dc85bd912052e371884ac253ec20afe8657c90
+  data.tar.gz: e09e82d1f026f3d00e9a849b7ff65c04479940838f0f45bbdfa644ecdc47ef81
 SHA512:
-  metadata.gz: b1f4ac6773adebc04da603a4c7e6b9e6cde1c1ba5bbe547e526f42cc88a178942a11f07a14abe6206c5b3de7a36e59c58c6173a9e388d6512bb08a0da71b45d1
-  data.tar.gz: 4d14203e911733e0ba30b769ed5e37204c225261649da5eed9c80bf4574af9e1e25e99c1c7739771340cecd6b53484fc5210b5be4e8b799be88237646c4acacf
+  metadata.gz: 4140819946300e345ad2898212241275017c57f586c5dc47d51872047e2a9d4dd48e2d5e06662e83b98ba8963b6c7e87d69d7cae0fe4e79b11ecf0639f739d42
+  data.tar.gz: 3a75893536dd2a17edcdacb8aaba291baa0ecbebc33d2b16b79015d80f922de0f3af79264f87b8acdf0c5b98f6285c6289d2e1e9db419e62cc7af5341620d7e0

data/lib/shaf/command.rb

@@ -11,9 +11,10 @@ module Shaf
 end
 
 require 'shaf/command/base'
-require 'shaf/command/new'
-require 'shaf/command/upgrade'
-require 'shaf/command/server'
 require 'shaf/command/console'
 require 'shaf/command/generate'
+require 'shaf/command/new'
+require 'shaf/command/server'
+require 'shaf/command/test'
+require 'shaf/command/upgrade'
 require 'shaf/command/version'

data/lib/shaf/command/base.rb

@@ -41,11 +41,16 @@ module Shaf
 
       def parse_options!
         parser = OptionParser.new
-        self.class.options(parser, @options)
+        common_options(parser, options)
+        self.class.options(parser, options)
         parser.parse!(args)
       rescue OptionParser::InvalidOption => e
         raise ArgumentError, e.message
       end
+
+      def common_options(parser, _options)
+        parser.on('--trace', 'Show backtrace on command failure')
+      end
     end
   end
 end

data/lib/shaf/command/test.rb

@@ -0,0 +1,134 @@
+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'
+
+module Shaf
+  module Command
+    class Test < Base
+      identifier %r{\A(t(est)?|spec)\Z}
+      usage 'test [FILTER] [..]'
+
+      def call
+        disable_autorun
+
+        bootstrap(env: 'test') do
+          setup_loadpath
+          reporter.start
+
+          spec_files.each do |file|
+            lines = lines_to_run(file)
+            run(file, lines) if lines
+          end
+
+          reporter.report
+        end
+      end
+
+      private
+
+      def setup_loadpath
+        $LOAD_PATH.unshift(spec_dir) unless $LOAD_PATH.include?(spec_dir)
+      end
+
+      def disable_autorun
+        # This makes sure this at_exit handler is registered after minitest/autorun
+        # This will make it run before the at_exit handler in minitest/autorun
+        require 'minitest/autorun'
+        at_exit do
+          exit! reporter.passed?
+        end
+      end
+
+      def spec_dir
+        @spec_dir ||= Settings.spec_dir || 'spec'
+      end
+
+      def spec_files
+        Dir["#{spec_dir}/**/*.rb"]
+      end
+
+      def filters
+        @filters ||=
+          if args.empty?
+            [Filter::None]
+          else
+            args.map { |arg| Filter.new(arg) }
+          end
+      end
+
+      def lines_to_run(file)
+        lines = filters
+          .select { |f| f.match? file }
+          .map(&:lines)
+
+        return if lines.empty?
+        return [] if lines.any?(&:empty?)
+        lines.flatten.to_set
+      end
+
+      def run(file, lines = [])
+        runners(file, lines).each do |runner|
+          runner.call(reporter)
+        end
+      end
+
+      def reporter
+        @reporter ||= Minitest::CompositeReporter.new.tap do |reporter|
+          reporter << Minitest::SummaryReporter.new($stdout)
+          reporter << Minitest::ProgressReporter.new($stdout)
+        end
+      end
+
+      def runners(file, lines)
+        runnables = runnables_in(file)
+
+        return runnables.map { |r| Runner.new r } if lines.empty?
+
+        methods = methods_for(runnables)
+
+        lines.each_with_object([]) do |line, runners|
+          if methods.empty? || line < methods.first.line
+            runnables.map { |r| runners << Runner.new(r) }
+          else
+            spec = methods.partition { |m| m.line < line }.first.last or next
+            runners << Runner.new(spec.runnable, spec.name)
+          end
+        end
+      end
+
+      def runnables_in(file)
+        require file
+
+        @runnables ||= Set.new
+
+        Minitest::Runnable.runnables.each_with_object([]) do |runnable, loaded|
+          next unless runnable.runnable_methods.any?
+          next if @runnables.include? runnable
+          @runnables << runnable
+          loaded << runnable
+        end
+      end
+
+      def methods_for(runnables)
+        methods = []
+
+        runnables.each do |runnable|
+          runnable.runnable_methods.each do |name|
+            methods << RunnableMethod.from(runnable, name)
+          end
+        end
+
+        methods.sort_by { |m| m.line }
+      end
+
+      def relative_to_root(file)
+        file = File.expand_path(file)
+        file.sub(File.join(Settings.app_root, ''), '')
+      end
+    end
+  end
+end

data/lib/shaf/command/test/filter.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Shaf
+  module Command
+    class Test < Base
+      class Filter
+        attr_reader :pattern, :lines
+
+        def initialize(criteria)
+          pattern, *lines = criteria.split(':')
+          @lines = lines.map(&:to_i)
+          @pattern = Regexp.new(pattern)
+        end
+
+        def match?(file)
+          pattern.match? file
+        end
+      end
+
+      Filter::None = Filter.new('.*.rb')
+    end
+  end
+end

data/lib/shaf/command/test/runnable_method.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Shaf
+  module Command
+    class Test < Base
+      class RunnableMethod
+        attr_reader :runnable, :name, :line
+
+        def self.from(runnable, method_name)
+          _, line = runnable.instance_method(method_name).source_location
+          new(runnable, method_name, line)
+        end
+
+        def initialize(runnable, name, line)
+          @runnable = runnable
+          @name = name
+          @line = line
+        end
+      end
+    end
+  end
+end

data/lib/shaf/command/test/runner.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+module Shaf
+  module Command
+    class Test < Base
+      class Runner
+        attr_reader :runnable, :method_name
+
+        def initialize(runnable, method_name = nil)
+          @runnable = runnable
+          @method_name = method_name
+        end
+
+        def call(reporter)
+          runnable.run(reporter, options)
+        end
+
+        def options
+          return {} unless method_name
+
+          {filter: method_name}
+        end
+      end
+    end
+  end
+end

data/lib/shaf/errors.rb

@@ -22,7 +22,7 @@ module Shaf
       end
 
       def initialize(msg = nil)
-        msg ||= "The request cannot be understood"
+        msg ||= "The request could not be understood"
         super(msg, code: "INVALID_REQUEST", title: "Invalid request")
       end
     end

data/lib/shaf/extensions/authorize.rb

@@ -40,8 +40,7 @@ module Shaf
 
     def __method_for(action)
       return action if action.to_s.end_with? '?'
-      "#{action}?".to_sym
+      :"#{action}?"
     end
   end
-
 end

data/lib/shaf/extensions/current_user.rb

@@ -19,7 +19,7 @@ module Shaf
       'User model with a column auth_token_digest'.freeze
 
     def auth_token
-      header = settings.auth_token_header
+      header = Utils.rackify_header(settings.auth_token_header)
       request.env[header]
     end
 

data/lib/shaf/formable.rb

@@ -2,22 +2,47 @@ require 'shaf/formable/builder'
 
 module Shaf
   module Formable
+    def self.add_class_reader(clazz, name, form)
+      clazz.define_singleton_method(name) { form }
+    end
+
+    def self.add_instance_reader(clazz, name, form, prefill)
+      clazz.define_method(name) do
+        form.tap do |f|
+          f.resource = self
+          f.fill! if prefill
+        end
+      end
+    end
+
+    # Deprecated legacy way of specifying forms inside models
     def form(&block)
+      forms_for(self, &block)
+      return unless defined? $logger
+
+      $logger.info <<~MSG
+
+
+        DEPRECATED method ::form in #{self}
+        Declare forms in a separate class extending Shaf::Formable with the class method forms_for!
+      MSG
+    end
+
+    # New way of writing forms in a separate class/file
+    def forms_for(clazz, &block)
       builder = Formable::Builder.new(&block)
-      builder.forms.each do |f|
-        next unless f.action
-        getter = "#{f.action}_form"
-
-        define_singleton_method(getter) { f }
-        next unless instance_accessor = builder.instance_accessor_for(f)
-
-        define_method(getter) do
-          f.dup.tap do |fm|
-            fm.resource = self
-            fm.fill! if instance_accessor.prefill?
-          end
+      builder.forms.each do |form|
+        next unless form.action
+        method_name = "#{form.action}_form"
+
+        Formable.add_class_reader(clazz, method_name, form.dup)
+
+        if instance_accessor = builder.instance_accessor_for(form)
+          prefill_form = instance_accessor.prefill?
+          Formable.add_instance_reader(clazz, method_name, form.dup, prefill_form)
         end
       end
     end
+    alias form_for forms_for
   end
 end

data/lib/shaf/generator.rb

@@ -10,6 +10,7 @@ end
 
 require 'shaf/generator/base'
 require 'shaf/generator/controller'
+require 'shaf/generator/forms'
 require 'shaf/generator/migration'
 require 'shaf/generator/model'
 require 'shaf/generator/policy'

data/lib/shaf/generator/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 require 'erb'
 require 'shaf/generator/helper'
@@ -31,13 +33,13 @@ module Shaf
       def call; end
 
       def template_dir
-        File.expand_path('../templates', __FILE__)
+        File.expand_path('templates', __dir__)
       end
 
       def read_template(file, directory = nil)
         directory ||= template_dir
         filename = File.join(directory, file)
-        filename << ".erb" unless filename.end_with?(".erb")
+        filename << '.erb' unless filename.end_with?('.erb')
         File.read(filename)
       end
 
@@ -46,8 +48,8 @@ module Shaf
         locals[:changes] ||= []
         b = Helper.new(locals).binding
 
-        return ERB.new(str, 0, '%-<>').result(b) if RUBY_VERSION < "2.6.0"
-        ERB.new(str,trim_mode: '-<>').result(b)
+        return ERB.new(str, 0, '%-<>').result(b) if RUBY_VERSION < '2.6.0'
+        ERB.new(str, trim_mode: '-<>').result(b)
       rescue SystemCallError => e
         puts "Failed to render template #{template}: #{e.message}"
         raise

data/lib/shaf/generator/forms.rb

@@ -0,0 +1,68 @@
+module Shaf
+  module Generator
+    class Forms < Base
+      identifier :forms
+      usage 'generate forms MODEL_NAME [attribute:type[:label]] [..]'
+
+      def call
+        create_forms
+      end
+
+      def model_name
+        n = args.first || ''
+        return n unless n.empty?
+        raise Command::ArgumentError,
+          'Please provide a model name when using the forms generator!'
+      end
+
+      def model_class_name
+        Utils.model_name(model_name)
+      end
+
+      def class_name
+        "#{model_class_name}Forms"
+      end
+
+      def template
+        'api/forms.rb'
+      end
+
+      def target
+        "api/forms/#{model_name}_forms.rb"
+      end
+
+      def create_forms
+        content = render(template, opts)
+        write_output(target, content)
+      end
+
+      def opts
+        {
+          model_name: model_name,
+          class_name: class_name,
+          model_class_name: model_class_name,
+          fields: fields
+        }
+      end
+
+      def fields
+        args[1..-1].map do |f|
+          (name, type, label) = f.split(':')
+          label_str = label ? %(, label: "#{label}") : ''
+          format 'field :%s, type: "%s"%s' % [name, rewrite(type), label_str]
+        end
+      end
+
+      def rewrite(type)
+        case type
+        when /foreign_key/
+          'integer'
+        when NilClass
+          'string'
+        else
+          type
+        end
+      end
+    end
+  end
+end

data/lib/shaf/generator/model.rb

@@ -9,21 +9,22 @@ module Shaf
         create_model
         create_migration
         create_serializer
+        create_forms
       end
 
       def model_name
-        n = args.first || ""
+        n = args.first || ''
         return n unless n.empty?
         raise Command::ArgumentError,
-          "Please provide a model name when using the model generator!"
+          'Please provide a model name when using the model generator!'
       end
 
       def model_class_name
-        Utils::model_name(model_name)
+        Utils.model_name(model_name)
       end
 
       def table_name
-        Utils::pluralize model_name
+        Utils.pluralize model_name
       end
 
       def template
@@ -39,30 +40,9 @@ module Shaf
         write_output(target, content)
       end
 
-      def form_fields
-        args[1..-1].map do |f|
-          (name, type, label) = f.split(':')
-          label_str = label ? %(, label: "#{label}") : ''
-          format 'field :%s, type: "%s"%s' % [name, rewrite(type), label_str]
-        end
-      end
-
-      def rewrite(type)
-        case type
-        when /foreign_key/
-          'integer'
-        when NilClass
-          'string'
-        else
-          type
-        end
-      end
-
       def opts
         {
-          model_name: model_name,
           class_name: model_class_name,
-          form_fields: form_fields
         }
       end
 
@@ -76,6 +56,11 @@ module Shaf
         serializer_args += args[1..-1].map { |arg| arg.split(':').first }
         Generator::Factory.create(*serializer_args, **options).call
       end
+
+      def create_forms
+        form_args = %W(forms #{model_name}) + args[1..-1]
+        Generator::Factory.create(*form_args, **options).call
+      end
     end
   end
 end

data/lib/shaf/generator/serializer.rb

@@ -162,21 +162,21 @@ module Shaf
       end
 
       def example(method, uri)
-        method_args = ""
+        curl_args = +'-H "Authorization: abcdef \\"'
         case method
         when "POST"
-          method_args = "\n#      -d@payload \\"
+          curl_args << "\n#      -d@payload \\"
         when "PUT"
-          method_args = "\n#      -X PUT -d@payload \\"
+          curl_args << "\n#      -X PUT -d@payload \\"
         when "DELETE"
-          method_args = "\n#      -X DELETE \\"
+          curl_args << "\n#      -X DELETE \\"
         end
 
         <<~EOS.chomp
           # Example:
           # ```
           # curl -H "Accept: application/hal+json" \\
-          #      -H "Authorization: abcdef" \\#{method_args}
+          #      #{curl_args}
           #      #{uri}
           #```
         EOS

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

@@ -0,0 +1,19 @@
+class <%= class_name %>
+  extend Shaf::Formable
+
+  forms_for(<%= model_class_name %>) do
+    <%= fields.join("\n    ") %>
+
+    create do
+      title 'Create <%= model_class_name %>'
+      name  'create-<%= model_name %>'
+    end
+
+    edit do
+      instance_accessor
+      title 'Update <%= model_class_name %>'
+      name  'update-<%= model_name %>'
+    end
+  end
+end
+

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

@@ -1,21 +1,4 @@
 class <%= class_name %> < Sequel::Model
-  extend Shaf::Formable
 
-<% if form_fields.any? %>
-  form do
-    <%= form_fields.join("\n    ") %>
-
-    create do
-      title 'Create <%= class_name %>'
-      name  'create-<%= model_name %>'
-    end
-
-    edit do
-      instance_accessor
-      title 'Update <%= class_name %>'
-      name  'update-<%= model_name %>'
-    end
-  end
-<% end %>
 end
 

data/lib/shaf/helpers/payload.rb

@@ -26,18 +26,11 @@ module Shaf
     private
 
     def payload
-      @@request_id ||= nil
-      @@payload ||= nil
-
-      if @@request_id != request.env["REQUEST_ID"]
-        @@request_id = request.env["REQUEST_ID"]
-        @@payload = parse_payload
-      end
-      @@payload
+      @payload ||= parse_payload
     end
 
     def read_input
-      request.body.rewind unless request.body.pos == 0
+      request.body.rewind unless request.body.pos.zero?
       request.body.read
     ensure
       request.body.rewind
@@ -45,19 +38,27 @@ module Shaf
 
     def parse_payload
       if request.env['CONTENT_TYPE'] == 'application/x-www-form-urlencoded'
-        return params.reject { |key,_| EXCLUDED_FORM_PARAMS.include? key }
+        return params.reject { |key, _| EXCLUDED_FORM_PARAMS.include? key }
       end
 
       input = read_input
       return {} if input.empty?
 
-      if request.env['CONTENT_TYPE'] =~ %r(\Aapplication/(hal\+)?json)
-        JSON.parse(input, symbolize_names: true)
-      else
-        raise Errors::UnsupportedMediaTypeError.new(request: request)
-      end
-    rescue StandardError
-      raise Errors::BadRequestError.new
+      raise raise_unsupported_media_type_error(request) unless suported_media_type?
+
+      JSON.parse(input, symbolize_names: true)
+    rescue Errors::UnsupportedMediaTypeError
+      raise
+    rescue StandardError => e
+      raise Errors::BadRequestError, "Failed to parse input payload: #{e.message}"
+    end
+
+    def suported_media_type?
+      request.env['CONTENT_TYPE'].match? %r{\Aapplication/(hal\+)?json}
+    end
+
+    def raise_unsupported_media_type_error(request)
+      raise Errors::UnsupportedMediaTypeError.new(request: request)
     end
 
     def safe_params(*fields)
@@ -66,16 +67,14 @@ module Shaf
       fields = fields.map { |f| f.to_sym.downcase }.to_set
       fields << :id
 
-      {}.tap do |allowed|
-        fields.each do |f|
-          allowed[f] = payload[f] if payload.key? f
-          allowed[f] ||= payload[f.to_s] if payload.key? f.to_s
-        end
+      fields.each_with_object({}) do |f, allowed|
+        allowed[f] = payload[f] if payload.key? f
+        allowed[f] ||= payload[f.to_s] if payload.key? f.to_s
       end
     end
 
     def ignore_form_input?(name)
-      return name == '_method'
+      name == '_method'
     end
 
     def profile(value = nil)
@@ -99,6 +98,7 @@ module Shaf
       preferred_response = preferred_response_type(resource)
       http_cache = kwargs.delete(:http_cache) { Settings.http_cache }
 
+      serializer ||= HALPresenter.lookup_presenter(resource)
       serialized = serialize(resource, serializer, collection, **kwargs)
       add_cache_headers(serialized) if http_cache
 
@@ -107,12 +107,11 @@ module Shaf
       if preferred_response == mime_type(:html)
         respond_with_html(resource, serialized)
       else
-        respond_with_hal(resource, serialized)
+        respond_with_hal(resource, serialized, serializer)
       end
     end
 
     def serialize(resource, serializer, collection, **options)
-      serializer ||= HALPresenter
       if collection
         serializer.to_collection(resource, current_user: current_user, **options)
       else
@@ -120,9 +119,9 @@ module Shaf
       end
     end
 
-    def respond_with_hal(resource, serialized)
+    def respond_with_hal(resource, serialized, serializer)
       log.debug "Response payload (#{resource.class}): #{serialized}"
-      content_type :hal, content_type_params(resource)
+      content_type :hal, content_type_params(serializer)
       body serialized
     end
 
@@ -144,18 +143,10 @@ module Shaf
       etag sha1, :weak # Weak or Strong??
     end
 
-    def content_type_params(resource)
+    def content_type_params(serializer)
       return {profile: profile} if profile
 
-      name =
-        case resource
-        when Formable::Form
-          Shaf::Settings.form_profile_name
-        when Errors::ServerError
-          Shaf::Settings.error_profile_name
-        end
-
-      {profile: name}.compact
+      {profile: serializer.semantic_profile}.compact
     end
   end
 end

data/lib/shaf/settings.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'yaml'
+require 'shaf/utils'
 
 module Shaf
   class Settings
@@ -26,12 +27,8 @@ module Shaf
         return {} unless File.exist? file
 
         yaml = File.read(file)
-        if RUBY_VERSION < '2.5.0'
-          YAML.safe_load(yaml, [], [], true).each_with_object({}) do |(k, v), hash|
-            hash[k.to_sym] = v
-          end
-        elsif RUBY_VERSION < '2.6.0'
-          YAML.safe_load(yaml, [], [], true).transform_keys(&:to_sym)
+        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

data/lib/shaf/spec/payload_utils.rb

@@ -48,20 +48,24 @@ module Shaf
         end
       end
 
-      def fill_form(fields)
-        fields.map do |field|
-          value = case field[:type]
-                  when 'integer'
-                    field[:name].size
-                  when 'string'
-                    "value for #{field[:name]}"
-                  when 'boolean'
-                    true
-                  else
-                    "type not supported"
-                  end
-          [field[:name], value]
-        end.to_h
+      def fill_form(fields, opts = {})
+        fields.each_with_object({}) do |field, payload|
+          key = field[:name]
+          payload[key] = opts.fetch(key, default_field_value(field))
+        end
+      end
+
+      def default_field_value(field)
+        case field[:type]
+        when 'integer'
+          field[:name].size
+        when 'string'
+          "value for #{field[:name]}"
+        when 'boolean'
+          true
+        else
+          'type not supported'
+        end
       end
 
       def assert_status(code)

data/lib/shaf/upgrade/package.rb

@@ -186,7 +186,8 @@ module Shaf
         puts '' unless @manifest.regexps.empty?
         files_in(dir).all? do |file|
           @manifest.regexps_for(file).all? do |name|
-            params = symbolize_keys(YAML.safe_load(@files[name]))
+            params = YAML.safe_load(@files[name])
+            params.transform_keys!(&:to_sym)
             apply_substitute(file, params)
           end
         end
@@ -207,11 +208,6 @@ module Shaf
 
         FileUtils.mv(tmp.path, file)
       end
-
-      # Refactor this when support for ruby 2.4 is dropped
-      def symbolize_keys(hash)
-        hash.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
-      end
     end
   end
 end

data/lib/shaf/utils.rb

@@ -40,9 +40,29 @@ module Shaf
       def symbol_string(str)
         symbolize(str).inspect
       end
+
+      def rackify_header(str)
+        return if str.nil?
+        str.upcase.tr('-', '_').tap do |key|
+          key.prepend('HTTP_') unless key.start_with? 'HTTP_'
+        end
+      end
+
+      def deep_symbolize_keys(value)
+        case value
+        when Hash
+          value.each_with_object({}) do |(k, v), h|
+            h[k.to_sym] = deep_symbolize_keys(v)
+          end
+        when Array
+          value.map { |v| deep_symbolize_keys(v) }
+        else
+          value
+        end
+      end
     end
 
-    def_delegators Utils, :pluralize, :singularize, :symbolize, :symbol_string, :gem_root
+    def_delegators Utils, :pluralize, :singularize, :symbolize, :symbol_string, :gem_root, :rackify_header
 
     def project_root
       return @project_root if defined? @project_root
@@ -73,9 +93,9 @@ module Shaf
       end
     end
 
-    def bootstrap
+    def bootstrap(env: 'development')
       in_project_root do
-        ENV['RACK_ENV'] ||= 'development'
+        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.0.4"
+  VERSION = "1.1.0"
 end

data/templates/api/serializers/error_serializer.rb

@@ -2,6 +2,7 @@ require 'serializers/base_serializer'
 
 class ErrorSerializer < BaseSerializer
   model Shaf::Errors::ServerError
+  profile Shaf::Settings.error_profile_name
 
   attribute :title
   attribute :code

data/templates/api/serializers/form_serializer.rb

@@ -2,8 +2,8 @@ require 'serializers/base_serializer'
 require 'shaf/formable'
 
 class FormSerializer < BaseSerializer
-
   model Shaf::Formable::Form
+  profile Shaf::Settings.form_profile_name
 
   attribute :method do
     (options[:method] || resource&.method || 'POST').to_s.upcase
@@ -25,7 +25,7 @@ class FormSerializer < BaseSerializer
 
   post_serialize do |hash|
     fields = resource&.fields
-    break if fields.nil? || fields.empty?
+    next if fields.nil? || fields.empty?
     hash[:fields] = fields.map do |field|
       {
         name: field.name,

data/templates/api/serializers/validation_error_serializer.rb

@@ -1,5 +1,6 @@
 class ValidationErrorSerializer < BaseSerializer
   model Shaf::Errors::ValidationError
+  profile Shaf::Settings.error_profile_name
 
   attribute :title
   attribute :code

data/templates/config/paths.rb

@@ -5,3 +5,4 @@ Shaf::Settings.app_root = app_root
 Shaf::Settings.app_dir = File.expand_path('api', app_root)
 Shaf::Settings.src_dir = File.expand_path('src', app_root)
 Shaf::Settings.lib_dir = File.expand_path('lib', app_root)
+Shaf::Settings.spec_dir = File.expand_path('spec', app_root)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shaf
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Sammy Henningsson
@@ -30,7 +30,7 @@ cert_chain:
   ZMhjYR7sRczGJx+GxGU2EaR0bjRsPVlC4ywtFxoOfRG3WaJcpWGEoAoMJX6Z0bRv
   M40=
   -----END CERTIFICATE-----
-date: 2019-05-04 00:00:00.000000000 Z
+date: 2019-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -141,6 +141,10 @@ files:
 - lib/shaf/command/new.rb
 - lib/shaf/command/server.rb
 - lib/shaf/command/templates/Gemfile.erb
+- lib/shaf/command/test.rb
+- lib/shaf/command/test/filter.rb
+- lib/shaf/command/test/runnable_method.rb
+- lib/shaf/command/test/runner.rb
 - lib/shaf/command/upgrade.rb
 - lib/shaf/command/version.rb
 - lib/shaf/doc_model.rb
@@ -158,6 +162,7 @@ files:
 - lib/shaf/generator.rb
 - lib/shaf/generator/base.rb
 - lib/shaf/generator/controller.rb
+- lib/shaf/generator/forms.rb
 - lib/shaf/generator/helper.rb
 - lib/shaf/generator/migration.rb
 - lib/shaf/generator/migration/add_column.rb
@@ -174,6 +179,7 @@ files:
 - lib/shaf/generator/scaffold.rb
 - lib/shaf/generator/serializer.rb
 - lib/shaf/generator/templates/api/controller.rb.erb
+- lib/shaf/generator/templates/api/forms.rb.erb
 - lib/shaf/generator/templates/api/model.rb.erb
 - lib/shaf/generator/templates/api/policy.rb.erb
 - lib/shaf/generator/templates/api/serializer.rb.erb
@@ -253,6 +259,7 @@ files:
 - upgrades/0.6.0.tar.gz
 - upgrades/1.0.0.tar.gz
 - upgrades/1.0.4.tar.gz
+- upgrades/1.1.0.tar.gz
 homepage: 
 licenses:
 - MIT
@@ -267,7 +274,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

metadata.gz.sig

@@ -1,2 +1 @@
-�,zҳ�N�s �0Fm���)5�=@>���~(�١��wy,}��lr `��<������;=�1��p/�ڪ�!����I=��X9?-�|)"�O�8��K�[�m>��<��|�&�I䛊H
F��䖖���F���Xl����w��Mf1�)���:2m�4���;f����.ٺVW�"��9���|F“��4�=�b��&w����=Y�K�i�`
-E����{�1ߧl��
(�L�Ct���^�x�>7�V�I
+|�_�σD�c_O�dC9� N��S�C6��X=����3szW>�(v���;�}fag<