pliny 0.26.0 → 0.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc435bb8dd0c08d30696e53650d96a8ed0c38cb9
-  data.tar.gz: 01707d0efaf29bc8e2133887d936d58a10a4a388
+  metadata.gz: e4adaaedbebc3ae5352103ddadbf1f85ee0ea368
+  data.tar.gz: d0c837f014f54d02eb7cc28903fdec073502564b
 SHA512:
-  metadata.gz: 593f3a3e15d3f1094a78ad0fad317e86500f596dd8d7577bfe406b4a3cc1b0a813efab88630dd4ebb30e6168a30d4cf202a06df77663b24c8114c960e8884218
-  data.tar.gz: 6300a8c749f94601fc7bec51baeffc83aa1687b51c458984c39484a0ab910a2fece3d61fc2518f6a08943efbe141b083047cca050bdde8d0080bf136b741c49d
+  metadata.gz: f50ff132e89a39ca8d28c9e873dd3f85a9d4fb2210fda66eaa7634af7a4a4647db0e5e158554add566dbdea69400c70332317153e45aa945315466a9b64ea58a
+  data.tar.gz: 88082d4d62b2b4b6e59011dfa22420f942242990fe32256be729f91400b5b5ab6d92035353c710053a82977db99dfc5929eccc7f0eca4bea1fe9488e05b21ac8

data/lib/pliny/helpers/params.rb

@@ -8,14 +8,23 @@ module Pliny::Helpers
 
     def parse_body_params
       if request.media_type == "application/json"
-        p = indifferent_params(MultiJson.decode(request.body.read))
+        p = load_params(MultiJson.decode(request.body.read))
         request.body.rewind
         p
       elsif request.form_data?
-        indifferent_params(request.POST)
+        load_params(request.POST)
       else
         {}
       end
     end
+
+    def load_params(data)
+      # Sinatra 1.x only supports the method. Sinatra 2.x only supports the class
+      if defined?(Sinatra::IndifferentHash)
+        Sinatra::IndifferentHash[data]
+      else
+        indifferent_params(data)
+      end
+    end
   end
 end

data/lib/pliny/middleware/cors.rb

@@ -8,6 +8,12 @@ module Pliny::Middleware
     EXPOSE_HEADERS =
       %w( Cache-Control Content-Language Content-Type Expires Last-Modified Pragma ).freeze
 
+    @@additional_headers = []
+
+    def self.add_additional_header(header)
+      @@additional_headers << header
+    end
+
     def initialize(app)
       @app = app
     end
@@ -19,7 +25,7 @@ module Pliny::Middleware
       else
         status, headers, response = @app.call(env)
 
-        # regualar CORS request: append CORS headers to response
+        # regular CORS request: append CORS headers to response
         if cors_request?(env)
           headers.merge!(cors_headers(env))
         end
@@ -32,11 +38,15 @@ module Pliny::Middleware
       env.has_key?("HTTP_ORIGIN")
     end
 
+    def allow_headers
+      ALLOW_HEADERS + @@additional_headers
+    end
+
     def cors_headers(env)
       {
         'Access-Control-Allow-Origin'      => env["HTTP_ORIGIN"],
         'Access-Control-Allow-Methods'     => ALLOW_METHODS.join(', '),
-        'Access-Control-Allow-Headers'     => ALLOW_HEADERS.join(', '),
+        'Access-Control-Allow-Headers'     => allow_headers.join(', '),
         'Access-Control-Allow-Credentials' => "true",
         'Access-Control-Max-Age'           => "1728000",
         'Access-Control-Expose-Headers'    => EXPOSE_HEADERS.join(', ')

data/lib/pliny/version.rb

@@ -1,3 +1,3 @@
 module Pliny
-  VERSION = "0.26.0"
+  VERSION = "0.26.1"
 end

data/spec/helpers/params_spec.rb

@@ -0,0 +1,28 @@
+require "spec_helper"
+
+describe Pliny::Helpers::Params do
+
+  def app
+    Sinatra.new do
+      helpers Pliny::Helpers::Params
+      post "/" do
+        body_params.to_json
+      end
+    end
+  end
+
+  it "loads json params" do
+    post "/", {hello: "world"}.to_json, {'CONTENT_TYPE' => 'application/json'}
+    assert_equal "{\"hello\":\"world\"}", last_response.body
+  end
+
+  it "loads form data params" do
+    post "/", {hello: "world"}
+    assert_equal "{\"hello\":\"world\"}", last_response.body
+  end
+
+  it "loads from an unknown content type" do
+    post "/", "<hello>world</hello>", {'CONTENT_TYPE' => 'application/xml'}
+    assert_equal "{}", last_response.body
+  end
+end

data/spec/middleware/cors_spec.rb

@@ -39,4 +39,15 @@ describe Pliny::Middleware::CORS do
     assert_equal "http://localhost",
       last_response.headers["Access-Control-Allow-Origin"]
   end
+
+  it "allows additional headers to be added to every response" do
+    Pliny::Middleware::CORS.add_additional_header("X-Origin")
+
+    header "Origin", "http://localhost"
+    get "/"
+    assert_equal 200, last_response.status
+    assert_equal "hi", last_response.body
+
+    assert last_response.headers["Access-Control-Allow-Headers"].include?("X-Origin")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pliny
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.26.1
 platform: ruby
 authors:
 - Brandur Leach
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-28 00:00:00.000000000 Z
+date: 2017-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -488,6 +488,7 @@ files:
 - spec/error_reporters_spec.rb
 - spec/errors_spec.rb
 - spec/helpers/encode_spec.rb
+- spec/helpers/params_spec.rb
 - spec/helpers/serialize_spec.rb
 - spec/integration_spec.rb
 - spec/log_spec.rb
@@ -528,7 +529,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Basic tooling to support API apps in Sinatra