dashamail_transactional 0.1.2 → 0.1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed5da2d563f592a2d9378f0408972f16ed502b5cf4a588378e5bba414a508bbe
-  data.tar.gz: 8dce85754b7f2879970201bdb700f532d1d19e123e382026bcd10735d4e4f6e1
+  metadata.gz: f4c7efdfd6a4d83f0ac24ba8ac1680fe9741d7d1ff7993da27a51f52ead69946
+  data.tar.gz: 22d593e75096ea5262f00cba2d0532732ce1a15c184d42c2acd5148381d03255
 SHA512:
-  metadata.gz: 69a1773cb820776261e3513f0f9b5c3d1986c35361f4f2d1645ee7bfda1ec8d42606ab88e22414c95481f49ae77eeafc48ece38cf4b2651167009c57bf41577e
-  data.tar.gz: edb9065fa33ce2aa8c27f3840c29b0f95e5b39eb258eea3de58b1e8e33868e4de1bb1bf0b350450fca3c201dd35c848ed68eacd0c2096ef066f742bf6fad5c21
+  metadata.gz: fa575e92b016a1ad1f81472e868acccdef5e951c532f291c9da7c7d1a990abd5494c2a85111684cc96bd108a549af652ce463e244f7b5b3b48b5430209ccca0b
+  data.tar.gz: e2a2d9ccb63991343fb68fa37632aced40ae857386a5d81bab9a5ac18e402a4eb8dd31eb3a01ec45e8cc8f0466da4dbdee60aff5f01c64005acdf203a5daf548

data/Gemfile

@@ -10,3 +10,4 @@ gem 'rake', '~> 13.2.1'
 gem 'minitest', '~> 5.25.4'
 
 gem 'rubocop', '~> 1.69.2'
+gem 'webmock'

data/Gemfile.lock

@@ -1,13 +1,20 @@
 PATH
   remote: .
   specs:
-    dashamail_transactional (0.1.1)
+    dashamail_transactional (0.1.3)
       mime-types (>= 3.4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
+    bigdecimal (3.1.8)
+    crack (1.0.0)
+      bigdecimal
+      rexml
+    hashdiff (1.1.2)
     json (2.9.0)
     language_server-protocol (3.17.0.3)
     logger (1.6.2)
@@ -20,10 +27,12 @@ GEM
     parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
+    public_suffix (6.0.1)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
     regexp_parser (2.9.3)
+    rexml (3.3.9)
     rubocop (1.69.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
@@ -40,6 +49,10 @@ GEM
     unicode-display_width (3.1.2)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
+    webmock (3.24.0)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   arm64-darwin-23
@@ -50,6 +63,7 @@ DEPENDENCIES
   minitest (~> 5.25.4)
   rake (~> 13.2.1)
   rubocop (~> 1.69.2)
+  webmock
 
 BUNDLED WITH
    2.5.11

data/README.md

@@ -11,10 +11,11 @@
 
 ## Установка
 
-Укажите в проекте загрузку гема из гитхаба:
+
+Добавьте в Gemfile:
 
 ```sh
-gem 'dashamail', git: 'https://github.com/creadone/dashamail'
+gem 'dashamail_transactional'
 ```
 Затем установите с помощью Bundler
 
@@ -79,8 +80,12 @@ pp response.data
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/creadone/dashamail.
+Bug reports and pull requests are welcome on GitHub at https://github.com/83312d/dashamail_transactional.
 
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+## Sponsored by
+
+[![Логотип проекта](images/21s.png)](https://21-school.ru/)

data/lib/dashamail/composer.rb

@@ -92,6 +92,10 @@ module DashamailTransactional
       @container[:ignore_delivery_policy] = ignore_delivery_policy
     end
 
+    def campaign_id=(campaign_id)
+      @container[:campaign_id] = campaign_id
+    end
+
     def call
       @container
     end

data/lib/dashamail/configuration.rb

@@ -92,8 +92,6 @@ module DashamailTransactional
 
     DEFAULT = {
       end_point: 'https://api.dashamail.ru',
-      no_track_opens: true,
-      no_track_clicks: true,
       response_format: 'JSON',
       ignore_delivery_policy: false
     }.freeze

data/lib/dashamail/http.rb

@@ -26,12 +26,14 @@ module DashamailTransactional
       }.merge!(options)
     end
 
-    def get(path, options = {})
-      execute(path, :get, options)
+    def reset_headers
+      @headers = base_headers
     end
 
-    def post(path, options = {})
-      execute(path, :post, options)
+    VERBS.each_key do |method|
+      define_method(method) do |path, options = {}|
+        execute(path, method, options)
+      end
     end
 
     private

data/lib/dashamail/utils.rb

@@ -5,30 +5,48 @@ require 'mime-types'
 
 module DashamailTransactional
   class Utils
-    def self.build_attachment(file_path)
-      raise StandardError, 'File not exist' unless File.exist?(file_path)
+    MAX_FILENAME_LENGTH = 255
 
-      file_name = File.basename(file_path)
-      file_body = File.open(file_path, 'rb') do |io|
-        Base64.strict_encode64(io.read)
+    class << self
+      def build_attachment(file_path)
+        validate_and_read_file(file_path) do |file_name, file_content|
+          {
+            name: truncate_filename(file_name),
+            filebody: Base64.strict_encode64(file_content)
+          }
+        end
+      end
+
+      def build_inline(file_path, cid)
+        validate_and_read_file(file_path) do |file_name, file_content|
+          {
+            mime_type: MIME::Types.type_for(file_path).first&.to_s || 'application/octet-stream',
+            filename: truncate_filename(file_name),
+            body: Base64.strict_encode64(file_content),
+            cid: cid
+          }
+        end
+      end
+
+      private
+
+      def validate_and_read_file(file_path)
+        raise StandardError, 'File not exist' unless File.exist?(file_path)
+
+        file_name = File.basename(file_path)
+        file_content = File.open(file_path, 'rb', &:read)
+
+        yield(file_name, file_content)
       end
-      { name: file_name, filebody: file_body }
-    end
 
-    def self.build_inline(file_path, cid)
-      raise StandardError, 'File not exist' unless File.exist?(file_path)
+      def truncate_filename(filename)
+        return filename if filename.bytesize <= MAX_FILENAME_LENGTH
 
-      file_name = File.basename(file_path)
-      mime_type = MIME::Types.type_for(file_path)[0].to_s
-      file_body = File.open(file_path, 'rb') do |io|
-        Base64.strict_encode64(io.read)
+        extension = File.extname(filename)
+        basename = File.basename(filename, extension)
+        max_basename_length = MAX_FILENAME_LENGTH - extension.bytesize
+        "#{basename.byteslice(0, max_basename_length)}#{extension}"
       end
-      {
-        mime_type: mime_type,
-        filename: file_name,
-        body: file_body,
-        cid: cid
-      }
     end
   end
 end

data/lib/dashamail/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DashamailTransactional
-  VERSION = '0.1.2'
+  VERSION = "0.1.3.1"
 end

metadata

@@ -1,10 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: dashamail_transactional
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3.1
 platform: ruby
 authors:
 - Sergey Fedorov
+- Dave Maksimovskiy
+- Alexander Bondarenko
 autorequire:
 bindir: exe
 cert_chain: []
@@ -26,6 +28,7 @@ dependencies:
         version: 3.4.0
 description: Ruby client DashaMail for transactional API
 email:
+- 83312d@gmail.com
 - creadone@gmail.com
 executables: []
 extensions: []
@@ -37,6 +40,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- dashamail_transactional-0.1.3.gem
 - lib/dashamail.rb
 - lib/dashamail/composer.rb
 - lib/dashamail/configuration.rb