Merge pull request #300 from sisimai/goodbye-v4-compatible-features

Goodbye v4 compatible features

ChangeLog.md

@@ -3,11 +3,14 @@ RELEASE NOTES for Ruby version of Sisimai
 - releases: "https://github.com/sisimai/rb-sisimai/releases"
 - download: "https://rubygems.org/gems/sisimai"
 
-v5.0.3p4
+v5.0.3p5
 ---------------------------------------------------------------------------------------------------
 - release: ""
 - version: ""
 - changes:
+  - #297 #300 Remove v4 compatible features
+    - `Sisimai.make()`
+    - `Sisimai::Fact.softbounce()`
   - #292 #293 Implement `Sisimai::Lhost::DragonFly`
     - Add 30 sample emails generated by DMA: DrangonFly Mail Agent (lhost-dragonfly-*.eml)
   - #288 Consolidate error messages scattered under `Sisimai::Reason::*` into `Sisimai::Rhost::*`

lib/sisimai.rb

@@ -7,12 +7,6 @@ class << self
     def version(); return Sisimai::VERSION; end
     def libname(); return 'Sisimai';        end
 
-    # Emulate "rise" method for the backward compatible
-    def make(argv0, **argv1)
-      warn ' ***warning: Sisimai.make will be removed at v5.1.0. Use Sisimai.rise instead';
-      return Sisimai.rise(argv0, **argv1)
-    end
-
     # Wrapper method for decoding mailbox/maidir
     # @param         [String] argv0      Path to mbox or Maildir/
     # @param         [Hash]   argv0      or Hash (decoded JSON)

lib/sisimai/fact.rb

@@ -437,15 +437,6 @@ def self.rise(**argvs)
       return listoffact
     end
 
-    # Emulate "softbounce" accessor for the backward compatible
-    # @return   [Integer]
-    def softbounce
-      warn ' ***warning: Sisimai::Fact.softbounce will be removed at v5.1.0. Use Sisimai::Fact.hardbounce instead'
-      return  0 if self.hardbounce
-      return -1 if self.reason == 'delivered' || self.reason == 'feedback' || self.reason == 'vacation'
-      return  1
-    end
-
     # Convert from Sisimai::Fact object to a Hash
     # @return   [Hash] Hashed data
     def damn

test/public/lhost-code.rb

@@ -499,23 +499,6 @@ def enginetest(enginename = nil, isexpected = {}, privateset = false, onlydebugs
             assert_equal cy['timestamp'], rr.timestamp.to_json, sprintf("%s %s", ct, cy['timestamp'])
           end
 
-          # ---------------------------------------------------------------------------------------
-          # SOFTBOUNCE
-          if false
-            cv = rr.softbounce
-            cr = %r/\A[-]?[01]\z/
-            ct = sprintf("%s [%s-%02d] #softbounce =", ce, e, errorindex)
-
-            assert_instance_of Integer, cv
-            refute_empty cv.to_s,  sprintf("%s %s", ct, cv)
-            if %w[delivered feedback vacation].include?(rr.reason)
-              assert_equal -1, cv, sprintf("%s %s", ct, cv)
-            else
-              assert_equal  0, cv, sprintf("%s %s", ct, cv) if rr.hardbounce == true
-              assert_equal  1, cv, sprintf("%s %s", ct, cv) if rr.hardbounce == false
-            end
-          end
-
         end # END OF Sisimai::Fact LIST
         emailindex += 1
         assert_equal true, errorindex > 0, sprintf("%s is including %d bounces", mailobject.data.path, errorindex)

test/public/sisimai-test.rb

@@ -3,7 +3,7 @@
 require 'json'
 
 class SisimaiTest < Minitest::Test
-  Methods = { class: %w[version libname rise dump engine reason match make] }
+  Methods = { class: %w[version libname rise dump engine reason match] }
   Samples = {
     mailbox: './set-of-emails/mailbox/mbox-0',
     maildir: './set-of-emails/maildir/bsd',
@@ -63,8 +63,6 @@ def test_rise
         else
           assert_instance_of Sisimai::Time, ee.timestamp
         end
-
-        assert_respond_to ee, 'softbounce'
         assert_respond_to ee, 'damn'
 
         refute_empty ee.addresser.address
@@ -165,17 +163,6 @@ def test_rise
     end
   end
 
-  def test_make
-    # For the backward compatible
-    ce = assert_raises ArgumentError do
-      Sisimai.make()
-      Sisimai.make('/path/to/email', 1)
-    end
-    assert_match %r/wrong number of arguments/, ce.to_s
-    assert_nil Sisimai.make(nil)
-    assert_nil Sisimai.make(false)
-  end
-
   def test_dump
     ce = assert_raises ArgumentError do
       Sisimai.dump()