http_stub 0.25.0 → 0.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89ef636d0f034ff2c6ad0966f3becc70899c8ca8
-  data.tar.gz: e2dd710bf4504f1ec6799a4717b0ed493a94a858
+  metadata.gz: bf1b8a410f17f0ab1797a5474d9c67567d4fec05
+  data.tar.gz: ed4cd4e41c8c080c2012ff00de1850a5f80c4ca9
 SHA512:
-  metadata.gz: c221e672a19916af0902c7a54eccd1cfe58d01f3a6b9ca1be504056079fdc193e09156bbe086634807e72975d5e065c48fa41c7c20d113183181b304736df632
-  data.tar.gz: 2061dd82264cfcba3b0cc3aa177086d1dde71407d32430242530464c3ac1b4de021e71fb7e9b0b6a5c529353aee6d9900baa552546264f03bee0b175af43e896
+  metadata.gz: f23b2f2d17db36ebefd1b6564b13b5631ed387c226715bfd71a0f07928cc6cea0aa753b88a1f8171704e20f908c907a3eb4902370b294c4d432815d160d3d31d
+  data.tar.gz: 472618feeed2b8bcd06177553a484cec111a12c5e24eb53bf18cc363b49b80631ad576b155556f2f9955ad53f1842e2f2e03c802dbf6e4143b02232123106b09

data/lib/http_stub.rb

@@ -16,7 +16,6 @@ require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/hash/slice'
 require 'active_support/core_ext/hash/deep_merge'
 require 'active_support/core_ext/hash/indifferent_access'
-require 'active_support/json/encoding'
 
 require_relative 'http_stub/extensions/core/hash/formatted'
 require_relative 'http_stub/extensions/core/hash/indifferent_and_insensitive_access'

data/lib/http_stub/server/request/request.rb

@@ -15,8 +15,8 @@ module HttpStub
           @body       = rack_request.body.read
         end
 
-        def to_hash
-          { uri: @uri, method: @method, headers: @headers, parameters: @parameters, body: @body }
+        def to_json(*args)
+          { uri: @uri, method: @method, headers: @headers, parameters: @parameters, body: @body }.to_json(*args)
         end
 
       end

data/lib/http_stub/server/stub/match/match.rb

@@ -17,8 +17,8 @@ module HttpStub
             @request.uri.include?(criteria[:uri]) && @request.method.casecmp(criteria[:method]).zero?
           end
 
-          def to_hash
-            { request: @request, response: @response, stub: @stub }
+          def to_json(*args)
+            { request: @request, response: @response, stub: @stub }.to_json(*args)
           end
 
         end

data/lib/http_stub/server/stub/match/rules.rb

@@ -21,8 +21,8 @@ module HttpStub
             [ @uri, @method, @headers, @parameters, @body ].all? { |matcher| matcher.matches?(request, logger) }
           end
 
-          def to_hash
-            { uri: @uri, method: @method, headers: @headers, parameters: @parameters, body: @body }
+          def to_json(*args)
+            { uri: @uri, method: @method, headers: @headers, parameters: @parameters, body: @body }.to_json(*args)
           end
 
         end

data/lib/http_stub/server/stub/response/base.rb

@@ -49,6 +49,10 @@ module HttpStub
             { status: @status, headers: @headers, delay_in_seconds: @delay_in_seconds }
           end
 
+          def to_json(*args)
+            self.to_hash.to_json(*args)
+          end
+
         end
 
       end

data/lib/http_stub/server/stub/stub.rb

@@ -23,8 +23,8 @@ module HttpStub
           @response.with_values_from(request)
         end
 
-        def to_hash
-          { id: @id, uri: @uri, match_rules: @match_rules, response: @response, triggers: @triggers }
+        def to_json(*args)
+          { id: @id, uri: @uri, match_rules: @match_rules, response: @response, triggers: @triggers }.to_json(*args)
         end
 
         def to_s

data/lib/http_stub/server/stub/triggers.rb

@@ -4,7 +4,7 @@ module HttpStub
 
       class Triggers
 
-        delegate :each, :as_json, to: :@triggers
+        delegate :each, to: :@triggers
 
         def initialize(triggers)
           @triggers = (triggers || []).map { |trigger| HttpStub::Server::Stub.create(trigger) }
@@ -14,6 +14,10 @@ module HttpStub
           @triggers.each { |trigger| registry.add(trigger, logger) }
         end
 
+        def to_json(*args)
+          @triggers.to_json(*args)
+        end
+
         def to_s
           @triggers.reduce("") { |result, trigger| "#{result}\n#{trigger}" }
         end

data/lib/http_stub/version.rb

@@ -1,3 +1,3 @@
 module HttpStub
-  VERSION = "0.25.0".freeze
+  VERSION = "0.25.1".freeze
 end

data/spec/acceptance/stub_match_last_spec.rb

@@ -84,7 +84,15 @@ describe "Stub matches last acceptance" do
       end
 
       it "returns JSON containing the uri of the matched stub" do
-        expect(json_response).to include("stub" => hash_including("uri" => stub_registrator.stub_uri))
+        expect_match_stub_to_include("uri" => stub_registrator.stub_uri)
+      end
+
+      it "returns JSON containing the request match rules of the matched stub" do
+        expect_match_stub_to_include("match_rules" => hash_including("uri" => stub_registrator.request_uri))
+      end
+
+      it "returns JSON containing the configured response of the matched stub" do
+        expect_match_stub_to_include("response" => hash_including("status" => stub_registrator.stub_response_status))
       end
 
     end
@@ -165,6 +173,10 @@ describe "Stub matches last acceptance" do
       expect(json_response).to(include("response" => hash_including(hash)))
     end
 
+    def expect_match_stub_to_include(hash)
+      expect(json_response).to(include("stub" => hash_including(hash)))
+    end
+
   end
 
 end

data/spec/lib/http_stub/json_spec.rb

@@ -0,0 +1,62 @@
+describe "JSON configuration" do
+
+  context "#to_json" do
+
+    context "when a class has a custom implmentation" do
+
+      module HttpStub
+        module JSONConfiguration
+
+          class HasCustomToJson
+
+            attr_reader :data
+
+            def initialize(name)
+              @data = { "#{name}" => "#{name} value" }
+            end
+
+            def to_json(*args)
+              @data.to_json(*args)
+            end
+
+            def method_missing(name, *args, &block)
+              @data.send(name, *args, &block)
+            end
+
+          end
+        end
+      end
+
+      context "and an instance is created" do
+
+        let(:instance) { HttpStub::JSONConfiguration::HasCustomToJson.new(1) }
+
+        subject { instance.to_json }
+
+        it "returns the value produced by the custom implementation" do
+          expect(subject).to eql(instance.data.to_json)
+        end
+
+      end
+
+      context "and a list of instances is created" do
+
+        let(:instances) { (1..3).map { |i| HttpStub::JSONConfiguration::HasCustomToJson.new(i) } }
+
+        subject { instances.to_json }
+
+        it "includes the JSON represenation of each instance" do
+          instances.each { |instance| expect(subject).to include(instance.to_json) }
+        end
+
+        it "excludes any instance variables" do
+          expect(subject).to_not include("data")
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/spec/lib/http_stub/server/request/request_spec.rb

@@ -91,32 +91,28 @@ describe HttpStub::Server::Request::Request do
 
   end
 
-  describe "#to_hash" do
+  describe "#to_json" do
 
-    subject { server_request.to_hash }
+    subject { server_request.to_json }
 
-    describe "supporting creating a JSON representation of the result" do
-
-      it "contains the requests uri" do
-        expect(subject).to include(uri: server_request.uri)
-      end
-
-      it "contains the requests method" do
-        expect(subject).to include(method: server_request.method)
-      end
+    it "contains the requests uri" do
+      expect(subject).to include_in_json(uri: server_request.uri)
+    end
 
-      it "contains the requests headers" do
-        expect(subject).to include(headers: server_request.headers)
-      end
+    it "contains the requests method" do
+      expect(subject).to include_in_json(method: server_request.method)
+    end
 
-      it "contains the requests parameters" do
-        expect(subject).to include(parameters: server_request.parameters)
-      end
+    it "contains the requests headers" do
+      expect(subject).to include_in_json(headers: server_request.headers)
+    end
 
-      it "contains the requests body" do
-        expect(subject).to include(body: server_request.body)
-      end
+    it "contains the requests parameters" do
+      expect(subject).to include_in_json(parameters: server_request.parameters)
+    end
 
+    it "contains the requests body" do
+      expect(subject).to include_in_json(body: server_request.body)
     end
 
   end

data/spec/lib/http_stub/server/stub/match/match_spec.rb

@@ -121,24 +121,20 @@ describe HttpStub::Server::Stub::Match::Match do
 
   end
 
-  describe "#to_hash" do
+  describe "#to_json" do
 
-    subject { match.to_hash }
+    subject { match.to_json }
 
-    describe "supporting creating a JSON representation of the result" do
-
-      it "contains the matching request" do
-        expect(subject).to include(request: request)
-      end
-
-      it "contains the served response" do
-        expect(subject).to include(response: response)
-      end
+    it "contains the matching request" do
+      expect(subject).to include_in_json(request: request)
+    end
 
-      it "contains the matched stub" do
-        expect(subject).to include(stub: stub)
-      end
+    it "contains the served response" do
+      expect(subject).to include_in_json(response: response)
+    end
 
+    it "contains the matched stub" do
+      expect(subject).to include_in_json(stub: stub)
     end
 
   end

data/spec/lib/http_stub/server/stub/match/rules_spec.rb

@@ -214,32 +214,28 @@ describe HttpStub::Server::Stub::Match::Rules do
 
   end
 
-  describe "#to_hash" do
+  describe "#to_json" do
 
-    subject { match_rules.to_hash }
+    subject { match_rules.to_json }
 
-    describe "supporting creating a JSON representation of the stub" do
-
-      it "contains the rules uri" do
-        expect(subject).to include(uri: match_rules.uri)
-      end
-
-      it "contains the rules method" do
-        expect(subject).to include(method: match_rules.method)
-      end
+    it "contains the rules uri" do
+      expect(subject).to include_in_json(uri: match_rules.uri)
+    end
 
-      it "contains the rules headers" do
-        expect(subject).to include(headers: match_rules.headers)
-      end
+    it "contains the rules method" do
+      expect(subject).to include_in_json(method: match_rules.method)
+    end
 
-      it "contains the rules parameters" do
-        expect(subject).to include(parameters: match_rules.parameters)
-      end
+    it "contains the rules headers" do
+      expect(subject).to include_in_json(headers: match_rules.headers)
+    end
 
-      it "contains the rules body" do
-        expect(subject).to include(body: match_rules.body)
-      end
+    it "contains the rules parameters" do
+      expect(subject).to include_in_json(parameters: match_rules.parameters)
+    end
 
+    it "contains the rules body" do
+      expect(subject).to include_in_json(body: match_rules.body)
     end
 
   end

data/spec/lib/http_stub/server/stub/response/base_spec.rb

@@ -190,20 +190,26 @@ describe HttpStub::Server::Stub::Response::Base do
 
     subject { response.to_hash }
 
-    describe "supporting creating a JSON representation of the response" do
+    it "contains the responses status" do
+      expect(subject).to include(status: response.status)
+    end
 
-      it "contains the responses status" do
-        expect(subject).to include(status: response.status)
-      end
+    it "contains the responses headers" do
+      expect(subject).to include(headers: response.headers)
+    end
 
-      it "contains the responses headers" do
-        expect(subject).to include(headers: response.headers)
-      end
+    it "contains the responses delay in seconds" do
+      expect(subject).to include(delay_in_seconds: response.delay_in_seconds)
+    end
 
-      it "contains the responses delay in seconds" do
-        expect(subject).to include(delay_in_seconds: response.delay_in_seconds)
-      end
+  end
+
+  describe "#to_json" do
+
+    subject { response.to_json }
 
+    it "is the JSON representation of the responses hash" do
+      expect(subject).to eql(response.to_hash.to_json)
     end
 
   end

data/spec/lib/http_stub/server/stub/response/file_spec.rb

@@ -184,16 +184,12 @@ describe HttpStub::Server::Stub::Response::File do
 
     subject { response_file.to_hash }
 
-    describe "supporting creating a JSON representation of the response" do
-
-      it "contains the files uri" do
-        expect(subject).to include(file_uri: response_file.uri)
-      end
-
-      it "contains the standard response attributes" do
-        expect(subject).to include(headers: response_file.headers)
-      end
+    it "contains the files uri" do
+      expect(subject).to include(file_uri: response_file.uri)
+    end
 
+    it "contains the standard response elements" do
+      expect(subject).to include(headers: response_file.headers)
     end
 
   end

data/spec/lib/http_stub/server/stub/response/text_spec.rb

@@ -169,16 +169,12 @@ describe HttpStub::Server::Stub::Response::Text do
 
     subject { response_text.to_hash }
 
-    describe "supporting creating a JSON representation of the response" do
-
-      it "contains the responses body" do
-        expect(subject).to include(body: response_text.body)
-      end
-
-      it "contains the standard response attributes" do
-        expect(subject).to include(headers: response_text.headers)
-      end
+    it "contains the responses body" do
+      expect(subject).to include(body: response_text.body)
+    end
 
+    it "contains the standard response elements" do
+      expect(subject).to include(headers: response_text.headers)
     end
 
   end

data/spec/lib/http_stub/server/stub/stub_spec.rb

@@ -175,32 +175,28 @@ describe HttpStub::Server::Stub::Stub do
 
   end
 
-  describe "#to_hash" do
+  describe "#to_json" do
 
-    subject { the_stub.to_hash }
+    subject { the_stub.to_json }
 
-    describe "supporting creating a JSON representation of the stub" do
-
-      it "contains the stubs id" do
-        expect(subject).to include(id: stub_id)
-      end
-
-      it "contains the stubs uri" do
-        expect(subject).to include(uri: the_stub.uri)
-      end
+    it "contains the stubs id" do
+      expect(subject).to include_in_json(id: stub_id)
+    end
 
-      it "contains the stubs match rules" do
-        expect(subject).to include(match_rules: the_stub.match_rules)
-      end
+    it "contains the stubs uri" do
+      expect(subject).to include_in_json(uri: the_stub.uri)
+    end
 
-      it "contains the stubs response" do
-        expect(subject).to include(response: the_stub.response)
-      end
+    it "contains the stubs match rules" do
+      expect(subject).to include_in_json(match_rules: the_stub.match_rules)
+    end
 
-      it "contains the stubs triggers" do
-        expect(subject).to include(triggers: the_stub.triggers)
-      end
+    it "contains the stubs response" do
+      expect(subject).to include_in_json(response: the_stub.response)
+    end
 
+    it "contains the stubs triggers" do
+      expect(subject).to include_in_json(triggers: the_stub.triggers)
     end
 
   end

data/spec/lib/http_stub/server/stub/triggers_spec.rb

@@ -41,16 +41,21 @@ describe HttpStub::Server::Stub::Triggers do
 
   end
 
-  describe "#as_json" do
+  describe "#to_json" do
 
-    let(:stub_hashes) { (1..stubs_for_triggers.length).map { |i| { "stub_#{i}" => "value #{i}" } } }
+    let(:json_for_stubs)        { (1..stubs_for_triggers.length).map { |i| "stub #{i} json" } }
+    let(:quoted_json_for_stubs) { json_for_stubs.map(&:to_json) }
+
+    subject { stub_triggers.to_json }
 
     before(:example) do
-      stubs_for_triggers.zip(stub_hashes).each { |stub, hash| allow(stub).to receive(:to_hash).and_return(hash) }
+      stubs_for_triggers.zip(quoted_json_for_stubs).each do |stub, json|
+        allow(stub).to receive(:to_json).and_return(json)
+      end
     end
 
-    it "returns an array containing the hash representation of each stub" do
-      expect(stub_triggers.as_json).to eql(stub_hashes)
+    it "returns a JSON array containing the JSON representation of each stub" do
+      expect(subject).to eql(json_for_stubs.to_json)
     end
 
   end

data/spec/spec_helper.rb

@@ -33,6 +33,7 @@ module HttpStub
 
 end
 
+require_relative 'support/include_in_json'
 require_relative 'support/cross_origin_server/integration'
 require_relative 'support/cross_origin_server/index_page'
 require_relative 'support/http_stub/server/request_fixture'

data/spec/support/include_in_json.rb

@@ -0,0 +1,19 @@
+RSpec::Matchers.define :include_in_json do |expected_hash|
+
+  match do |actual_json|
+    actual_json.include?(expected_hash.to_json[1..-2])
+  end
+
+  failure_message do |actual_json|
+    "expected the JSON #{actual_json} to include #{expected_hash.to_json}"
+  end
+
+  failure_message_when_negated do |actual_json|
+    "expected the JSON #{actual_json} to exclude #{expected_hash.to_json}"
+  end
+
+  description do
+    "include JSON"
+  end
+
+end

data/spec/tmp/log/json_stub_console.log

@@ -0,0 +1,25 @@
+[2016-08-10 14:43:30] INFO  WEBrick 1.3.1
+[2016-08-10 14:43:30] INFO  ruby 2.3.1 (2016-04-26) [x86_64-darwin15]
+== Sinatra (v1.4.7) has taken the stage on 8006 for test with backup from WEBrick
+[2016-08-10 14:43:30] INFO  WEBrick::HTTPServer#start: pid=938 port=8006
+I, [2016-08-10T14:43:31.660265 #938]  INFO -- : Finding stub matching: #<HttpStub::Server::Request::Request:0x007fd9e61670c0>
+I, [2016-08-10T14:43:31.660336 #938]  INFO -- : Registered stub miss: #<HttpStub::Server::Stub::Match::Miss:0x007fd9e615df70>
+127.0.0.1 - - [10/Aug/2016:14:43:31 +1000] "GET / HTTP/1.1" 404 9 0.0078
+127.0.0.1 - - [10/Aug/2016:14:43:31 AEST] "GET / HTTP/1.1" 404 9
+- -> /
+I, [2016-08-10T14:43:31.673732 #938]  INFO -- : Registered stub: {"id"=>"16f8622e-316c-434e-b8e3-c920e7a50292", "uri"=>"/some_resource", "method"=>"get", "headers"=>{}, "parameters"=>{}, "body"=>{}, "response"=>{"status"=>200, "headers"=>{"content-type"=>"application/json"}, "body"=>"[{\"data\":{\"in_json\":\"some value in json\"},\"not_in_json\":\"some value not in json\"}]", "delay_in_seconds"=>""}, "triggers"=>[], "base_uri"=>"http://localhost:8006"}
+127.0.0.1 - - [10/Aug/2016:14:43:31 +1000] "POST /http_stub/stubs HTTP/1.1" 200 2 0.0023
+127.0.0.1 - - [10/Aug/2016:14:43:31 AEST] "POST /http_stub/stubs HTTP/1.1" 200 2
+- -> /http_stub/stubs
+127.0.0.1 - - [10/Aug/2016:14:43:31 +1000] "POST /http_stub/stubs/memory HTTP/1.1" 200 2 0.0004
+127.0.0.1 - - [10/Aug/2016:14:43:31 AEST] "POST /http_stub/stubs/memory HTTP/1.1" 200 2
+- -> /http_stub/stubs/memory
+127.0.0.1 - - [10/Aug/2016:14:43:36 +1000] "GET /http_stub/stubs HTTP/1.1" 200 1738 0.0113
+127.0.0.1 - - [10/Aug/2016:14:43:36 AEST] "GET /http_stub/stubs HTTP/1.1" 200 1738
+- -> /http_stub/stubs
+127.0.0.1 - - [10/Aug/2016:14:43:36 +1000] "GET /jquery-2.2.4.min.js HTTP/1.1" 304 - 0.0003
+127.0.0.1 - - [10/Aug/2016:14:43:36 AEST] "GET /jquery-2.2.4.min.js HTTP/1.1" 304 0
+http://localhost:8006/http_stub/stubs -> /jquery-2.2.4.min.js
+127.0.0.1 - - [10/Aug/2016:14:43:36 +1000] "GET /application.css HTTP/1.1" 200 904 0.0091
+127.0.0.1 - - [10/Aug/2016:14:43:36 AEST] "GET /application.css HTTP/1.1" 200 904
+http://localhost:8006/http_stub/stubs -> /application.css

data/spec/tmp/pids/json_stub.pid

@@ -0,0 +1 @@
+938

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_stub
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.25.1
 platform: ruby
 authors:
 - dueckes
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -443,6 +443,7 @@ files:
 - "./spec/lib/http_stub/extensions/core/hash/with_indifferent_and_insensitive_access_spec.rb"
 - "./spec/lib/http_stub/extensions/core/hash_spec.rb"
 - "./spec/lib/http_stub/extensions/rack/handler_spec.rb"
+- "./spec/lib/http_stub/json_spec.rb"
 - "./spec/lib/http_stub/rake/server_daemon_tasks_smoke_spec.rb"
 - "./spec/lib/http_stub/rake/server_tasks_smoke_spec.rb"
 - "./spec/lib/http_stub/rake/server_tasks_spec.rb"
@@ -524,6 +525,9 @@ files:
 - "./spec/support/http_stub/server_integration.rb"
 - "./spec/support/http_stub/stub_fixture.rb"
 - "./spec/support/http_stub/stub_registrator.rb"
+- "./spec/support/include_in_json.rb"
+- "./spec/tmp/log/json_stub_console.log"
+- "./spec/tmp/pids/json_stub.pid"
 homepage: http://github.com/MYOB-Technology/http_stub
 licenses:
 - MIT
@@ -544,7 +548,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: http_stub
-rubygems_version: 2.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A HTTP Server replaying configured stub responses
@@ -595,6 +599,7 @@ test_files:
 - "./spec/lib/http_stub/extensions/core/hash/with_indifferent_and_insensitive_access_spec.rb"
 - "./spec/lib/http_stub/extensions/core/hash_spec.rb"
 - "./spec/lib/http_stub/extensions/rack/handler_spec.rb"
+- "./spec/lib/http_stub/json_spec.rb"
 - "./spec/lib/http_stub/rake/server_daemon_tasks_smoke_spec.rb"
 - "./spec/lib/http_stub/rake/server_tasks_smoke_spec.rb"
 - "./spec/lib/http_stub/rake/server_tasks_spec.rb"
@@ -676,3 +681,6 @@ test_files:
 - "./spec/support/http_stub/server_integration.rb"
 - "./spec/support/http_stub/stub_fixture.rb"
 - "./spec/support/http_stub/stub_registrator.rb"
+- "./spec/support/include_in_json.rb"
+- "./spec/tmp/log/json_stub_console.log"
+- "./spec/tmp/pids/json_stub.pid"