pact-support 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmE3YmExODMzYzc4ODljOWNiMjQ5NTZmMjFlYjUwYjBkZmZjNTY1Zg==
+    NWE0OThiMTk0ZTVjOTU1YWE5MGZmODZiZDM2MjIzNTc3M2YwYTZhYw==
   data.tar.gz: !binary |-
-    MGYzMWNkOTU5M2MxOWQwMzY2Mzg2NTI4YWMyNWM2ZTVhN2QxOTBlMA==
+    NGE1ZmFlOGY4M2NjZTUyMTMxODhhYzNkODU0YmU4ZjY2OGNiYWEwMw==
 SHA512:
   metadata.gz: !binary |-
-    NmM1ZjFlODEwNTlmNzM3ZTU2NjM1ZmJkOWI4OGQ0YjE4NjlkNDMwNThiZjI3
-    MDZhZDIzMDk4NTBmZDY2Y2EzZThjYjViMWVhM2FlNDVmMTVhNmY3YjU2NGM1
-    M2JlY2IzNzRkZDM4OGQ3NzhjOGIwYWE4YmI1YmE3N2Y2MmI0ZmM=
+    M2QzYmJlY2M5MzJjMWQwY2RiOTRlNDBhMWRkYTc2MDc4Mjk3MjY4NDIzZWYw
+    Zjc3ODE5OWJhN2JiYzk5MDU0NzI2YWI0Mjg4YmUwMmQ0NjhhZWVmMTEwZDI2
+    NDNlOTYzYjI2NmQ4YWM4YTVlMTQ2NDlmMWFkOTE5OTAzOWVhYWY=
   data.tar.gz: !binary |-
-    YjJiOGEwMmJmOGNmZjczMjY4MDU3ZDE2NzY3NmQ2NDMwZTVkN2FlYzA1MzZk
-    MmQ5MGMyNDdlNDg5YmE0MzA2N2M2ODg2ZDI3YzQ2MjI2NTI4Y2QxYWI5ZmE5
-    OTY2YTJlNWEzMGVmNzliYzI4ZmUwNzQ2MDFlM2M1OWQ0YmMwNGI=
+    YTBlNGY3YWQ2MzViNjgwNTdiODI2YzM0MzNiMGJiOTAxNTkyOTVmNzAzZTQw
+    OWY4YTA5YTAwYmZjNTZhZWQ4MmU3Y2NkZmNlNjJkZjcxYWUyNWY4NmUxNzY3
+    ODFkODcxNjkxYjZiZjhkNTFmZTJlOWM0NThjZDAyYTEzZGUyMWI=

data/CHANGELOG.md

@@ -2,3 +2,12 @@ Do this to generate your change history
 
   git log --pretty=format:'  * %h - %s (%an, %ad)'
 
+### 0.0.2 (12 October 2014)
+
+  * e7080fe - Added a QueryString class in preparation for a QueryHash class (Beth, Sun Oct 12 14:32:15 2014 +1100)
+  * 8839151 - Added Travis config (Beth, Sun Oct 12 12:31:44 2014 +1100)
+  * 81ade54 - Removed CLI (Beth, Sun Oct 12 12:29:22 2014 +1100)
+  * 3bdde98 - Removing unused files (Beth, Sun Oct 12 12:11:48 2014 +1100)
+  * ef95717 - Made it build (Beth, Sat Oct 11 13:24:35 2014 +1100)
+  * 1e78b62 - Removed pact-test.rake (Beth, Sat Oct 11 13:20:49 2014 +1100)
+  * 3389b5e - Initial commit (Beth, Sat Oct 11 13:13:23 2014 +1100)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pact-support (0.0.1)
+    pact-support (0.0.2)
       awesome_print (~> 1.1)
       find_a_port (~> 1.0.1)
       json

data/lib/pact/consumer_contract/query_string.rb

@@ -0,0 +1,52 @@
+require 'pact/shared/active_support_support'
+require 'pact/matchers'
+
+module Pact
+  class QueryString
+
+    include ActiveSupportSupport
+    include Pact::Matchers
+
+    def initialize query
+      @query = query.nil? ? query : query.dup
+    end
+
+    def as_json opts = {}
+      @query
+    end
+
+    def to_json opts = {}
+      as_json(opts).to_json(opts)
+    end
+
+    def eql? other
+      self == other
+    end
+
+    def == other
+      QueryString === other && other.query == query
+    end
+
+    def difference(other)
+      diff(query, other.query)
+    end
+
+    def query
+      @query
+    end
+
+    def to_s
+      @query
+    end
+
+    def empty?
+      @query && @query.empty?
+    end
+
+    # Naughty...
+    def nil?
+      @query.nil?
+    end
+
+  end
+end

data/lib/pact/consumer_contract/request.rb

@@ -35,16 +35,22 @@ module Pact
       end
 
       def difference(actual_request)
-        request_diff = diff(to_hash_without_body, actual_request.to_hash_without_body)
-        unless body.is_a? NullExpectation
-          request_diff.merge(body_difference(actual_request.body))
-        else
-          request_diff
-        end
+        request_diff = diff(to_hash_without_body_or_query, actual_request.to_hash_without_body_or_query)
+        request_diff.merge!(query_diff(actual_request.query))
+        request_diff.merge!(body_diff(actual_request.body))
       end
 
       protected
 
+      def query_diff actual_query
+        if specified?(:query)
+          query_diff = query.difference(actual_query)
+          query_diff.any? ? {query: query_diff} : {}
+        else
+          {}
+        end
+      end
+
       def self.key_not_found
         Pact::NullExpectation.new
       end
@@ -59,8 +65,12 @@ module Pact
         DEFAULT_OPTIONS.merge(symbolize_keys(options))
       end
 
-      def body_difference(actual_body)
-        body_differ.call({:body => body}, {body: actual_body}, allow_unexpected_keys: runtime_options[:allow_unexpected_keys_in_body])
+      def body_diff(actual_body)
+        if specified?(:body)
+          body_differ.call({:body => body}, {body: actual_body}, allow_unexpected_keys: runtime_options[:allow_unexpected_keys_in_body])
+        else
+          {}
+        end
       end
 
       def body_differ

data/lib/pact/reification.rb

@@ -19,6 +19,8 @@ module Pact
         end
       when Pact::Request::Base
         from_term(term.to_hash)
+      when Pact::QueryString
+        from_term(term.query)
       else
         term
       end

data/lib/pact/shared/request.rb

@@ -1,6 +1,7 @@
 require 'pact/matchers'
 require 'pact/symbolize_keys'
 require 'pact/consumer_contract/headers'
+require 'pact/consumer_contract/query_string'
 
 module Pact
 
@@ -18,7 +19,7 @@ module Pact
         @path = path.chomp('/')
         @headers = Hash === headers ? Headers.new(headers) : headers # Could be a NullExpectation - TODO make this more elegant
         @body = body
-        @query = query
+        @query = is_unspecified?(query) ? query : Pact::QueryString.new(query)
       end
 
       def to_json(options = {})
@@ -74,11 +75,15 @@ module Pact
       end
 
       def specified? key
-        !(self.send(key).is_a? self.class.key_not_found.class)
+        !is_unspecified?(self.send(key))
       end
 
-      def to_hash_without_body
-        keep_keys = [:method, :path, :headers, :query]
+      def is_unspecified? value
+        value.is_a? self.class.key_not_found.class
+      end
+
+      def to_hash_without_body_or_query
+        keep_keys = [:method, :path, :headers]
         as_json.reject{ |key, value| !keep_keys.include? key }.tap do | hash |
           hash[:method] = method.upcase
         end

data/lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/spec/lib/pact/consumer_contract/query_string_spec.rb

@@ -0,0 +1,131 @@
+require 'spec_helper'
+require 'pact/consumer_contract/query_string'
+
+module Pact
+  describe QueryString do
+
+    subject { QueryString.new(query) }
+
+    context "when the query a Pact::Term" do
+
+      let(:query) { Pact::Term.new(generate: "param=thing", matcher: /param=.*/) }
+
+      describe "#as_json" do
+        it "returns the query as a string" do
+          expect(subject.as_json).to eq query
+        end
+      end
+
+      describe "#to_json" do
+        it "returns the query as JSON" do
+          expect(subject.to_json).to eq query.to_json
+        end
+      end
+
+      describe "#==" do
+        context "when the query is not an identical string match" do
+          let(:other) { QueryString.new("param=thing2")}
+          it "returns false" do
+            expect(subject == other).to be false
+          end
+        end
+
+        context "when the query is an identical string match" do
+          let(:other) { QueryString.new(query) }
+          it "returns true" do
+            expect(subject == other).to be true
+          end
+        end
+      end
+
+      describe "#to_s" do
+        it "returns the query string" do
+          expect(subject.to_s).to eq query
+        end
+      end
+
+    end
+
+    context "when the query is not nil" do
+
+      let(:query) { "param=thing" }
+
+      describe "#as_json" do
+        it "returns the query as a string" do
+          expect(subject.as_json).to eq query
+        end
+      end
+
+      describe "#to_json" do
+        it "returns the query as JSON" do
+          expect(subject.to_json).to eq query.to_json
+        end
+      end
+
+      describe "#==" do
+        context "when the query is not an identical string match" do
+          let(:other) { QueryString.new("param=thing2")}
+          it "returns false" do
+            expect(subject == other).to be false
+          end
+        end
+
+        context "when the query is an identical string match" do
+          let(:other) { QueryString.new(query) }
+          it "returns true" do
+            expect(subject == other).to be true
+          end
+        end
+      end
+
+      describe "#to_s" do
+        it "returns the query string" do
+          expect(subject.to_s).to eq query
+        end
+      end
+
+    end
+
+    context "when the query is nil" do
+
+      let(:query) { nil }
+
+      describe "#as_json" do
+        it "returns the query as a string" do
+          expect(subject.as_json).to eq query
+        end
+      end
+
+      describe "#to_json" do
+        it "returns the query as JSON" do
+          expect(subject.to_json).to eq query.to_json
+        end
+      end
+
+      describe "#==" do
+        context "when the query is not an identical string match" do
+          let(:other) { QueryString.new("param=thing2")}
+          it "returns false" do
+            expect(subject == other).to be false
+          end
+        end
+
+        context "when the query is an identical string match" do
+          let(:other) { QueryString.new(query) }
+          it "returns true" do
+            expect(subject == other).to be true
+          end
+        end
+      end
+
+      describe "#to_s" do
+        it "returns the query string" do
+          expect(subject.to_s).to eq query
+        end
+      end
+
+    end
+
+
+  end
+end

data/spec/lib/pact/consumer_contract/request_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'pact/consumer_contract/request'
-require 'support/shared_examples_for_request'
 require 'pact/consumer/request'
+require 'support/shared_examples_for_request'
 
 module Pact
 

data/spec/lib/pact/reification_spec.rb

@@ -63,5 +63,17 @@ module Pact
 
     end
 
+    context "when Query" do
+
+      let(:query) { QueryString.new(Pact::Term.new(generate: "param=thing", matcher: /param=.*/)) }
+
+      subject { Reification.from_term(query)}
+
+      it "returns the contents of the generate" do
+        expect(subject).to eq("param=thing")
+      end
+
+    end
+
   end
 end

data/spec/support/shared_examples_for_request.rb

@@ -72,7 +72,7 @@ shared_examples "a request" do
     end
 
     it "extracts the query" do
-      expect(subject.query).to eq 'query'
+      expect(subject.query).to eq Pact::QueryString.new('query')
     end
 
     it "blows up if method is absent" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - James Fraser
@@ -238,6 +238,7 @@ files:
 - lib/pact/consumer_contract/headers.rb
 - lib/pact/consumer_contract/interaction.rb
 - lib/pact/consumer_contract/pact_file.rb
+- lib/pact/consumer_contract/query_string.rb
 - lib/pact/consumer_contract/request.rb
 - lib/pact/consumer_contract/response.rb
 - lib/pact/consumer_contract/service_consumer.rb
@@ -282,6 +283,7 @@ files:
 - spec/lib/pact/consumer_contract/consumer_contract_spec.rb
 - spec/lib/pact/consumer_contract/headers_spec.rb
 - spec/lib/pact/consumer_contract/interaction_spec.rb
+- spec/lib/pact/consumer_contract/query_string_spec.rb
 - spec/lib/pact/consumer_contract/request_spec.rb
 - spec/lib/pact/consumer_contract/response_spec.rb
 - spec/lib/pact/matchers/differ_spec.rb
@@ -356,6 +358,7 @@ test_files:
 - spec/lib/pact/consumer_contract/consumer_contract_spec.rb
 - spec/lib/pact/consumer_contract/headers_spec.rb
 - spec/lib/pact/consumer_contract/interaction_spec.rb
+- spec/lib/pact/consumer_contract/query_string_spec.rb
 - spec/lib/pact/consumer_contract/request_spec.rb
 - spec/lib/pact/consumer_contract/response_spec.rb
 - spec/lib/pact/matchers/differ_spec.rb