glider 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56ade2823d9195bba93e1a16d53668fbd5ab541b
-  data.tar.gz: fed6293814d10e220b682c25e9dfe4c254df4f2a
+  metadata.gz: 49c8b08742fc8788d9d49197bf485a6a5030971f
+  data.tar.gz: d79644048c230745ae0cbbe291434eae5e62b44d
 SHA512:
-  metadata.gz: 9e0293cddb527f040d040deb4a12915dbd0375c933ae573deeb313487bf64add68ba8452df80f57beae27b0aec6250414d6d3c8be69b112e39e55a5c9b532944
-  data.tar.gz: 2f667877f767f44b8a9ee09617e10ba6688700719146d2eb0b875b6737f0d9ebfda00f8f56d2964a8cdd4720dafb1a860b95ad844ad8affdd8a30fe15ebc3e47
+  metadata.gz: 730c502cb42e085e6eb21443183f9e83d939b89d8abcdef045d378c02aaacb1573f0756e5636fdfb5b9ab7cf49b13073cdce0040d8d07311c286bc7002b72f20
+  data.tar.gz: fea7015660469c2160ee3f857a9d4181c87b7cd355ace861e65a398d3c6eb78ded76a81c25fbc189080b32536f51268551394f385f10bb1de1a1d69076ff0b8d

data/Gemfile

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gem 'aws-sdk', '>= 1.0.0'
 gem 'activesupport', '>= 4.0.0', require: 'active_support/inflector'
-
+gem 'json'
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do

data/Gemfile.lock

@@ -69,3 +69,4 @@ DEPENDENCIES
   aws-sdk (>= 1.0.0)
   bundler (~> 1.0)
   jeweler (~> 1.8.7)
+  json

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/examples/Gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 gem 'pry'
 gem 'aws-sdk'
 gem 'colorize'
-gem 'glider', '0.1.0'#, path: '../pkg/'
+gem 'glider', '0.1.2'#, path: '../pkg/'

data/examples/Gemfile.lock

@@ -14,7 +14,7 @@ GEM
       uuidtools (~> 2.1)
     coderay (1.1.0)
     colorize (0.6.0)
-    glider (0.1.0)
+    glider (0.1.2)
       activesupport (>= 4.0.0)
       aws-sdk (>= 1.0.0)
     i18n (0.6.5)
@@ -39,5 +39,5 @@ PLATFORMS
 DEPENDENCIES
   aws-sdk
   colorize
-  glider (= 0.1.0)
+  glider (= 0.1.2)
   pry

data/examples/activity.rb

@@ -8,6 +8,7 @@ class MySWF < Glider::Component
 	register_activity :hello_world, '1.5'
 
 	def hello_world(input)
+		task.fail! reason: "BECAUSE!" and return
 		$logger.warn "Executing hello_world."
 		sleep 2
 		$logger.warn "Completed hello_world."

data/examples/trigger.rb

@@ -2,7 +2,7 @@ require_relative 'shared_boot'
 
 def trigger
 	puts "TRIGGER!"
-	execution = Glider.execute :gt3, :say_hi, '1.5', "ALOHA"
+	execution = Glider.execute :gt3, :say_hi, '1.5', input: {message: "ALOHA"}.to_json
 	#Glider.signal :glider_test, execution.workflow_id, :test
 	return execution
 end

data/examples/workflow.rb

@@ -10,6 +10,7 @@ class MySWF < Glider::Component
 	def say_hi(event_name, event, data)
 		case event_name
 		when :workflow_execution_started, :hello_world_activity_timed_out
+			binding.pry
 			act = {name: 'hello_world', version: '1.5'}
 			task.schedule_activity_task act
 		when :test_signal

data/lib/glider.rb

@@ -1,6 +1,7 @@
 #$LOAD_PATH << File.dirname(__FILE__)
 
 #require 'active_support/all'
+require 'json'
 require 'aws-sdk'
 require 'active_support/inflector'
 #require 'act'

data/lib/glider/activities.rb

@@ -22,10 +22,10 @@ module Glider
 				options = default_options.merge options
 
 				begin
-					activity_type = domain.activity_types.create name.to_s, version, options
+					activity_type = domain.activity_types.create name.to_s, version.to_s, options
 				rescue AWS::SimpleWorkflow::Errors::TypeAlreadyExistsFault
 					# already registered
-					activity_type = domain.activity_types[name.to_s, version]
+					activity_type = domain.activity_types[name.to_s, version.to_s]
 				end
 				workers.times do 
 					ProcessManager.register_worker loop_block_for_activity(activity_type)
@@ -47,7 +47,7 @@ module Glider
 									Glider.logger.info "Executing activity=#{activity_type.name} workflow_id=#{workflow_id}"
 									target_instance = self.new activity_task
 									activity_result = target_instance.send activity_type.name, activity_task.input
-									activity_task.complete! result: activity_result.to_s
+									activity_task.complete! result: activity_result.to_s unless activity_task.responded?
 								rescue AWS::SimpleWorkflow::ActivityTask::CancelRequestedError
 									# cleanup after ourselves
 									activity_task.cancel!

data/lib/glider/utils.rb

@@ -4,10 +4,11 @@ module Glider
 		$logger ||= Logger.new STDOUT
 	end
 
-	def Glider.execute(domain_name, workflow_name, version, input)
+	def Glider.execute(domain_name, workflow_name, version, options={})
 		swf = AWS::SimpleWorkflow.new
 		domain = swf.domains[domain_name.to_s]
-		domain.workflow_types[workflow_name.to_s, version].start_execution input: input, task_start_to_close_timeout: 5
+		options = { task_start_to_close_timeout: 5 }.merge(options)
+		domain.workflow_types[workflow_name.to_s, version.to_s].start_execution options
 	end
 
 	def Glider.signal(domain_name, workflow_id, signal_name, options={})

data/lib/glider/workflows.rb

@@ -23,10 +23,10 @@ module Glider
 				}
 				options = default_options.merge options
 				begin
-					workflow_type = domain.workflow_types.create name.to_s, version, options
+					workflow_type = domain.workflow_types.create name.to_s, version.to_s, options
 				rescue AWS::SimpleWorkflow::Errors::TypeAlreadyExistsFault
 					# already registered
-					workflow_type = domain.workflow_types[name.to_s, version]
+					workflow_type = domain.workflow_types[name.to_s, version.to_s]
 				end
 				workers.times do 
 					ProcessManager.register_worker loop_block_for_workflow(workflow_type)
@@ -64,21 +64,27 @@ module Glider
 			end
 
 			def workflow_data_for(event_name, event)
-				case event_name
-				when :workflow_execution_started #:decision_task_scheduled
-					event.attributes.input
-				when :workflow_execution_signaled
-					begin event.attributes.input rescue nil end
-				when :activity_task_completed
-					begin event.attributes.result rescue nil end
-				else
-					begin 
-						event.attributes.result
-					rescue
-						Glider.logger.debug "no input or result in event, data will be nil event=#{event_name} attributes=#{event.attributes.to_h}"
-						nil
-					end
-				end 
+				data = 	case event_name
+						when :workflow_execution_started #:decision_task_scheduled
+							event.attributes.input
+						when :workflow_execution_signaled
+							begin event.attributes.input rescue nil end
+						when :activity_task_completed
+							begin event.attributes.result rescue nil end
+						else
+							begin 
+								event.attributes.result
+							rescue
+								Glider.logger.debug "no input or result in event, data will be nil event=#{event_name} attributes=#{event.attributes.to_h}"
+								nil
+							end
+						end 
+				# try to parse as JSON
+				begin
+					JSON.parse data
+				rescue JSON::ParserError
+					data
+				end
 			end
 
 			# used for timeouts and activity task completed
@@ -93,7 +99,6 @@ module Glider
 
 			def process_decision_task(workflow_type, task)
 				workflow_id = task.workflow_execution.workflow_id
-				Glider.logger.info "Deciding workflow=#{workflow_type.name} workflow_id=#{workflow_id}"
 				task.new_events.each do |event| 
 					event_name = ActiveSupport::Inflector.underscore(event.event_type).to_sym
 					if should_call_workflow_target? event_name, task.workflow_execution
@@ -105,10 +110,13 @@ module Glider
 					 		event_name = "#{event.attributes.signal_name}_signal".to_sym
 					 	when :activity_task_completed
 					 		event_name = "#{activity_name_for(task, event)}_activity_completed".to_sym
+					 	when :activity_task_failed
+					 		event_name = "#{activity_name_for(task, event)}_activity_failed".to_sym
 					 	when :activity_task_timed_out
 					 		event_name = "#{activity_name_for(task, event)}_activity_timed_out".to_sym
 						end
 						
+						Glider.logger.info "event_name=#{event_name} workflow=#{workflow_type.name} workflow_id=#{workflow_id}"
 						target_instance.send workflow_type.name, event_name, event, data
 						
 
@@ -117,7 +125,7 @@ module Glider
 						Glider.logger.debug decisions
 						if decisions.length == 0 && !task.responded?
 							# the decider didn't add any decision
-							Glider.logger.warn "No decision made workflow=#{workflow_type.name}  workflow_id=#{task.workflow_execution.workflow_id}"
+							Glider.logger.warn "No decision was made event_name=#{event_name} workflow=#{workflow_type.name} workflow_id=#{task.workflow_execution.workflow_id}"
 						end
 					end
 				end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glider
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - David Pelaez
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement