myslog 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01ae65979b5ba26faf80d43e15c9a0f8178e0f61
-  data.tar.gz: 8e4c38a14bf1fdd953ee165423e5fea39395fed0
+  metadata.gz: acc2b4218401ea178a7879e7af86a35cb421833f
+  data.tar.gz: 3fd0187e5be618194825df871deab6b7b2e6429b
 SHA512:
-  metadata.gz: 781f661946cde324e8ae78e5ee30aaed434478d07344b3abe699fc6993d5b18e1d93e1685b88f0026c0e3be97438bddb063c8562361474c2e4b048b2d330e4aa
-  data.tar.gz: 8d4965c1611b43bbc04a1d911da3d0e2ae6a978bf621e80c057cd2add85ebd0b9ba00693071c452ef8919a94537e8505a61ffb728a00749f097831c3b6f68c62
+  metadata.gz: 0b0b5b8e7db1e435d4d22a033deb05f6bba7a9cea5657d1e77959df88dccea4e273f7b26eacb5cc7fc91b0f190ce696d0c7826973501428431609a057a6cbca6
+  data.tar.gz: 47b2f84d9b281e5f8df98cf65767e076ce5058a54af25c8ca2b0cabcea0882c3027efaddcb3cb6ef9f865ad589f247c9c5607196c1369e20bc87445f90064ff3

data/lib/myslog.rb

@@ -38,15 +38,10 @@ class MySlog
 
       if record.start_with? "# User@Host:"
 
-        elems = record.split(" ")
-        response[:user]      = elems[2].strip
-        if elems[5] == nil
-          response[:host]    = nil
-          response[:host_ip] = elems[4].strip[1...-1]
-        else
-          response[:host]    = elems[4].strip
-          response[:host_ip] = elems[5].strip[1...-1]
-        end
+        elems = record.split(/ /, 7)
+        response[:user]    = elems[2].strip
+        response[:host]    = elems[4].empty? ? nil : elems[4].strip
+        response[:host_ip] = elems[5].strip[1...-1]
       elsif record.start_with? "#"
 
         elems = record[2..-1].strip().split " "

data/myslog.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |spec|
   spec.name          = "myslog"
-  spec.version       = "0.1.0"
-  spec.authors       = ["taka84u9"]
+  spec.version       = "0.1.1"
+  spec.authors       = ["Yuku Takahashi"]
   spec.email         = ["taka84u9@gmail.com"]
   spec.summary       = "MySQL slow query parser."
   spec.description   = "MySQL slow query parser."

data/spec/myslog_spec.rb

@@ -53,6 +53,12 @@ use mysql;
 SET timestamp=1455094936;
 select
 sleep(2);
+# Time: 160219 21:58:25
+# User@Host: root[root] @  [192.168.10.1]  Id:     1
+# Query_time: 0.000985  Lock_time: 0.000985 Rows_sent: 1  Rows_examined: 1
+use test_db;
+SET timestamp=1455886705;
+select * from test_table;
     EOF
   end
 
@@ -121,7 +127,13 @@ sleep(2);
       expect(record[0]).to eq(
           "# Time: 2016-02-10T18:02:16.411200+09:00"
       )
-      
+
+      record = results[6]
+      expect(record.size).to eq(4)
+      expect(record[0]).to eq(
+          "# Time: 160219 21:58:25"
+      )
+
     end
   end
 
@@ -277,7 +289,40 @@ sleep(2);
           expect(@response[:sql]).to           eq(@sql.strip)
         end
       end
+    end
 
+    context "given unexist localhost and exist Id" do
+      describe "response" do
+        before :each do
+          @user = "root[root]"
+          @host = nil
+          @host_ip = "192.168.10.1"
+          @query_time = 0.000985
+          @lock_time = 0.000985
+          @rows_sent = 1
+          @rows_examined = 1
+          @sql = "SET timestamp=1455886705; SELECT * FROM test_table;"
+          @lines = [
+            "# User@Host: #{@user} @ #{@host} [#{@host_ip}]  Id:     1",
+            "# Query_time: #{@query_time}  Lock_time: #{@lock_time}  Rows_sent: #{@rows_sent}  Rows_examined: #{@rows_examined}",
+            @sql
+          ]
+          @response = @myslog.parse_record(@lines)
+        end
+
+        it "should have expected values" do
+          expect(@response[:date].utc.to_s).to eq("2016-02-19 12:58:25 UTC")
+          expect(@response[:user]).to          eq(@user)
+          expect(@response[:host]).to          eq(@host)
+          expect(@response[:host_ip]).to       eq(@host_ip)
+          expect(@response[:query_time]).to    eq(@query_time)
+          expect(@response[:lock_time]).to     eq(@lock_time)
+          expect(@response[:rows_sent]).to     eq(@rows_sent)
+          expect(@response[:rows_examined]).to eq(@rows_examined)
+          expect(@response[:sql]).to           eq(@sql.strip)
+        end
+      end
     end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: myslog
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
-- taka84u9
+- Yuku Takahashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler