mailsocio_rails 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a75e8ff2ed1d5344a797f16d0ab268453d890af
-  data.tar.gz: a07994c2e18aa9e8a1e66ca5b45f351f4b743ec5
+  metadata.gz: 62ac0e391ddccb54f35b0cdf6b7840ebf6e412db
+  data.tar.gz: a195b1fb7816a2b16357c03dafc338a3b0253400
 SHA512:
-  metadata.gz: 0990a84ed8af1d6d7037c2e18288523d0e595092223e18d451a199391a2d80e4f1abf8b337bf21c1ad3928797713414024303a9acb8217b1181454402a254bc7
-  data.tar.gz: 628cea7c4cef60a12330dedffe86cf15ebfbe9d93aeb89ceed7c83371eb84515c7055f4cf5c4f1753ca0727f10581603f14feaded75515acf6d3e5514752c047
+  metadata.gz: 01889521cd0e027b209ed1cc4b0d125719a5c6b564102dd6b35020c06a4385619b1b851f168f6f263bbfdd95cd6a85e673de682aee6a2fa31c6fe1a5fd2f7eff
+  data.tar.gz: 17df29c184f737a689ae6aef1868728abb62d7156b9efd77c97d51aeec3215a6427015bbd06e2d7b947e20f8d51c691bd000ba53484627bdd24690913b4563d6

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/Gemfile

@@ -2,3 +2,9 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in mailsocio-action-mailer.gemspec
 gemspec
+
+group :development, :test do
+  gem "rspec"
+  gem "pry"
+  gem "pry-doc"
+end

data/README.md

@@ -1,20 +1,20 @@
 # Mailsocio Rails
 
-ActionMailer plugin to use mailsocio to deliver emails
+Плагин к ActionMailer для использования mailsocio для отправки электронной почты.
 
-## Installation
+## Установка
 
-Add this line to your application's Gemfile:
+Строчка в Гемфайл:
 
 ```ruby
 gem 'mailsocio_rails'
 ```
 
-And then execute `bundle`.
+Ну и выполните `bundle`.
 
-## Usage
+## Использование
 
-Configure ActionMailer as follows:
+Сконфигурируйте ActionMailer вот так:
 
 ```ruby
 # config/application.rb
@@ -26,30 +26,4 @@ config.action_mailer.mailsocio_settings = {
 }
 ```
 
-You're done!
-
-## Customization
-
-You can also override gem defaults:
-
-```ruby
-config.action_mailer.mailsocio_settings = {
-  account_id: '<your account id>',
-  api_key: '<your account api key>',
-
-  address:             'app.mailarbor.com',        # This can be any smtp server
-  port:                25,                         # that is capable to
-  domain:              'localhost.localdomain'     # deliver emails.
-
-  mailsocio_recipient: 'submit@app.mailarbor.com', # If you change this,
-                                                   # bad things can happen.
-}
-```
-
-## Contributing
-
-1. Fork it ( https://github.com/[my-github-username]/mailsocio_rails/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+Готово!

data/Rakefile

@@ -1,2 +1,5 @@
 require "bundler/gem_tasks"
 
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+task default: :spec

data/lib/mailsocio_rails/delivery.rb

@@ -36,8 +36,14 @@ module MailsocioRails
 
     def addresses_from(mail, *methods)
       methods.flat_map { |method|
-        (mail.send(method) || []).zip(mail[method].try(:display_names) || [])
+        (mail.send(method) || []).zip(really_try(mail[method], :display_names) || [])
       }
     end
+
+    def really_try(obj, meth, *args, &block)
+      obj.send(meth, *args, &block)
+    rescue NameError
+      nil
+    end
   end
 end

data/lib/mailsocio_rails/version.rb

@@ -1,3 +1,3 @@
 module MailsocioRails
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/lib/mailsocio_rails.rb

@@ -0,0 +1,11 @@
+require "spec_helper"
+
+RSpec.describe "mailsocio rails main file" do
+  it "adds delivery_method" do
+    expect(ActionMailer::Base.delivery_methods).to include(mailsocio: MailsocioRails::Delivery)
+  end
+
+  it "adds configuration method" do
+    expect(ActionMailer::Base).to respond_to(:mailsocio_settings=)
+  end
+end

data/spec/lib/mailsocio_rails/delivery_spec.rb

@@ -0,0 +1,91 @@
+require "spec_helper"
+
+RSpec.describe MailsocioRails::Delivery do
+  before(:each) do
+    # Reset all defaults back to original state
+    Mail.defaults do
+      delivery_method MailsocioRails::Delivery, {
+        account_id: "some_id",
+        api_key: "some_secret"
+      }
+    end
+    MockSMTP.clear_deliveries
+  end
+
+  describe "general usage" do
+    it "delivers to mailsocio gateway" do
+      mail = Mail.deliver do
+        from    "roger@moore.com"
+        to      "marcel@amont.com"
+        subject "invalid RFC2822"
+      end
+
+      expect(MockSMTP.deliveries[0].to).to eq [Mail.delivery_method.settings[:mailsocio_recipient]]
+    end
+
+    it "wipes to, cc and bcc" do
+      mail = Mail.deliver do
+        from    "roger@moore.com"
+        to      "marcel@amont.com"
+        cc      "moore@amont.com"
+        bcc     "luke@amont.com"
+        subject "invalid RFC2822"
+      end
+
+      expect(MockSMTP.deliveries[0].mail.to).not_to eq ["marcel@amont.com"]
+      expect(MockSMTP.deliveries[0].mail.cc).not_to be
+      expect(MockSMTP.deliveries[0].mail.bcc).not_to be
+    end
+
+    it "places to and cc to X-To" do
+      mail = Mail.deliver do
+        from    "roger@moore.com"
+        to      "Dr.Jones <marcel@amont.com>, <unnamed@gmail.com>"
+        cc      "AnotherGuy <mike@twitter.com>"
+        subject "invalid RFC2822"
+      end
+
+      expected_to = {
+        "marcel@amont.com" => { "name": "Dr.Jones" },
+        "unnamed@gmail.com" => { "name" => nil },
+        "mike@twitter.com" => {"name" => "AnotherGuy"}
+      }
+      expect(MockSMTP.deliveries[0].mail["X-To"].to_s).to eq expected_to.to_json
+    end
+
+    it "places bcc to X-Bcc" do
+      mail = Mail.deliver do
+        from    "roger@moore.com"
+        to      "marcel@amont.com"
+        bcc     "luke@amont.com"
+        subject "invalid RFC2822"
+      end
+
+      expect(MockSMTP.deliveries[0].mail["X-Bcc"].to_s).to eq "luke@amont.com"
+    end
+
+    it "preserves from and body" do
+      mail = Mail.deliver do
+        from    "roger@moore.com"
+        to      "marcel@amont.com"
+        subject "invalid RFC2822"
+        body    "Oh come on!"
+      end
+
+      expect(MockSMTP.deliveries[0].from).to eq "roger@moore.com"
+      expect(MockSMTP.deliveries[0].mail.body.to_s).to eq "Oh come on!"
+    end
+
+    it "adds account id and api key" do
+      mail = Mail.deliver do
+        from    "roger@moore.com"
+        to      "marcel@amont.com"
+        subject "invalid RFC2822"
+      end
+
+      expect(MockSMTP.deliveries[0].mail["X-Account-Id"].to_s).to eq "some_id"
+      expect(MockSMTP.deliveries[0].mail["X-Api-Key"].to_s).to eq "some_secret"
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,15 @@
+require 'bundler/setup'
+
+Bundler.require(:default, :test)
+
+require (Pathname.new(__FILE__).dirname + '../lib/mailsocio_rails').expand_path
+
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
+RSpec.configure do |config|
+  class Net::SMTP
+    def self.new(*args)
+      MockSMTP.new
+    end
+  end
+end

data/spec/support/mock_smtp.rb

@@ -0,0 +1,49 @@
+class MockSMTP
+
+  def self.deliveries
+    @@deliveries
+  end
+
+  def initialize
+    @@deliveries = []
+  end
+
+  def sendmail(mail, from, to)
+    @@deliveries << OpenStruct.new(raw: mail, from: from, to: to, mail: Mail.read_from_string(mail))
+    'OK'
+  end
+
+  def start(*args)
+    if block_given?
+      return yield(self)
+    else
+      return self
+    end
+  end
+
+  def finish
+    return true
+  end
+
+  def self.clear_deliveries
+    @@deliveries = []
+  end
+
+  # in the standard lib: net/smtp.rb line 577
+  #   a TypeError is thrown unless this arg is a
+  #   kind of OpenSSL::SSL::SSLContext
+  def enable_tls(context = nil)
+    if context && context.kind_of?(OpenSSL::SSL::SSLContext)
+      true
+    elsif context
+      raise TypeError,
+        "wrong argument (#{context.class})! "+
+        "(Expected kind of OpenSSL::SSL::SSLContext)"
+    end
+  end
+
+  def enable_starttls_auto(context = :dummy_ssl_context)
+    true
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailsocio_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Anahoret team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -61,21 +61,21 @@ dependencies:
 description: |
   # Mailsocio Rails
 
-  ActionMailer plugin to use mailsocio to deliver emails
+  Плагин к ActionMailer для использования mailsocio для отправки электронной почты.
 
-  ## Installation
+  ## Установка
 
-  Add this line to your application's Gemfile:
+  Строчка в Гемфайл:
 
   ```ruby
   gem 'mailsocio_rails'
   ```
 
-  And then execute `bundle`.
+  Ну и выполните `bundle`.
 
-  ## Usage
+  ## Использование
 
-  Configure ActionMailer as follows:
+  Сконфигурируйте ActionMailer вот так:
 
   ```ruby
   # config/application.rb
@@ -87,33 +87,7 @@ description: |
   }
   ```
 
-  You're done!
-
-  ## Customization
-
-  You can also override gem defaults:
-
-  ```ruby
-  config.action_mailer.mailsocio_settings = {
-    account_id: '<your account id>',
-    api_key: '<your account api key>',
-
-    address:             'app.mailarbor.com',        # This can be any smtp server
-    port:                25,                         # that is capable to
-    domain:              'localhost.localdomain'     # deliver emails.
-
-    mailsocio_recipient: 'submit@app.mailarbor.com', # If you change this,
-                                                     # bad things can happen.
-  }
-  ```
-
-  ## Contributing
-
-  1. Fork it ( https://github.com/[my-github-username]/mailsocio_rails/fork )
-  2. Create your feature branch (`git checkout -b my-new-feature`)
-  3. Commit your changes (`git commit -am 'Add some feature'`)
-  4. Push to the branch (`git push origin my-new-feature`)
-  5. Create a new Pull Request
+  Готово!
 email:
 - dmitriy.kiriyenko@anahoret.com
 executables: []
@@ -121,6 +95,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -129,6 +104,11 @@ files:
 - lib/mailsocio_rails/delivery.rb
 - lib/mailsocio_rails/version.rb
 - mailsocio_rails.gemspec
+- spec/lib/mailsocio_rails.rb
+- spec/lib/mailsocio_rails/delivery_spec.rb
+- spec/spec_helper.rb
+- spec/support/.keep
+- spec/support/mock_smtp.rb
 homepage: http://app.mailarbor.com
 licenses:
 - MIT
@@ -153,4 +133,10 @@ rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: ActionMailer plugin to use mailsocio to deliver emails
-test_files: []
+test_files:
+- spec/lib/mailsocio_rails.rb
+- spec/lib/mailsocio_rails/delivery_spec.rb
+- spec/spec_helper.rb
+- spec/support/.keep
+- spec/support/mock_smtp.rb
+has_rdoc: