sms-logparser 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93e212f0f77154778e786a79367f9cd82c9cee3b
-  data.tar.gz: 49e41a9246a1ed98d9b758879229c35e05155142
+  metadata.gz: 9e27a12723425509ba68cdaf5ff40b2e8cf0c8f7
+  data.tar.gz: 1f28ec67759effb560f95eb20dd9746f3c6c1438
 SHA512:
-  metadata.gz: d556599ab90dfa6c382b2f49ce55c184b11f168133777ce86580361dccf38b7080a79c56a05e05c54db63162fd154270e4f6ada22c94025a291abccbbc3dbd96
-  data.tar.gz: 053425917166b1b60cb82b2744e2df956a97c1a5950be1fa53c6ce5f1e52ad5fa04d360982165693b8673b36a5fe0670083de5643bb08a069b20dbceecd76d0f
+  metadata.gz: cf90a38a56e49ed5b20fb8befcefd91b0b898d165287cdecbbbca99d471b4247dface8454799606ca2861001dc8f7d99fabe10aa9b03649afd104ffd6c8c9c89
+  data.tar.gz: 0020bd4587d6588753694888c0dc84b4fa6d053b71c1b8dabd0ac959bb778f9d5b28456f94b9e0ec4f8f70553a8df3d3b806697871fd536429a54c720cf9c6a8

data/lib/sms-logparser/cli.rb

@@ -81,7 +81,7 @@ module SmsLogparser
             if data
               requests = api.send(data)
               state[:match_count] += 1
-              verbose_parser_output(data, requests, entry) if options[:verbose]
+              verbose_parser_output(data, requests, entry['ID']) if options[:verbose]
             end
           end
           state[:last_event_id] = entry['ID']
@@ -155,9 +155,9 @@ module SmsLogparser
     end
 
     no_commands do
-      def verbose_parser_output(data, requests, entry)
+      def verbose_parser_output(data, requests, entry_id)
         say "ID:\t", :cyan
-        say entry['ID']
+        say entry_id
         say "URL:\t", :cyan
         say requests.map {|req| "#{req[:url]}#{req[:uri]} (Status: #{req[:status] || 'n/a'})"}.join("\n\t")
         say "Data:\t", :cyan

data/lib/sms-logparser/mysql.rb

@@ -78,15 +78,12 @@ module SmsLogparser
 
     def get_entries(options={})
       last_id = options[:last_id] || get_last_parse_id
-      if options[:limit]
-        max_id = last_id + options[:limit] + 1
-      else 
-        max_id = get_last_event_id
-      end
+      max_id, query_limit = get_query_limits(last_id, options[:limit])
       while last_id < max_id
-        entries = select_entries(last_id)
+        entries = select_entries(last_id, query_limit)
         yield entries
-        last_id = entries.to_a[-1]['ID']
+        entries = entries.to_a
+        last_id = entries.size > 0 ? entries[-1]['ID'] : max_id
       end
     end
 
@@ -99,11 +96,25 @@ module SmsLogparser
 
     private
 
-    def select_entries(last_id)
-      client.query("SELECT * FROM SystemEvents\
+    def get_query_limits(last_id, user_limit = nil)
+      if user_limit
+        max_id = last_id + user_limit
+        if @query_limit > user_limit
+          query_limit = user_limit
+        end
+      else 
+        max_id = get_last_event_id
+      end
+      [max_id, query_limit || @query_limit]
+    end
+
+    def select_entries(offset, max_entries = @query_limit)
+      client.query(
+        "SELECT * FROM SystemEvents\
         WHERE `FromHost` like '#{@host_filter}'\
         ORDER BY ID ASC\
-        LIMIT #{last_id},#{@query_limit};")
+        LIMIT #{offset},#{max_entries};"
+      )
     end
 
     def get_last_event_id

data/lib/sms-logparser/version.rb

@@ -1,3 +1,3 @@
 module SmsLogparser
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/spec/api_spec.rb

@@ -20,10 +20,10 @@ describe SmsLogparser::Api do
       :traffic_type => 'TRAFFIC_WEBCAST',
       :visitor_type => 'VISITORS_WEBCAST'
     }
-    urls = @api.send(data)
-    urls.size.must_equal 2
-    urls[0].must_match /\/1\/2\/3\/TRAFFIC_WEBCAST\/128$/
-    urls[1].must_match /\/1\/2\/3\/VISITORS_WEBCAST\/1$/
+    requests = @api.send(data)
+    requests.size.must_equal 2
+    requests[0][:uri].must_match /\/1\/2\/3\/TRAFFIC_WEBCAST\/128$/
+    requests[1][:uri].must_match /\/1\/2\/3\/VISITORS_WEBCAST\/1$/
   end
 
   it "does not send traffic for m3u8 files" do
@@ -37,9 +37,9 @@ describe SmsLogparser::Api do
       :traffic_type => 'TRAFFIC_MOBILE',
       :visitor_type => 'VISITORS_MOBILE'
     }
-    urls = @api.send(data)
-    urls.size.must_equal 1
-    urls[0].must_match /\/100\/200\/300\/VISITORS_MOBILE\/1$/
+    requests = @api.send(data)
+    requests.size.must_equal 1
+    requests[0][:uri].must_match /\/100\/200\/300\/VISITORS_MOBILE\/1$/
   end
 
   it "does not send visitor info if no visitor_type" do
@@ -52,9 +52,9 @@ describe SmsLogparser::Api do
       :user_agent => 'Mozilla/5.0 (Android; Mobile; rv:13.0) Gecko/13.0 Firefox/13.0',
       :traffic_type => 'TRAFFIC_MOBILE',
     }
-    urls = @api.send(data)
-    urls.size.must_equal 1
-    urls[0].must_match /\/101\/202\/303\/TRAFFIC_MOBILE\/48$/
+    requests = @api.send(data)
+    requests.size.must_equal 1
+    requests[0][:uri].must_match /\/101\/202\/303\/TRAFFIC_MOBILE\/48$/
   end
 
 end

metadata

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