antwort 0.0.12 → 1.0.0

data/lib/antwort/{builder.rb → builders.rb}

@@ -1,8 +1,8 @@
-require 'antwort/builder/helpers/logic'
-require 'antwort/builder/helpers/sanitizers'
+require 'antwort/helpers/logic_helper'
+require 'antwort/helpers/sanitizers_helper'
+
 require 'antwort/builder/builder'
 require 'antwort/builder/email'
 require 'antwort/builder/partial'
 require 'antwort/builder/flattener'
 require 'antwort/builder/style'
-require 'antwort/cli/helpers'

data/lib/antwort/cli.rb

@@ -1,7 +1,6 @@
 require 'fileutils'
 require 'thor'
 
-require 'antwort/cli/helpers'
 require 'antwort/cli/cli'
 require 'antwort/cli/send'
 require 'antwort/cli/upload'

data/lib/antwort/cli/cli.rb

@@ -1,7 +1,7 @@
 module Antwort
   class CLI < Thor
     include Thor::Actions
-    include Antwort::CLIHelpers
+    include Antwort::FileHelpers
 
     class_option :version, type: :boolean
 
@@ -53,20 +53,19 @@ module Antwort
     desc 'list', 'Lists all emails in the ./emails directory by id'
     method_option aliases: 'l'
     def list
-      list_folders('./emails').each { |e| puts "- #{e}" }
+      EmailCollection.new.list.each do |email_id|
+        puts "- #{email_id}"
+      end
     end
 
     #-- upload
 
     desc 'upload', 'Uploads email assets to AWS S3'
-    method_option :force,
-                  type: :boolean,
-                  default: false,
-                  aliases: '-f',
-                  desc: 'Overwrites existing files on the server'
     method_option aliases: 'u'
+
     def upload(email_id)
-      Upload.new(email_id, options[:force]).upload
+      require 'antwort/cli/upload'
+      Upload.new(email_id).upload
     end
 
     #-- send
@@ -81,16 +80,17 @@ module Antwort
                   type: :string,
                   default: ENV['SEND_TO'],
                   aliases: '-r',
-                  desc: 'Email address of receipient'
+                  desc: 'Email address of receipient(s). Split multiple recipients with a comma.'
     method_option :subject,
                   type: :string,
                   aliases: '-s',
                   desc: 'Email Subject. Defaults to <title> value if blank.'
     def send(email_id)
+      require 'antwort/cli/send'
       build = last_build_by_id(email_id)
 
       if build.nil?
-        say "   warning  ", :yellow
+        say '   warning  ', :yellow
         say "No build found for '#{email_id}'. Building now..."
         build(email_id)
         build = last_build_by_id(email_id)
@@ -131,48 +131,37 @@ module Antwort
                   default: 'expanded',
                   aliases: '-c',
                   desc: 'CSS output style'
-    def build(email_id='')
-      require 'antwort'
-
-      emails = options[:all] ? available_emails : Array.new.push(email_id)
-
-      emails.each do |email_id|
-        attrs = { email: email_id, id: create_id_from_timestamp }.merge(options)
-        email = Antwort::EmailBuilder.new(attrs)
-        until email.build
-          sleep 1
-        end
-
-        if build_partials?
-          partials = Antwort::PartialBuilder.new(attrs)
-          sleep 1 until partials.build
-        end
+    def build(email_id = '')
+      if email_id.empty?
+        say 'Error: ', :red
+        say 'build which email?'
+        list
+      else
+        to_build = options[:all] ? EmailCollection.new.list : email_id
+        Build.new(to_build, options).create!
+        show_accuracy_warning if options[:partials]
       end
-
-      show_accuracy_warning if build_partials?
-
-      return true
     end
 
     #-- prune
 
     desc 'prune', 'Removes all files in the ./build directory'
     method_option :force,
-              type: :boolean,
-              default: false,
-              aliases: '-f',
-              desc: 'Removes all files in the ./build directory'
+                  type: :boolean,
+                  default: false,
+                  aliases: '-f',
+                  desc: 'Removes all files in the ./build directory'
     def prune
       if confirms_prune?
         build_dir = File.expand_path('./build')
         Dir.foreach(build_dir) do |f|
           next if f.to_s[0] == '.'
-          say "   delete ", :red
+          say '  delete ', :red
           say "./build/#{f}/"
           FileUtils.rm_rf(File.expand_path("./build/#{f}"))
         end
       else
-        say "prune aborted."
+        say 'prune aborted.'
       end
     end
 
@@ -180,22 +169,28 @@ module Antwort
 
     desc 'remove [email_id]', 'Removes an email, incl. its assets, styles and data'
     method_option :force,
-              type: :boolean,
-              default: false,
-              aliases: '-f',
-              desc: 'Removes an email, incl. its assets, styles and data'
+                  type: :boolean,
+                  default: false,
+                  aliases: '-f',
+                  desc: 'Removes an email, incl. its assets, styles and data'
     def remove(email_id)
       @email_id = email_id
+
+      unless can_remove?
+        say "The '#{email_id}' folder is a project dependency and cannot be removed.", :red
+        return
+      end
+
       if confirms_remove?
         remove_email
       else
-        say "Remove aborted."
+        say 'Remove aborted.'
       end
     end
 
     #-- version
 
-    desc 'version','Ouputs version number'
+    desc 'version', 'Ouputs version number'
     def version
       puts "Version: #{Antwort::VERSION}" if options[:version]
     end
@@ -205,9 +200,8 @@ module Antwort
     attr_reader :project_name, :email_id
 
     no_commands do
-
-      def build_partials?
-        options[:partials]
+      def can_remove?
+        email_id != 'shared'
       end
 
       def confirms_prune?
@@ -223,7 +217,7 @@ module Antwort
                   File.join('assets', 'css', email_directory)
         directory 'email/images',
                   File.join('assets', 'images', email_directory)
-        create_file File.join('data', "#{email_id}.yml")
+        create_file!(content: '', path: File.join('data', "#{email_id}.yml"))
         copy_file 'email/email.html.erb',
                   File.join('emails', email_directory, 'index.html.erb')
       end
@@ -252,11 +246,11 @@ module Antwort
       end
 
       def email_directory
-        email_id.downcase.gsub(/([^A-Za-z0-9_\/-]+)|(--)/, '')
+        email_id.downcase.gsub(%r{([^A-Za-z0-9_/-]+)|(--)}, '')
       end
 
       def project_directory
-        project_name.downcase.gsub(/([^A-Za-z0-9_\/-]+)|(--)/, '')
+        project_name.downcase.gsub(%r{([^A-Za-z0-9_/-]+)|(--)}, '')
       end
 
       def create_id_from_timestamp

data/lib/antwort/cli/send.rb

@@ -5,7 +5,7 @@ module Antwort
   class CLI
     class Send
       include Thor::Shell
-      attr_reader :build_id, :sender, :recipient, :subject
+      attr_reader :build_id, :sender, :recipient, :subject, :html_body, :mail
 
       Mail.defaults do
         delivery_method :smtp,
@@ -18,15 +18,16 @@ module Antwort
                         return_response: true
       end
 
-      def initialize(build_id, options={})
+      def initialize(build_id, options = {})
         @build_id  = build_id
-        @html_body = File.open("#{build_folder}/#{template_name}.html").read
+        @html_body = File.open("build/#{build_id}/#{template_name}.html").read
 
-        @recipient = options[:recipient]
+        @recipient = (options[:recipient] || ENV['SEND_TO']).split(',')
         @sender    = options[:from] || ENV['SEND_FROM']
-        @subject   = options[:subject] || "[Test] " << extract_title(@html_body)
+        @subject   = options[:subject] || '[Test] ' << extract_title(@html_body)
       end
 
+      # rubocop:disable Metrics/MethodLength
       def send
         # because scope changes inside mail DSL
         mail_from    = @sender
@@ -34,7 +35,7 @@ module Antwort
         mail_subject = @subject
 
         # setup email
-        mail = Mail.new do
+        @mail = Mail.new do
           from     mail_from
           to       mail_to
           subject  mail_subject
@@ -44,13 +45,13 @@ module Antwort
           end
 
           html_part do
-            content_type 'text/html; charset=UTF-8'
+            content_type 'text/html'
             body @html_body
           end
         end
 
         # send email
-        if mail.deliver!
+        if @mail.deliver!
           say "Sent Email \"#{template_name}\" at #{Time.now.strftime('%d.%m.%Y %H:%M')}", :green
           say "  to:      #{@recipient}"
           say "  subject: #{@subject}"
@@ -59,6 +60,7 @@ module Antwort
           say "Error sending #{build_id}/#{template_name} at #{Time.now.strftime('%d.%m.%Y %H:%M')}", :red
         end
       end
+      # rubocop:enable Metrics/MethodLength
 
       private
 
@@ -66,14 +68,9 @@ module Antwort
         @build_id.split('-')[0...-1].join('-') # removes timestamp ID
       end
 
-      def build_folder
-        "build/#{@build_id}"
-      end
-
       def extract_title(body = '')
         body.scan(%r{<title>(.*?)</title>}).first.first
       end
-
     end
   end
-end
+end

data/lib/antwort/cli/upload.rb

@@ -4,39 +4,37 @@ module Antwort
   class CLI
     class Upload < Thor
       include Thor::Actions
-      include Antwort::CLIHelpers
-      attr_reader :email_id
+      include Antwort::FileHelpers
+
+      attr_reader :email_id, :template
+
+      def initialize(email_id)
+        @email_id = email_id
+        @template = Antwort::EmailTemplate.new(email_id)
 
-      def initialize(email_id, force = false)
-        @force      = force
-        @email_id   = email_id
-        @images_dir = images_dir(email_id)
         check_credentials
       end
 
       no_commands do
-
         def check_credentials
           failed = false
-          vars = ['ASSET_SERVER', 'AWS_BUCKET', 'AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY']
+          vars = %w(ASSET_SERVER AWS_BUCKET AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY)
           vars.each do |var|
-            if ENV[var].nil?
-              say "Error ", :red
-              say "#{var} not set."
-              failed = true
-            end
+            next unless ENV[var].nil?
+            say 'Error ', :red
+            say "#{var} not set."
+            failed = true
           end
 
-          if failed
-            abort "Please fix your .env config file and try again."
-          end
+          abort 'Please fix your .env config file and try again.' if failed
         end
 
         def upload
-          count = count_files @images_dir
-          abort "No images in #{@images_dir} to upload." if count === 0
+          unless @template.has_images?
+            abort "#{@template.name} has no images to upload."
+          end
 
-          if confirms_upload?(count)
+          if confirms_upload?
             do_upload
           else
             say 'Upload aborted. ', :red
@@ -44,21 +42,21 @@ module Antwort
           end
         end
 
-        def confirms_upload?(count)
-          yes?("Upload #{count} images and overwrite '#{email_id}' folder on assets server? (y/n)")
+        def confirms_upload?
+          yes?("Upload #{@template.images.length} images and overwrite '#{@template.name}' folder on assets server? (y/n)")
         end
 
         def do_upload
           clean_directory!
-          Dir.foreach(@images_dir) do |f|
-            next if f.to_s[0] == '.'
+
+          @template.images.each do |f|
             directory.files.create(
-              key: "#{email_id}/#{f}",
-              body: File.open(File.join(@images_dir, f)),
+              key: upload_path(f),
+              body: File.open(@template.image_path(f)),
               public: true
             )
             say '    create   ', :green
-            say "#{ENV['ASSET_SERVER']}/#{email_id}/#{f}"
+            say "#{ENV['ASSET_SERVER']}/#{upload_path(f)}"
           end
         end
 
@@ -76,13 +74,16 @@ module Antwort
           return @directory if defined?(@directory)
 
           @directory ||=
-            connection.directories.get(ENV['AWS_BUCKET'], prefix: email_id)
+            connection.directories.get(ENV['AWS_BUCKET'], prefix: @template.name)
+        end
+
+        def upload_path(file)
+          "#{@template.name}/#{file}"
         end
 
         def clean_directory!
           directory.files.each(&:destroy)
         end
-
       end
     end
   end

data/lib/antwort/core.rb

@@ -0,0 +1,4 @@
+require 'antwort/email/build'
+require 'antwort/email/collection'
+require 'antwort/email/template'
+require 'antwort/email/data'

data/lib/antwort/email/build.rb

@@ -0,0 +1,41 @@
+require 'antwort/builders'
+
+module Antwort
+  class Build
+    include Antwort::Helpers
+    include Antwort::FileHelpers
+
+    attr_reader :id
+
+    def initialize(emails, opts = {})
+      @id      = new_timestamp_id
+      @emails  = emails.is_a?(Array) ? emails : [].push(emails)
+      @options = opts
+    end
+
+    def create!
+      @emails.each do |email_id|
+        attrs = { email: email_id, id: @id }.merge(@options)
+        build_email(attrs)
+        build_partials(attrs) if @options[:partials]
+      end
+    end
+
+    private
+
+    def build_email(attrs)
+      email = Antwort::EmailBuilder.new(attrs)
+      sleep 1 until email.build!
+    end
+
+    def build_partials(attrs)
+      partials = Antwort::PartialBuilder.new(attrs)
+      sleep 1 until partials.build!
+    end
+
+    def new_timestamp_id
+      stamp = Time.now.to_s
+      stamp.split(' ')[0..1].join.gsub(/(-|:)/, '')
+    end
+  end
+end

data/lib/antwort/email/collection.rb

@@ -0,0 +1,41 @@
+module Antwort
+  class EmailCollection
+    include Antwort::Helpers
+    include Antwort::FileHelpers
+
+    attr_reader :templates, :list
+
+    def initialize
+      @templates = []
+      @list = []
+
+      dir = './emails'
+      find_templates(dir) if Dir.exist? dir
+    end
+
+    def empty?
+      @templates.empty?
+    end
+
+    def total
+      @templates.length
+    end
+
+    private
+
+    def find_templates(dir)
+      folders = Dir.entries(dir)
+      folders = filter_templates(folders)
+
+      folders.each do |f|
+        @list.push f
+        @templates.push Antwort::EmailTemplate.new(f)
+      end
+    end
+
+    def filter_templates(arry = [])
+      arry.delete_if { |name| name.to_s[0] == '.' }
+      arry.delete_if { |name| name.to_s == 'shared' }
+    end
+  end
+end