apostle-rails 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 820ba8052c67159b8831ba1bbbf574194dd6294d
-  data.tar.gz: f03e43cbbda3b74b1990868e173a6d7ca9587131
+  metadata.gz: e40feb7201325989310cb29d4ae0686695f2dfd6
+  data.tar.gz: bdd50f8383d0cc19773eaaac7b6e57835fd32da4
 SHA512:
-  metadata.gz: 75f1e252eb9f2834b916a0ea7f565bd4e3e657859db02ce40bf8bb53d17f2a194de3db301c59a58f0f5b39b391b62ec95b68cb2cf0dea1879da376beebd056b7
-  data.tar.gz: bee4a097b19fa528b0feb63426f0634a77cf8368407fea42465b6324718c3917692f69542d733382854db0aab8548abe0e2b4efe3bbaf5a1e51130bb595ddee7
+  metadata.gz: 7c4617edd9f93720619ca0adbd3f5c1eb78d20d5d0059042d84e58c116052332bf0778e6d89f4e5d2c53a9613ae0fe2563154fd1dd9eaa184eee9be21cf63b01
+  data.tar.gz: c094aa154c827351edaa7111ab5dad6cc16941edd90babc8f139c456325f133a33db71836802fcefc19153be273eb32651ec56602ba92129fc68c966c5831fb2

data/lib/apostle_rails/mailer.rb

@@ -18,7 +18,7 @@ module Apostle
         self.send(method_name, *args)
       end
 
-      def mail(template, headers, &block)
+      def mail(template, variables = {}, &block)
         m = @_message
         m.template_id = template
 
@@ -29,22 +29,14 @@ module Apostle
         end
 
         # Handle defaults
-        headers = headers.reverse_merge(default_values)
+        variables = variables.reverse_merge(default_values)
 
         # Set configure delivery behavior
         # TODO Enable config options such as perform_deliveries and raise_delivery_errors
         # wrap_delivery_behavior!(headers.delete(:delivery_method),headers.delete(:delivery_method_options))
 
-        # List of assignable attributes
-        directly_assignable = [:to, :from, :email, :name, :layout_id, :template, :reply_to]
-
-        # Anything that's not an assignable attribute is a header
-        assignable_headers = headers.except(*directly_assignable)
-        assignable_headers.each { |k, v| m.header(k, v) }
-
-        # Assign the assignable attributes
-        assignable_attributes = headers.slice(*directly_assignable)
-        assignable_attributes.each { |k, v| m.send("#{k}=", v) }
+        # Assign all attributes
+        variables.each { |k, v| m.send("#{k}=", v) }
 
         # Assign all new instance vars as attributes
         all_instance_vars = self.instance_variables.dup

data/lib/apostle_rails/version.rb

@@ -1,3 +1,3 @@
 module ApostleRails
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apostle-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Mal Curtis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler