Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion shard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ dependencies:

teeplate:
github: mosop/teeplate
version: ~> 0.6.1
version: ~> 0.7.0

development_dependencies:
ameba:
Expand Down
2 changes: 1 addition & 1 deletion src/amber/cli/commands/exec.cr
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/amber/cli/templates/app/shard.yml.ecr
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -37,7 +37,7 @@ dependencies:

jasper_helpers:
github: amberframework/jasper-helpers
version: ~> 0.2.0
version: ~> 0.2.1

<% case @database when "pg" -%>
pg:
Expand Down
2 changes: 1 addition & 1 deletion src/amber/pipes/static.cr
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/amber/router/cookies.cr
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 2 additions & 3 deletions src/amber/router/file.cr
Original file line number Diff line number Diff line change
@@ -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?
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/amber/router/flash.cr
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ module Amber

def fetch(key : String)
@read << key
@store.fetch(key)
@store.fetch(key, nil)
end

def fetch(key : Symbol)
Expand Down
2 changes: 1 addition & 1 deletion src/amber/server/server.cr
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down