pacto 0.2.1 → 0.2.2

data/.rspec

@@ -1,4 +1,4 @@
 --colour
 --require spec_helper
---pattern spec/unit/**/*_spec.rb
+--require integration/spec_helper
 --require unit/spec_helper

data/.rspec_integration

@@ -1,4 +1,4 @@
 --colour
 --require spec_helper
---pattern spec/integration/**/*_spec.rb
 --require integration/spec_helper
+--pattern spec/integration/**/*_spec.rb

data/.rspec_unit

@@ -0,0 +1,4 @@
+--colour
+--require spec_helper
+--require unit/spec_helper
+--pattern spec/unit/**/*_spec.rb

data/.travis.yml

@@ -1,3 +1,5 @@
 language: ruby
 rvm:
   - 1.9.3
+env:
+  - CI=true

data/Guardfile

@@ -1,8 +1,16 @@
-guard 'rspec', :cli => '--color --require spec_helper', :version => 2 do
-  watch(%r{^spec/pacto/.+_spec\.rb$})
-  watch(%r{^spec/json/.+_spec\.rb$})
-  watch(%r{^lib/pacto\.rb$})      { |m| "spec" }
-  watch(%r{^lib/json-generator\.rb$}) { |m| "spec" }
-  watch(%r{^lib/(.+)\.rb$})           { |m| "spec/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')        { "spec" }
+guard :rspec do
+  # Unit tests
+  watch(%r{^spec/unit/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})            { |m| "spec/unit/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')         { "spec/unit" }
+  watch('spec/unit/spec_helper.rb')    { "spec/unit" }
+  watch(%r{^spec/unit/data/.+\.json$}) { "spec/unit" }
+
+  # Integration tests
+  watch(%r{^spec/integration/.+_spec\.rb$})
+  watch(%r{^spec/integration/utils/.+\.rb$})  { "spec/integration" }
+  watch(%r{^lib/.+.rb$})                      { "spec/integration" }
+  watch('spec/spec_helper.rb')                { "spec/integration" }
+  watch('spec/integration/spec_helper.rb')    { "spec/integration" }
+  watch(%r{^spec/integration/data/.+\.json$}) { "spec/integration" }
 end

data/Rakefile

@@ -3,8 +3,8 @@ require 'rspec/core/rake_task'
 
 if defined?(RSpec)
   desc "Run unit tests"
-  task :spec do
-    abort unless system('rspec --option .rspec')
+  task :unit do
+    abort unless system('rspec --option .rspec_unit')
   end
 
   desc "Run integration tests"
@@ -12,5 +12,5 @@ if defined?(RSpec)
     abort unless system('rspec --option .rspec_integration')
   end
 
-  task :default => [:spec, :integration]
+  task :default => [:unit, :integration]
 end

data/lib/pacto.rb

@@ -2,7 +2,7 @@ require "pacto/version"
 
 require "httparty"
 require "hash_deep_merge"
-require "json"
+require "yajl/json_gem"
 require "json-schema"
 require "json-generator"
 require "webmock"

data/lib/pacto/response.rb

@@ -22,10 +22,34 @@ module Pacto
       end
       
       if @definition['body']
-        JSON::Validator.fully_validate(@definition['body'], response.body)
+        if @definition['body']['type'] && @definition['body']['type'] == 'string'
+          validate_as_pure_string response.body
+        else
+          validate_as_json response.body
+        end
       else
         []
       end
     end
+    
+    private
+    
+    def validate_as_pure_string response_body
+      errors = []
+      if @definition['body']['required'] && response_body.nil?
+        errors << "The response does not contain a body"
+      end
+      
+      pattern = @definition['body']['pattern']
+      if pattern && !(response_body =~ Regexp.new(pattern))
+        errors << "The response does not match the pattern #{pattern}"
+      end
+      
+      errors
+    end
+    
+    def validate_as_json response_body
+      JSON::Validator.fully_validate(@definition['body'], response_body)
+    end
   end
 end

data/lib/pacto/version.rb

@@ -1,3 +1,3 @@
 module Pacto
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/pacto.gemspec

@@ -13,14 +13,13 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://github.com/thoughtworks/pacto'
   gem.license       = 'MIT'
 
-
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
   gem.add_dependency "webmock"
-  gem.add_dependency "json"
+  gem.add_dependency "yajl-ruby"
   gem.add_dependency "json-schema", "1.0.4"
   gem.add_dependency "json-generator"
   gem.add_dependency "hash-deep-merge"

data/spec/integration/data/simple_contract.json

@@ -1,7 +1,7 @@
 {
   "request": {
     "method": "GET",
-    "path": "/simple_contract.json",
+    "path": "/hello",
     "headers": {
       "Accept": "application/json"
     },
@@ -10,15 +10,12 @@
 
   "response": {
     "status": 200,
-    "headers": {
-      "Content-Type": "application/json"
-    },
+    "headers": { "Content-Type": "application/json" },
     "body": {
       "type": "object",
+      "required": true,
       "properties": {
-        "message": {
-          "type": "string"
-        }
+        "message": { "type": "string", "required": true }
       }
     }
   }

data/spec/integration/e2e_spec.rb

@@ -1,26 +1,38 @@
-describe "Pacto" do
+describe 'Pacto' do
+  let(:contract_path) { 'spec/integration/data/simple_contract.json' }
+
   before :all do
-    @server = DummyServer.new
-    @server.start
+    WebMock.allow_net_connect!
   end
 
-  after :all do
-    @server.terminate
-  end
+  context 'Contract validation' do
+    before :all do
+      @server = DummyServer.new 8000, '/hello', '{"message": "Hello World!"}'
+      @server.start
+    end
 
-  let(:contract_path) { 'spec/integration/data/simple_contract.json' }
-  let(:end_point_address) { 'http://localhost:8000' }
+    after :all do
+      @server.terminate
+    end
 
-  it "validates a contract against a server" do
-    WebMock.allow_net_connect!
-    contract = Pacto.build_from_file(contract_path, end_point_address)
-    contract.validate.should == []
+    it 'verifies the contract against a producer' do
+      contract = Pacto.build_from_file(contract_path, 'http://localhost:8000')
+      contract.validate.should == []
+    end
   end
 
-  pending "generates a mocked response based on a contract specification" do
-    contract = Pacto.build_from_file(contract_path, end_point_address)
-    Pacto.register('my_contract', contract)
-    Pacto.use('my_contract')
+  context 'Stub generation' do
+    it 'generates a stub to be used by a consumer' do
+      contract = Pacto.build_from_file(contract_path, 'http://dummyprovider.com')
+      Pacto.register('my_contract', contract)
+      Pacto.use('my_contract')
+      response.keys.should == ['message']
+      response['message'].should be_kind_of(String)
+    end
 
+    let :response do
+      raw_response = HTTParty.get('http://dummyprovider.com/hello', headers: {'Accept' => 'application/json' })
+      JSON.parse(raw_response.body)
+    end
   end
 end

data/spec/integration/utils/dummy_server.rb

@@ -14,11 +14,11 @@ class Servlet < WEBrick::HTTPServlet::AbstractServlet
 end
 
 class DummyServer
-  def initialize
-    @server = WEBrick::HTTPServer.new :Port => 8000,
+  def initialize port, path, response
+    @server = WEBrick::HTTPServer.new :Port => port,
       :AccessLog => [],
       :Logger => WEBrick::Log::new("/dev/null", 7)
-    @server.mount "/simple_contract.json", Servlet, '{"message": "Hello World!"}'
+    @server.mount path, Servlet, response
   end
 
   def start

data/spec/unit/pacto/response_spec.rb

@@ -1,10 +1,13 @@
 module Pacto
 	describe Response do
+    let(:body_definition) do
+      {:type => "object", :required => true, :properties => double("body definition properties")}
+    end
     let(:definition) do
       {
         'status' => 200,
         'headers' => {'Content-Type' => 'application/json'},
-        'body' => double('definition body')
+        'body' => body_definition
       }
     end
 
@@ -26,11 +29,12 @@ module Pacto
     describe '#validate' do
       let(:status) { 200 }
       let(:headers) { {'Content-Type' => 'application/json', 'Age' => '60'} }
+      let(:response_body) { {'message' => 'response'} }
       let(:fake_response) do
         double({
           :status => status,
           :headers => headers,
-          :body => 'body'
+          :body => response_body
         })
       end
 
@@ -45,6 +49,80 @@ module Pacto
         end
       end
       
+      context 'when body is a pure string and matches the description' do
+        let(:string_required) { true }
+        let(:body_definition) do
+          { 'type' => 'string', 'required' => string_required }
+        end
+        let(:response_body) { "a simple string" }
+        
+        it 'should not validate using JSON Schema' do
+          response = described_class.new(definition)
+          
+          JSON::Validator.should_not_receive(:fully_validate)
+          response.validate(fake_response)
+        end
+        
+        context 'if required' do
+          it 'should not return an error when body is a string' do
+            response = described_class.new(definition)
+          
+            response.validate(fake_response).should == []
+          end
+          
+          it 'should return an error when body is nil' do
+            response = described_class.new(definition)
+            
+            fake_response.stub(:body).and_return(nil)
+            response.validate(fake_response).size.should == 1
+          end
+        end
+        
+        context 'if not required' do
+          let(:string_required) { false }
+          
+          it 'should not return an error when body is a string' do
+            response = described_class.new(definition)
+          
+            response.validate(fake_response).should == []
+          end
+          
+          it 'should not return an error when body is nil' do
+            response = described_class.new(definition)
+            
+            fake_response.stub(:body).and_return(nil)
+            response.validate(fake_response).should == []
+          end
+        end
+        
+        context 'if contains pattern' do
+          let(:body_definition) do
+            { 'type' => 'string', 'required' => string_required, 'pattern' => 'a.c' }
+          end
+          
+          context 'body matches pattern' do
+            let(:response_body) { 'cabcd' }
+            
+            it "should not return an error" do
+              response = described_class.new(definition)
+              
+              response.validate(fake_response).should == []
+            end
+          end
+          
+          context 'body does not match pattern' do
+            let(:response_body) { 'cabscd' }
+            
+            it "should return an error" do
+              response = described_class.new(definition)
+              
+              response.validate(fake_response).size.should == 1
+            end
+          end
+          
+        end
+      end
+      
       context 'when status does not match' do
         let(:status) { 500 }
 

data/spec/unit/spec_helper.rb

@@ -1,2 +1,5 @@
-require 'coveralls'
-Coveralls.wear!
+# Enable Coveralls only on the CI environment
+if ENV['CI']
+  require 'coveralls'
+  Coveralls.wear!
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pacto
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -230,6 +230,7 @@ files:
 - .gitignore
 - .rspec
 - .rspec_integration
+- .rspec_unit
 - .travis.yml
 - Gemfile
 - Guardfile
@@ -278,12 +279,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3258303232236998448
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3258303232236998448
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25