launch_control 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 862084a345e31444834f1be53cabc41e7c2ca9fa
-  data.tar.gz: 97ba4842f3be6640dfc571c0bda30fbf177092d9
+  metadata.gz: e6ca5a72db16aac918a2604d405c7633cf386907
+  data.tar.gz: ca9f3df4166bc41e187786f3857f73499d4c03ee
 SHA512:
-  metadata.gz: ea6f1112b7f95097cece49d81452ff1e5d731b1bcb15aa62e1c15b4bd5c87a7b545859cd7fda5723e86a323a348e8e415d48656ae06acb283b362102352e9390
-  data.tar.gz: c5e0495a06647b62bb5a180f04476c419bc1cd030a64c7598a274d52f75961a25b6f197faf5db666aed169272696f6c99e75c1b9e0d7c08e1bd7234d78e47cc4
+  metadata.gz: 64f62077388716398fee4dbb881dcf1c29cc7038da4f6d23a083688491bacabf37fb321334d197b091fcfa35bc2b75d1b2246d7c5c74538203d9346afbbf0765
+  data.tar.gz: cefceac0ff5419c5c448fc4fc5b97f59f5517104c6abb953366797ecf273691538208fc5d4cb1564f57568a1e54007a01bb3efede087f10acaaa508032c312ce

data/launch_control.gemspec

@@ -35,5 +35,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", '~> 3.2', ">= 3.2.0"
   spec.add_development_dependency "pry", '~> 0.9', ">= 0.9.12"
   spec.add_development_dependency "webmock"
+  spec.add_development_dependency "byebug"
   spec.add_development_dependency "simplecov", '~> 0.10', ">= 0.10.0"
 end

data/lib/launch_control.rb

@@ -73,7 +73,7 @@ module LaunchControl
     end
 
     def valid?
-      !!(@to && @subject && @template_id)
+      !!(@to && @template_id)
     end
 
     private

data/lib/launch_control/mandrill_contract.rb

@@ -38,15 +38,18 @@ module LaunchControl
       default_email_contract.merge!(validations)
     end
 
+    def defaults
+      {}
+    end
+
     def merged_options(options)
-      options
+      defaults.merge(options)
     end
 
-    def deliver!(options)
-      options = merged_options(options)
-      launch = LaunchControl::Mailer.new(template, options)
+    def deliver!(options = {})
+      launch = LaunchControl::Mailer.new(template, merged_options(options))
       raise ContractFailure.new(error_string) unless valid?(options) && launch.valid?
-      valid?(options) && launch.valid? && launch.deliver
+      launch.deliver
     end
 
     def deliver(options)
@@ -55,14 +58,15 @@ module LaunchControl
     end
 
     def default_email_contract
+      # Note that subject is not required as it can be set in Mandrill
       {
-        to:      lambda { |to| [Array,String,Hash].include?(to.class) },
-        subject: 'string'
+        to: lambda { |to| [Array,String,Hash].include?(to.class) && to.present? }
       }
     end
 
-    def valid?(options)
-      validator = HashValidator.validate(options, merged_contract)
+    def valid?(options = {})
+      merged_options = merged_options(options)
+      validator = HashValidator.validate(merged_options, merged_contract)
       if validator.valid?
         true
       else
@@ -76,5 +80,9 @@ module LaunchControl
         "#{attr} #{message}"
       }.join(', ')
     end
+
+    def string_present?
+      lambda { |value| value.class == String && value.present? }
+    end
   end
 end

data/lib/launch_control/version.rb

@@ -1,3 +1,3 @@
 module LaunchControl
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: launch_control
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Chris Teague
@@ -146,6 +146,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement