shaf 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7f82470e7ccfc65f38530f6ca195d68c9d4296744396924aee3f7477ff8e283
-  data.tar.gz: 78d0876c23b01ffaf9bcbb54d1ea887aafa6f4dbd9a7bdecc7bc6c0b686a7605
+  metadata.gz: ec94396d12fceb99bdb58bcb8a11ec6851b730cd2dad7c1dd19b320f340dd48b
+  data.tar.gz: edab56921f648eeaa6532499a7b4892e86bc493fcbb7513d8736b6b0cdc5d7c3
 SHA512:
-  metadata.gz: 59acbbf7c33b1bc368f86d6ec814138d12101443281e5b67dce9598084a3c55fac09fbefd30085e86a2af2aee298c3f6b08954cd6a37e6921d5d7c5f36baabfb
-  data.tar.gz: 15a5029adbe0f7d1402f3fa535c2abdc3ae7e0e5b22ae7cce516716c7646b4c7e526c74d7cd749c701f8a0106c9819a33161ca0fce88d74241548b3e8a7448ea
+  metadata.gz: b1f4ac6773adebc04da603a4c7e6b9e6cde1c1ba5bbe547e526f42cc88a178942a11f07a14abe6206c5b3de7a36e59c58c6173a9e388d6512bb08a0da71b45d1
+  data.tar.gz: 4d14203e911733e0ba30b769ed5e37204c225261649da5eed9c80bf4574af9e1e25e99c1c7739771340cecd6b53484fc5210b5be4e8b799be88237646c4acacf

data/lib/shaf/generator/model.rb

@@ -42,9 +42,19 @@ module Shaf
       def form_fields
         args[1..-1].map do |f|
           (name, type, label) = f.split(':')
-          type ||= "string"
-          label_str = label ? %Q(, label: "#{label}") : ""
-          format 'field :%s, type: "%s"%s' % [name, type, label_str]
+          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
 

data/lib/shaf/helpers/cache_control.rb

@@ -1,21 +1,20 @@
 module Shaf
   module CacheControl
-
     def cache_control(*args, **kwargs)
       return unless Shaf::Settings.http_cache
-      set_max_age(kwargs)
+      __rewrite_max_age(kwargs)
       super(*args, **kwargs)
     end
 
     private
 
-    def set_max_age(kwargs)
-      max_age = kwargs[:http_cache_max_age] or return
+    def __rewrite_max_age(kwargs)
+      max_age = kwargs.delete(:http_cache_max_age)
       if max_age.is_a? Symbol
         key = "http_cache_max_age_#{max_age}".to_sym
-        max_age = Settings.respond_to?(key) ? Settings.send(key) : 86400
-        kwargs[:http_cache_max_age] = max_age
+        max_age = Settings.respond_to?(key) ? Settings.send(key) : 86_400
       end
+      kwargs[:max_age] ||= max_age
     end
   end
 end

data/lib/shaf/version.rb

@@ -1,3 +1,3 @@
 module Shaf
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/templates/api/controllers/base_controller.rb

@@ -62,6 +62,8 @@ class BaseController < Sinatra::Base
       ForbiddenError.new
     when ServerError
       err
+    when Sequel::ValidationFailed
+      Shaf::Errors::ValidationError.from_sequel(err)
     else
       ServerError.new(err.message)
     end

data/templates/config/initializers/sequel.rb

@@ -1,5 +1,6 @@
 require 'config/database'
 
 Sequel::Model.plugin :timestamps
+Sequel::Model.plugin :validation_helpers
 Sequel.extension :blank
 DB.extension(:pagination)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shaf
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Sammy Henningsson
@@ -30,7 +30,7 @@ cert_chain:
   ZMhjYR7sRczGJx+GxGU2EaR0bjRsPVlC4ywtFxoOfRG3WaJcpWGEoAoMJX6Z0bRv
   M40=
   -----END CERTIFICATE-----
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2019-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -252,6 +252,7 @@ files:
 - upgrades/0.5.0.tar.gz
 - upgrades/0.6.0.tar.gz
 - upgrades/1.0.0.tar.gz
+- upgrades/1.0.4.tar.gz
 homepage: 
 licenses:
 - MIT