slactionmailer 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: facb80e15d5d783c867aff5b9610f07744d077e3
-  data.tar.gz: 8915d1a5b4e653a31c61a3b89e94a357ad3823ad
+  metadata.gz: b73fc4cb138a09f2af4ff78a986845c9b50cd322
+  data.tar.gz: cc75c51e5aef197fcc16f90e344da89f4e2d3aad
 SHA512:
-  metadata.gz: aaa1f00129e0b78f4a10611120ae726e8e1061dec6e0988907bfed0a5a48c109dd9e66c3ed8c0aa7d515102441a933e2db9f4c86143a7be49844276491dd7639
-  data.tar.gz: 80c98b01198ba4b0691186f92b79d0db395592a8ae4624a83adb698d7881d6d3f19e0c78f2e426ad01de2b8241a12040ecc8a68a14ab16289ef3a167c92da822
+  metadata.gz: d7c9a7687045ac7d8babbe58983c8671af0dc7ca8fcc22153ce78f6c7454f12aa7ca6a40f5a71ffd655ba70f18edc0b186419b69ce56a8ceafd54edf9b7b9658
+  data.tar.gz: 2f500cefad7559c52c3a3bb7142aa4c80e3e55e74ecdb84e917fc80da240ae3c6d3b667e53af1ad2bc0dabb7443cf259e57fc74feb1c8fea7c95473833d509f2

data/lib/slactionmailer/delivery_method.rb

@@ -3,16 +3,18 @@ module SlactionMailer
     class InvalidOption < StandardError; end
 
     attr_accessor :settings
-    
+
     def initialize(options = {})
-      raise InvalidOption, 'ENV["SLACK_WEBHOOK_URL"]is required to send messages' if options[:webhook].nil?
-      raise InvalidOption, 'ENV["SLACK_CHANNEL"]is required to send messages' if options[:channel].nil?
       raise InvalidOption, 'ENV["SLACK_USERNAME"]is required to send messages' if options[:username].nil?
       self.settings = options
     end
 
     def deliver!(mail)
-      notifier = Slack::Notifier.new settings[:webhook], channel:  settings[:channel], username: settings[:username]
+      raise InvalidOption, 'channel is required to send messages' if mail[:channel].nil? && ENV["SLACK_CHANNEL"].nil?
+      raise InvalidOption, 'webhook is required to send messages' if mail[:webhook].nil? && ENV["SLACK_USERNAME"].nil?
+      channel = mail[:channel].nil? ? ENV["SLACK_CHANNEL"] : mail[:channel].value
+      webhook = mail[:webhook].nil? ? ENV["SLACK_WEBHOOK_URL"] : mail[:webhook].value
+      notifier = Slack::Notifier.new webhook, channel: channel, username: settings[:username]
       if settings.key?(:template)
         message = Message.new(mail, :template => settings[:template])
       else

data/lib/slactionmailer/message.rb

@@ -1,9 +1,8 @@
 require 'erb'
 
-
 module SlactionMailer
   class Message < ERB
-    
+
     def initialize(mail, options = {})
       @mail = mail
       @template = options.fetch(:template, self.class.template)
@@ -12,7 +11,7 @@ module SlactionMailer
 
     def body
       @mail.text_part.body.decoded
-    end 
+    end
 
     def from
       @from ||= Array(@mail['from']).join(", ")
@@ -26,7 +25,7 @@ module SlactionMailer
 "Subject: <%= @mail.subject %>
  From: <%= from %>
  To: <%= to %>
- 
+
  <%= body %>"
     end
 

data/lib/slactionmailer/version.rb

@@ -1,3 +1,3 @@
 module Slactionmailer
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: slactionmailer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Lee Gillentine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 4.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 4.2.2
 - !ruby/object:Gem::Dependency