alphamail 1.0.1.pre → 1.0.3

data/lib/alphamail.rb

@@ -5,7 +5,7 @@ require 'net/http'
 require 'json'
 
 # Email contact class
-class EmailContact
+class AlphaMailEmailContact
 	attr_accessor :name
 	attr_accessor :email
 
@@ -16,22 +16,27 @@ class EmailContact
 end
 
 # Message payload class
-class EmailMessagePayload
+class AlphaMailEmailMessagePayload
 	attr_accessor :project_id
 	attr_accessor :receiver_id
 	attr_accessor :sender
 	attr_accessor :receiver
 	attr_accessor :body
 
-	def initialize(project_id = 0, receiver_id = 0, sender = EmailContact.new('', ''), receiver = EmailContact.new('', ''), body = '')
+	def initialize(project_id = 0, receiver_id = 0, sender = AlphaMailEmailContact.new('', ''), receiver = AlphaMailEmailContact.new('', ''), body = '')
 		@project_id = project_id
 		@receiver_id = receiver_id
 		@sender = sender
 		@receiver = receiver
 		@body = body
+		@body_json = ''
 	end
 
 	def to_json(*a)
+		if @body.respond_to?('to_json')
+			@body_json  = @body.to_json
+		end
+		
 		{
 			'project_id'		=>	project_id,
 			'receiver_id'		=>	receiver_id,
@@ -39,11 +44,20 @@ class EmailMessagePayload
 			'sender_email'		=>	sender.email,
 			'receiver_name'		=>	receiver.name,
 			'receiver_email'	=>	receiver.email,
-			'body'			=>	body
+			'body'			=>	@body_json
 		
 		}.to_json(*a)
 	end
+end
 
+class AlphaMailResult
+	attr_accessor :error_code
+	attr_accessor :message
+	
+	def initialize(error_code = 0, message = '')
+		@error_code = error_code
+		@message = message
+	end
 end
 
 # Alpha-mail email service
@@ -60,12 +74,20 @@ class AlphaMailEmailService
 		req.basic_auth '', @api_token
 		req.body = payload.to_json
 		req.content_type = 'application/json'
-		res = Net::HTTP.start('api.am1.comfirm.se', uri.port) {|http|
+		res = Net::HTTP.start(uri.host, uri.port) {|http|
 			http.request(req)
 		}
-		puts res.body
-
-		puts 'Message was successfully queued!'
+		
+		# Check response
+		case res.code
+			when '200' then
+				am_res = JSON.parse(res.body)
+				return AlphaMailResult.new(am_res['error_code'], am_res['message'])
+			else
+				am_res = JSON.parse(res.body)
+				return AlphaMailResult.new(am_res['error_code'], am_res['message'])
+		end 
+		return AlphaMailResult.new(-1, 'Unknown error')
 	end
 end
 

data/spec/alphamail_test.rb

@@ -1,11 +1,11 @@
 require 'rubygems'
 require 'alphamail'
 
-class Member
+class NewMember
 	attr_accessor :name
 	attr_accessor :password
 	
-	def initialize(name = 'Unknown', password = '')
+	def initialize(name = 'Unknown', password = 'unset1')
 		@name = name
 		@password = password
 	end
@@ -19,15 +19,38 @@ class Member
 	end
 end
 
-m = Member.new 'Jack', 'my3Pass0rd89'
+# Demo 1 --------------------------------------------------
+
+# The email content (in this case, member info)
+myMember = NewMember.new('Ruby Diamond Ruben', 'my3Passw0rd89')
+
+# The payload
+myPayload = AlphaMailEmailMessagePayload.new
+
+# Set payload fields
+myPayload.project_id = 139
+myPayload.receiver_id = 1
+myPayload.sender.name = 'Jack Sender'
+myPayload.sender.email = 'jack@example.com'
+myPayload.receiver.name = 'John Doe'
+myPayload.receiver.email = 'john.doe@example.com'
+myPayload.body = myMember
+
+myService = AlphaMailEmailService.new 'http://api.am1.comfirm.se/v1', 'YOUR-TOKEN-HERE'
+am_res = myService.queue(myPayload)
+puts "#{am_res.error_code} #{am_res.message}"
+
+
+# Demo 2 ---------------------
+
+# The payload
+am_res = myService.queue(AlphaMailEmailMessagePayload.new(
+	139,								# Project ID
+	2,								# Sender ID
+	AlphaMailEmailContact.new('Jack Sender', 'jack@example.com'),	# Sender
+	AlphaMailEmailContact.new('John Doe', 'john.doe@example.com'),	# Receiver
+	NewMember.new('John Doe', 'wh4tswhAt')				# Body object
+))
+puts "#{am_res.error_code} #{am_res.message}"
 
-a = EmailMessagePayload.new
-a.project_id = 139
-a.sender.name = 'Jack'
-a.sender.email = 'jack.johansson@comfirm.se'
-a.receiver.name = 'Timothy'
-a.receiver.email = 'jack@skysel.com'
-a.body = m.to_json
 
-service = AlphaMailEmailService.new 'http://api.am1.comfirm.se/v1', '4e8c684c47a2f0-50424246'
-service.queue(a)

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: alphamail
 version: !ruby/object:Gem::Version 
-  hash: 961915984
-  prerelease: true
+  hash: 17
+  prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  - pre
-  version: 1.0.1.pre
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Jack Engqvist Johansson