postfix_status_line 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b10924e32ce6ebffb06011504d98b5a58215ffd
-  data.tar.gz: 2b651b2c2167f9bf337fcf9d85c1ee56a96a6a08
+  metadata.gz: 6e0228c71c5531a6bc5859266242b3c31e6e6479
+  data.tar.gz: cc24c357e37e617b4e50bad0d7480584391f99db
 SHA512:
-  metadata.gz: 2098822209549b5a511050b43448714b32dc4a44e3d87d4cda001233e738edd6019aecec612aa0a9e493a6a46298869c92c30a68fda5df74f4c6a0c4d1743a3b
-  data.tar.gz: 562cc8ceb999f4f158fa4413c05a5d0f429e407d63f8781755de3311ce36bd6bbc42fcae79e1505bc9343705c62f70341eb4dc5784af99da5f8dfb8d486b1624
+  metadata.gz: a2010e03c30750c4cf8234b6c35bf6f04bc9617f10621c3cf8544cdf993abb49cc2088b008c68130fb238b8187b0343463093a4464636485ad842b7ad9bf4c2b
+  data.tar.gz: b7a7a09bb7c84721ea0bc7d9c5d81881f965b586b3d3dfb64641422695a50bbbd488c41707d4bc11de0cf2f71a6d63b18fbbdad56495e073b50e68f2eb3448dd

data/ext/postfix_status_line_core.c

@@ -104,6 +104,40 @@ static void mask_email(char *str) {
   }
 }
 
+static void put_domain(char *value, VALUE hash) {
+  char *domain = strchr(value, '@');
+
+  if (domain == NULL) {
+    return;
+  }
+
+  domain++;
+
+  char *bracket = strchr(domain, '>');
+  VALUE v_value;
+
+  if (bracket == NULL) {
+    v_value = rb_str_new2(domain);
+  } else {
+    size_t len = bracket - domain;
+    v_value = rb_str_new(domain, len);
+  }
+
+  rb_hash_aset(hash, rb_str_new2("domain"), v_value);
+}
+
+static void put_status(char *value, VALUE hash) {
+  char *reason = strchr(value, ' ');
+
+  if (reason != NULL) {
+    *reason = '\0';
+    reason++;
+    rb_hash_aset(hash, rb_str_new2("reason"), rb_str_new2(reason));
+  }
+
+  rb_hash_aset(hash, rb_str_new2("status"), rb_str_new2(value));
+}
+
 static void put_attr(char *str, VALUE hash) {
   char *value = strchr(str, '=');
 
@@ -115,35 +149,19 @@ static void put_attr(char *str, VALUE hash) {
   value++;
 
   VALUE v_key = rb_str_new2(str);
-  VALUE v_value;
 
   if (strcmp(str, "delay") == 0) {
-    v_value = rb_float_new(atof(value));
+    VALUE v_value = rb_float_new(atof(value));
+    rb_hash_aset(hash, v_key, v_value);
+  } else if (strcmp(str, "status") == 0) {
+    put_status(value, hash);
   } else {
-    v_value = rb_str_new2(value);
+    VALUE v_value = rb_str_new2(value);
+    rb_hash_aset(hash, v_key, v_value);
   }
 
-  rb_hash_aset(hash, v_key, v_value);
-
   if (strcmp(str, "to") == 0) {
-    char *domain = strchr(value, '@');
-
-    if (domain == NULL) {
-      return;
-    }
-
-    domain++;
-
-    char *bracket = strchr(domain, '>');
-
-    if (bracket == NULL) {
-      v_value = rb_str_new2(domain);
-    } else {
-      size_t len = bracket - domain;
-      v_value = rb_str_new(domain, len);
-    }
-
-    rb_hash_aset(hash, rb_str_new2("domain"), v_value);
+    put_domain(value, hash);
   }
 }
 

data/lib/postfix_status_line/version.rb

@@ -1,3 +1,3 @@
 module PostfixStatusLine
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postfix_status_line
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler