griddler 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c93ac0eaccf2bf366151a3d202d31fb80c955e3a
-  data.tar.gz: 7966242ad3ac5d8566b8ed991b3b1118f266d88d
+  metadata.gz: 5a2cacfe5e74d1231a76e4502ed28c88399fd769
+  data.tar.gz: 3213db391f6032cfa65f6d0fa2e0323b45016001
 SHA512:
-  metadata.gz: 42e335e21700230465f2f60b9148cb0bd7188c5b99c86421d8bb06d3e34f8c4658a0b871c1248d5620a1edf4b1cb59e200bc961b0df5571c0698eda403894fc6
-  data.tar.gz: 40fdce0ad4cdd2e3644b40a253bf427e1b724c70831c36ae02ddd07b4efc07b835fda1e48537d7cca073f2d5d08a105d7a4c23144e870fb5e33ad10f5ce32af0
+  metadata.gz: c9cf20906c65491d019e30b68dfd669c5f16f80eca4cbb922410c91f63b338e723e52f1a7912e56a2f6dfc10b041806eb64fe2ce7bc6adfdea3a1038ac88c304
+  data.tar.gz: b047cccc5d6ea2fdfce31da626671fe11de304ec5d338850afacdf1640da27f51d60c31bee2b72d54d9c64db6147c17a9ad4d5d54e93d193e32d5925d1f6e6b7

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Caleb Thompson, Joel Oliveira and thoughtbot, inc.
+Copyright (c) 2014 Caleb Thompson, Joel Oliveira and thoughtbot, inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -286,6 +286,6 @@ The names and logos for thoughtbot are trademarks of thoughtbot, inc.
 License
 -------
 
-Griddler is Copyright © 2013 Caleb Thompson, Joel Oliveira and thoughtbot. It is
+Griddler is Copyright © 2014 Caleb Thompson, Joel Oliveira and thoughtbot. It is
 free software, and may be redistributed under the terms specified in the LICENSE
 file.

data/lib/griddler/adapters/mandrill_adapter.rb

@@ -13,12 +13,12 @@ module Griddler
       def normalize_params
         events.map do |event|
           {
-            to: recipients(event),
-            cc: ccs(event),
+            to: recipients(:to, event),
+            cc: recipients(:cc, event),
             from: full_email([ event[:from_email], event[:from_name] ]),
             subject: event[:subject],
-            text: event[:text],
-            html: event[:html],
+            text: event.fetch(:text, ''),
+            html: event.fetch(:html, ''),
             raw_body: event[:raw_msg],
             attachments: attachment_files(event)
           }
@@ -35,13 +35,8 @@ module Griddler
         end
       end
 
-      def recipients(event)
-        event[:to].map { |recipient| full_email(recipient) }
-      end
-
-      def ccs(event)
-        found = event[:headers].select { |header| header.first == 'Cc' }.first
-        Array(found).last.to_s.split(',').map(&:strip)
+      def recipients(field, event)
+        Array.wrap(event[field]).map { |recipient| full_email(recipient) }
       end
 
       def full_email(contact_info)

data/lib/griddler/email.rb

@@ -16,7 +16,7 @@ module Griddler
       @body = extract_body
       @raw_text = params[:text]
       @raw_html = params[:html]
-      @raw_body = @raw_text || @raw_html
+      @raw_body = @raw_text.presence || @raw_html
 
       @headers = extract_headers
 
@@ -68,11 +68,8 @@ module Griddler
     end
 
     def text_or_sanitized_html
-      if params.key? :text
-        clean_text(params[:text])
-      elsif params.key? :html
-        clean_html(params[:html])
-      end
+      text = clean_text(params.fetch(:text, ''))
+      text.presence || clean_html(params.fetch(:html, '')).presence
     end
 
     def clean_text(text)

data/lib/griddler/version.rb

@@ -1,3 +1,3 @@
 module Griddler
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: griddler
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Caleb Thompson
@@ -11,76 +11,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   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: sqlite3
   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: jquery-rails
   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'
 description: 
@@ -125,17 +125,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: SendGrid Parse API client Rails Engine