add api_url

zhouhuan
1 parent 3d2cc9a9
Showing 3 changed files with 7 additions and 22 deletions Show diff stats
lib/sendcloud/attachment.rb
lib/sendcloud/client.rb
lib/sendcloud/deliverer.rb
@@ -1,16 +0,0 @@
-module Sendcloud
-  class Attachment < StringIO
-    attr_reader :original_filename, :content_type, :path
-
-    def initialize (attachment, *rest)
-      @path = ''
-      if rest.detect {|opt| opt[:inline] }
-        basename = @original_filename = attachment.cid
-      else
-        basename = @original_filename = attachment.filename
-      end
-      @content_type = attachment.content_type.split(';')[0]
-      super attachment.body.decoded
-    end
-  end
-end
@@ -2,11 +2,12 @@ require &#39;rest_client&#39;
  
 module Sendcloud
   class Client
-    attr_reader :api_key, :domain
+    attr_reader :api_key, :domain, :api_url
  
     def initialize(api_key, domain)
       @api_key = api_key
       @domain = domain
+      @api_url = api_url
     end
  
     def send_message(options)
@@ -14,11 +15,7 @@ module Sendcloud
     end
  
     def sendcloud_url
-      api_url+"/messages"
-    end
-
-    def api_url
-      "http://api.sendcloud.net/apiv2/mail"
+      @api_url
     end
   end
 end
@@ -15,6 +15,10 @@ module Sendcloud
       self.settings[:api_key]
     end
  
+    def api_url
+      self.settings[:api_url]
+    end
+
     def deliver!(rails_message)
       response = sendcloud_client.send_message build_sendcloud_message_for(rails_message)
       if response.code == 200
...	...	@@ -1,16 +0,0 @@
1		-module Sendcloud
2		- class Attachment < StringIO
3		- attr_reader :original_filename, :content_type, :path
4		-
5		- def initialize (attachment, *rest)
6		- @path = ''
7		- if rest.detect {\|opt\| opt[:inline] }
8		- basename = @original_filename = attachment.cid
9		- else
10		- basename = @original_filename = attachment.filename
11		- end
12		- @content_type = attachment.content_type.split(';')[0]
13		- super attachment.body.decoded
14		- end
15		- end
16		-end
...	...	@@ -2,11 +2,12 @@ require 'rest_client'
2	2
3	3	module Sendcloud
4	4	class Client
5		- attr_reader :api_key, :domain
	5	+ attr_reader :api_key, :domain, :api_url
6	6
7	7	def initialize(api_key, domain)
8	8	@api_key = api_key
9	9	@domain = domain
	10	+ @api_url = api_url
10	11	end
11	12
12	13	def send_message(options)
...	...	@@ -14,11 +15,7 @@ module Sendcloud
14	15	end
15	16
16	17	def sendcloud_url
17		- api_url+"/messages"
18		- end
19		-
20		- def api_url
21		- "http://api.sendcloud.net/apiv2/mail"
	18	+ @api_url
22	19	end
23	20	end
24	21	end
...	...
...	...	@@ -15,6 +15,10 @@ module Sendcloud
15	15	self.settings[:api_key]
16	16	end
17	17
	18	+ def api_url
	19	+ self.settings[:api_url]
	20	+ end
	21	+
18	22	def deliver!(rails_message)
19	23	response = sendcloud_client.send_message build_sendcloud_message_for(rails_message)
20	24	if response.code == 200
...	...