webmachine-test 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 189b72179cd8a93c2bf0b9d207cba120d3a23d90
-  data.tar.gz: d5208e1169a927d2fc6e205733c64b1ccbb9e19b
+  metadata.gz: dbb4219bac475070c93f974353e7fd69112c162b
+  data.tar.gz: 877f3a36c7d4a6f7e326bb3771f137b1ec7cefc5
 SHA512:
-  metadata.gz: 04f460df1ec0baabd99ec75075d2b1daca8d258ed11ef6f90de9992971ee13740d655c38f2e753943c437fedd6ee706f52ba0bb720398c5df9a2643241303567
-  data.tar.gz: 2bd2bc4fb9bd5582f80290729849fff7c3694794eff0eaddc397d5706b0f421f808199cb1a4d22a2386772e09d8c338f1d35b1af299ee57bf868762a4b699600
+  metadata.gz: 93fbb64af4c096b346d2d5f6551560b6b5acbeebb40d6c9aa04f27764de5ed426f193317913bcbbee31d5cdd6cc1705b58ea6d61a51b742b5dd184756a28e782
+  data.tar.gz: d742cc1bf715ea74b334afd4d0d5668d9913269bf5396605306c3e7a3beaefcf12ff3e02a0d7df83486b274ff0311d5d2b200353bfb6a5f6655d87ba3985e08d

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'webmachine', github: 'seancribbs/webmachine-ruby'
+gem 'webmachine', github: 'webmachine/webmachine-ruby'

data/lib/webmachine/test.rb

@@ -14,7 +14,7 @@ module Webmachine
       @session ||= Webmachine::Test::Session.new(app)
     end
 
-    def_delegators :current_session, :request, :header, :headers, :body, :response,
+    def_delegators :current_session, :request, :header, :headers, :cookie, :session_cookies, :body, :response,
                                      :get, :post, :put, :patch, :delete,
                                      :options, :head
   end

data/lib/webmachine/test/session.rb

@@ -10,6 +10,7 @@ module Webmachine
 
       def initialize(app)
         @headers = Webmachine::Headers.new
+        @session_cookies = {}
         @body = nil
         @req = nil
         @res = nil
@@ -31,6 +32,14 @@ module Webmachine
         @headers[name] = value
       end
 
+      def cookie(name, value)
+        @session_cookies[name] = value
+      end
+
+      def session_cookies
+        @session_cookies
+      end
+
       # Set the request body.
       def body(value)
         @body = value
@@ -56,21 +65,53 @@ module Webmachine
         add_query_params(uri, options[:params])
 
         # Set some default headers and merge the provided ones.
-        @headers['Host'] = [uri.host, uri.port].compact.join(':') unless @headers['Host']
-        @headers['Accept'] = '*/*' unless @headers['Accept']
+        @headers['Host'] ||= [uri.host, uri.port].compact.join(':')
+        @headers['Accept'] ||= '*/*'
+        @headers['Origin'] ||= @headers['Host']
+        add_cookies
 
         options[:headers] ||= {}
         options[:headers].each { |k, v| @headers[k] = v }
 
+
         @body ||= options[:body]
 
         @req = Webmachine::Request.new(method, uri, @headers, @body)
         @res = Webmachine::Response.new
 
         @app.dispatcher.dispatch(@req, @res)
+        update_session_cookies
         return @res
       end
 
+      def update_session_cookies
+        if @res.headers['Set-Cookie']
+          @res.headers['Set-Cookie'].reduce(@session_cookies) do |cookies, c|
+            cookie_info = c.split(';')
+            kv = Webmachine::Cookie.parse(cookie_info.shift)
+            cname = kv.keys.first
+            cval = kv.values.first
+            cookie = cookie_info.map(&:strip).reduce({value: cval}) do |cookie, part|
+              case part
+              when 'Secure'
+                cookie[:secure] = true
+              when 'HttpOnly'
+                cookie[:http_only] = true
+              when /Expires=(?<date>.*)/
+                cookie[:expires] = Time.parse($~[:date])
+              end
+              cookie
+            end
+            if cookie[:value].nil? or (cookie[:expires] and cookie[:expires] < Time.now)
+              cookies.delete cname
+            else
+              cookies.merge!({cname => cval})
+            end
+            cookies
+          end
+        end
+      end
+
       def add_query_params(uri, params)
         if params
           q = params.map do |k, v|
@@ -81,6 +122,14 @@ module Webmachine
           uri.query = uri.query ? [uri.query, q].join('&') : q
         end
       end
+
+      def add_cookies
+        as_strings = @session_cookies.map do |k,v|
+          "#{k}=#{v}"
+        end
+        cookies = as_strings.join("; ")
+        @headers['Cookie'] = cookies unless cookies.empty?
+      end
     end
   end
 end

data/lib/webmachine/test/version.rb

@@ -1,5 +1,5 @@
 module Webmachine
   module Test
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

data/spec/fixtures/test_resource.rb

@@ -4,6 +4,7 @@ class TestResource < Webmachine::Resource
   end
 
   def to_text
+    response.set_cookie 'TEST', 'VALUE'
     'OK'
   end
 end

data/spec/webmachine/test/session_spec.rb

@@ -151,4 +151,21 @@ describe Webmachine::Test::Session do
       request.body.should be_nil
     end
   end
+  describe "#cookie" do
+    it "sets a cookie" do
+      cookie('SOME_COOKIE', 'VALUE')
+      get '/'
+      request.headers['COOKIE'].should eq('SOME_COOKIE=VALUE')
+    end
+    it "forwards cookies sent by the server (like a browser)" do
+      get '/'
+      request.headers['COOKIE'].should be_nil
+      get '/'
+      request.headers['COOKIE'].should eq('TEST=VALUE')
+    end
+    it "shows available session cookies" do
+      get '/'
+      session_cookies['TEST'].should eq('VALUE')
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webmachine-test
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Bernd Ahlers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webmachine
@@ -118,7 +118,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: Test API for webmachine-ruby
@@ -126,7 +126,7 @@ test_files:
 - Gemfile
 - Rakefile
 - ".rspec"
-- spec/webmachine/test/session_spec.rb
-- spec/spec_helper.rb
 - spec/fixtures/traceable_resource.rb
 - spec/fixtures/test_resource.rb
+- spec/spec_helper.rb
+- spec/webmachine/test/session_spec.rb