postman_mta 0.1.7 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fab550588eda2e9d22a008b8acbd4004922fa042
-  data.tar.gz: 2b28cbeb65d3e81abaef24122bf1228b3b77e0ea
+SHA256:
+  metadata.gz: 7d6d5fffa4743f5f68aca42d85ce8504cd3b1438e87b08b9aab67f8c86dcd1a8
+  data.tar.gz: 9e533b9344643973321ed86143708bd19db68424f995499478a24c0e5b5c05e6
 SHA512:
-  metadata.gz: 5bb1c93d360b9dfbf0fdc2169ff5411747fd03e3e74e57eac9d08e3f60a56292ed86573ca9f4369259d8c2098cbaadff7336b503b5ef245828ec4b47137a1e66
-  data.tar.gz: 8b02e0f717d57da96b8ba2917aba388740a4d8186674ca541956f644c535e62a4046e0ed7a4f4d89051bca501972fe3531c6d1d53ea05655a1248181f7a7cef6
+  metadata.gz: f1eec23222904c934a81f5e1a867f9a0bb0a670403e984274ae4a941a6acd6d702c630fd623c05bb6c155b2fe3a32280699be1e8aa58d2c750de866aa5f100f1
+  data.tar.gz: ca7da62ced3248c0735e49f7fa4f4f323fab93cd72e59cd32f2a7d65d5ba836ba9c70fcc544d038eab9b231d8989f37292ecb2dbba66317b4df205080130014a

data/.rubocop.yml

@@ -1,7 +1,7 @@
 AllCops:
-  TargetRubyVersion: 2.3
-
-  Excludes:
+  NewCops: disable
+  TargetRubyVersion: 2.4
+  Exclude:
     - "Guardfile"
     - "Rakefile"
     - "bin/**/*"
@@ -30,7 +30,7 @@ Lint/AmbiguousBlockAssociation:
 
 ##################### Metrics ##################################
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 110
 
 Metrics/ClassLength:
@@ -45,11 +45,3 @@ Metrics/BlockLength:
   Max: 50
   Exclude:
     - "**/*_spec.rb"
-
-##################### Rails ##################################
-
-Rails:
-  Enabled: true
-
-Rails/SkipsModelValidations:
-  Enabled: false

data/.ruby-version

@@ -0,0 +1 @@
+2.5.1

data/Gemfile

@@ -9,6 +9,6 @@ group :development, :test do
   gem 'api_matchers', '~> 0.6.2'
   gem 'rails', '~> 5.0'
   gem 'rspec-rails', '~> 3.5', '>= 3.5.2'
-  gem 'sqlite3', '~> 1.3', '>= 1.3.13'
+  gem 'sqlite3', '~> 1.3', '< 1.4'
   gem 'webmock', '~> 3.0', '>= 3.0.1'
 end

data/app/controllers/postman_mta/archive/conversations_controller.rb

@@ -0,0 +1,23 @@
+module PostmanMta
+  module Archive
+    class ConversationsController < ApplicationController
+      def index
+        render conversation.index(permitted_params)
+      end
+
+      def show
+        render conversation.find(params[:id])
+      end
+
+      private
+
+      def conversation
+        @conversation ||= PostmanMta::Archive::Conversation.new
+      end
+
+      def permitted_params
+        params.permit!
+      end
+    end
+  end
+end

data/app/controllers/postman_mta/attachments_controller.rb

@@ -5,9 +5,12 @@ module PostmanMta
     def show
       response = attachment.find(params[:uuid]).deep_symbolize_keys
       file = response.dig(:json, :attachment)
-      file_data = Base64.decode64(file[:body])
 
-      send_data(file_data, type: file[:content_type], filename: file[:filename], dispostion: 'attachment')
+      if file[:body].present?
+        send_attachment(file)
+      else
+        proxy_attachment(file)
+      end
     end
 
     private
@@ -15,5 +18,15 @@ module PostmanMta
     def attachment
       @attachment ||= PostmanMta::Attachment.new(params[:message_token])
     end
+
+    def send_attachment(file)
+      file_data = Base64.decode64(file[:body])
+      send_data(file_data, type: file[:content_type], filename: file[:filename], dispostion: 'attachment')
+    end
+
+    def proxy_attachment(file)
+      headers['X-Accel-Redirect'] = PostmanMta::Utils::SendfileUrl.new(file[:url]).to_url
+      headers['Content-Disposition'] = "attachment; filename=\"#{file[:filename]}\""
+    end
   end
 end

data/app/controllers/postman_mta/conversations_controller.rb

@@ -30,6 +30,10 @@ module PostmanMta
       render conversation.move(permitted_params)
     end
 
+    def search
+      render conversation.search(permitted_params)
+    end
+
     private
 
     def conversation

data/app/controllers/postman_mta/domains_controller.rb

@@ -0,0 +1,17 @@
+module PostmanMta
+  class DomainsController < ApplicationController
+    def index
+      render domain.index(permitted_params)
+    end
+
+    private
+
+    def domain
+      @domain ||= PostmanMta::Domain.new
+    end
+
+    def permitted_params
+      params.permit!
+    end
+  end
+end

data/app/controllers/postman_mta/labels_controller.rb

@@ -1,9 +1,17 @@
 module PostmanMta
   class LabelsController < ApplicationController
+    def index
+      render label.index(label_params)
+    end
+
     def create
       render label.create(label_params)
     end
 
+    def update
+      render label.update(params[:id], label_params)
+    end
+
     def destroy
       render label.destroy(params[:id])
     end

data/app/models/postman_mta/archive/conversation.rb

@@ -0,0 +1,13 @@
+module PostmanMta
+  module Archive
+    class Conversation < PostmanMta::Conversation
+      def index(params = {})
+        get('/archive/conversations', body: params)
+      end
+
+      def find(conversation_id)
+        get("/archive/conversations/#{conversation_id}")
+      end
+    end
+  end
+end

data/app/models/postman_mta/attachment.rb

@@ -7,7 +7,7 @@ module PostmanMta
     end
 
     def find(uuid)
-      get("/api/v1/messages/#{message_token}/attachments/#{uuid}")
+      get("/messages/#{message_token}/attachments/#{uuid}")
     end
   end
 end

data/app/models/postman_mta/bookmark.rb

@@ -0,0 +1,18 @@
+module PostmanMta
+  class Bookmark < ApplicationModel
+    attr_reader :target_type, :target_id
+
+    def initialize(target_type, target_id)
+      @target_type = target_type
+      @target_id = target_id
+    end
+
+    def create(params)
+      post("/#{target_type}/#{target_id}/bookmarks", body: params)
+    end
+
+    def destroy(bookmark_id)
+      delete("/#{target_type}/#{target_id}/bookmarks/#{bookmark_id}")
+    end
+  end
+end

data/app/models/postman_mta/conversation.rb

@@ -1,35 +1,43 @@
 module PostmanMta
   class Conversation < ApplicationModel
     def index(params = {})
-      get('/api/v1/conversations', body: params)
+      get('/conversations', body: params)
+    end
+
+    def archive(params = {})
+      get('/archive/conversations', body: params)
     end
 
     def folder(folder, params = {})
       params = {
         folder: folder
-      }.merge(params)
+      }.merge!(params)
 
-      get('/api/v1/conversations', body: params)
+      get('/conversations', body: params)
     end
 
     def find(conversation_id)
-      get("/api/v1/conversations/#{conversation_id}")
+      get("/conversations/#{conversation_id}")
     end
 
     def move_to_trash(conversation_id)
-      delete("/api/v1/conversations/#{conversation_id}/trash")
+      delete("/conversations/#{conversation_id}/trash")
     end
 
     def mark_as_read(params = {})
-      patch('/api/v1/conversations/mark', body: params.merge(event: 'mark_as_read'))
+      patch('/conversations/mark', body: params.merge(event: 'mark_as_read'))
     end
 
     def mark_as_unread(params = {})
-      patch('/api/v1/conversations/mark', body: params.merge(event: 'mark_as_unread'))
+      patch('/conversations/mark', body: params.merge(event: 'mark_as_unread'))
     end
 
     def move(params = {})
-      patch('/api/v1/conversations/move', body: params)
+      patch('/conversations/move', body: params)
+    end
+
+    def search(params = {})
+      get('/search/conversations', body: params)
     end
   end
 end

data/app/models/postman_mta/credential.rb

@@ -1,7 +1,7 @@
 module PostmanMta
   class Credential < ApplicationModel
     def create(params = {})
-      post('/api/v1/credentials', body: params)
+      post('/credentials', body: params)
     end
   end
 end

data/app/models/postman_mta/domain.rb

@@ -1,15 +1,15 @@
 module PostmanMta
   class Domain < ApplicationModel
-    def index
-      get('/api/v1/domains')
+    def index(params = {})
+      get('/domains', body: params)
     end
 
     def create(params = {})
-      post('/api/v1/domains', body: params)
+      post('/domains', body: params)
     end
 
     def dns_setup(uuid)
-      put("/api/v1/domains/#{uuid}/dns_setup")
+      put("/domains/#{uuid}/dns_setup")
     end
   end
 end

data/app/models/postman_mta/label.rb

@@ -6,12 +6,20 @@ module PostmanMta
       @conversation_id = conversation_id
     end
 
+    def index(params = {})
+      get('/labels', body: params)
+    end
+
     def create(params)
-      post("/api/v1/conversations/#{conversation_id}/labels", body: params)
+      post("/conversations/#{conversation_id}/labels", body: params)
+    end
+
+    def update(label_id, params)
+      patch("/conversations/#{conversation_id}/labels/#{label_id}", body: params)
     end
 
     def destroy(label_id)
-      delete("/api/v1/conversations/#{conversation_id}/labels/#{label_id}")
+      delete("/conversations/#{conversation_id}/labels/#{label_id}")
     end
   end
 end

data/app/models/postman_mta/message.rb

@@ -1,15 +1,19 @@
 module PostmanMta
   class Message < ApplicationModel
     def find(token)
-      get("/api/v1/messages/#{token}")
+      get("/messages/#{token}")
     end
 
     def create(params)
-      post('/api/v1/messages', body: params)
+      post('/messages', body: params)
     end
 
     def unread_stats
-      get('/api/v1/stats/messages/unread')
+      get('/stats/messages/unread')
+    end
+
+    def search(params = {})
+      get('/search/messages', body: params)
     end
   end
 end

data/app/models/postman_mta/route.rb

@@ -1,15 +1,15 @@
 module PostmanMta
   class Route < ApplicationModel
     def index
-      get('/api/v1/routes')
+      get('/routes')
     end
 
     def update(uuid, params = {})
-      patch("/api/v1/routes/#{uuid}", body: params)
+      patch("/routes/#{uuid}", body: params)
     end
 
     def create(params = {})
-      post('/api/v1/routes', body: params)
+      post('/routes', body: params)
     end
   end
 end

data/app/models/postman_mta/tag.rb

@@ -7,11 +7,11 @@ module PostmanMta
     end
 
     def create(params)
-      post("/api/v1/conversations/#{conversation_id}/tags", body: params)
+      post("/conversations/#{conversation_id}/tags", body: params)
     end
 
     def destroy(tag_id)
-      delete("/api/v1/conversations/#{conversation_id}/tags/#{tag_id}")
+      delete("/conversations/#{conversation_id}/tags/#{tag_id}")
     end
   end
 end

data/config.reek

@@ -12,3 +12,7 @@ UtilityFunction:
   exclude:
     - "PostmanMta::Utils::Signature#digest"
     - "PostmanMta::ApiClient#perform_request"
+
+FeatureEnvy:
+  exclude:
+    - 'PostmanMta::AttachmentsController#send_attachment'

data/config/routes.rb

@@ -9,11 +9,12 @@ PostmanMta::Engine.routes.draw do
     end
 
     match :starred, on: :collection, via: :get, to: 'conversations#index'
+    match :search, on: :collection, via: :get
     match :read, on: :collection, via: [:put, :patch]
     match :unread, on: :collection, via: [:put, :patch]
     match :move, on: :collection, via: [:put, :patch]
 
-    resources :labels, only: [:create, :destroy]
+    resources :labels, only: [:create, :update, :destroy]
     resources :tags, only: [:create, :destroy]
   end
 
@@ -23,5 +24,11 @@ PostmanMta::Engine.routes.draw do
     end
   end
 
+  namespace :archive do
+    resources :conversations, only: [:index, :show]
+  end
+
   resources :routes, only: :index
+  resources :domains, only: :index
+  resources :labels, only: :index
 end

data/lib/postman_mta.rb

@@ -5,6 +5,7 @@ module PostmanMta
   module Utils
     autoload :Signature, 'postman_mta/utils/signature'
     autoload :SignedRequest, 'postman_mta/utils/signed_request'
+    autoload :SendfileUrl, 'postman_mta/utils/sendfile_url'
   end
 
   autoload :ApiClient, 'postman_mta/api_client'

data/lib/postman_mta/api_request.rb

@@ -19,6 +19,14 @@ module PostmanMta
       self.class.send(request_type.downcase, path, request_options)
     end
 
+    def full_path
+      @full_path ||= PostmanMta.api_endpoint + path
+    end
+
+    def uri
+      @uri ||= URI(full_path)
+    end
+
     private
 
     def request_options
@@ -26,7 +34,7 @@ module PostmanMta
     end
 
     def auth_headers
-      PostmanMta::Utils::SignedRequest.new(request_method: request_type.upcase, path: path).headers
+      PostmanMta::Utils::SignedRequest.new(request_method: request_type.upcase, path: uri.request_uri).headers
     end
 
     def merge_with_custom_options

data/lib/postman_mta/utils/sendfile_url.rb

@@ -0,0 +1,21 @@
+require 'uri'
+
+module PostmanMta
+  module Utils
+    class SendfileUrl
+      PREFIX = '/private'.freeze
+
+      def initialize(data)
+        @data = data
+      end
+
+      def uri
+        @uri ||= URI(@data)
+      end
+
+      def to_url
+        File.join(PREFIX, uri.host, "#{uri.path}?#{uri.query}")
+      end
+    end
+  end
+end

data/lib/postman_mta/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PostmanMta
-  VERSION = '0.1.7'
+  VERSION = '0.2.2'
 end

data/postman_mta.gemspec

@@ -1,6 +1,6 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'postman_mta/version'
 
@@ -25,9 +25,11 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'guard-rspec', '~> 4.7', '>= 4.7.3'
+  spec.add_development_dependency 'overcommit'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'reek'
-  spec.add_development_dependency 'overcommit'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'sqlite3'
 
-  spec.add_dependency 'httparty', '~> 0.15.6'
+  spec.add_dependency 'httparty', '~> 0.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postman_mta
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.2
 platform: ruby
 authors:
 - Igor Malinovskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,6 +44,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.7.3
+- !ruby/object:Gem::Dependency
+  name: overcommit
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +87,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: overcommit
+  name: rubocop
+  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: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -92,14 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.6
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.6
+        version: '0.15'
 description: This gem will add some routes to the application to forward requests
   from frontend to postman API
 email:
@@ -112,6 +140,7 @@ files:
 - ".overcommit.yml"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - Guardfile
@@ -119,15 +148,19 @@ files:
 - README.md
 - Rakefile
 - app/controllers/postman_mta/application_controller.rb
+- app/controllers/postman_mta/archive/conversations_controller.rb
 - app/controllers/postman_mta/attachments_controller.rb
 - app/controllers/postman_mta/conversations_controller.rb
+- app/controllers/postman_mta/domains_controller.rb
 - app/controllers/postman_mta/labels_controller.rb
 - app/controllers/postman_mta/messages_controller.rb
 - app/controllers/postman_mta/routes_controller.rb
 - app/controllers/postman_mta/stats/messages_controller.rb
 - app/controllers/postman_mta/tags_controller.rb
 - app/models/postman_mta/application_model.rb
+- app/models/postman_mta/archive/conversation.rb
 - app/models/postman_mta/attachment.rb
+- app/models/postman_mta/bookmark.rb
 - app/models/postman_mta/conversation.rb
 - app/models/postman_mta/credential.rb
 - app/models/postman_mta/domain.rb
@@ -143,6 +176,7 @@ files:
 - lib/postman_mta/api_client.rb
 - lib/postman_mta/api_request.rb
 - lib/postman_mta/engine.rb
+- lib/postman_mta/utils/sendfile_url.rb
 - lib/postman_mta/utils/signature.rb
 - lib/postman_mta/utils/signed_request.rb
 - lib/postman_mta/version.rb
@@ -167,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Rails gem to easy integrate postman to your application