barthes 0.0.13 → 0.0.14

data/barthes.gemspec

@@ -27,4 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "term-ansicolor"
   spec.add_dependency "activesupport"
   spec.add_dependency "nokogiri"
+  spec.add_dependency "chronic"
+  spec.add_dependency "httparty"
 end

data/example/q3_env.json

@@ -0,0 +1,4 @@
+{
+	"endpoint": "http://q3-global.herokuapp.com",
+	"method": "GET"
+}

data/example/q3_spec.json

@@ -0,0 +1,66 @@
+["feature", "Q3", [
+  ["scenario", "CreateQueue", [
+    ["action", "create queue with CreateQueue API", {
+      "params": {
+        "Action": "CreateQueue",
+        "QueueName": "takeuchitest"
+      },
+      "expectations": [
+        {
+          "type": "response_code",
+          "value": 200
+        },
+        {
+          "type": "xpath_value",
+          "xpath": "//CreateQueueResponse/CreateQueueResult/QueueUrl",
+          "value": "http://q3-global.herokuapp.com/*/takeuchitest"
+        }
+      ]
+    }],
+    ["action", "check if that queue is created with ListQueues API", {
+      "params": {
+        "Action": "ListQueues"
+      },
+      "expectations": [
+        {
+          "type": "response_code",
+          "value": 200
+        },
+        {
+          "type": "xpath_value",
+          "xpath": "ListQueuesResponse/ListQueuesResult/QueueUrl[1]",
+          "value": "http://q3-global.herokuapp.com/*/takeuchitest"
+        }
+      ]
+    }],
+    ["action", "send message to that queue with SendMessage API", {
+      "params": {
+        "Action": "SendMessage",
+        "MessageBody": "hello barthes"
+      },
+      "env": {
+        "path": "/*/takeuchitest"
+      },
+      "expectations": [
+        {
+          "type": "response_code",
+          "value": 200
+        }
+      ]
+    }],
+    ["action", "receive message from that queue with ReceiveMessage API", {
+      "params": {
+        "Action": "ReceiveMessage"
+      },
+      "env": {
+        "path": "/*/takeuchitest"
+      },
+      "expectations": [
+        {
+          "type": "response_code",
+          "value": 200
+        }
+      ]
+    }]
+  ]]
+]]

data/lib/barthes/action.rb

@@ -1,10 +1,12 @@
 require 'barthes/cache'
+require 'barthes/client/httparty'
+require 'chronic'
 
 module Barthes
 	class Action
 		def initialize(env)
 			@env = env.dup
-			client_class = Object.const_get(@env['client_class'])
+			client_class = @env['client_class'] ? @env['client_class'].constantize : Barthes::Client::HTTParty
 			@client = client_class.new(env)
 		end
 
@@ -73,7 +75,8 @@ module Barthes
 			new_params = {}
 			params.each do |k, v|
 				if v.class == String
-					new_v = v.gsub(/\$\{(.+?)\}/) { @env[$1] }
+					new_v = v.gsub(/\$\{time:(.+?):(.+?)\}/) { Chronic.parse($1).strftime($2) }
+					new_v = new_v.gsub(/\$\{(.+?)\}/) { @env[$1] }
 					new_v = new_v.gsub(/\@\{(.+?)\}/) { Barthes::Cache[$1] }
 				else
 					new_v = v

data/lib/barthes/cli.rb

@@ -11,7 +11,7 @@ module Barthes
 			  on 'e', 'env',       'environment file paths',               argument: :optional, as: Array
 			  on 'q', 'quiet',     'not show test details',                argument: :optional, as: :count
 			  on 'f', 'from',      'test number to start from',            argument: :optional, as: Integer, default: 1
-			  on 't', 'to',        'test number to stop to',               argument: :optional
+			  on 't', 'to',        'test number to stop to',               argument: :optional, as: Integer
 			  on 'l', 'load',      'An optional password',                 argument: :optional
 			  on 'd', 'dryrun',    'not run test but show just structure', argument: :optional, as: :count
 			  on 'c', 'cache',     'cache path',                           argument: :optional, default: './barthes-cache.json'

data/lib/barthes/client/httparty.rb

@@ -0,0 +1,56 @@
+require 'httparty'
+require 'nokogiri'
+
+module Barthes
+	module Client
+		class HTTParty
+			include ::HTTParty
+
+			def initialize(env)
+				@env = env
+			end
+
+			def action(params)
+				url = @env['path'] ? @env['endpoint'] + @env['path'] : @env['endpoint']
+				self.class.post(url, query: params)
+			end
+
+			def compare(response, expectation)
+				result = nil
+				case expectation['type']
+				when 'response_code'
+					result = response.code == expectation['value']
+					{'result' => result, 'returned' => response.code, 'expected' => expectation['value']}
+				when 'xpath_value'
+					text = xpath(response, expectation['xpath']).text
+					if expectation['method'].nil? || expectation['method'] == 'eq'
+						result = (text == expectation['value'])
+        		                elsif expectation['method'] == 'regexp'
+						result = !(text.match Regexp.new(expectation['value'])).nil?
+					elsif expectation['method'] == 'ne'
+						result = (text != expectation['value'])
+					end
+					{'result' => result, 'returned' => text, 'expected' => expectation['value']}
+				when 'xpath_size'
+					size = xpath(response, expectation['xpath']).size
+					if expectation['method'].nil? || expectation['method'] == 'eq'
+						result = (size == expectation['value'])
+					elsif expectation['method'] == 'gt'
+						result = (size > expectation['value'])
+					end
+					{'result' => result, 'returned' => size, 'expected' => expectation['value']}
+				else
+					{'result' => true}
+				end
+			end
+
+			def extract(config, response)
+			end
+
+			def xpath(response, xpath)
+				doc = Nokogiri::XML response.body.gsub(/xmlns="(.+?)"/, '')
+				doc.xpath(xpath)
+			end
+		end
+	end
+end

data/lib/barthes/reporter/default.rb

@@ -9,19 +9,19 @@ module Barthes
 				@opts = opts
 			end
 
-			def before_feature(num, name)
-				puts "#{name} (##{num})"
+			def before_feature(name)
+				puts name
 			end
 
-			def before_scenario(num, name, scenario, scenarios)
-				puts ("\t" * scenarios.size) + "#{name} (##{num})"
+			def before_scenario(name, scenario, scenarios)
+				puts ("\t" * scenarios.size) + name
 			end
 
-			def before_action(num, name, action, scenarios)
-				puts ("\t" * scenarios.size) + "#{name} (##{num})"
+			def before_action(name, action, scenarios)
+				puts ("\t" * scenarios.size) + "##{action['number']} #{name}"
 			end
 
-			def after_action(num, name, action, scenarios)
+			def after_action(name, action, scenarios)
 				if Barthes::Config[:quiet] == 0 && Barthes::Config[:dryrun] == 0
 					puts indent scenarios.size + 1, "request:"
 					puts indent scenarios.size + 2, JSON.pretty_generate(action['request'])
@@ -59,6 +59,31 @@ module Barthes
 					("\t" * num) + line
 				end.join("\n")
 			end
+
+			def after_run(features)
+				@count = Hash.new(0)
+				walk_json(features)
+				puts '-' * 80
+				puts [
+					"all: #{@count['all'].to_s }",
+					"success: #{@count['success'] > 0 ? green { @count['success'].to_s } : @count['success'].to_s }",
+					"failure: #{@count['failure'] > 0 ? red { @count['failure'].to_s }   : @count['failure'].to_s }",
+					"error: #{@count['error'] > 0 ? red { @count['error'].to_s } : @count['error'].to_s }",
+					"skipped: #{@count['skipped'].to_s }"
+				].join(", ")
+			end
+
+			def walk_json(obj)
+				case obj.first
+				when 'feature', 'scenario'
+					walk_json(obj.last)
+				when 'action'
+					@count['all'] += 1
+					@count[obj.last['status']] += 1
+				else
+					obj.each {|obj2| walk_json(obj2) }
+				end
+			end
 		end
 	end
 end

data/lib/barthes/runner.rb

@@ -10,7 +10,8 @@ module Barthes
 			Barthes::Config.update(options)
 			load_cache
 			load_libraries
-			load_envs(options[:env])
+			@env = {}
+			load_envs(options[:env]) if options[:env]
 			@reporter = Reporter.new
 		end
 
@@ -26,7 +27,6 @@ module Barthes
 		end
 
 		def load_envs(env_paths)
-			@env = {}
 			env_paths.each do |path|
 				@env.update JSON.parse File.read(path)
 			end
@@ -55,8 +55,7 @@ module Barthes
 				@num = 1
 				files.each do |file|
 					json = JSON.parse File.read(file)
-					@reporter.report(:feature, @num, json[1]) do
-						@num += 1
+					@reporter.report(:feature, json[1]) do
 						walk_json(json.last, [file])
 						results << json
 						json
@@ -71,7 +70,7 @@ module Barthes
 
 		def in_range?
 			flag = @num >= Barthes::Config[:from]
-			flag = flag && (@num >= Barthes::Config[:to]) if Barthes::Config[:to]
+			flag = flag && (@num <= Barthes::Config[:to]) if Barthes::Config[:to]
 			flag
 		end
 	
@@ -80,11 +79,12 @@ module Barthes
 				case json.first
 				when 'scenario'
 					handle_scenario(json, scenarios)
-					@num += 1
 					scenarios.push(json.first)
 					walk_json(json.last, scenarios)
 					scenarios.pop
 				when 'action'
+					json.last['status'] = 'skipped' if Barthes::Config[:dryrun] > 0
+					json.last['number'] = @num
 					handle_action(json, scenarios) if in_range?
 					@num += 1
 				else
@@ -97,7 +97,7 @@ module Barthes
 	
 		def handle_scenario(scenario, scenarios)
 			return if @failed
-			@reporter.report(:scenario, @num, scenario[1], scenario.last, scenarios) do
+			@reporter.report(:scenario, scenario[1], scenario.last, scenarios) do
 				scenario.last
 			end
 		end
@@ -107,13 +107,11 @@ module Barthes
 			name, content = action[1], action.last
 			env = @env.dup
 			env.update(content['env']) if content['env']
-			@reporter.report(:action, @num, name, action.last, scenarios) do
-				content['number'] = @num
+			@reporter.report(:action, name, action.last, scenarios) do
 				if Barthes::Config[:dryrun] == 0 && !@failed
 					content = Action.new(env).action(content)
 					@failed = true if %w(failure error).include?(content['status'])
 				end
-				content['status'] = 'skipped' if Barthes::Config[:dryrun] > 0
 				content
 			end
 		end

data/lib/barthes/version.rb

@@ -1,3 +1,3 @@
 module Barthes
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: barthes
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -139,6 +139,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: lightweight scenario test framework
 email:
 - tily05@gmail.com
@@ -155,10 +187,13 @@ files:
 - Rakefile
 - barthes.gemspec
 - bin/barthes
+- example/q3_env.json
+- example/q3_spec.json
 - lib/barthes.rb
 - lib/barthes/action.rb
 - lib/barthes/cache.rb
 - lib/barthes/cli.rb
+- lib/barthes/client/httparty.rb
 - lib/barthes/config.rb
 - lib/barthes/reporter.rb
 - lib/barthes/reporter/default.rb