yafs 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92873718936b67d9105e769541532b8f6ddf927d
-  data.tar.gz: 8edff93dc54b1fecad4716d3f4d1cbdc2e602b1d
+  metadata.gz: 05afd0bde033e12ab8fe7343d0e0942c9ec8fe88
+  data.tar.gz: 99f5bedab418c6dff2bdcba91490e13b854a1296
 SHA512:
-  metadata.gz: 77689755ac037feacb34545ac83c65650de96181d80efa6bec45651a3a529901a618ba984df1b28ef1e5038f99c6fcee2248c7ddc6abfa5a974181e63704d374
-  data.tar.gz: 9990bc6d017672556d40b27a30625468f2578466bcdf6acf52b13e6f62608d361a0edd810957407cc9229a636fc5d3c1f47bcd3bd01c019376f4c4fbb45ec379
+  metadata.gz: a7136068281561d14e3813b2d45bab51ad84645002db5ad5e8c35a8df59ecbc9ba0dae41058148cad8ddedf56e781f8342574f65868fdb08ac88c3faf0a1bd03
+  data.tar.gz: 8010fcf6bd214cc95add20fcd6c23a8bbc06b5bea22a44e3b911081668645f02b29025f056771d2e48bab73456205ddfb9f8deec26d9edeb6a1ef9eba4c3783c

data/README.md

@@ -0,0 +1,17 @@
+# FAKE
+
+## simple example
+```ruby
+  describe "Simple service without parameters" do
+    before(:each) { Fake.start(port:4568) }
+    after(:each) { Fake.stop }
+
+    it "can handle get" do
+      Fake.get('/').respond(body:"_response_")
+      response = HTTParty.get('http://localhost:4568')
+      expect(response.body).to eq "_response_"
+    end
+  end
+```
+
+

data/lib/fake/fake.rb

@@ -27,4 +27,5 @@ module Fake
     end
   end
 
+
 end

data/lib/fake/request_handler.rb

@@ -1,3 +1,6 @@
+require 'URI'
+require 'rack'
+
 module Fake
   class RequestHandler
     attr_reader :responses
@@ -9,7 +12,9 @@ module Fake
     # path: Path of the request like '/home/something'
     def initialize(method, path)
       @method = method
-      @path = Path.new(path)
+      uri = URI.parse(path)
+      @params = parse_params(uri)
+      @path = Path.new(uri.path)
       @responses = InfiniteQueue.new
       @body = nil
     end
@@ -26,12 +31,23 @@ module Fake
   private
     def should_serve?(request)
       should_serve = @path.eql?(request.path) && request.request_method.eql?(@method.to_s.upcase)
+      if should_serve && @params != {}
+        should_serve = request.params == @params
+      end
       if should_serve && @body != nil
         should_serve = @body == request.body_string
       end
       should_serve
     end
 
+    def parse_params(uri)
+      if uri.query
+        Rack::Utils.parse_nested_query(uri.query)
+      else
+        {}
+      end
+    end
+
     def presentation
       @path
     end

data/lib/fake/server.rb

@@ -0,0 +1,29 @@
+module Fake
+  class Server
+
+    def start(rack_app, webrick_config)
+      return unless @server_thread.nil?
+      mutex = Mutex.new
+      server_started = ConditionVariable.new
+      @server_thread = Thread.new(rack_app, webrick_config) do |app, config|
+        @server = WEBrick::HTTPServer.new(config)
+        @server.mount "/", Rack::Handler::WEBrick, app
+        server_started.signal
+        @server.start
+      end
+      mutex.synchronize do
+        server_started.wait(mutex)
+      end
+    end
+
+    def stop
+      unless @server_thread.nil?
+        @server.shutdown
+        @server_thread.join if @server_thread.alive?
+        @server_thread = nil
+      end
+    end
+  end
+end
+
+

data/lib/fake/service.rb

@@ -10,12 +10,6 @@ module Fake
       @app.add_request_handler(request_handler)
     end
 
-    def get(path)
-      request_handler = RequestHandler.new(:get, path)
-      @app.add_request_handler(request_handler)
-      RequestHandlerBuilder.new(request_handler)
-    end
-
     def start
       @server.start(@app, @webrick_config)
     end

data/lib/fake_service.rb

@@ -1,6 +1,7 @@
 require 'rack'
 require 'singleton'
 require 'WEBrick'
+require_relative './fake/server.rb'
 require_relative './fake/service.rb'
 require_relative './fake/request_handler.rb'
 require_relative './fake/requests.rb'
@@ -33,11 +34,11 @@ module Fake
   end
 
   class RequestHandlerBuilder
+
     def initialize(request_handler)
       @request_handler = request_handler
     end
 
-
     #
     # DSL
     #
@@ -81,30 +82,5 @@ module Fake
     end
   end
 
-  class Server
-
-    def start(rack_app, webrick_config)
-      return unless @server_thread.nil?
-      mutex = Mutex.new
-      server_started = ConditionVariable.new
-      @server_thread = Thread.new(rack_app, webrick_config) do |app, config|
-        @server = WEBrick::HTTPServer.new(config)
-        @server.mount "/", Rack::Handler::WEBrick, app
-        server_started.signal
-        @server.start
-      end
-      mutex.synchronize do
-        server_started.wait(mutex)
-      end
-    end
-
-    def stop
-      unless @server_thread.nil?
-        @server.shutdown
-        @server_thread.join if @server_thread.alive?
-        @server_thread = nil
-      end
-    end
-  end
 end
 

data/spec/fake/request_handler_spec.rb

@@ -33,4 +33,40 @@ describe Fake::RequestHandler do
       expect(rh.call(get_request('http://localhost/home'))).to eq nil
     end
   end
+
+  context "when path contains query parameters" do
+    context "when path and parameters match" do
+      it "returns the response" do
+        rh = Fake::RequestHandler.new(:get, '/home?param=1')
+        rh.responses << Fake::Response.new("", "200 OK", {})
+        expect(rh.call(get_request('http://localhost/home?param=1'))).not_to eq nil
+      end
+    end
+
+    context "when path matches but parameter does not match" do
+      it "returns nil" do
+        rh = Fake::RequestHandler.new(:get, '/home?param=1')
+        rh.responses << Fake::Response.new("", "200 OK", {})
+        expect(rh.call(get_request('http://localhost/home?param=2'))).to eq nil
+      end
+    end
+  end
+
+  context "when path is not well formatted with query params" do
+    context "when path and query matches" do
+      it "returns the response" do
+        rh = Fake::RequestHandler.new(:get, '/home/?param=1')
+        rh.responses << Fake::Response.new("", "200 OK", {})
+        expect(rh.call(get_request('http://localhost/home/?param=1'))).not_to eq nil
+      end
+    end
+    context "when path matches but query does not" do
+      it "returns the response" do
+        rh = Fake::RequestHandler.new(:get, '/home/?param=2')
+        rh.responses << Fake::Response.new("", "200 OK", {})
+        expect(rh.call(get_request('http://localhost/home/?param=1'))).to eq nil
+      end
+    end
+
+  end
 end

data/spec/features/fake_service_spec.rb

@@ -7,11 +7,11 @@ describe 'Fake Service' do
   after(:each) { fs.stop }
 
   describe "configuration" do
-    let(:fs) { Fake::Service.new(bind:'127.0.0.1') }
     it "can be bind to different addresses" do
-      fs.get('/').respond(body:"ok")
-      fs.start
+      Fake.start(bind:'127.0.0.1', port:8080)
+      Fake.get('/').respond(body:"ok")
       expect(HTTParty.get('http://127.0.0.1:8080').body).to eq "ok"
+      Fake.stop
     end
   end
 
@@ -30,6 +30,11 @@ describe 'Fake Service' do
       expect(response.body).to eq "_response_"
     end
 
+    it "can handle shitty path" do
+      Fake.get('/path/?id=5').respond(body: 'ok')
+      expect(HTTParty.get('http://localhost:4568/path/?id=5').body).to eq 'ok'
+    end
+
     it "can handle post" do
       Fake.post('/').respond(body:"_response_")
       response = HTTParty.post('http://localhost:4568')
@@ -47,41 +52,44 @@ describe 'Fake Service' do
 
   describe "Response code" do
     it "returns assigned response code" do
-      fs.get('/').respond(status:404)
-      fs.start
-
+      Fake.start(port:4567)
+      Fake.get('/').respond(status:404)
       response = HTTParty.get('http://localhost:4567')
       expect(response.code).to eq 404
+      Fake.stop
     end
   end
 
   describe "Headers" do
     it "sets headers to response" do
-      fs.get('/').respond(headers: {"x-header" => "someurl"})
-      fs.start
+      Fake.start(port:4567)
+      Fake.get('/').respond(headers: {"x-header" => "someurl"})
       response = HTTParty.get('http://localhost:4567')
       expect(response.headers).to include("x-header")
       expect(response.headers['x-header']).to eq "someurl"
+      Fake.stop
     end
   end
 
   describe "Paths" do
     describe "static paths" do
       it "routes requests to correct handler" do
-        fs.get('/cart').respond(body:"1")
-        fs.get('/order/new').respond(body:"2")
-        fs.start
+        Fake.start(port:4567)
+        Fake.get('/cart').respond(body:"1")
+        Fake.get('/order/new').respond(body:"2")
 
         expect(HTTParty.get('http://localhost:4567/cart'     ).response.body).to eq "1"
         expect(HTTParty.get('http://localhost:4567/order/new').response.body).to eq "2"
+        Fake.stop
       end
     end
 
     describe "dynamic paths" do
       it "routes request to match path variables" do
-        fs.get('/cart/:id/status').respond(body:"ok")
-        fs.start
+        Fake.start(port:4567)
+        Fake.get('/cart/:id/status').respond(body:"ok")
         expect(HTTParty.get('http://localhost:4567/cart/path/status').response.body).to eq "ok"
+        Fake.stop
       end
     end
 
@@ -93,9 +101,10 @@ describe 'Fake Service' do
         Fake.stop
       end
 
-      xit "can respond based on query parameter" do
+      it "can respond based on query parameter" do
         # what about specific parameters vs some parameter
-        fs.get('/cart/option').param('id=5').respond("ok") # Matches /cart/option?id=5,
+        Fake.get('/cart/option?id=5').respond(body: "ok")
+        expect(HTTParty.get('http://localhost:4567/cart/option?id=5').response.body).to eq "ok"
       end
 
       it "can resbond based on specific body" do
@@ -108,22 +117,24 @@ describe 'Fake Service' do
 
     describe "Checking request parameters" do
       it "can verify single parameter" do
-        fs.get('/cart').respond(body:'')
-        fs.start
+        Fake.start(port:4567)
+        Fake.get('/cart').respond(body:'')
         HTTParty.get('http://localhost:4567/cart?id=5&status=pending')
         params = Fake::Requests.request(:get, '/cart').params
         expect(params.has_key? 'id')
         expect(params.has_key? 'status')
         expect(params["id"]).to eq "5"
         expect(params["status"]).to eq "pending"
+        Fake.stop
 
       end
 
       xit "can name a request to ease matching of request" do
-        fs.get('/cart', name: :my_cart_request)
-        fs.start
+        Fake.start
+        Fake.get('/cart', name: :my_cart_request)
         HTTParty.get('http://localhost:4567/cart?id=5&status=pending')
         expect(Fake::Requests.request(:my_cart_request)).not_to be nil
+        Fake.stop
       end
 
       context "from post request" do
@@ -173,32 +184,34 @@ describe 'Fake Service' do
   describe "Setting responses" do
     describe "chaining responses" do
       it "returns responses in order" do
-        fs.get('/cart').respond(body:"1").respond(body:"2").respond(body:"3")
-        fs.start
+        Fake.start(port:4567)
+        Fake.get('/cart').respond(body:"1").respond(body:"2").respond(body:"3")
         expect(HTTParty.get('http://localhost:4567/cart').response.body).to eq "1"
         expect(HTTParty.get('http://localhost:4567/cart').response.body).to eq "2"
         expect(HTTParty.get('http://localhost:4567/cart').response.body).to eq "3"
         expect(HTTParty.get('http://localhost:4567/cart').response.body).to eq "3"
         expect(HTTParty.get('http://localhost:4567/cart').response.body).to eq "3"
+        Fake.stop
       end
     end
   end
 
   describe "using block" do
     it "uses block return value as response" do
-      fs.get('/').respond do
+      Fake.start(port:4567)
+      Fake.get('/').respond do
         "my response"
       end
-      fs.start
       expect(HTTParty.get('http://localhost:4567').response.body).to eq "my response"
+      Fake.stop
     end
 
     it "can access response object" do
-      fs.get('/').respond do |r|
+      Fake.start(port:4567)
+      Fake.get('/').respond do |r|
         r.status = 201
         "response"
       end
-      fs.start
       expect(HTTParty.get('http://localhost:4567').response.code).to eq "201"
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yafs
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Mika Lackman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -37,6 +37,7 @@ files:
 - lib/fake/request_handler.rb
 - lib/fake/requests.rb
 - lib/fake/response.rb
+- lib/fake/server.rb
 - lib/fake/service.rb
 - lib/fake_service.rb
 - spec/fake/path_spec.rb
@@ -65,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Yet another fake http service for e2e tests
@@ -76,4 +77,3 @@ test_files:
 - spec/features/fake_service_spec.rb
 - spec/helpers.rb
 - spec/spec_helper.rb
-has_rdoc: