blastengine 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb192455e96f1e16a8c2d70ac2035758bef80f0d5e56c0c651b33dd118558f15
-  data.tar.gz: 6fc1ef4846f1090cb4b57b38fe1ff1c063a8eeb4f47cadff2a930fb62b1af0f4
+  metadata.gz: a9d7c3658112bf007f14c0db5b8e63c753c3ef74edb1428af29cc458229fa349
+  data.tar.gz: 649c891776820ff43fefeb250f7d5359dc58acf5ebd20f4e8aeffd0f4ebd3afe
 SHA512:
-  metadata.gz: 6c44da8ddac18082ebcf1fe7a3007bf242e7b3d3236c4b6479df8ae643b1f0f8762122716b87f8795cc245ad6ebe97aafa0de0e5325a6db2f59d6ad96da1cb76
-  data.tar.gz: 7001480e3afe9debb0d7ec8c95996450c79bb0e92eafbdbdc37758ea2aa7c277e938b8772b2a362d537f8ca32ca904d506028a2ac4645d265cb5208c53d6a842
+  metadata.gz: b8ccb93cbf79da083e1b5260d84a90450e090dd43603aafca3bf06b217f9c67fbb56ff17290a7949e7aec002c7891b11ec3f9f437404dcd7fb1fa76cd4c08942
+  data.tar.gz: 3ed44fe674133c8a7bd58e661c03d9b1f65108e3e2f8cff80c521172a25d58e6e6d853cf9b36df9b16a5a47f9e8f779d9e75456f52fadb8615b937fb98c1b752

data/README.md

@@ -67,8 +67,8 @@ bulk.text_part = "This is a test email to __name__"
 bulk.register
 
 # Add address
-bulk.add "test1@example.jp", {name: "User 1"}
-bulk.add "test2@example.jp", {name: "User 2"}
+bulk.addTo "test1@example.jp", {name: "User 1"}
+bulk.addTo "test2@example.jp", {name: "User 2"}
 bulk.update
 
 # Send email immediately

data/lib/blastengine/base.rb

@@ -4,6 +4,67 @@ module Blastengine
 		attr_accessor :delivery_id, :status, :delivery_time, :delivery_type, :open_count,
 			:created_time, :updated_time, :hard_error_count, :soft_error_count, :drop_count, :sent_count, :total_count
 
+		def self.client
+			base = Base.new
+			base.client
+		end
+
+		def client
+			@@client
+		end
+
+		def sets(params)
+			params.each do |key, value|
+				self.set(key, value)
+			end
+		end
+
+		def set(key, value)
+			case key
+			when "delivery_id"
+				@delivery_id = value
+			when "status"
+				@status = value
+			when "delivery_time"
+				@delivery_time = Date.parse(value) if value != nil
+			when "delivery_type"
+				@delivery_type = value
+			when "open_count"
+				@open_count = value
+			when "created_time"
+				@created_time = Date.parse(value) if value != nil
+			when "updated_time"
+				@updated_time = Date.parse(value) if value != nil
+			when "hard_error_count"
+				@hard_error_count = value
+			when "soft_error_count"
+				@soft_error_count = value
+			when "drop_count"
+				@drop_count = value
+			when "sent_count"
+				@sent_count = value
+			when "total_count"
+				@total_count = value
+			when "from"
+				@_from = value
+			when "reservation_time"
+				@reservation_time = Date.parse(value) if value != nil
+			when "maillog_id"
+				@maillog_id = value
+			when "email"
+				@to = value
+			when "last_response_code"
+				@last_response_code = value
+			when "last_response_message"
+				@last_response_message = value
+			when "subject"
+				@subject = value
+			when "open_time"
+				@open_time = Date.parse(value) if value != nil
+			end
+			self
+		end
+	
 		def get
 			# APIリクエスト用のパス
 			path = "/deliveries/#{@delivery_id}"
@@ -37,11 +98,5 @@ module Blastengine
 			res = @@client.delete path
 			return res["delivery_id"]
 		end
-
-		def report
-			report = Blastengine::Report.new @delivery_id
-			report.create
-			report
-		end
 	end
 end

data/lib/blastengine/bulk.rb

@@ -1,4 +1,6 @@
 require "time"
+require "tempfile"
+require "csv"
 
 module Blastengine
 	class Bulk < Base
@@ -40,7 +42,7 @@ module Blastengine
 		#
 		# 受信者の追加
 		#
-		def add(email, params = {})
+		def addTo(email, params = {})
 			@to << {
 				email: email,
 				insert_code: params.map{|key, value| {
@@ -54,6 +56,14 @@ module Blastengine
 		# バルクメールの更新
 		#
 		def update
+			if @to.size > 50
+				return self.csv_update
+			else
+				return self.normal_update
+			end
+		end
+
+		def normal_update
 			# APIリクエスト用のパス
 			path = "/deliveries/bulk/update/#{@delivery_id}"
 			data = {
@@ -69,6 +79,36 @@ module Blastengine
 			return res["delivery_id"]
 		end
 
+		def csv_update
+			f = Tempfile.create(['blastengine', '.csv'])
+			f.close
+			csv = CSV.open(f.path, "w")
+			# ヘッダーの作成
+			headers = ["email"]
+			@to.each do |to|
+				to[:insert_code].each do |insert_code|
+					headers << insert_code[:key] if headers.index(insert_code[:key]) == nil
+				end
+			end
+			csv.puts headers
+			@to.each do |to|
+				lines = [to[:email]]
+				headers.each do |header|
+					next if header == "email"
+					insert_code = to[:insert_code].find{|insert_code| insert_code[:key] == header}
+					lines << insert_code[:value] if insert_code != nil
+				end
+				csv.puts lines
+			end
+			csv.close
+			job = self.import f.path
+			while !job.finish?
+				sleep 1
+			end
+			File.unlink f.path
+			@delivery_id
+		end
+
 		#
 		# バルクメールの送信
 		#
@@ -82,6 +122,7 @@ module Blastengine
 			# API実行
 			res = @@client.patch path, data
 			# エラーがあったら例外を投げるので、この場合は通常終了
+			@delivery_id = res["delivery_id"]
 			return res["delivery_id"]
 		end
 

data/lib/blastengine/report.rb

@@ -4,6 +4,7 @@ module Blastengine
 		attr_accessor :job_id, :delivery_id, :percentage, :status, :mail_open_file_url, :total_count, :report
 		def initialize delivery_id
 			@delivery_id = delivery_id
+			create
 		end
 
 		def create

data/lib/blastengine/transaction.rb

@@ -1,13 +1,14 @@
 module Blastengine
 	class Transaction < Base
 		include Blastengine
-		attr_accessor :to, :cc, :bcc, :subject, :text_part, :encode, :html_part, :attachments
+		attr_accessor :to, :cc, :bcc, :subject, :text_part, :encode, :html_part, :attachments, :insert_code
 		def initialize
 			@to = ""
 			@cc = []
 			@bcc = []
 			@attachments = []
 			@encode = "UTF-8"
+			@insert_code = {}
 		end
 
 		#
@@ -35,9 +36,18 @@ module Blastengine
 			}
 			# HTMLパートがある場合は追加
 			data[:html_part] = @html_part unless @html_part.nil?
+			if @insert_code != nil
+				data[:insert_code] = @insert_code.map do |key, value|
+					{
+						key: "__#{key}__",
+						value: value
+					}
+				end
+			end
 			# API実行
 			res = @@client.post path, data, @attachments
 			# エラーがあったら例外を投げるので、この場合は通常終了
+			@delivery_id = res["delivery_id"]
 			return res["delivery_id"]
 		end
 	end

data/lib/blastengine/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Blastengine
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/blastengine.rb

@@ -10,6 +10,8 @@ require "blastengine/job"
 require "blastengine/usage"
 require "blastengine/email"
 require "blastengine/report"
+require "blastengine/mail"
+require "blastengine/log"
 
 module Blastengine
   class Error < StandardError; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blastengine
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Atsushi Nakatsugawa
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-25 00:00:00.000000000 Z
+date: 2023-07-20 00:00:00.000000000 Z
 dependencies: []
 description: This is a SDK for sending email by blastengine.
 email:
@@ -25,7 +25,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- blastengine.gemspec
 - lib/blastengine.rb
 - lib/blastengine/base.rb
 - lib/blastengine/bulk.rb
@@ -60,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.9
 signing_key:
 specification_version: 4
 summary: SDK for sending email by blastengine

data/blastengine.gemspec

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "lib/blastengine/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "blastengine"
-  spec.version = Blastengine::VERSION
-  spec.authors = ["Atsushi Nakatsugawa"]
-  spec.email = ["atsushi@moongift.jp"]
-
-  spec.summary = "SDK for sending email by blastengine"
-  spec.description = "This is a SDK for sending email by blastengine."
-  spec.homepage = "https://blastengine.jp/"
-  spec.license = "MIT"
-  spec.required_ruby_version = ">= 2.6.0"
-
-  # spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/blastengineMania/blastengine-ruby"
-  spec.metadata["changelog_uri"] = "https://github.com/blastengineMania/blastengine-ruby/CHANGELOG.md"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
-    end
-  end
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "example-gem", "~> 1.0"
-
-  # For more information and examples about making a new gem, check out our
-  # guide at: https://bundler.io/guides/creating_gem.html
-end