kjson-roda 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aecd0fd2eb4fa562138cf9932ea18dcd54c8a5f9
-  data.tar.gz: 2a1baf15dabf93d3ccbee63d2cf37eb48b6e29a4
+  metadata.gz: cfe02084725e0cf06be435b99653dd536d9b7bb6
+  data.tar.gz: 598593e0d6e614510bcf71585f76f92898bcad9f
 SHA512:
-  metadata.gz: 30a2e3d70de27a1820d343f9bddc2905e1ce306a430a0483d3d193e7d9ccc9e6de7c0aa542ebf08dff00dda24b3f90c4c621af4dc030c658893cb30df9537395
-  data.tar.gz: 4c9feb1d648ad101cdc61bf0cbb3bf445c0ce613364804cb90507729f03616d30781ea909beabeab4b19186f265f471df4b6e563a52422c4b0771c3a6dfef2e3
+  metadata.gz: 8661a7709bf544f0d88f79174c99001d23c34e9f8e53ce452affa44e4822399216382750d0f203562dcd5371d03516684eac3bc7e95f1e0f37270c79c9099ae9
+  data.tar.gz: ea7bdeae72b225ef0a8131c81ce7cdc7fcb1c0a4bad2cfa14c8e7bd2b1488f90555d605ca3c2699a87c40a63f13a846b4aa86b76579adbee18aba975bfd75b43

data/lib/kjson/roda.rb

@@ -66,7 +66,7 @@ module Kjson
           stored_endpoints = @remaining_endpoints
           @remaining_endpoints = @remaining_endpoints.drop(path.size)
           if @remaining_endpoints.empty?
-            block_result(yield)
+            yield
             throw :error, [NO_DATA, RESPONSE_ERROR] if @remaining_endpoints.empty?
           else
             yield
@@ -118,7 +118,7 @@ module Kjson
           yield
         }
         response.data(data)
-        throw :halt, response.finish
+        throw :halt, response.kjson_finish
       end
 
       def catch_error(&_b)
@@ -131,7 +131,7 @@ module Kjson
         }
         error = [error] unless error.is_a?(Array)
         response.error(*error)
-        throw :halt, response.finish
+        throw :halt, response.kjson_finish
       end
 
       def kjson_decode(str)
@@ -164,14 +164,13 @@ module Kjson
         nil
       end
 
-      def finish
-        if @kjson_response
-          @body = [kjson_encode(
-            "data" => @data,
-            "error" => @error
-          )]
-        end
-        super
+      def kjson_finish
+        raise Roda::RodaError, "should call #data or #error before finish response" unless @kjson_response
+        write(kjson_encode(
+          "data" => @data,
+          "error" => @error
+        ))
+        finish
       end
 
       private

data/lib/kjson/roda/version.rb

@@ -1,5 +1,5 @@
 module Kjson
   module Roda
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kjson-roda
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Maksim V.
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: KJson Roda plugin