sms-logparser 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ad478bf9a5f80ba72ab9e0f48303ce03e850511
-  data.tar.gz: 95d931e94749fcdb7876a7ecece52e4ce225675e
+  metadata.gz: bff5cf76ce93fa19c9d0f5c488363dd5b86d10fd
+  data.tar.gz: 05f02b03ef8e63810a21bd3f6e9061eff6c1b325
 SHA512:
-  metadata.gz: 19b52cef0cf0181912da7075cb91deb76f9f7a7bd2aeba49ce6409ed730ecc623a0c67927ab059a67bfb1ab31270201fa33c449c5b152470595ba8c1798404fe
-  data.tar.gz: 4cc3e8d1135625a43129d5f6f9a460b97e1fa20e7d55671b17017ebf70a9becc4e7b00b0908a3bc48de075895e8683e0483112eea4937784e533ae0bb1c9a6a4
+  metadata.gz: 3fcba57cac34ad776f065f98169ba2c00bcf8040ad59de87037a37ce0573ef28ee8187804d48875e19cba7b1fb62223b9e2bec9665542b235571050e573a56b6
+  data.tar.gz: 2f496cd73c38b7910a1851de88fe4a3e27873d9f2a935354bac3e81868033c144055c2a184ed8ff3688cec7c792bce296af412439e8e91c2588022bc70ed4e43

data/lib/sms-logparser/log_message.rb

@@ -16,16 +16,20 @@ module SmsLogparser
       match[3]
     end
 
-    def status
-      match[5].to_i
+    def file
+      match[4]
     end
 
-    def bytes
+    def args
+      match[5]
+    end
+
+    def status
       match[6].to_i
     end
 
-    def file
-      match[4]
+    def bytes
+      match[7].to_i
     end
 
     def file_extname
@@ -33,7 +37,7 @@ module SmsLogparser
     end
     
     def user_agent
-      match[7]
+      match[8]
     end
 
     def account_info
@@ -61,7 +65,7 @@ module SmsLogparser
     private 
 
     def match
-      @match ||= @message.match /\/content\/(\d+)\/(\d+)\/(\d+)\/(\w+\.\w+)\s.*\"\s(\d+)\s(\d+).+"(.*)"$/
+      @match ||= @message.match /\/content\/(\d+)\/(\d+)\/(\d+)\/(\w+\.\w+)(\?\S*)*\s.*\"\s(\d+)\s(\d+).+"(.*)"$/
     end
   end
 end 

data/lib/sms-logparser/version.rb

@@ -1,3 +1,3 @@
 module SmsLogparser
-  VERSION = "0.15.0"
+  VERSION = "0.15.1"
 end

data/spec/log_message_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe SmsLogparser::LogMessage do
 
-  it "can extract the correct values from messages" do
+  it "can extract the correct values from messages without arg string" do
     log_message = SmsLogparser::LogMessage.new('127.0.0.1 - - [13/Apr/2014:05:33:23 +0200] "GET /content/51/102/42481/simvid_1.mp4 HTTP/1.1" 206 7865189 "-" "iTunes/11.1.5 (Windows; Microsoft Windows 7 Home Premium Edition Service Pack 1 (Build 7601)) AppleWebKit/537.60.11"')
     log_message.customer_id.must_equal '51'
     log_message.author_id.must_equal '102'
@@ -10,8 +10,22 @@ describe SmsLogparser::LogMessage do
     log_message.status.must_equal 206
     log_message.bytes.must_equal 7865189
     log_message.file.must_equal 'simvid_1.mp4'
+    log_message.args.must_equal nil
     log_message.file_extname.must_equal '.mp4'
     log_message.user_agent.must_equal 'iTunes/11.1.5 (Windows; Microsoft Windows 7 Home Premium Edition Service Pack 1 (Build 7601)) AppleWebKit/537.60.11'
   end
 
+  it "can extract the correct values from messages wit arg string" do
+    log_message = SmsLogparser::LogMessage.new('- - [23/Apr/2014:17:36:33 +0200] "GET /content/51/52/42721/simvid_1_40.flv?position=22 HTTP/1.1" 206 100708 "http://blick.simplex.tv/NubesPlayer/player.swf" "Mozilla/5.0 (Windows NT 6.1; rv:28.0) Gecko/20100101 Firefox/28.0"')
+    log_message.customer_id.must_equal '51'
+    log_message.author_id.must_equal '52'
+    log_message.project_id.must_equal '42721'
+    log_message.status.must_equal 206
+    log_message.bytes.must_equal 100708
+    log_message.file.must_equal 'simvid_1_40.flv'
+    log_message.args.must_equal '?position=22'
+    log_message.file_extname.must_equal '.flv'
+    log_message.user_agent.must_equal 'Mozilla/5.0 (Windows NT 6.1; rv:28.0) Gecko/20100101 Firefox/28.0'
+  end
+
 end

data/spec/parser_spec.rb

@@ -101,6 +101,16 @@ describe SmsLogparser::Parser do
     data[1][:value].must_equal 1
   end
 
+  it "count traffic with status 206 and a argumenst string and user agent Firefox on Windows as webcast visit" do
+    message = '- - [23/Apr/2014:17:36:33 +0200] "GET /content/51/52/42721/simvid_1_40.flv?position=22 HTTP/1.1" 206 100708 "http://blick.simplex.tv/NubesPlayer/player.swf" "Mozilla/5.0 (Windows NT 6.1; rv:28.0) Gecko/20100101 Firefox/28.0"'
+    data = SmsLogparser::Parser.new.extract_data_from_msg(message)
+    data.first[:customer_id].must_equal "51"
+    data.first[:author_id].must_equal "52"
+    data.first[:project_id].must_equal "42721"
+    data.first[:type].must_equal 'TRAFFIC_WEBCAST'
+    data.first[:value].must_equal 100708
+  end
+
   it "do not count *.css with status 200 as visit" do
     message = '- - [22/Apr/2014:18:00:50 +0200] "GET /content/51/52/42431/application.css HTTP/1.1" 200 192 "http://blick.simplex.tv/NubesPlayer/player.swf" "Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; rv:11.0) like Gecko"'
     data = SmsLogparser::Parser.new.extract_data_from_msg(message)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sms-logparser
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - niwo