screenplay 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63bce83d0f98bb3b47361fe3e9fb1e3faf2f41c3
-  data.tar.gz: 119bf21f6e38ff112ba28e9a27be71508f933def
+  metadata.gz: b226d59c75415b22f69511c0c26d5c123ef7148c
+  data.tar.gz: 9c15ef66099947510117fd11bc442b67f71139f6
 SHA512:
-  metadata.gz: 5a887b644db3c1db7424c5e53f836688f0a4216273b2be93ccc782d3d0267adff931f67ba8fab5c6e5ef6d2d64826bcf95d3b5324032f1946e0243f5f7e52941
-  data.tar.gz: 85c1a1a3a264aa50eb481e3213d0eac55ca88df8120e4adc88e2fbb45bf6a7ad53a0792ceff56824a58b19edd073ae0999b833ff00abc484742d9516d1b91c01
+  metadata.gz: 9fad414d66f8a9c71980d839628e08da5d1ac7c40244db69ec16607971f69df44525baa270f8901557d0d69de2f8630799035300e45484826469fa84d4c7e9c3
+  data.tar.gz: 4e40b8ec65f9c2d1319a852f9357ddb0a6d9c00013d4770153f2549a91c3549125e47df634fe68d1405fa13a9933e0a5e7513f33c4e03269653b972a1243e85f

data/Gemfile

@@ -2,5 +2,8 @@ source 'http://rubygems.org'
 
 gem 'rest-client', '~> 1.7.3'
 gem 'highline', '~> 1.6.21'
+gem 'mime-types', '~> 2.99.2'
+
+gem 'minitest'
 
 

data/lib/screenplay/actors/api.rb

@@ -16,7 +16,8 @@ module Screenplay
 		def configure(config)
 			@url = config[:url].to_s
 			@url += '/' unless @url.end_with?('/')
-			@headers = config[:headers] || {}
+			@headers = {}
+			@config = config
 			@cookies = nil
 		end
 
@@ -28,7 +29,8 @@ module Screenplay
 			data = params[:data] || {} rescue {}
 			data = input if (data.is_a?(String)) && (data == '$input')
 			data.stringify_keys!
-			headers = @headers
+			headers = {}
+			headers['Content-Type'] = @config[:content_type] if (!@config[:content_type].nil?)
 			headers[:cookie] = @cookies unless @cookies.nil?
 			url = @url + path.to_s.replace_vars(input)
 			if ([:get, :head, :delete].include?(method))
@@ -36,10 +38,12 @@ module Screenplay
 				data = {}
 			end
 
-			if (headers['Content-Type'.to_sym] == 'application/json')
+			if (headers['Content-Type'] == 'application/json')
 				data = JSON.generate(data)
 			end
 
+			puts "\nAPI - #{method.to_s.upcase} - #{url}: #{data}" if Screenplay.options[:debug]
+
 			begin
 				response = RestClient::Request.execute({
 					url: url,

data/lib/screenplay/actors/cache.rb

@@ -16,10 +16,12 @@ module Screenplay
 					@cache.clear
 				elsif action == :set
 					values.each { | cache_key, input_key  |
-						@cache[cache_key.to_sym] = (input_key == '$input'.to_sym) ? input : input[input_key.to_sym]
+						@cache[cache_key] = (input_key == '$input'.to_sym) ? input : input.get_value_from_path(input_key)
+						puts "\nSet cache #{cache_key} to #{@cache[cache_key]}" if Screenplay.options[:debug]
 					}
 				elsif (action == :merge || action == :get)
 					values.each { | input_key, cache_key |
+						puts "\nSet #{input_key.to_sym} to #{@cache[cache_key.to_sym]} from cache key #{cache_key}" if Screenplay.options[:debug]
 						output[input_key.to_sym] = @cache[cache_key.to_sym]
 					}
 				end

data/lib/screenplay/actors/test.rb

@@ -35,8 +35,7 @@ module Screenplay
 					test = test.to_s[4..-1] unless expects
 					method = "test_#{test}".to_sym
 					raise UnknownTestException.new(test) if !respond_to?(method)
-					raise UnknownInputKeyException.new(test, key) unless input.include?(key.to_sym)
-					a = input[key.to_sym]
+					a = input.get_value_from_path(key)
 					raise TestFailedException.new(test, a, b) unless (public_send(method, a, b) == expects)
 				}
 			}

data/lib/screenplay/datatype-extensions.rb

@@ -53,6 +53,27 @@ class Hash
 		return self
 	end
 
+	def get_value_from_path(path, sep_char = '.')
+		node, rest = path.to_s.split(sep_char, 2)
+		index = node.gsub(/(^.*\[|\]$)/, '')
+		value = nil
+		if node == index
+			value = self[node.to_sym] || self[node.to_s]
+		elsif index.numeric?
+			node.gsub!(/\[(\w+)\]$/, '')
+			if self.include?(node.to_sym) && self[node.to_sym].is_a?(Array)
+				value = self[node.to_sym][index.to_i]
+			elsif self.include?(node.to_s) && self[node.to_s].is_a?(Array)
+				value = self[node.to_s][index.to_i]
+			else
+				value = nil
+			end
+		end
+		return nil if value.nil?
+		return value if rest.nil? || rest.empty?
+		return value.is_a?(Hash) ? value.get_value_from_path(rest, sep_char) : nil
+	end
+
 end
 
 
@@ -102,12 +123,11 @@ class String
 		(self.length > max_length) ? self.to_s[0..max_length].gsub(/[^\w]\w+\s*$/, '...') : self.to_s
 	end
 
-	def replace_vars!(input)
+	def replace_vars!(input, sep_char = '.')
 		input = {} unless input.is_a?(Hash)
-		return if input.empty?
-		matches = {}
-		input.each { | k, v | matches['#{' + k.to_s + '}'] = v.to_s }
-		self.gsub!(/\#({\w+})/, matches)
+		self.gsub!(/\#({[\w#{Regexp.escape(sep_char)}]+})/) { | key |
+			input.get_value_from_path(key.delete("{}#"))
+		}
 	end
 
 	def replace_vars(input)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: screenplay
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Taco Jan Osinga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Screenplay