klaviyo-rails 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f28c35f8c31c26d66cccddd22fb2842b99f74f1
-  data.tar.gz: 586af0d96fc875b00abde7e7e06ac8aaeefb04ea
+  metadata.gz: b0dd6b7ffa88ded8b24b90c1cabcc8136655400e
+  data.tar.gz: 57ce1e1e158c0ff47dbba3b97d960353bb676c97
 SHA512:
-  metadata.gz: ca03abcdfed5ad54486ff857ad4e6a1183ed0dbef7b954374b936b290a7fcba155219c44e0de0a3206c3cf2abdcc1016b65a652514ebf9769e861e42738b682a
-  data.tar.gz: 4b969ad517ee93d800122823e0780439f923459011a6074a482208d05bd704f03d498a53b44505ef82dc28031c7f433b101b29b6a6653d97c95252232fe7628c
+  metadata.gz: f9709e3a04042998e990fa3014b63bc3b2f1a780c300121bd50921b9f2a31adc808212bfe0087e800a770d95dad48bb86b8677571d609a205949f31209dc090f
+  data.tar.gz: e0c3873b1a8bfb792c8534319c97838dd6ac811e6df9c40cfcebdcc4258c989ed5da393c301d1eac0fb39cc155c207c2d13b94827a9faa14116881cd30c3d64a

data/lib/klaviyo-rails/delivery_method.rb

@@ -11,17 +11,8 @@ module KlaviyoRails
     end
 
     def deliver!(mail)
-      response = client.invoke(
-        :templates,
-        :render_and_send,
-        id: mail['template_id'].value,
-        context: mail['context'].value,
-        service: settings.fetch(:service) { 'klaviyo' },
-        from_email: mail['from'].to_s,
-        from_name:  mail['from'].display_names.first,
-        subject: mail['subject'].to_s,
-        to: mail['to'].to_s
-      )
+
+      response = client.templates.render_and_send(message_to_klaviyo(mail))
 
       if settings[:return_response]
         response
@@ -32,6 +23,25 @@ module KlaviyoRails
 
     private
 
+    def klaviyo_message(message)
+      @klaviyo_message = {
+        id: message['template_id'].value,
+        context: message['context'].value,
+        service: settings.fetch(:service) { 'klaviyo' },
+        subject: message['subject'].to_s,
+        to: message['to'].to_s
+      }
+
+      if message['from']
+        @klaviyo_message[:from_email] = message['from'].addresses.first
+        unless message['from'].display_names.compact.empty?
+          @klaviyo_message[:from_name] = message['from'].display_names.compact.first
+        end
+      end
+
+      @klaviyo_message
+    end
+
     def client
       @client ||= ::Klaviyo::Client.new(settings[:secret_key], settings[:token])
     end

data/lib/klaviyo-rails/version.rb

@@ -1,3 +1,3 @@
 module KlaviyoRails
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: klaviyo-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Maxim Pechnikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel588-klaviyo