optimus_prime 3.2.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56096e8c29cc2d111db55150a046098ee6126270
-  data.tar.gz: 135faa19207432c3472c063f31c7ff587594a4d8
+  metadata.gz: b21594444427e0d8f033659808f7694b71d51f08
+  data.tar.gz: 79b3ada0c5c81ecac3c502a3e5c5763f035009b9
 SHA512:
-  metadata.gz: d93c30608c30f43f50886596331154f2edd1f0dd6f1c79b9bdaf4015af4217849cefb5bef87146f22d443bd4dce18cf733834aeab9cb640e6033086e23833fc6
-  data.tar.gz: b4574a0b24c877342df9a4f6eceef35121b59a1ce0fcc7140f9a37b5d9de9748d1ad6926916a96bf2f0c8d7888cf1bbdabe2b6ab85dec72ba1eb232983236754
+  metadata.gz: ca99401cb0c9100ed66e20997871600d97b52258cbf3f53ef3ce0500863864e74da3cb7492011a624c90e6b48a42c6788bc4a52bf504e575100ed97c616ee145
+  data.tar.gz: 6609b0f517db910e86d21674de883fe94183050bcc9f9f09925dbd8ebb584edf6bc08a097b0f2bd198ebb3503a9b814f4533526c569e71f8909456f6d4b7ce8b

data/lib/optimus_prime/server.rb

@@ -28,19 +28,19 @@ module OptimusPrime
         return 404
       end
 
+      body = parse_request(response[:content_type])
+
       if response[:requested_with]
-        request.body.rewind
-        return 404 unless eval("request.body.read.include?('#{response[:requested_with]}')")
+        return 404 unless body.include?(response[:requested_with])
       end
 
       sleep(response[:sleep].to_i) if response[:sleep]
 
       if response[:persisted]
-        new_body = request.body.read
-        @@responses[path][:body] = JSON.parse(response[:body]).merge!(JSON.parse(new_body)).to_json
+        @@responses[path][:body] = JSON.parse(response[:body]).merge!(body)
       end
 
-      record_request(path)
+      record_request(path, body)
       content_type(response[:content_type])
       status(response[:status_code] || 201)
       return "" if response[:status_code] =~ /500|404/
@@ -55,19 +55,19 @@ module OptimusPrime
         return 404
       end
 
+      body = parse_request(response[:content_type])
+
       if response[:requested_with]
-        request.body.rewind
-        return 404 unless eval("request.body.read.include?('#{response[:requested_with]}')")
+        return 404 unless body.include?(response[:requested_with])
       end
 
       sleep(response[:sleep].to_i) if response[:sleep]
 
       if response[:persisted]
-        new_body = request.body.read
-        @@responses[path][:body] = JSON.parse(response[:body]).merge!(JSON.parse(new_body)).to_json
+        @@responses[path][:body] = JSON.parse(response[:body]).merge!(body).to_json
       end
 
-      record_request(path)
+      record_request(path, body)
       content_type(response[:content_type])
       status(response[:status_code] || 201)
       return "" if response[:status_code] =~ /500|404/
@@ -82,41 +82,24 @@ module OptimusPrime
         return 404
       end
 
+      body = parse_request(response[:content_type])
+
       if response[:requested_with]
-        request.body.rewind
-        return 404 unless eval("request.body.read.include?('#{response[:requested_with]}')")
+        return 404 unless body.include?(response[:requested_with])
       end
 
-
       if response[:persisted]
-        new_body = params.tap { |p| p.delete("splat"); p.delete("captures") }
-        @@responses[path][:body] = new_body.to_json
+        @@responses[path][:body] = body
       end
 
-      record_request(path)
-
+      record_request(path, body)
       content_type(response[:content_type])
       status(response[:status_code])
-
       sleep(response[:sleep].to_i) if response[:sleep]
-
       return "" if response[:status_code] =~ /500|404/
       response[:body]
     end
 
-    def record_request(path)
-      requests[path][:count] += 1
-      params.delete("splat")
-      params.delete("captures")
-      request_made = { method: self.env["REQUEST_METHOD"], body: params, headers: { content_type: request.content_type, accept: request.accept } }
-      requests[path][:last_request] = request_made
-    end
-
-    def get_path
-      # self.env["REQUEST_URI"].scan(/^\/get\/([\/\w+]+)(\/|\?|$)/).flatten[0]
-      self.env["REQUEST_URI"].sub(/\/get\/|\/requests\//, "")
-    end
-
     get "/get/*" do
       path = get_path
       response = responses[path]
@@ -126,7 +109,7 @@ module OptimusPrime
         return 404
       end
 
-      record_request(path)
+      record_request(path, {})
 
       sleep(response[:sleep].to_f) if response[:sleep]
 
@@ -166,20 +149,42 @@ module OptimusPrime
       @@not_primed.to_json
     end
 
+    def record_request(path,  body)
+      requests[path][:count] += 1
+      request_made = { method: self.env["REQUEST_METHOD"], body: body, headers: { content_type: request.content_type, accept: request.accept } }
+      @@requests[path][:last_request] = request_made
+    end
+
+    def get_path
+      # self.env["REQUEST_URI"].scan(/^\/get\/([\/\w+]+)(\/|\?|$)/).flatten[0]
+      self.env["REQUEST_URI"].sub(/\/get\/|\/requests\//, "")
+    end
+
+
     private
 
-      def responses
-        @@responses
+    def parse_request(content_type)
+      if content_type.match(/json/)
+        request_body = request.body.read
+        request_body = request_body.empty? ? "{}" : request_body
+        request_body = JSON.parse(request_body)
+      else
+        request_body = request.body.read
       end
+      request.body.rewind
+      request_body
+    end
 
-      def requests
-        @@requests
-      end
+    def responses
+      @@responses
+    end
 
-      def get_boolean(boolean)
-        boolean == "true"
-      end
+    def requests
+      @@requests
+    end
 
+    def get_boolean(boolean)
+      boolean == "true"
+    end
   end
-
 end

data/lib/optimus_prime/version.rb

@@ -1,3 +1,3 @@
 module OptimusPrime
-  VERSION = "3.2.0"
+  VERSION = "4.0.0"
 end

data/spec/lib/optimus_prime_spec.rb

@@ -2,6 +2,12 @@ OptimusPrime::Cannon.fire!(7003)
 
 describe OptimusPrime do
 
+  after(:all) do
+    if File.exists?(File.expand_path("../../tmp/pids/optimus_prime.pid", __dir__))
+      system("thin stop -P #{File.expand_path("../../tmp/pids/optimus_prime.pid", __dir__)}")
+    end
+  end
+
   let(:op) { OptimusPrime::Base.new }
 
   it "primes an endpoint" do
@@ -9,7 +15,7 @@ describe OptimusPrime do
   end
 
   it "primes an endpoint with attributes" do
-    op.prime("test", "I am a response")
+    op.prime("test", "I am a response", content_type: "text/html")
 
     response = ::Faraday.get("http://localhost:7003/get/test")
     expect( response.body ).to eq "I am a response"
@@ -68,7 +74,7 @@ describe OptimusPrime do
   context "Asserting on request content" do
 
     it "returns a 404 if the request body does not match the assertion" do
-      op.prime("user", { username: "Test" }.to_json, content_type: :json, requested_with: "haha")
+      op.prime("user", { username: "Test" }.to_json, content_type: "text/html", requested_with: "haha")
 
       response = ::Faraday.post('http://localhost:7003/get/user', "I am a body")
 
@@ -76,7 +82,7 @@ describe OptimusPrime do
     end
 
     it "returns a 200 if the request body does match the assertion" do
-      op.prime("user", { username: "Test" }.to_json, content_type: :json, requested_with: "I am a body")
+      op.prime("user", { username: "Test" }.to_json, content_type: :html, requested_with: "I am a body")
 
       response = ::Faraday.post('http://localhost:7003/get/user', "I am a body")
 
@@ -199,19 +205,19 @@ describe OptimusPrime do
 
     it "POST" do
       op.prime("kermit", { username: "Test" }.to_json, content_type: :json)
-      ::Faraday.post("http://localhost:7003/get/kermit", { username: "Test" })
+      ::Faraday.post("http://localhost:7003/get/kermit", { username: "Test" }.to_json)
       expect( op.last_request_for("kermit") ).to eq({ "method" => "POST", "body" => { "username" => "Test" }, "headers"=>{ "content_type"=>"application/x-www-form-urlencoded", "accept"=>["*/*"]} })
     end
 
     it "PUT" do
       op.prime("put/kermit", { username: "Test" }.to_json, content_type: :json)
-      ::Faraday.put("http://localhost:7003/get/put/kermit", { username: "Test" })
+      ::Faraday.put("http://localhost:7003/get/put/kermit", { username: "Test" }.to_json)
       expect( op.last_request_for("put/kermit") ).to eq({"method"=>"PUT", "body"=>{"username"=>"Test"}, "headers"=>{"content_type"=>"application/x-www-form-urlencoded", "accept"=>["*/*"]}})
     end
 
     it "returns a decoded body" do
       op.prime("kermit", { username: "Test" }.to_json, content_type: :json)
-      ::Faraday.post("http://localhost:7003/get/kermit", { word: "with spaces and other shit" })
+      ::Faraday.post("http://localhost:7003/get/kermit", { word: "with spaces and other shit" }.to_json)
       expect( op.last_request_for("kermit") ).to eq({"method"=>"POST", "body"=>{"word"=>"with spaces and other shit"}, "headers"=>{"content_type"=>"application/x-www-form-urlencoded", "accept"=>["*/*"]}})
     end
 
@@ -242,8 +248,8 @@ describe OptimusPrime do
       op = OptimusPrime::Base.new(wait_for: 1)
       op.prime("expectation", { status: "UNKOWN" }, content_type: :json)
 
-      ::Faraday.post("http://localhost:7003/get/expectation", { status: "IN_PROGRESS" } )
-      Thread.new { sleep(0.5); ::Faraday.post("http://localhost:7003/get/expectation", { status: "COMPLETED" } )}
+      ::Faraday.post("http://localhost:7003/get/expectation", { status: "IN_PROGRESS" }.to_json )
+      Thread.new { sleep(0.5); ::Faraday.post("http://localhost:7003/get/expectation", { status: "COMPLETED" }.to_json )}
 
       op.wait_until_request("expectation") do |request|
         expect(request["body"]["status"]).to eq("COMPLETED")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: optimus_prime
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Antonio Nalesso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler