Commit 4b1f82835e3a11b3351b62bd8a7de15878289144

Authored by zhouhuan
1 parent 0784b839
Exists in master

remove client options

.gitignore
... ... @@ -40,3 +40,5 @@ bower.json
40 40  
41 41 # Ignore Byebug command history file.
42 42 .byebug_history
  43 +
  44 +.*.swp
... ...
lib/sendcloud/client.rb
... ... @@ -2,11 +2,9 @@ require 'rest_client'
2 2  
3 3 module Sendcloud
4 4 class Client
5   - attr_reader :api_key, :api_user, :api_url
  5 + attr_reader :api_url
6 6  
7   - def initialize(api_key, api_user, api_url)
8   - @api_key = api_key
9   - @api_user = api_user
  7 + def initialize(api_url)
10 8 @api_url = api_url
11 9 end
12 10  
... ...
lib/sendcloud/deliverer.rb
... ... @@ -32,7 +32,7 @@ module Sendcloud
32 32  
33 33 def build_sendcloud_message_for(rails_message)
34 34 sendcloud_message = build_basic_sendcloud_message_for rails_message
35   - #transform_sendcloud_attributes_from_rails rails_message, sendcloud_message
  35 + transform_sendcloud_attributes_from_rails rails_message, sendcloud_message
36 36 remove_empty_values sendcloud_message
37 37  
38 38 sendcloud_message
... ... @@ -40,11 +40,13 @@ module Sendcloud
40 40  
41 41 def build_basic_sendcloud_message_for(rails_message)
42 42 sendcloud_message = {
43   - from: rails_message[:from].formatted,
44   - to: rails_message[:to].formatted,
45   - subject: rails_message.subject,
46   - html: extract_html(rails_message),
47   - text: extract_text(rails_message)
  43 + apiUser: api_user,
  44 + apiKey: api_key,
  45 + from: rails_message[:from].formatted,
  46 + to: rails_message[:to].formatted,
  47 + subject: rails_message.subject,
  48 + html: extract_html(rails_message),
  49 + text: extract_text(rails_message)
48 50 }
49 51  
50 52 [:cc, :bcc].each do |key|
... ... @@ -90,7 +92,7 @@ module Sendcloud
90 92 end
91 93  
92 94 def sendcloud_client
93   - @sendcloud_client ||= Client.new(api_key, api_user, api_url)
  95 + @sendcloud_client ||= Client.new(api_url)
94 96 end
95 97 end
96 98 end
... ...