pinch_hitter 0.1 → 0.2

data/Changelog

@@ -1,2 +1,5 @@
 === Release 0.1 / 2013-1-20
 Initial release of the gem
+
+=== Release 0.2 / 2013-1-27
+Switch json to do overrides by key rather than path (like xml)

data/README.md

@@ -15,15 +15,20 @@ Or install it yourself as:
 
     $ gem install pinch_hitter
 
-## Usage
+## Purpose
 
-Any xml posted to the /store endpoint will be returned (FIFO) when a post to the /respond endpoint is made.
+Simulate those pesky external web services for testing and gain control over the data that's returned.  Pinch Hitter can stand in for one or many services.  The test controls the content that is served in an order it controls to the application under test.
 
-Start the service using rackup
-  rackup
+See the [wiki](https://github.com/stevenjackson/pinch_hitter/wiki) for more details
 
 See Rakefile for test options
 
+## Standalone
+
+Start the service using rackup
+
+    $ rackup
+
 ## Contributing
 
 1. Fork it

data/features/step_definitions/test_replay_steps.rb

@@ -33,3 +33,11 @@ end
 Then /^I see a definition$/ do
   @response.body.to_s.should == messages.load(:glossary).squish
 end
+
+Given /^I want to lookup a definition with a "(.*?)" of "(.*?)"$/ do |key, value|
+  mock.prime '/glossary', :glossary, key => value
+end
+
+Then /^I see a definition with a "(.*?)" of "(.*?)"$/ do |key, value|
+  @response.body.to_s.should == messages.load(:glossary, { key => value }).squish
+end

data/features/test_replay.feature

@@ -21,3 +21,7 @@ Feature:  Test WS replay
     When I query the glossary
     Then I see a definition
 
+  Scenario:  Replay with json substituion
+    Given I want to lookup a definition with a "ID" of "FOO"
+    When I query the glossary
+    Then I see a definition with a "ID" of "FOO"

data/lib/pinch_hitter.rb

@@ -23,7 +23,11 @@ module PinchHitter
   end
 
   def prime(endpoint, message, overrides={})
-    @session.post "/store?endpoint=#{endpoint}", message_store.load(message, overrides)
+    store endpoint, message_store.load(message, overrides)
+  end
+
+  def store(endpoint, content)
+    @session.post "/store?endpoint=#{endpoint}", content
   end
 
 end

data/lib/pinch_hitter/message/json.rb

@@ -22,17 +22,33 @@ module PinchHitter
 
       def replace_json(content, overrides={})
         return content if overrides.empty?
-        modified = child = parent = JSON.parse(content).clone
-        overrides.each do |key, value| 
-
-          key.each do |part|
-            parent = child 
-            child = parent.send "fetch", part
+        doc = JSON.parse(content)
+        overrides.each do |key, value|
+          hash = find_nested_hash(doc, key)
+          if has_key(hash, key)
+            hash[key] = value
           end
-          parent[key.last] = value
         end
-        modified.to_s
+        doc.to_s
+      end
+
+      def find_nested_hash(parent, key)
+        return parent if has_key(parent, key)
+        return nil unless parent.respond_to? :each
+
+        found = nil
+        parent.find do |parent_key, child|
+          found = find_nested_hash(child, key)
+        end
+        found
       end
+
+      def has_key(hash, key)
+        hash.respond_to?(:key?) && hash.key?(key)
+      end
+
+     
+
     end
   end
 end

data/lib/pinch_hitter/service/replay_ws.rb

@@ -20,17 +20,17 @@ module PinchHitter
 
       post '/reset' do
         @@responses.reset
-        200
+        status 200
       end
 
       post '/store/*' do
         store "/#{params[:splat].first}", request.body.read
-        200
+        status 200
       end
 
       post '/store' do
         store request["endpoint"], request.body.read
-        200
+        status 200
       end
 
       post '/respond' do

data/lib/pinch_hitter/version.rb

@@ -1,3 +1,3 @@
 module PinchHitter
-  VERSION = "0.1"
+  VERSION = "0.2"
 end

data/test/test_json_message.rb

@@ -25,6 +25,9 @@ class TestJsonMessage < MiniTest::Unit::TestCase
   "value": "File",
   "popup": {
     "menuitem": "OpenDoc()"
+  },
+  "trigger" : {
+    "action" : "confirm"
   }
 }}
 }
@@ -35,7 +38,7 @@ class TestJsonMessage < MiniTest::Unit::TestCase
   end
 
   def test_message_with_overrides
-    json = @test.json_message(filename, {["menu", "popup", "menuitem"] => 'WhatsUpDoc?' })
+    json = @test.json_message(filename, {"menuitem" => 'WhatsUpDoc?' })
     assert json.include? "WhatsUpDoc?"
   end
 end

data/test/test_pinch_hitter.rb

@@ -52,4 +52,10 @@ class TestPinchHitter < MiniTest::Unit::TestCase
     assert_equal message_content, session.last_response.body
   end
 
+  def test_store
+    @test.store '/foo', message_content
+    session.get '/foo'
+    assert_equal message_content, session.last_response.body
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pinch_hitter
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-21 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -192,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4118053142123846714
+      hash: 2707663932851003695
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4118053142123846714
+      hash: 2707663932851003695
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24