postfix_status_line 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df9ab0374f13af0d782be989d057f95a6aa474ed
-  data.tar.gz: 768d579c879a6b5209405143775bc7f0ad79e027
+  metadata.gz: 2b920514b0a6ff068bf055a64be86526944d199a
+  data.tar.gz: ddb676372a005b34e200bab00fa0d2c74398fd7b
 SHA512:
-  metadata.gz: 980943454a02e5151a986a2795d834bdb095018b876856951ec474d1db7d0dcfd3c8e59e816240737331b9d3fff502a3678bc369a2f3aa02bfca22a02259af04
-  data.tar.gz: b7153669aa950d74f1c0bb3e7ad4fd5874d974a98810beeeed41dd3840a882150bde2c5d1559a0b96b626f518a52e931fe88da8b1f19c1182faf05d2961d2e1f
+  metadata.gz: 31cce84295ccb08bddf943cc42f33816fda52761ca0a9c42d6dc414dd15853269fff792b86b1d2add5caeda6da83126154d34a31f7a6c67b6922393e28080e81
+  data.tar.gz: 949dd602e7f663e7e4ab5a8fa4d21bf8873c95a809537be896951d9d229d156dfbde4658c9bf4aaae993e4450260eccc512ac18a11a349b24d655224b3d3712e

data/ext/postfix_status_line_core.c

@@ -186,7 +186,17 @@ static void put_status(char *value, VALUE hash, bool mask) {
     mask_email(value);
   }
 
-  char *detail = strchr(value, ' ');
+  char *detail = NULL;
+  char *detail1 = strchr(value, ' ');
+  char *detail2 = strchr(value, ',');
+
+  if (detail1 != NULL && detail2 != NULL) {
+    detail = detail1 < detail2 ? detail1 : detail2;
+  } else if (detail1 != NULL && detail2 == NULL) {
+    detail = detail1;
+  } else if (detail1 == NULL && detail2 != NULL) {
+    detail = detail2;
+  }
 
   if (detail != NULL) {
     *detail = '\0';
@@ -273,19 +283,15 @@ static void split_line2(char *str, bool mask, VALUE hash, bool include_hash, cha
   for (;;) {
     ptr = split(&str, ", ", 2);
 
-    // status detail includes ", "
-    if (strchr(str, '=') == NULL) {
-      *(str - 1) = ' ';
-      *(str - 2) = ' ';
-      str = ptr;
-      break;
-    }
-
     if (ptr == NULL) {
       break;
     }
 
     put_attr(ptr, hash, mask, include_hash, salt, salt_len);
+
+    if (strncmp(str, "status=", 7) == 0) {
+      break;
+    }
   }
 
   if (str) {
@@ -362,7 +368,7 @@ if (rb_value_to_bool(v_hash)) {
       salt_len = RSTRING_LEN(v_salt);
     }
 #else
-    rb_raise(rb_eArgumentError, "OpenSSL is not linked");
+    rb_raise(rb_eArgError, "OpenSSL is not linked");
 #endif // HAVE_OPENSSL_SHA_H
   }
 

data/lib/postfix_status_line/version.rb

@@ -1,3 +1,3 @@
 module PostfixStatusLine
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: postfix_status_line
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-27 00:00:00.000000000 Z
+date: 2015-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   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
     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: rspec
   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-compiler
   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: Postfix Status Line Log Parser implemented by C.
@@ -74,9 +74,9 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -100,17 +100,17 @@ require_paths:
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Postfix Status Line Log Parser implemented by C.