griddler 1.0.0.pre.alpha.2 → 1.0.0.pre.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14d0542f8b3e4760904cd0cae896aa2f2b38bfef
-  data.tar.gz: ce6967089ef0171910af88f294a6a6aafba876fc
+  metadata.gz: 5db84495ea1dd75d93ad77af6b7b345471658418
+  data.tar.gz: ab4522dd7709770a8fa825c1328a034fc42abe8a
 SHA512:
-  metadata.gz: b4163d740d3bccefdb2339663331a3ffa8a3bb7e5caa7687188a21446a143a2670588b2c4b3654a35e99455f64a4c843d2ace43ebc60e0fb1ef9b6ad40ef1067
-  data.tar.gz: 88a91945c578a51cda0f769715533ab6fa66431d7f9e7ccc59dd4f195a19e7936a20c6873df444b35c81a37eca3866cf4b64065f5939dbfdabe726820adc8d46
+  metadata.gz: c3a1251948e7b861c2fea3ba5e526a90c14dbe352ab9b00d64dacb18fb9cd0a3e3dd77f3a910ed0f709eb9802ef81a031dbe624d4392902d1bb6877df04ca6d3
+  data.tar.gz: 3df07fd60447f539702466ea27e5d6890e2e68d25266b0a9e3cc98d6b134b15125d2cea2cd4dfe835b0501bbfd9f8aecf29b3ada57064af1eb1ac79f32702932

data/app/controllers/griddler/emails_controller.rb

@@ -1,14 +1,25 @@
 class Griddler::EmailsController < ActionController::Base
   def create
     normalized_params.each do |p|
-      Griddler::Email.new(p).process
+      process_email Griddler::Email.new(p)
     end
+
     head :ok
   end
 
   private
 
+  delegate :processor_class, :processor_method, :email_service, to: :griddler_configuration
+
   def normalized_params
-    Array.wrap(Griddler.configuration.email_service.normalize_params(params))
+    Array.wrap(email_service.normalize_params(params))
+  end
+
+  def process_email(email)
+    processor_class.new(email).public_send(processor_method)
+  end
+
+  def griddler_configuration
+    Griddler.configuration
   end
 end

data/lib/griddler.rb

@@ -7,12 +7,3 @@ require 'griddler/email_parser'
 require 'griddler/configuration'
 require 'griddler/route_extensions'
 require 'griddler/adapter_registry'
-require 'griddler/adapters/cloudmailin_adapter'
-require 'griddler/adapters/postmark_adapter'
-
-require 'griddler/sendgrid'
-require 'griddler/mandrill'
-require 'griddler/mailgun'
-
-Griddler.adapter_registry.register(:cloudmailin, Griddler::Adapters::CloudmailinAdapter)
-Griddler.adapter_registry.register(:postmark, Griddler::Adapters::PostmarkAdapter)

data/lib/griddler/configuration.rb

@@ -16,30 +16,7 @@ module Griddler
   end
 
   class Configuration
-    attr_accessor :processor_class, :processor_method, :reply_delimiter, :cc, :from
-
-    def to
-      @to ||= :hash
-    end
-
-    def to=(type)
-      if type == :token
-        Kernel.warn <<-WARN.strip_heredoc
-          [Deprecation] the :token option is deprecated and will be removed in v0.6.
-          For tokens use :hash and retrieve the token from email.to[:token] or choose any of [:email, :full, :hash]
-        WARN
-      end
-
-      @to = type
-    end
-
-    def cc
-      @cc ||= :email
-    end
-
-    def from
-      @from ||= :email
-    end
+    attr_accessor :processor_class, :processor_method, :reply_delimiter
 
     def processor_class
       @processor_class ||=
@@ -65,7 +42,7 @@ module Griddler
     end
 
     def email_service
-      @email_service_adapter ||= Griddler.adapter_registry[:sendgrid]
+      @email_service_adapter ||= Griddler.adapter_registry[:default]
     end
 
     def email_service=(new_email_service)

data/lib/griddler/email.rb

@@ -10,7 +10,7 @@ module Griddler
       @params = params
 
       @to = recipients(:to)
-      @from = extract_address(params[:from], config.from)
+      @from = extract_address(params[:from])
       @subject = params[:subject]
 
       @body = extract_body
@@ -27,12 +27,6 @@ module Griddler
       @attachments = params[:attachments]
     end
 
-    def process
-      processor_class  = config.processor_class
-      processor_method = config.processor_method
-      processor_class.public_send(processor_method, self)
-    end
-
     private
 
     attr_reader :params
@@ -41,18 +35,12 @@ module Griddler
       @config ||= Griddler.configuration
     end
 
-    def recipients(type=:to)
-      params[type].to_a.map { |recipient| extract_address(recipient, config.send(type)) }
+    def recipients(type)
+      params[type].to_a.map { |recipient| extract_address(recipient) }
     end
 
-    def extract_address(address, type)
-      parsed = EmailParser.parse_address(address)
-
-      if type == :hash
-        parsed
-      else
-        parsed[type]
-      end
+    def extract_address(address)
+      EmailParser.parse_address(address)
     end
 
     def extract_body

data/lib/griddler/email_parser.rb

@@ -76,7 +76,7 @@ module Griddler::EmailParser
       reply_delimeter_regex,
       /^\s*[-]+\s*Original Message\s*[-]+\s*$/i,
       /^\s*--\s*$/,
-      /^\s*\>?\s*On.*\r?\n?\s*.*\s*wrote:$/,
+      /^\s*\>?\s*On.*\r?\n?\s*.*\s*wrote:\r?\n?$/,
       /On.*wrote:/,
       /From:.*$/i,
       /^\s*\d{4}\/\d{1,2}\/\d{1,2}\s.*\s<.*>?$/i

data/lib/griddler/testing.rb

@@ -51,7 +51,39 @@ shared_examples_for 'Griddler adapter' do |adapter, service_params|
         email: 'hi@example.com',
         name: 'Hello World',
       }])
-      email.cc.should eq ['emily@example.com']
+      email.cc.should eq [{
+        token: 'emily',
+        host: 'example.com',
+        email: 'emily@example.com',
+        full: 'emily@example.com',
+        name: nil
+      }]
+    end
+  end
+end
+
+RSpec::Matchers.define :be_normalized_to do |expected|
+  failure_message do |actual|
+    message = ""
+    expected.each do |k, v|
+      if actual[k] != expected[k]
+        message << "expected :#{k} to be normalized to #{expected[k].inspect}, "\
+          "but received #{actual[k].inspect}\n"
+      end
+    end
+    message
+  end
+
+  description do
+    "be normalized to #{expected}"
+  end
+
+  match do |actual|
+    expected.each do |k, v|
+      case v
+      when Regexp then actual[k].should =~ v
+      else actual[k].should === v
+      end
     end
   end
 end

data/lib/griddler/version.rb

@@ -1,3 +1,3 @@
 module Griddler
-  VERSION = "1.0.0-alpha.2"
+  VERSION = "1.0.0-beta.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: griddler
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha.2
+  version: 1.0.0.pre.beta.1
 platform: ruby
 authors:
 - Caleb Thompson
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -69,6 +69,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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
@@ -99,8 +113,6 @@ files:
 - config/initializers/griddler.rb
 - lib/griddler.rb
 - lib/griddler/adapter_registry.rb
-- lib/griddler/adapters/cloudmailin_adapter.rb
-- lib/griddler/adapters/postmark_adapter.rb
 - lib/griddler/configuration.rb
 - lib/griddler/email.rb
 - lib/griddler/email_parser.rb

data/lib/griddler/adapters/cloudmailin_adapter.rb

@@ -1,34 +0,0 @@
-module Griddler
-  module Adapters
-    class CloudmailinAdapter
-      def initialize(params)
-        @params = params
-      end
-
-      def self.normalize_params(params)
-        adapter = new(params)
-        adapter.normalize_params
-      end
-
-      def normalize_params
-        {
-          to: params[:envelope][:to].split(','),
-          cc: ccs,
-          from: params[:envelope][:from],
-          subject: params[:headers][:Subject],
-          text: params[:plain],
-          attachments: params.fetch(:attachments) { [] },
-        }
-      end
-
-      private
-
-      attr_reader :params
-
-      def ccs
-        params[:headers][:Cc].to_s.split(',').map(&:strip)
-      end
-
-    end
-  end
-end

data/lib/griddler/adapters/postmark_adapter.rb

@@ -1,63 +0,0 @@
-module Griddler
-  module Adapters
-    class PostmarkAdapter
-      def initialize(params)
-        @params = params
-      end
-
-      def self.normalize_params(params)
-        adapter = new(params)
-        adapter.normalize_params
-      end
-
-      def normalize_params
-        {
-          to: extract_recipients(:ToFull),
-          cc: extract_recipients(:CcFull),
-          from: full_email(params[:FromFull]),
-          subject: params[:Subject],
-          text: params[:TextBody],
-          html: params[:HtmlBody],
-          attachments: attachment_files,
-        }
-      end
-
-      private
-
-      attr_reader :params
-
-      def extract_recipients(key)
-        params[key].to_a.map { |recipient| full_email(recipient) }
-      end
-
-      def full_email(contact_info)
-        email = contact_info[:Email]
-        if contact_info[:Name].present?
-          "#{contact_info[:Name]} <#{email}>"
-        else
-          email
-        end
-      end
-
-      def attachment_files
-        attachments = Array(params[:Attachments])
-
-        attachments.map do |attachment|
-          ActionDispatch::Http::UploadedFile.new({
-            filename: attachment[:Name],
-            type: attachment[:ContentType],
-            tempfile: create_tempfile(attachment)
-          })
-        end
-      end
-
-      def create_tempfile(attachment)
-        filename = attachment[:Name]
-        tempfile = Tempfile.new(filename, Dir::tmpdir, encoding: 'ascii-8bit')
-        tempfile.write(Base64.decode64(attachment[:Content]))
-        tempfile.rewind
-        tempfile
-      end
-    end
-  end
-end