Skip to content

Commit d196fe6

Browse files
committed
Set correct Content-Type
1 parent b8be369 commit d196fe6

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

Gemfile.lock

+8
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,20 @@ PATH
22
remote: .
33
specs:
44
qrtrx (0.1.0)
5+
mimemagic (~> 0.3)
56
rqrcode (~> 0.10)
67

78
GEM
89
remote: https://rubygems.org/
910
specs:
1011
chunky_png (1.3.10)
12+
coderay (1.1.2)
1113
diff-lcs (1.3)
14+
method_source (0.9.0)
15+
mimemagic (0.3.2)
16+
pry (0.11.3)
17+
coderay (~> 1.1.0)
18+
method_source (~> 0.9.0)
1219
rake (10.5.0)
1320
rqrcode (0.10.1)
1421
chunky_png (~> 1.0)
@@ -31,6 +38,7 @@ PLATFORMS
3138

3239
DEPENDENCIES
3340
bundler (~> 1.16)
41+
pry
3442
qrtrx!
3543
rake (~> 10.0)
3644
rspec (~> 3.0)

lib/qrtrx/server.rb

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
require 'rqrcode'
22
require 'socket'
33
require 'securerandom'
4+
require 'mimemagic'
45

56
module Qrtrx
67
class Server
@@ -17,7 +18,6 @@ def start
1718
socket = server.accept
1819

1920
file_path = File.join(Dir.pwd, file_name)
20-
2121
File.open(file_path, "rb") do |file|
2222
socket.print http_header(file)
2323
IO.copy_stream(file, socket)
@@ -50,14 +50,13 @@ def ip_address
5050

5151
def http_header(file)
5252
"HTTP/1.1 200 OK\r\n" +
53-
"Content-Type: #{content_type(file)}\r\n" +
53+
"Content-Type: #{content_type}\r\n" +
5454
"Content-Length: #{file.size}\r\n" +
5555
"Connection: close\r\n\r\n"
5656
end
5757

58-
def content_type(file)
59-
# TODO
60-
'text/plain'
58+
def content_type
59+
MimeMagic.by_path(file_name).type
6160
end
6261

6362
end

qrtrx.gemspec

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ Gem::Specification.new do |spec|
3333
spec.add_development_dependency "bundler", "~> 1.16"
3434
spec.add_development_dependency "rake", "~> 10.0"
3535
spec.add_development_dependency "rspec", "~> 3.0"
36+
# spec.add_development_dependency "pry"
3637

3738
spec.add_dependency "rqrcode", "~> 0.10"
39+
spec.add_dependency "mimemagic", "~> 0.3"
3840
end

0 commit comments

Comments
 (0)