pact-message 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef9df4e508dca614f25914df88e80e1871316975
-  data.tar.gz: 93bdc495602316c7b62b0a4b40ec356162f03a60
+  metadata.gz: c298a5c26b7e2525401462a2e295bc3b8e7e176c
+  data.tar.gz: a442288d24e1a72fdb9a55add17e14649007e08e
 SHA512:
-  metadata.gz: bb5765686e2fab5838b7a92b6872a231f70d928849f94bc4c397f44a019ef09a41bf0221eddc12c04f591f92ce11a053002e206629ed2874fded5a579d43b35c
-  data.tar.gz: 5546f4ae753b1590d8f13efcfe8951b8496bc2e3a647410b1266f285bfad034df6aa17b91ddd0be96c0966576dbaf5e86dd6e1d4db940d4bbb99fd88470b90ef
+  metadata.gz: d6c93d26c1f87d02abda79a409f3bfc782864a54bc837599df28a0030dcdd41639dd9877df22b4e59ef12154698d94008534ac0abcc940314e8ef9d4a0ce7482
+  data.tar.gz: b88265f0b0dbf1f0974eb17ee55ef2edad26c6c79646cf7d626460a5a7ff118d9c522ba59215a6d6a437503b6feb7273c48e958e5ec1d9fb7b25f51d9e6f1abc

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+<a name="v0.4.3"></a>
+### v0.4.3 (2018-05-06)
+
+
+#### Features
+
+* **version**
+  * add version command to CLI, fixes #10	 ([f928248](/../../commit/f928248))
+
+
+#### Bug Fixes
+
+* **content**
+  * rename message content -> contents. fixes #9	 ([0908962](/../../commit/0908962))
+
+
 <a name="v0.4.1"></a>
 ### v0.4.1 (2018-04-05)
 

data/lib/pact/consumer_contract/message.rb

@@ -1,11 +1,11 @@
-require 'pact/consumer_contract/message/content'
+require 'pact/consumer_contract/message/contents'
 require 'pact/symbolize_keys'
 require 'pact/shared/active_support_support'
 require 'pact/matching_rules'
 require 'pact/errors'
 require 'pact/consumer/request'
 require 'pact/consumer_contract/response'
-require 'pact/consumer_contract/message/content'
+require 'pact/consumer_contract/message/contents'
 
 module Pact
   class ConsumerContract
@@ -13,12 +13,12 @@ module Pact
       include Pact::ActiveSupportSupport
       include Pact::SymbolizeKeys
 
-        attr_accessor :description, :content, :provider_state, :metadata
+        attr_accessor :description, :contents, :provider_state, :metadata
 
         def initialize attributes = {}
           @description = attributes[:description]
           @provider_state = attributes[:provider_state] || attributes[:providerState]
-          @content = attributes[:content]
+          @contents = attributes[:contents]
           @metadata = attributes[:metadata]
         end
 
@@ -27,21 +27,21 @@ module Pact
           unless opts[:pact_specification_version]
             opts[:pact_specification_version] = Pact::SpecificationVersion::NIL_VERSION
           end
-          content_matching_rules = hash['matchingRules'] && hash['matchingRules']['body']
-          content_hash = Pact::MatchingRules.merge(hash['content'], content_matching_rules, opts)
-          content = Pact::ConsumerContract::Message::Content.from_hash(content_hash)
+          contents_matching_rules = hash['matchingRules'] && hash['matchingRules']['body']
+          contents_hash = Pact::MatchingRules.merge(hash['contents'], contents_matching_rules, opts)
+          contents = Pact::ConsumerContract::Message::Contents.from_hash(contents_hash)
           metadata = hash['metaData']
           provider_state = hash['providerStates'] && hash['providerStates'].first && hash['providerStates'].first['name']
           warn_if_multiple_provider_states(provider_state, hash)
           warn_if_params_used_in_provider_states(hash)
-          new(symbolize_keys(hash).merge(content: content, provider_state: provider_state, metadata: metadata))
+          new(symbolize_keys(hash).merge(contents: contents, provider_state: provider_state, metadata: metadata))
         end
 
         def to_hash
           {
             description: description,
             provider_states: [{ name: provider_state }],
-            content: content.to_hash,
+            contents: contents.to_hash,
             metadata: metadata
           }
         end
@@ -68,7 +68,7 @@ module Pact
             status: 200,
             headers: {'Content-Type' => 'application/json'},
             body: {
-              content: content
+              contents: contents
             }
           )
         end
@@ -82,7 +82,7 @@ module Pact
         end
 
         def validate!
-          raise Pact::InvalidMessageError.new(self) unless description && content
+          raise Pact::InvalidMessageError.new(self) unless description && contents
         end
 
         def == other

data/lib/pact/consumer_contract/message/contents.rb

@@ -0,0 +1,49 @@
+module Pact
+  class ConsumerContract
+    class Message
+      class Contents
+        include ActiveSupportSupport
+        include SymbolizeKeys
+
+        # Could technically be an array
+        def self.from_hash contents, options = {}
+          new(contents)
+        end
+
+        def initialize contents
+          @contents = contents
+        end
+
+        def to_s
+          if @contents.is_a?(Hash) || @contents.is_a?(Array)
+            @contents.to_json
+          else
+            @contents.to_s
+          end
+        end
+
+        def contents
+          @contents
+        end
+
+        def as_json
+          @contents
+        end
+      end
+    end
+  end
+end
+
+module Pact
+  module Message
+    class Contents
+      def self.new *args
+        Pact::ConsumerContract::Message::Contents.new(*args)
+      end
+
+      def self.from_hash *args
+        Pact::ConsumerContract::Message::Contents.from_hash(*args)
+      end
+    end
+  end
+end

data/lib/pact/message/cli.rb

@@ -23,6 +23,11 @@ module Pact
         require 'pact/support'
         puts Pact::Reification.from_term(JSON.load(json)).to_json
       end
+
+      def version
+        require 'pact/message/version.rb'
+        puts Pact::Message::VERSION
+      end
     end
   end
 end

data/lib/pact/message/consumer/consumer_contract_builder.rb

@@ -23,11 +23,11 @@ module Pact
 
         def send_message
           # TODO handle matchers
-          yield @content_string if block_given?
+          yield @contents_string if block_given?
         end
 
         def handle_interaction_fully_defined(interaction)
-          @content_string = interaction.content.to_s
+          @contents_string = interaction.contents.to_s
           @interactions << interaction
           @interaction_builder = nil
           # TODO pull these from pact config

data/lib/pact/message/consumer/interaction_builder.rb

@@ -28,7 +28,7 @@ module Pact
         end
 
         def with_content(object)
-          interaction.content = Pact::Message::Content.from_hash(object)
+          interaction.contents = Pact::Message::Contents.from_hash(object)
           @callback.call interaction
           self
         end

data/lib/pact/message/consumer/interaction_decorator.rb

@@ -15,7 +15,7 @@ module Pact
         def as_json options = {}
           hash = { :description => message.description }
           hash[:providerStates] = provider_states if message.provider_state
-          hash[:content] = extract_content
+          hash[:contents] = extract_contents
           hash[:matchingRules] = extract_matching_rules
           fix_all_the_things hash
         end
@@ -28,12 +28,12 @@ module Pact
 
         attr_reader :message
 
-        def decorate_content
-          message.content.as_json
+        def decorate_contents
+          message.contents.as_json
         end
 
-        def extract_content
-          Pact::Reification.from_term(message.content.content)
+        def extract_contents
+          Pact::Reification.from_term(message.contents.contents)
         end
 
         def provider_states
@@ -42,7 +42,7 @@ module Pact
 
         def extract_matching_rules
           {
-            body: Pact::MatchingRules.extract(message.content.content, pact_specification_version: pact_specification_version)
+            body: Pact::MatchingRules.extract(message.contents.contents, pact_specification_version: pact_specification_version)
           }
         end
 

data/lib/pact/message/consumer_contract_parser.rb

@@ -1,6 +1,6 @@
 require 'pact/consumer_contract'
 require 'pact/consumer_contract/message'
-require 'pact/consumer_contract/message/content'
+require 'pact/consumer_contract/message/contents'
 
 module Pact
   module Message

data/lib/pact/message/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Message
-    VERSION = "0.4.1"
+    VERSION = "0.4.3"
   end
 end

data/script/update-pact.sh

@@ -5,7 +5,7 @@ bundle exec bin/pact-message update '{
       "name": "an alligator named Mary exists"
     }
   ],
-  "content": {
+  "contents": {
     "name": {
       "contents": "Mary",
       "json_class": "Pact::SomethingLike"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pact-message
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Beth Skurrie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pact-support
@@ -161,7 +161,7 @@ files:
 - bin/pact-message
 - bin/setup
 - lib/pact/consumer_contract/message.rb
-- lib/pact/consumer_contract/message/content.rb
+- lib/pact/consumer_contract/message/contents.rb
 - lib/pact/message.rb
 - lib/pact/message/cli.rb
 - lib/pact/message/consumer/configuration.rb

data/lib/pact/consumer_contract/message/content.rb

@@ -1,49 +0,0 @@
-module Pact
-  class ConsumerContract
-    class Message
-      class Content
-        include ActiveSupportSupport
-        include SymbolizeKeys
-
-        # Could technically be an array
-        def self.from_hash content, options = {}
-          new(content)
-        end
-
-        def initialize content
-          @content = content
-        end
-
-        def to_s
-          if @content.is_a?(Hash) || @content.is_a?(Array)
-            @content.to_json
-          else
-            @content.to_s
-          end
-        end
-
-        def content
-          @content
-        end
-
-        def as_json
-          @content
-        end
-      end
-    end
-  end
-end
-
-module Pact
-  module Message
-    class Content
-      def self.new *args
-        Pact::ConsumerContract::Message::Content.new(*args)
-      end
-
-      def self.from_hash *args
-        Pact::ConsumerContract::Message::Content.from_hash(*args)
-      end
-    end
-  end
-end