qmessage 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1392f6b432e4a4fdde1da68279c48b49dede45ff
-  data.tar.gz: 47f6c5b29b53b94bada24eae47df9f4def93678d
+  metadata.gz: facae4f4cd0185575055733866d37d4eafb392b9
+  data.tar.gz: 9f97d9c0de3fd01add5072a4717ecae6c694978c
 SHA512:
-  metadata.gz: 481077a924eb5bf26087c4f1dc102af7b96f4ea0031d132c95b3c10530c4bab2ab5e4a6b69551e560d4bb5b3dd431babcddd83639c40d557552db0b039dafb1a
-  data.tar.gz: 63d472074e27dcf407ea5547b12473fa441c45ad92bfd6fc7c9ecf0096b6bbf5a6f88e00cb8b5078143bb5b5370e9556db6587f2dcb852b317ce5ed57087b046
+  metadata.gz: 14032dc748d6ea2a24ad00927c6e1815609b173a0ff067c65fcec2bfcdd854047c7151a90a500ae982e9aea2af41f0a62586a74a799b48021acddb5ff33e9810
+  data.tar.gz: a66cc2d8948717e3d0a660d4384c81ae5b77d2befc8a558a4b62c9f31d1da64726293b5898c9b8c2e5dbce592b56587bd05612386d8c74e06a2b41bbc2a9e8a8

data/lib/qmessage.rb

@@ -10,28 +10,40 @@ module QMsg
     end
   end
 
-  def self.run(str)
-    @messages = []
-    qq_message = nil
-    m_str = ''
-    str.split("\n").each do |m|
-      if m == "\r"
-        qq_message.message = m_str
-        @messages.push(qq_message)
-        m_str = ''
+  class << self
+    def run(str)
+      @messages = []
+      qq_message = nil
+      m_str = ''
+      str.split("\n").each do |m|
+        if m == "\r"
+          qq_message.message = m_str
+          @messages.push(qq_message)
+          m_str = ''
+        end
+        if m[/([0-9]{3}\-[0-9]{,2}\-[0-9]{,2}) ([0-9]{,2}):([0-9]{,2}):([0-9]{,2}) ([A-Z][A-Z]) (.*)\(([0-9]*)\)/]
+          data = Time.gm(*$1.split('-'), time12for24($2.to_i, $5), $3, $4)
+          u_name = $6
+          u_code = $7
+          qq_message = QQMessage.new(data, u_name, u_code, '')
+          next
+        end
+        m_str = m_str + m
       end
-      if m[/([0-9]{3}\-[0-9]{,2}\-[0-9]{,2}) ([0-9]{,2}):([0-9]{,2}):([0-9]{,2}) ([A-Z][A-Z]) (.*)\(([0-9]*)\)/]
-        data = Time.gm(*$1.split('-'), ($5 == 'PM' ? $2.to_i + 12 : $2), $3, $4)
-        u_name = $6
-        u_code = $7
-        qq_message = QQMessage.new(data, u_name, u_code, '')
-        next
+      return @messages if @messages.last == qq_message
+      qq_message.message = m_str
+      @messages.push(qq_message)
+    end
+
+    private
+    def time12for24(time, type)
+      if type == 'PM' || type == 'pm'
+        return 0 if time == 12
+        time + 12
+      else
+        time
       end
-      m_str = m_str + m
     end
-    return @messages if @messages.last == qq_message
-    qq_message.message = m_str
-    @messages.push(qq_message)
   end
 
 end

data/lib/qmessage/version.rb

@@ -1,3 +1,3 @@
 module Qmessage
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qmessage
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - molingyu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-23 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler