kenji 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5fdf8390ae9d6d9eec304907eeb51dfac87e44e
-  data.tar.gz: 6d7e9930d844f336ae34af1d0bcf54073ce99a48
+  metadata.gz: e83a89585b88869726736b155d9d4d37eb31a8ec
+  data.tar.gz: d658ee594bb6e857b6fa51b011526b1aa185c0f8
 SHA512:
-  metadata.gz: 13094758c7771669041badcffff388ca387cb547bb4965c5010dd176e82cf66e9b6e50d78baa891aa0206a26044bf3e2e6ed08238544dcf58b2a6c917e2ed415
-  data.tar.gz: c2e5133ae4a52328ce095843f6e7f78757035e5f46136aaf685909c3a273822b6052f314144c6179afd4540d86f9fc7b1ef6b250dc1e5a42ef791c301419f1e8
+  metadata.gz: 8ef81fe9cb198731bc5a6e1807c749223586b8c4184d35755c0c2b1a81d3adf5888c1306859d79e288285acade23c249a91dcbe723949142eb27c63f77a85182
+  data.tar.gz: c96a3bc8b47d60df1a2d664f2de306596bbaced86909b9de0931cadd3100c544a5c6b3e4a59792757d344a07af8ea98b0d988f2a332de96e8cb07a9cbfca233d

data/README.md

@@ -100,6 +100,11 @@ And already, your app is ready to go:
 
 ## Changelog
 
+#### 1.2.1
+
+- `respond_raw` now takes a second optional argument for additional headers.
+- Fix bug with `kenji.header`
+
 #### 1.2.0
 
 - A new `exception_in_body` option (defaults to false) defines whether options

data/lib/kenji.rb

@@ -141,7 +141,7 @@ module Kenji
     #   kenji.header 'Content-Type' => 'hello/world'
     #
     def header(hash = {})
-      @header.merge!(hash)
+      @headers.merge!(hash)
     end
 
     # Returns the response headers
@@ -178,12 +178,15 @@ module Kenji
 
     # Respond with raw bytes
     #
+    # `status` is 200 by default
+    # `header` is merged with @headers
     # `data` can either be a string or an IO object.
     #
-    def respond_raw(status = 200, data)
+    def respond_raw(status = 200, headers = {}, data)
       @status = status
+      headers = @headers.merge(headers)
       body = data.is_a?(IO) ? data : [data]
-      throw(:KenjiRespondControlFlowInterrupt, [@status, @headers, body])
+      throw(:KenjiRespondControlFlowInterrupt, [@status, headers, body])
     end
 
 

data/lib/kenji/version.rb

@@ -1,3 +1,3 @@
 module Kenji
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kenji
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Kenneth Ballenegger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Kenji
@@ -156,4 +156,3 @@ test_files:
 - spec/5/controllers/main.rb
 - spec/7/controllers/main.rb
 - spec/kenji_spec.rb
-has_rdoc: