rims-rfc822 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d5fb16811b51a21112bde75cf3afb370097c69205b0351847382a19debeaac9
-  data.tar.gz: c7a0b7ee568f34e324f2fe3cef2db7908346a09ab7c9131fc6ae96bdd39c06e0
+  metadata.gz: cc4454910f11d01d157636ce54fd8cbceeb6bec9dd609f5a8d969ed80cdda046
+  data.tar.gz: 773c722bd0f8c13c2475fadb68af4de073eb150f043db04bfca9edf2cccd76b4
 SHA512:
-  metadata.gz: 0f4e32a989c3f2d49a304133eba4109d6f058eca263bcf4c593ee81aafce43ef54aae91bd74f8e0cba9dd571c5c4892a0dcfe2b31b4d96cedd4adfe6574509ca
-  data.tar.gz: 67c9fccdca18ccb61c91f5c416e650a7525de89827654173fd9cc09f403190a5cd586d2eac7934be73080956499be2bdf373f8251a7b79504e513a641d263d50
+  metadata.gz: e0ceeaf306c54fac3d97386a95f82c1778abbb21b8078d014d4182e4b1c8717e1af46d9df694007ab38de948cc9c2b9a0721ef390dee07b8a6f4d6576f80aef0
+  data.tar.gz: 4500f5d11ca07f4905f4f158e450886dbb1ba5cf5d36b89b14d5b33a0477625d8e6fbf180c6f8eb19e9a5cb38b22b7c0ad11e7c9358b4db102a593f75e4d0ae3

data/lib/rims/rfc822.rb

@@ -8,7 +8,7 @@ module RIMS
   module RFC822
     module Parse
       def split_message(msg_txt)
-        header_txt, body_txt = msg_txt.lstrip.split(/\r?\n\r?\n/, 2)
+        header_txt, body_txt = msg_txt.lstrip.split(/\R\R/, 2)
         if ($&) then
           header_txt << $&
         else
@@ -22,13 +22,12 @@ module RIMS
 
       def parse_header(header_txt)
         field_pair_list = header_txt.scan(%r{
-          ^
           ((?#name) \S+? )
           \s* : \s*
           (
              (?#value)
-             .*? (?: \n|\z)
-             (?: ^\s .*? (?: \n|\z) )*
+             .*? (?: \R|\z)
+             (?: \s .*? (?: \R|\z) )*
           )
         }x)
 
@@ -432,11 +431,8 @@ module RIMS
           encoded_word_list = $&.split(/\s+/, -1)
 
           unless (foreword.empty?) then
-            if (dst.encoding.dummy?) then
-              # run the slow `String#encode' only when really needed
-              # because of a premise that the strings other than
-              # encoded words are ASCII only.
-              foreword.encode!(dst.encoding, charset_convert_options)
+            if (Encoding.compatible? dst, foreword) then
+              foreword.encode!(dst.encoding, **charset_convert_options)
             end
             dst << foreword
           end
@@ -451,28 +447,26 @@ module RIMS
             if (decode_charset_encoding) then
               if (decoded_text.encoding != decode_charset_encoding) then
                 # `decoded_text' is frozen
-                decoded_text = decoded_text.encode(decode_charset_encoding, charset_convert_options)
+                decoded_text = decoded_text.encode(decode_charset_encoding, **charset_convert_options)
               end
-            elsif (dst.ascii_only?) then
-              if (decoded_text.encoding.dummy?) then
-                dst.encode!(decoded_text.encoding, charset_convert_options)
-              end
-            else
-              if (decoded_text.encoding != dst.encoding) then
+            end
+
+            unless (Encoding.compatible? dst, decoded_text) then
+              if (dst.ascii_only?) then
+                dst.encode!(decoded_text.encoding, **charset_convert_options)
+              else
                 # `decoded_text' is frozen
-                decoded_text = decoded_text.encode(dst.encoding, charset_convert_options)
+                decoded_text = decoded_text.encode(dst.encoding, **charset_convert_options)
               end
             end
+
             dst << decoded_text
           end
         end
 
         unless (src.empty?) then
-          if (dst.encoding.dummy?) then
-            # run the slow `String#encode' only when really needed
-            # because of a premise that the strings other than encoded
-            # words are ASCII only.
-            src = src.encode(dst.encoding, charset_convert_options) # `src' may be frozen
+          unless (Encoding.compatible? dst, src) then
+            src = src.encode(dst.encoding, **charset_convert_options) # `src' may be frozen
           end
           dst << src
         end

data/lib/rims/rfc822/version.rb

@@ -2,7 +2,7 @@
 
 module RIMS
   module RFC822
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
   end
 end
 

data/rims-rfc822.gemspec

@@ -28,10 +28,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) {|f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.17'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rdoc'
   spec.add_development_dependency 'test-unit'
+  spec.add_development_dependency 'irb'
 end
 
 # Local Variables:

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: rims-rfc822
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - TOKI Yoshinori
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-22 00:00:00.000000000 Z
+date: 2019-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: irb
+  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'
 description: |2
       Fast parser for a RFC822 formatted message.
       This gem is a component of RIMS (Ruby IMap Server), but can be