pinch_hitter 0.5.6 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61b0f448b1236a0470c64ffdd3015e536db68cf9
-  data.tar.gz: a451b062d54056d41397a2d187d260bf7ec00162
+  metadata.gz: 0c0e017cec57427c43e8e5d00fdbf6f5824a811d
+  data.tar.gz: 4f08b9678da6946f6775d3bf61c874b081982f21
 SHA512:
-  metadata.gz: b266a49251d14f0adb19d9103f9a750eaec21073f32986723d8687aeb8f331d63fb91b61e6dd4baf559d7f16ce3ab088fa13cc3ef7d79bb00a86fb44d9e459aa
-  data.tar.gz: 664117aff93c40d35fd9b09b1cf5257d35c5050c70869c70ae6df49ef64b9c7f7f96a01653f7b52176d41f7b46bb28e189f2e3b01d821e1901c267c193b5314b
+  metadata.gz: 3132ce9f63afd12c4a4efeb632a8d1d339aba116708f060586090108e3f2d879d1135bf2f35f89122d5c55fe287230c43f333cd1e6f60f50118166e932f5cf99
+  data.tar.gz: b086e13074d4362d6ebd7e910818eaffcb48c9eb1370175970c3fb984f6bba0775437f321132171aa719b743a8092801cc65b5a41bb49137f5632b70ecd72310

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0-p353
+ruby-2.3.1

data/.travis.yml

@@ -1,8 +1,7 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.5
-  - 2.2.2
+  - 2.1.9
+  - 2.2.5
+  - 2.3.1
 before_install:
   - gem update bundler

data/Changelog

@@ -37,3 +37,7 @@ test logs.
 * Add ability to disable cache control (useful for IE testing)
 * Allow client to register a module that will hydrate the response object.
 * Break apart recording and responding to better support full response payloads
+
+=== Release 0.6.0 / 2016-06-14
+* Removed references to 1.9.2 which has long been EOL'd. - Thanks @garyjohnson!
+* Remove dependency on nokogiri

data/README.md

@@ -1,6 +1,8 @@
-# Pinch Hitter
+# Pinch Hitter [![Build Status](https://travis-ci.org/stevenjackson/pinch_hitter.svg?branch=master)](https://travis-ci.org/stevenjackson/pinch_hitter)
+
 Simple replay mock for web service testing
 
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -36,3 +38,7 @@ Start the service using rackup
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Notes
+
+If the `json` gem fails to install on OSX, try running `brew install coreutils`.

data/Rakefile

@@ -10,11 +10,7 @@ Rake::TestTask.new(:unit) do |t|
 end
 
 Cucumber::Rake::Task.new(:features) do |t|
-  if RUBY_VERSION == '1.9.2'
-    t.profile = '1.9.2'
-  else
-    t.profile = 'default'
-  end
+  t.profile = 'default'
 end
 
 desc 'Run all unit tests and features'

data/cucumber.yml

@@ -1,2 +1 @@
 default: --no-source --color --format pretty
-1.9.2: --no-source --color --format pretty --tags ~@not_1.9.2

data/features/verify.feature

@@ -18,7 +18,6 @@ Feature:  Verify application's output
       | POST   | /poster  |
       | PUT    | /putter  |
 
-  @not_1.9.2
   Scenario Outline: HTTP methods
     When I do a <method> on "<endpoint>"
     Then the service has recieved a request on "<endpoint>"

data/lib/pinch_hitter/message/xml.rb

@@ -1,4 +1,5 @@
-require 'nokogiri'
+require 'rexml/document'
+require 'rexml/xpath'
 
 module PinchHitter::Message
   module Xml
@@ -12,7 +13,8 @@ module PinchHitter::Message
 
     private
     def load_xml_file(filename)
-      Nokogiri::XML File.open filename
+      file = File.new filename
+      REXML::Document.new file
     end
 
     def replace_xml(xml, key, text)
@@ -21,15 +23,15 @@ module PinchHitter::Message
 
       if parts.length == 1
         #match text node
-        tag.content = text
+        tag.text = text
       else
         #match attribute
-        tag[parts.last] = text
+        tag.attributes[parts.last] = text
       end
     end
 
     def find_node(xml, tag)
-      xml.at_xpath("//#{tag}", xml.collect_namespaces)
+      REXML::XPath.first(xml, "//#{tag}")
     end
   end
 end

data/lib/pinch_hitter/service/replay_ws.rb

@@ -1,7 +1,6 @@
 require 'bundler/setup'
 require 'sinatra/base'
 require 'sinatra/cross_origin'
-require 'nokogiri'
 require 'json'
 
 require 'pinch_hitter/service/endpoint_handlers'

data/lib/pinch_hitter/version.rb

@@ -1,3 +1,3 @@
 module PinchHitter
-  VERSION = "0.5.6"
+  VERSION = "0.6.0"
 end

data/pinch_hitter.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'sinatra', '>= 1.3.3'
-  gem.add_dependency 'nokogiri', '>= 1.5.6'
   gem.add_dependency 'json', '>= 1.7.6'
   gem.add_dependency 'sinatra-cross_origin', '~> 0.3.1'
 

data/test/test_message.rb

@@ -26,7 +26,7 @@ class TestMessage < MiniTest::Test
   end
 
   def xml_message
-%Q{<?xml version="1.0" encoding="UTF-8"?>
+%Q{<?xml version='1.0' encoding='UTF-8'?>
 <Body/>
 }
   end
@@ -42,7 +42,7 @@ class TestMessage < MiniTest::Test
     @messages.message_directory = "/foo"
     assert_equal "/foo", @messages.message_directory
   end
-  
+
   def test_loads_xml
     assert_equal xml_message, @messages.load(xml_filename.to_sym)
   end
@@ -52,7 +52,7 @@ class TestMessage < MiniTest::Test
   end
 
   def test_message_no_whitespace
-    squish = %Q{<?xml version="1.0" encoding="UTF-8"?><Body/>}
+    squish = %Q{<?xml version='1.0' encoding='UTF-8'?><Body/>}
     assert_equal squish, @messages.load(xml_filename.to_sym).squish
   end
 

data/test/test_xml_message.rb

@@ -19,18 +19,18 @@ class TestXmlMessage < MiniTest::Test
   end
 
   def our_message
-%Q{<?xml version="1.0" encoding="UTF-8"?>
+%Q{<?xml version='1.0' encoding='UTF-8'?>
 <wrapper>
-  <Body xmlns:ns="http://www.abc.org/OTA/2003/05">
+  <Body xmlns:ns='http://www.abc.org/OTA/2003/05'>
     <node>text</node>
-    <withattrib attrib="value"/>
+    <withattrib attrib='value'/>
     <ns:testnode>text</ns:testnode>
   </Body>
 </wrapper>
 }
   end
 
-  def test_message_no_overrides 
+  def test_message_no_overrides
     assert_equal our_message, @test.xml_message(filename)
   end
 
@@ -42,7 +42,7 @@ class TestXmlMessage < MiniTest::Test
   def test_message_tag_override_attrib
     xml = @test.xml_message(filename,
         {"withattrib@attrib" => "BetterValue"})
-    assert xml.include? "<withattrib attrib=\"BetterValue\""
+    assert xml.include? "<withattrib attrib='BetterValue'"
   end
 
   def test_message_tag_override_with_namespace

metadata

@@ -1,139 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: pinch_hitter
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.0
 platform: ruby
 authors:
 - Steve Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-19 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.3
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.6
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.6
 - !ruby/object:Gem::Dependency
   name: sinatra-cross_origin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.3.3
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.1
 description: A simple web service that returns primed responses in FIFO order
@@ -143,10 +129,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Changelog
 - Gemfile
 - LICENSE
@@ -197,17 +183,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Test utility for mocking out external web responses