pliny 0.29.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e47d761bd19ec78a4558b81ab7018a268bea25545895a67c07f21623699c21ba
-  data.tar.gz: ee9b112e0a31a4e9646d3e60b02f8c8538440c770dae8c6376031bbad285b7dd
+  metadata.gz: 279c8a9ee0783e1a6627cdb320f5b1158861d2b780ba7c04ecfca5b3143d1714
+  data.tar.gz: c986b467e5647f3d9fef59636945b5a3beb554b47c89a5fae7bd4b324ed311fb
 SHA512:
-  metadata.gz: 3e5682954ac33fa5b7231c50cc59101c4fe811611e21cdc9ffc0eb06d586281692d5bc6c9231f0d553cc4b3cc275640b953cd239d219c46576d2425725f92f72
-  data.tar.gz: 0be3d40932b255ca70c0101cfd20a5680d5bc01fd61d8d448d27ca9f4c52043d25ec48af172122f30ab28ef4a37315c37f28358feec36edebcf7bf068a24560d
+  metadata.gz: 7a4720a9394893df84c2eb8eeb5b39afef82bb07f8b86289ab50fbdec600d874be6c0558ac0fbbb1e42f07fb33fda8bf2b1309dc179485179f3ec14e98b658ae
+  data.tar.gz: f70983c80a528a574c5be08037799593928b2c564b04a69f91a0f31be747da183f70bccc7dc9744fe692b5de36dfdb340984e4e306f9f4928031b4cbae612b35

data/lib/pliny/helpers/params.rb

@@ -8,9 +8,13 @@ module Pliny::Helpers
 
     def parse_body_params
       if request.media_type == "application/json"
-        p = load_params(MultiJson.decode(request.body.read))
+        begin
+          decoded = MultiJson.decode(request.body.read)
+        rescue MultiJson::ParseError => e
+          raise Pliny::Errors::BadRequest, e.message
+        end
         request.body.rewind
-        p
+        load_params(decoded)
       elsif request.form_data?
         load_params(request.POST)
       else

data/lib/pliny/log.rb

@@ -123,13 +123,17 @@ module Pliny
       end
     end
 
-    def quote_string(k, v)
+    def replace_newlines(v)
+      v.gsub("\n", "\\n")
+    end
+
+    def quote_string(v)
       if !v.include?('"')
-        %{#{k}="#{v}"}
+        %{"#{v}"}
       elsif !v.include?("'")
-        %{#{k}='#{v}'}
+        %{'#{v}'}
       else
-        %{#{k}="#{v.gsub(/"/, '\\"')}"}
+        %{"#{v.gsub(/"/, '\\"')}"}
       end
     end
 
@@ -150,11 +154,10 @@ module Pliny
         "#{k}=#{v.iso8601}"
       else
         v = "#{v}"
-        if v =~ /\s/
-          quote_string(k, v)
-        else
-          "#{k}=#{v}"
-        end
+        v = replace_newlines(v)
+        v = quote_string(v) if v =~ /\s/
+
+        "#{k}=#{v}"
       end
     end
   end

data/lib/pliny/version.rb

@@ -1,3 +1,3 @@
 module Pliny
-  VERSION = "0.29.0"
+  VERSION = "0.30.0"
 end

data/spec/helpers/params_spec.rb

@@ -34,4 +34,12 @@ describe Pliny::Helpers::Params do
     post "/", "<hello>world</hello>", {"CONTENT_TYPE" => "application/xml"}
     assert_equal "{}", last_response.body
   end
+
+  it "should throw bad request when receiving invalid json via post" do
+    err = assert_raises(Pliny::Errors::BadRequest) do
+      post "/", "{\"foo\"}", {"CONTENT_TYPE" => "application/json"}
+    end
+
+    assert_match /unexpected token/, err.message
+  end
 end

data/spec/log_spec.rb

@@ -161,6 +161,12 @@ describe Pliny::Log do
       Pliny.log(foo: "string with spaces")
     end
 
+    it "replaces newlines in strings" do
+      expect(@io).to receive(:print).with("foo=\"string\\nwith newlines\\n\"\n")
+
+      Pliny.log(foo: "string\nwith newlines\n")
+    end
+
     it "by default interpolates objects into strings" do
       expect(@io).to receive(:print).with("foo=message\n")
       expect(@io).to receive(:print).with("foo=42\n")

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pliny
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Brandur Leach
 - Pedro Belo
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-30 00:00:00.000000000 Z
+date: 2020-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -503,7 +503,7 @@ homepage: https://github.com/interagent/pliny
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -519,7 +519,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Basic tooling to support API apps in Sinatra
 test_files: []