diff --git a/shard.yml b/shard.yml index 54b5e17f7..33c1fe2e2 100644 --- a/shard.yml +++ b/shard.yml @@ -68,7 +68,7 @@ dependencies: teeplate: github: mosop/teeplate - version: ~> 0.6.1 + version: ~> 0.7.0 development_dependencies: ameba: diff --git a/src/amber/cli/commands/exec.cr b/src/amber/cli/commands/exec.cr index 8504041ac..f5fee405b 100644 --- a/src/amber/cli/commands/exec.cr +++ b/src/amber/cli/commands/exec.cr @@ -10,7 +10,7 @@ module Amber::CLI @filelogs : String def initialize(__previous, __argv) - @filename = "./tmp/#{Time.now.epoch_ms}_console.cr" + @filename = "./tmp/#{Time.now.to_unix_ms}_console.cr" @filelogs = @filename.sub("console.cr", "console_result.log") super(__previous, __argv) end diff --git a/src/amber/cli/templates/app/shard.yml.ecr b/src/amber/cli/templates/app/shard.yml.ecr index 8412a8bac..8d736bc0d 100644 --- a/src/amber/cli/templates/app/shard.yml.ecr +++ b/src/amber/cli/templates/app/shard.yml.ecr @@ -24,11 +24,11 @@ dependencies: <% case @model when "crecto" -%> crecto: github: Crecto/crecto - version: ~> 0.9.0 + version: ~> 0.10.1 <% else -%> granite: github: amberframework/granite - version: ~> 0.14.0 + version: ~> 0.15.0 <% end -%> quartz_mailer: @@ -37,7 +37,7 @@ dependencies: jasper_helpers: github: amberframework/jasper-helpers - version: ~> 0.2.0 + version: ~> 0.2.1 <% case @database when "pg" -%> pg: diff --git a/src/amber/pipes/static.cr b/src/amber/pipes/static.cr index 9dd57058c..4076ca321 100644 --- a/src/amber/pipes/static.cr +++ b/src/amber/pipes/static.cr @@ -70,7 +70,7 @@ module Amber end private def etag(context, file_path) - etag = %{W/"#{File.info(file_path).modification_time.epoch.to_s}"} + etag = %{W/"#{File.info(file_path).modification_time.to_unix.to_s}"} context.response.headers["ETag"] = etag return false if !context.request.headers["If-None-Match"]? || context.request.headers["If-None-Match"] != etag context.response.headers.delete "Content-Type" diff --git a/src/amber/router/cookies.cr b/src/amber/router/cookies.cr index aee4cfc72..dc723e555 100644 --- a/src/amber/router/cookies.cr +++ b/src/amber/router/cookies.cr @@ -108,7 +108,7 @@ module Amber::Router return unless @cookies.has_key?(name) value = @cookies.delete(name) - @delete_cookies[name] = HTTP::Cookie.new(name, "", path, Time.epoch(0), domain) + @delete_cookies[name] = HTTP::Cookie.new(name, "", path, ::Time.unix(0), domain) value end diff --git a/src/amber/router/file.cr b/src/amber/router/file.cr index d9e5c1103..4df2fd629 100644 --- a/src/amber/router/file.cr +++ b/src/amber/router/file.cr @@ -1,9 +1,8 @@ require "http/headers" -require "tempfile" module Amber::Router struct File - getter file : Tempfile + getter file : ::File getter filename : String? getter headers : HTTP::Headers getter creation_time : Time? @@ -13,7 +12,7 @@ module Amber::Router def initialize(upload) @filename = upload.filename - @file = Tempfile.new(filename) + @file = ::File.tempfile(filename) ::File.open(@file.path, "w") do |f| ::IO.copy(upload.body, f) end diff --git a/src/amber/router/flash.cr b/src/amber/router/flash.cr index 70f0334b7..a73c6c6b0 100644 --- a/src/amber/router/flash.cr +++ b/src/amber/router/flash.cr @@ -30,7 +30,7 @@ module Amber def fetch(key : String) @read << key - @store.fetch(key) + @store.fetch(key, nil) end def fetch(key : Symbol) diff --git a/src/amber/server/server.cr b/src/amber/server/server.cr index 1d51b19d3..c1bfdfcad 100644 --- a/src/amber/server/server.cr +++ b/src/amber/server/server.cr @@ -59,7 +59,7 @@ module Amber if ssl_enabled? ssl_config = Amber::SSL.new(settings.ssl_key_file.not_nil!, settings.ssl_cert_file.not_nil!).generate_tls - server.bind_ssl Amber.settings.host, Amber.settings.port, ssl_config, settings.port_reuse + server.bind_tls Amber.settings.host, Amber.settings.port, ssl_config, settings.port_reuse else server.bind_tcp Amber.settings.host, Amber.settings.port, settings.port_reuse end