kenji 1.2.0 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c5fdf8390ae9d6d9eec304907eeb51dfac87e44e
4
- data.tar.gz: 6d7e9930d844f336ae34af1d0bcf54073ce99a48
3
+ metadata.gz: e83a89585b88869726736b155d9d4d37eb31a8ec
4
+ data.tar.gz: d658ee594bb6e857b6fa51b011526b1aa185c0f8
5
5
  SHA512:
6
- metadata.gz: 13094758c7771669041badcffff388ca387cb547bb4965c5010dd176e82cf66e9b6e50d78baa891aa0206a26044bf3e2e6ed08238544dcf58b2a6c917e2ed415
7
- data.tar.gz: c2e5133ae4a52328ce095843f6e7f78757035e5f46136aaf685909c3a273822b6052f314144c6179afd4540d86f9fc7b1ef6b250dc1e5a42ef791c301419f1e8
6
+ metadata.gz: 8ef81fe9cb198731bc5a6e1807c749223586b8c4184d35755c0c2b1a81d3adf5888c1306859d79e288285acade23c249a91dcbe723949142eb27c63f77a85182
7
+ data.tar.gz: c96a3bc8b47d60df1a2d664f2de306596bbaced86909b9de0931cadd3100c544a5c6b3e4a59792757d344a07af8ea98b0d988f2a332de96e8cb07a9cbfca233d
data/README.md CHANGED
@@ -100,6 +100,11 @@ And already, your app is ready to go:
100
100
 
101
101
  ## Changelog
102
102
 
103
+ #### 1.2.1
104
+
105
+ - `respond_raw` now takes a second optional argument for additional headers.
106
+ - Fix bug with `kenji.header`
107
+
103
108
  #### 1.2.0
104
109
 
105
110
  - A new `exception_in_body` option (defaults to false) defines whether options
@@ -141,7 +141,7 @@ module Kenji
141
141
  # kenji.header 'Content-Type' => 'hello/world'
142
142
  #
143
143
  def header(hash = {})
144
- @header.merge!(hash)
144
+ @headers.merge!(hash)
145
145
  end
146
146
 
147
147
  # Returns the response headers
@@ -178,12 +178,15 @@ module Kenji
178
178
 
179
179
  # Respond with raw bytes
180
180
  #
181
+ # `status` is 200 by default
182
+ # `header` is merged with @headers
181
183
  # `data` can either be a string or an IO object.
182
184
  #
183
- def respond_raw(status = 200, data)
185
+ def respond_raw(status = 200, headers = {}, data)
184
186
  @status = status
187
+ headers = @headers.merge(headers)
185
188
  body = data.is_a?(IO) ? data : [data]
186
- throw(:KenjiRespondControlFlowInterrupt, [@status, @headers, body])
189
+ throw(:KenjiRespondControlFlowInterrupt, [@status, headers, body])
187
190
  end
188
191
 
189
192
 
@@ -1,3 +1,3 @@
1
1
  module Kenji
2
- VERSION = '1.2.0'
2
+ VERSION = '1.2.1'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kenji
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0
4
+ version: 1.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kenneth Ballenegger
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-04-02 00:00:00.000000000 Z
11
+ date: 2016-02-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: json
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
141
141
  version: '0'
142
142
  requirements: []
143
143
  rubyforge_project:
144
- rubygems_version: 2.2.2
144
+ rubygems_version: 2.5.1
145
145
  signing_key:
146
146
  specification_version: 4
147
147
  summary: Kenji
@@ -156,4 +156,3 @@ test_files:
156
156
  - spec/5/controllers/main.rb
157
157
  - spec/7/controllers/main.rb
158
158
  - spec/kenji_spec.rb
159
- has_rdoc: