http_stub 0.24.1 → 0.24.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9901731654d0eeda9511137a9f8a37af8b90d3d
-  data.tar.gz: 15b7fd910cdba41e9c39d43b1856dbc224db93e1
+  metadata.gz: 19a6a02a024a22ad07ff458e4076ac6b3edae3c9
+  data.tar.gz: 2a8a5a9f5d0e4dd10e1e6e8471f7e263045b72d9
 SHA512:
-  metadata.gz: f7ee3913ab3048dbe60b3d4f92ea573828011ca8496122a96c8533c92aa72ae8d1397f0739deb3b3eb4ba1bb5525a93d61a8e691578721394a46dc5e91c93290
-  data.tar.gz: 90e55d873f32fede338a8eb54cbbc6345ddbe85d736919ebcae1d68e76499b46ebbb5844acb81a940922e4854110294a3b89a9cb78e057b0bab5d1b6529135c3
+  metadata.gz: 2c427195bbf661e6a9717658b1ca3a6f2b4cc286194fe3f2a8a677356da3f73bb187c336c14248ce4f37105ae3f78df2becc33dcb599b3854581f3008b6a7431
+  data.tar.gz: ddab90edb0e73220865ab2378295e90331d2e1692833c997380521e22217a817fc64ad6c4472563424f7fca79de85331e4795a097d0ad9892db51381221dae86

data/lib/http_stub/server/application/cross_origin_support.rb

@@ -9,8 +9,8 @@ module HttpStub
           def add_headers_if_necessary
             response.headers.merge!(
               "Access-Control-Allow-Origin"  => "*",
-              "Access-Control-Allow-Methods" => @http_stub_request.method.upcase,
-              "Access-Control-Allow-Headers" => @http_stub_request.headers.keys.join(",")
+              "Access-Control-Allow-Methods" => determine_allowed_methods,
+              "Access-Control-Allow-Headers" => determine_allowed_headers
             ) if settings.cross_origin_support?
           end
 
@@ -19,6 +19,16 @@ module HttpStub
             halt 200
           end
 
+          private
+
+          def determine_allowed_methods
+            @http_stub_request.headers["Access_Control_Request_Method"] || @http_stub_request.method.upcase
+          end
+
+          def determine_allowed_headers
+            @http_stub_request.headers["Access_Control_Request_Headers"] || @http_stub_request.headers.keys.join(",")
+          end
+
         end
 
         def self.registered(application)

data/lib/http_stub/version.rb

@@ -1,3 +1,3 @@
 module HttpStub
-  VERSION = "0.24.1".freeze
+  VERSION = "0.24.2".freeze
 end

data/spec/acceptance/cross_origin_support_spec.rb

@@ -4,8 +4,6 @@ describe "Cross origin support acceptance" do
 
   let(:cross_origin_page) { CrossOriginServer::IndexPage.new(browser) }
 
-  let(:headers) { (1..3).each_with_object({}) { |i, result| result["HEADER_#{i}"] = "header value #{i}" } }
-
   context "when a stub server with cross origin support is initialized" do
     include_context "configurer integration"
 
@@ -34,7 +32,11 @@ describe "Cross origin support acceptance" do
 
       context "and a matching request is made" do
 
-        let(:response) { HTTParty.get("#{server_uri}/some_path", headers: headers) }
+        let(:application_headers) do
+          (1..3).each_with_object({}) { |i, result| result["APPLICATION_HEADER_#{i}"] = "header value #{i}" }
+        end
+
+        let(:response) { HTTParty.get("#{server_uri}/some_path", headers: application_headers) }
 
         before(:example) { cross_origin_page.wait_for_response_indicator("Succeeded") }
 
@@ -43,7 +45,7 @@ describe "Cross origin support acceptance" do
         end
 
         it "responds with cross origin support headers" do
-          expect_response_to_contain_cross_origin_headers("GET")
+          expect_response_to_contain_cross_origin_support(method: "GET", header_names: application_headers.keys)
         end
 
       end
@@ -54,13 +56,23 @@ describe "Cross origin support acceptance" do
 
       before(:example) { configurer.activate!("Options scenario") }
 
-      context "and a matching request is made" do
+      context "and a matching pre-flight request is made" do
+
+        let(:access_control_request_method)       { "PUT" }
+        let(:access_control_request_header_names) { (1..3).map { |i| "ACCESS_CONTROL_HEADER_#{i}" } }
+        let(:access_control_request_headers) do
+          {
+            "Access-Control-Request-Method"  => access_control_request_method,
+            "Access-Control-Request-Headers" => access_control_request_header_names.join(",")
+          }
+        end
 
-        let(:response) { HTTParty.options("#{server_uri}/some_path", headers: headers) }
+        let(:response) { HTTParty.options("#{server_uri}/some_path", headers: access_control_request_headers) }
 
-        it "ignores the stub and replays a cross origin options response" do
+        it "ignores the stub and replays the cross origin response" do
           expect(response.code).to eql(200)
-          expect_response_to_contain_cross_origin_headers("OPTIONS")
+          expect_response_to_contain_cross_origin_support(method:       access_control_request_method,
+                                                          header_names: access_control_request_header_names)
         end
 
       end
@@ -115,10 +127,10 @@ describe "Cross origin support acceptance" do
 
   end
 
-  def expect_response_to_contain_cross_origin_headers(method_name)
+  def expect_response_to_contain_cross_origin_support(expectations)
     expect(response.headers["access-control-allow-origin"]).to eql("*")
-    expect(response.headers["access-Control-allow-methods"]).to eql(method_name)
-    headers.keys.each do |expected_header_name|
+    expect(response.headers["access-control-allow-methods"]).to eql(expectations[:method])
+    expectations[:header_names].each do |expected_header_name|
       expect(response.headers["access-control-allow-headers"]).to include(expected_header_name)
     end
 

data/spec/lib/http_stub/configurer/dsl/server_spec.rb

@@ -79,6 +79,64 @@ describe HttpStub::Configurer::DSL::Server do
 
   end
 
+  describe "#enable" do
+
+    context "when a feature is provided" do
+
+      let(:feature) { :some_feature }
+
+      subject { server.enable(feature) }
+
+      it "enables the feature" do
+        subject
+
+        expect(server.enabled?(feature)).to be(true)
+      end
+
+    end
+
+    context "when features are provided" do
+
+      let(:features) { (1..3).map { |i| "feature_#{i}".to_sym } }
+
+      subject { server.enable(*features) }
+
+      it "enables the features" do
+        subject
+
+        features.each { |feature| expect(server.enabled?(feature)).to be(true) }
+      end
+
+    end
+
+  end
+
+  describe "#enabled?" do
+
+    let(:feature) { :some_feature }
+
+    subject { server.enabled?(feature) }
+
+    context "when a feature is enabled" do
+
+      before(:example) { server.enable(feature) }
+
+      it "returns false" do
+        expect(subject).to be(true)
+      end
+
+    end
+
+    context "when a feature is not enabled" do
+
+      it "returns false" do
+        expect(subject).to be(false)
+      end
+
+    end
+
+  end
+
   describe "#request_defaults=" do
 
     let(:args) { { request_rule_key: "request rule value" } }

data/spec/lib/http_stub/server/application/cross_origin_support_spec.rb

@@ -1,9 +1,18 @@
 describe HttpStub::Server::Application::CrossOriginSupport do
   include Rack::Test::Methods
 
-  let(:header_names)    { (1..3).map { |i| "HEADER_#{i}" } }
-  let(:request_headers) do
-    header_names.each_with_object({}) { |name, result| result["HTTP_#{name}"] = "#{name} value" }
+  let(:application_header_names) { (1..3).map { |i| "APPLICATION_HEADER_#{i}" } }
+  let(:application_headers)      do
+    application_header_names.each_with_object({}) { |name, result| result["HTTP_#{name}"] = "#{name} value" }
+  end
+
+  let(:access_control_request_method)       { "PATCH" }
+  let(:access_control_request_header_names) { (1..3).map { |i| "ACCESS_CONTROL_HEADER_#{i}" } }
+  let(:access_control_request_headers)      do
+    {
+      "ACCESS_CONTROL_REQUEST_METHOD"  => access_control_request_method,
+      "ACCESS_CONTROL_REQUEST_HEADERS" => access_control_request_header_names.join(",")
+    }
   end
 
   let(:response) { last_response }
@@ -31,15 +40,13 @@ describe HttpStub::Server::Application::CrossOriginSupport do
       it "responds with an access control method header allowing the method of the current request" do
         subject
 
-        expect(response.headers["Access-Control-Allow-Methods"]).to eql(request_method)
+        expect(response.headers["Access-Control-Allow-Methods"]).to eql(allowed_request_methods)
       end
 
       it "responds with an access control headers header allowing the headers of the current request" do
         subject
 
-        header_names.each do |expected_header_name|
-          expect(response.headers["Access-Control-Allow-Headers"]).to include(expected_header_name)
-        end
+        expect(response.headers["Access-Control-Allow-Headers"]).to include(allowed_request_headers)
       end
 
     end
@@ -50,7 +57,10 @@ describe HttpStub::Server::Application::CrossOriginSupport do
 
       context "and a non-OPTIONS request is issued" do
 
-        let(:request_method) { "GET" }
+        let(:request_headers) { application_headers }
+
+        let(:allowed_request_methods) { "GET" }
+        let(:allowed_request_headers) { application_header_names.join(",") }
 
         subject { get "/some_resource", {}, request_headers }
 
@@ -58,10 +68,12 @@ describe HttpStub::Server::Application::CrossOriginSupport do
 
       end
 
+      context "and a pre-flight OPTIONS request is issued" do
 
-      context "and an OPTIONS request is issued" do
+        let(:request_headers) { access_control_request_headers }
 
-        let(:request_method) { "OPTIONS" }
+        let(:allowed_request_methods) { access_control_request_method }
+        let(:allowed_request_headers) { access_control_request_header_names.join(",") }
 
         subject { options "/some_resource", {}, request_headers }
 
@@ -79,25 +91,23 @@ describe HttpStub::Server::Application::CrossOriginSupport do
 
     context "and cross origin support is disabled" do
 
-      before(:example) do
-        app_class.disable :cross_origin_support
-      end
+      before(:example) { app_class.disable :cross_origin_support }
 
       context "and a non-OPTIONS request is issued" do
 
-        subject { get "/some_resource", {}, request_headers }
+        subject { get "/some_resource", {}, application_headers }
 
         it "does not add access control headers" do
           subject
 
-          header_names.each { |header_name| expect(header_name).to_not match(/^Access-Control/) }
+          response.headers.keys.each { |header_name| expect(header_name).to_not include("Access-Control") }
         end
 
       end
 
       context "and an OPTIONS request is issued" do
 
-        subject { options "/some_resource" }
+        subject { options "/some_resource", {}, access_control_request_headers }
 
         it "returns a not found response" do
           subject

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_stub
 version: !ruby/object:Gem::Version
-  version: 0.24.1
+  version: 0.24.2
 platform: ruby
 authors:
 - dueckes
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake