mayaml 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 460a5ca87aa475de21f9fa38f4c546a8ec4c4db3
-  data.tar.gz: 9e44f1efb68113e3ff1a815f79871e60d5089e93
+  metadata.gz: 0fc2e662cee19930ae8a3802e1d42874f3ce5925
+  data.tar.gz: b7b2c54f4d44cc32270749c0d758ad47fba6fa45
 SHA512:
-  metadata.gz: e5c58756f99dab2e33c41c67619b0578a07666da179128cfa3310d36b04bde06910c902ccfa0d2a767d9301ebc66b8f468af705fc75f73315da6a24eb7eb75aa
-  data.tar.gz: d7e7a85789971c5a12103e982a32e72a3d3fd483191d01fa8249d15f29a926e1d46d13546d3e6d19b2393711ffb2f674bab90829808fc622d0058165964cd80a
+  metadata.gz: 79419e0e20c57900f1e9f62bd66de0af817d9d541ee15f40de0dafe4db1cdab090cb6821a2b18c98527ba3329f068b9985a7399a4fa85949bcc14c8f0d848126
+  data.tar.gz: d6fd36d5ac090d1f691cecc077cf1eee437a25d9e1277f06af12f36cf91341ac47a9d2b0dc16730edfb1df88fe1b16c4ea1862ae3c8e04d2007b9ef7bafa8ed4

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+=== 3.0.0 (2016.09.07)
+
+* add new required arrtibutes: `smtp_protocol`, `smtp_port` and `smtp_authenticator`
+* 4 valid account types: `imap`, `pop3`, `imapssl`, `pop3ssl`
+
 === 2.0.1 (2016.08.31)
 
 * update tests

data/README.md

@@ -43,17 +43,23 @@ Mayaml.accounts_from_file(yaml_path).each { |account| ... }
   pass: sercet_password
   mailboxes:
     - INBOX
+  smtp_protocol: smtps
+  smtp_port: 587
+  smtp_authenticator: login
 ```
 
 #### Required attributes
 
 * `name`
-* `type`
+* `realname`
+* `type` [imap | imapssl | pop3 | pop3ssl]
 * `server`
 * `port`
 * `user`
 * `pass`
-* `realname`
+* `smtp_protocol` [smpt | smtps]
+* `smtp_port`
+* `smtp_authenticator`
 
 #### Default attributes
 

data/lib/mayaml.rb

@@ -40,6 +40,9 @@ module Mayaml
       builder.user raw_account.fetch("user")
       builder.pass raw_account.fetch("pass")
       builder.mailboxes raw_account.fetch("mailboxes", [])
+      builder.smtp_protocol raw_account.fetch("smtp_protocol")
+      builder.smtp_port raw_account.fetch("smtp_port")
+      builder.smtp_authenticator raw_account.fetch("smtp_authenticator")
     end
   end
 end

data/lib/mayaml/mail_account.rb

@@ -19,7 +19,8 @@
 
 module Mayaml
   class MailAccount
-    attr_accessor :name, :default, :realname, :type, :server, :port, :user, :pass, :mailboxes
+    attr_accessor :name, :default, :realname, :type, :server, :port, :user, :pass, \
+                  :mailboxes, :smtp_protocol, :smtp_port, :smtp_authenticator
 
     def initialize
       set_default_flag
@@ -39,6 +40,7 @@ module Mayaml
       <<-DESC
         Account#{default_mark}: #{@name}<#{@realname}> | user: #{@user}:#{@pass}
           #{@type} - #{@server}:#{@port} [#{@mailboxes.join(",")}]
+          #{@smtp_protocol} - #{@server}:#{@smtp_port} [auth: #{@smtp_authenticator}]
       DESC
     end
   end

data/lib/mayaml/mail_account/builder.rb

@@ -23,6 +23,7 @@ require "mayaml/mail_account/type_validator"
 require "mayaml/mail_account/port_validator"
 require "mayaml/mail_account/mailboxes_validator"
 require "mayaml/mail_account/default_flag_validator"
+require "mayaml/mail_account/smtp_protocol_validator"
 
 module Mayaml
   class MailAccount
@@ -85,6 +86,20 @@ module Mayaml
         end
       end
 
+      def smtp_protocol(str)
+        valid_attribute SmtpProtocolValidator, WrongAccountSmtpProtocol, str
+        @account.smtp_protocol = str.to_sym
+      end
+
+      def smtp_port(nr)
+        valid_attribute PortValidator, WrongAccountSmtpPort, nr
+        @account.smtp_port = nr.to_i
+      end
+
+      def smtp_authenticator(str)
+        @account.smtp_authenticator = str
+      end
+
       def account
         obj = valid_account
         @account = ::Mayaml::MailAccount.new

data/lib/mayaml/mail_account/error.rb

@@ -37,5 +37,11 @@ module Mayaml
 
     class WrongAccountMailboxes < Error
     end
+
+    class WrongAccountSmtpPort < Error
+    end
+
+    class WrongAccountSmtpProtocol < Error
+    end
   end
 end

data/lib/mayaml/mail_account/required_attributes_validator.rb

@@ -24,17 +24,63 @@ module Mayaml
 
       def initialize(mail_account)
         @errors = []
-        @errors << "Missing name attribute." if mail_account.name.nil?
-        @errors << "Missing realname attribute." if mail_account.realname.nil?
-        @errors << "Missing type attribute." if mail_account.type.nil?
-        @errors << "Missing server attribute." if mail_account.server.nil?
-        @errors << "Missing user attribute." if mail_account.user.nil?
-        @errors << "Missing pass attribute." if mail_account.pass.nil?
+        @mail_account = mail_account
+        check_mail_account_attrs
       end
 
       def valid?
         @errors.empty?
       end
+
+      private
+
+      def check_mail_account_attrs
+        check_missing_name
+        check_missing_realname
+        check_missing_type
+        check_missing_server
+        check_missing_user
+        check_missing_pass
+        check_missing_smtp_protocol
+        check_missing_smtp_port
+        check_missing_smtp_authenticator
+      end
+
+      def check_missing_name
+        @errors << "Missing name attribute." if @mail_account.name.nil?
+      end
+
+      def check_missing_realname
+        @errors << "Missing realname attribute." if @mail_account.realname.nil?
+      end
+
+      def check_missing_type
+        @errors << "Missing type attribute." if @mail_account.type.nil?
+      end
+
+      def check_missing_server
+        @errors << "Missing server attribute." if @mail_account.server.nil?
+      end
+
+      def check_missing_user
+        @errors << "Missing user attribute." if @mail_account.user.nil?
+      end
+
+      def check_missing_pass
+        @errors << "Missing pass attribute." if @mail_account.pass.nil?
+      end
+
+      def check_missing_smtp_protocol
+        @errors << "Missing smtp_protocol attribute." if @mail_account.smtp_protocol.nil?
+      end
+
+      def check_missing_smtp_port
+        @errors << "Missing smtp_port attribute." if @mail_account.smtp_port.nil?
+      end
+
+      def check_missing_smtp_authenticator
+        @errors << "Missing smtp_authenticator attribute." if @mail_account.smtp_authenticator.nil?
+      end
     end
   end
 end

data/lib/mayaml/mail_account/smtp_protocol_validator.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+
+# Copyright (C) 2016 Szymon Kopciewski
+#
+# This file is part of Mayaml.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+module Mayaml
+  class MailAccount
+    class SmtpProtocolValidator
+      attr_reader :errors
+      VALID_TYPES = [:smtp, :smtps].freeze
+
+      def initialize(type)
+        @errors = []
+        type = type.to_sym if type.respond_to? :to_sym
+        unless VALID_TYPES.include?(type)
+          types = VALID_TYPES.join(", ")
+          @errors << "Mail account smtp_protocol is invalid. Allowed types: #{types}."
+        end
+      end
+
+      def valid?
+        @errors.empty?
+      end
+    end
+  end
+end

data/lib/mayaml/mail_account/type_validator.rb

@@ -21,7 +21,7 @@ module Mayaml
   class MailAccount
     class TypeValidator
       attr_reader :errors
-      VALID_TYPES = [:imap, :pop3].freeze
+      VALID_TYPES = [:imap, :pop3, :imapssl, :pop3ssl].freeze
 
       def initialize(type)
         @errors = []

data/lib/mayaml/version.rb

@@ -18,5 +18,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Mayaml
-  VERSION = "2.0.1".freeze
+  VERSION = "3.0.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mayaml
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Szymon Kopciewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -102,6 +102,7 @@ files:
 - lib/mayaml/mail_account/mailboxes_validator.rb
 - lib/mayaml/mail_account/port_validator.rb
 - lib/mayaml/mail_account/required_attributes_validator.rb
+- lib/mayaml/mail_account/smtp_protocol_validator.rb
 - lib/mayaml/mail_account/type_validator.rb
 - lib/mayaml/parser.rb
 - lib/mayaml/version.rb