mayaml 3.0.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9874c9e37bfc49de675f95dfc81d13b97e54f4d
-  data.tar.gz: a476d041cbf9d53b1d839a02a88a57bb67a561ec
+  metadata.gz: 74e3d6707b071d1f972bfb024d43eac1f5a1ca54
+  data.tar.gz: 088d0075bbb947df082e5477bf9ea97528511a5f
 SHA512:
-  metadata.gz: 55e738f33f89bde34d756cfeb4f77a8771e29ab6d59c6eab69c58ac19de0078994862f39f8e6c83c5bd20b8c05de4b4d946669e2a6ccf07b98ebdbed8a28d2cd
-  data.tar.gz: 608733f46b565b35b775e97b31d340d56317f3f349b3bdc2cc87a83ccbe5ee8573bcf3f0c990f1c37586fc14d5a702a4ff74a4cca3f8af231f3f12f89d0bb031
+  metadata.gz: 5b567d121147740c830bb684ec926607b35275bbc8ae328c6932fbfe56cbdb8e4e4a72363742861fc6ab8f4eaa92454a6f2da75ac81dbbfacb3740fa82d405c7
+  data.tar.gz: b5a057671e202871bfd38de08745055186b9653e1daa926dba0ef71436b7b2723c2a4c2f5ab1758605144fdee944eeec3c439c4ba8f4d5db12c5d19d50d8894c

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 4.0.0 (2017.04.06)
+
+* add smpt_server attribute
+* some refactoring
+* update license and cleanup
+
 ### 3.0.1 (2017.04.06)
 
 * fix travis integration

data/README.md

@@ -47,6 +47,7 @@ Mayaml.accounts_from_file(yaml_path).each { |account| ... }
   smtp_protocol: smtps
   smtp_port: 587
   smtp_authenticator: login
+  smtp_server: test.mailserver.com
 ```
 
 #### Required attributes
@@ -61,6 +62,7 @@ Mayaml.accounts_from_file(yaml_path).each { |account| ... }
 * `smtp_protocol` [smpt | smtps]
 * `smtp_port`
 * `smtp_authenticator`
+* `smtp_server`
 
 #### Default attributes
 

data/bin/mayaml-check

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Copyright (C) 2016 Szymon Kopciewski
+# Copyright (C) 2017 Szymon Kopciewski
 #
 # This file is part of Mayaml.
 #

data/lib/mayaml/error.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-# Copyright (C) 2016 Szymon Kopciewski
+# Copyright (C) 2017 Szymon Kopciewski
 #
 # This file is part of Mayaml.
 #

data/lib/mayaml/mail_account/builder.rb

@@ -1,7 +1,6 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
-# Copyright (C) 2016 Szymon Kopciewski
+# Copyright (C) 2017 Szymon Kopciewski
 #
 # This file is part of Mayaml.
 #
@@ -101,6 +100,10 @@ module Mayaml
         @account.smtp_authenticator = str
       end
 
+      def smtp_server(str)
+        @account.smtp_server = str
+      end
+
       def account
         obj = valid_account
         @account = ::Mayaml::MailAccount.new

data/lib/mayaml/mail_account/default_flag_validator.rb

@@ -1,7 +1,6 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
-# Copyright (C) 2016 Szymon Kopciewski
+# Copyright (C) 2017 Szymon Kopciewski
 #
 # This file is part of Mayaml.
 #
@@ -21,17 +20,23 @@
 module Mayaml
   class MailAccount
     class DefaultFlagValidator
-      attr_reader :errors
-
       def initialize(flag)
-        @errors = []
-        unless [true, false, "true", "false"].include? flag
-          @errors << "Flag need to be 'true' or 'false'"
-        end
+        @flag = flag
+        errors << "Flag need to be 'true' or 'false'" unless valid_flag?
       end
 
       def valid?
-        @errors.empty?
+        errors.empty?
+      end
+
+      def errors
+        @errors ||= []
+      end
+
+      private
+
+      def valid_flag?
+        [true, false, "true", "false"].include? @flag
       end
     end
   end

data/lib/mayaml/mail_account/error.rb

@@ -1,7 +1,6 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
-# Copyright (C) 2016 Szymon Kopciewski
+# Copyright (C) 2017 Szymon Kopciewski
 #
 # This file is part of Mayaml.
 #

data/lib/mayaml/mail_account/mailboxes_validator.rb

@@ -1,7 +1,6 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
-# Copyright (C) 2016 Szymon Kopciewski
+# Copyright (C) 2017 Szymon Kopciewski
 #
 # This file is part of Mayaml.
 #
@@ -21,21 +20,33 @@
 module Mayaml
   class MailAccount
     class MailboxesValidator
-      attr_reader :errors
-
       def initialize(mailboxes)
-        @errors = []
-        @errors << "Mailboxes should be array." unless mailboxes.instance_of? Array
-        if mailboxes.instance_of?(Array) && mailboxes.empty?
-          @errors << "Mailboxes can not be empty."
-        end
-        if mailboxes.instance_of?(Array) && !mailboxes.all? { |box| box.instance_of? String }
-          @errors << "Mailboxes should all be strings."
-        end
+        @mailboxes = mailboxes
+        errors << "Mailboxes should be array." unless right_mailboxes_type?
+        errors << "Mailboxes can not be empty." unless mailboxes_exists?
+        errors << "Mailboxes should all be strings." unless right_mailboxes_content?
       end
 
       def valid?
-        @errors.empty?
+        errors.empty?
+      end
+
+      def errors
+        @errors ||= []
+      end
+
+      private
+
+      def right_mailboxes_type?
+        @mailboxes.instance_of? Array
+      end
+
+      def mailboxes_exists?
+        right_mailboxes_type? && !@mailboxes.empty?
+      end
+
+      def right_mailboxes_content?
+        right_mailboxes_type? && @mailboxes.all? { |box| box.instance_of? String }
       end
     end
   end

data/lib/mayaml/mail_account/port_validator.rb

@@ -1,7 +1,6 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
-# Copyright (C) 2016 Szymon Kopciewski
+# Copyright (C) 2017 Szymon Kopciewski
 #
 # This file is part of Mayaml.
 #
@@ -21,17 +20,24 @@
 module Mayaml
   class MailAccount
     class PortValidator
-      attr_reader :errors
-
       def initialize(port)
-        @errors = []
-        port = port.respond_to?(:to_i) ? port.to_i : 0
-        @errors << "Mail account port is invalid." if port == 0
-        @errors << "Mail account port could not be negative." if port < 0
+        port = conver_port(port)
+        errors << "Mail account port is invalid." if port.zero?
+        errors << "Mail account port could not be negative." if port.negative?
       end
 
       def valid?
-        @errors.empty?
+        errors.empty?
+      end
+
+      def errors
+        @errors ||= []
+      end
+
+      private
+
+      def conver_port(port)
+        port.respond_to?(:to_i) ? port.to_i : 0
       end
     end
   end

data/lib/mayaml/mail_account/required_attributes_validator.rb

@@ -1,7 +1,6 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
-# Copyright (C) 2016 Szymon Kopciewski
+# Copyright (C) 2017 Szymon Kopciewski
 #
 # This file is part of Mayaml.
 #
@@ -45,6 +44,7 @@ module Mayaml
         check_missing_smtp_protocol
         check_missing_smtp_port
         check_missing_smtp_authenticator
+        check_missing_smtp_server
       end
 
       def check_missing_name
@@ -82,6 +82,10 @@ module Mayaml
       def check_missing_smtp_authenticator
         @errors << "Missing smtp_authenticator attribute." if @mail_account.smtp_authenticator.nil?
       end
+
+      def check_missing_smtp_server
+        @errors << "Missing smtp_server attribute." if @mail_account.smtp_server.nil?
+      end
     end
   end
 end

data/lib/mayaml/mail_account/smtp_protocol_validator.rb

@@ -1,7 +1,6 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
-# Copyright (C) 2016 Szymon Kopciewski
+# Copyright (C) 2017 Szymon Kopciewski
 #
 # This file is part of Mayaml.
 #
@@ -21,20 +20,33 @@
 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
+        @type = convert_type(type)
+        errors << "Mail account smtp_protocol is invalid. Allowed: #{types}." unless valid_type?
       end
 
       def valid?
-        @errors.empty?
+        errors.empty?
+      end
+
+      def errors
+        @errors ||= []
+      end
+
+      private
+
+      def convert_type(type)
+        type.to_sym if type.respond_to? :to_sym
+      end
+
+      def valid_type?
+        VALID_TYPES.include? @type
+      end
+
+      def types
+        VALID_TYPES.join(", ")
       end
     end
   end

data/lib/mayaml/mail_account/type_validator.rb

@@ -1,7 +1,6 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
-# Copyright (C) 2016 Szymon Kopciewski
+# Copyright (C) 2017 Szymon Kopciewski
 #
 # This file is part of Mayaml.
 #
@@ -21,19 +20,33 @@
 module Mayaml
   class MailAccount
     class TypeValidator
-      attr_reader :errors
       VALID_TYPES = [:imap, :pop3, :imapssl, :pop3ssl].freeze
 
       def initialize(type)
-        @errors = []
-        type = type.to_sym if type.respond_to? :to_sym
-        unless VALID_TYPES.include?(type)
-          @errors << "Mail account type is invalid. Allowed types: #{VALID_TYPES.join(", ")}."
-        end
+        @type = convert_type(type)
+        errors << "Mail account type is invalid. Allowed types: #{valid_types}." unless valid_type?
       end
 
       def valid?
-        @errors.empty?
+        errors.empty?
+      end
+
+      def errors
+        @errors ||= []
+      end
+
+      private
+
+      def convert_type(type)
+        type.to_sym if type.respond_to? :to_sym
+      end
+
+      def valid_type?
+        VALID_TYPES.include? @type
+      end
+
+      def valid_types
+        VALID_TYPES.join(", ")
       end
     end
   end

data/lib/mayaml/mail_account.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-# Copyright (C) 2016 Szymon Kopciewski
+# Copyright (C) 2017 Szymon Kopciewski
 #
 # This file is part of Mayaml.
 #
@@ -21,7 +21,7 @@
 module Mayaml
   class MailAccount
     attr_accessor :name, :default, :realname, :type, :server, :port, :user, :pass, \
-                  :mailboxes, :smtp_protocol, :smtp_port, :smtp_authenticator
+                  :mailboxes, :smtp_protocol, :smtp_port, :smtp_authenticator, :smtp_server
 
     def initialize
       set_default_flag
@@ -41,7 +41,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}]
+          #{@smtp_protocol} - #{@smtp_server}:#{@smtp_port} [auth: #{@smtp_authenticator}]
       DESC
     end
   end

data/lib/mayaml/parser.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-# Copyright (C) 2016 Szymon Kopciewski
+# Copyright (C) 2017 Szymon Kopciewski
 #
 # This file is part of Mayaml.
 #

data/lib/mayaml/version.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-# Copyright (C) 2016 Szymon Kopciewski
+# Copyright (C) 2017 Szymon Kopciewski
 #
 # This file is part of Mayaml.
 #
@@ -19,5 +19,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Mayaml
-  VERSION = "3.0.1"
+  VERSION = "4.0.0"
 end

data/lib/mayaml.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-# Copyright (C) 2016 Szymon Kopciewski
+# Copyright (C) 2017 Szymon Kopciewski
 #
 # This file is part of Mayaml.
 #
@@ -44,6 +44,7 @@ module Mayaml
       builder.smtp_protocol raw_account.fetch("smtp_protocol")
       builder.smtp_port raw_account.fetch("smtp_port")
       builder.smtp_authenticator raw_account.fetch("smtp_authenticator")
+      builder.smtp_server raw_account.fetch("smtp_server")
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mayaml
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Szymon Kopciewski