sms-logparser 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68b3faab7670b5bc5754b7418ad0c3906dd9caf8
-  data.tar.gz: 062592b33ab6e405d9bac193c33234b207c547c8
+  metadata.gz: 9947d072a5d20d349783fd951fdd84a0e7ae399d
+  data.tar.gz: df012488b0a89171d4266a01c05a98e20f7e6e35
 SHA512:
-  metadata.gz: 289c94bd76b9988527c2b417c62d09dd2a417ddefe8276094625ebbb44a6293c0a7eb3040a7d0517fc9af49d16cf2e133cd1ff3c09514920043f7661f3b805ac
-  data.tar.gz: ed1e0cfe7f29147f7f0a3caf2e96c65723b9ca3e45447acd5f04c9642f5329026afb0b2520f1f47dd3ce8c02756184af60e460249a7adbb8625184adb0941c6b
+  metadata.gz: fa94858261fc273a87d3ebba39120795631c477979d0fef1b770d1092b17c50c95387a662b8b7743c841f34a06e687bf3e0ce0181c630e07a05549145ebd5685
+  data.tar.gz: f97dd70501d1b23919b52e79159b179eb1d91da5bcc192738ee0d0419a581543307c599b627bcdfc6f48f4464e2079add11e7492be4d3e5a77f954388d739822

data/lib/sms-logparser/api.rb

@@ -1,8 +1,10 @@
 module SmsLogparser
   class Api
+    require 'uri'
 
     def initialize(options)
       @options = options
+      @base_url = URI(@options[:api_base_url] || 'http://localhost:8080/creator/rest')
     end
 
     def connection
@@ -10,8 +12,7 @@ module SmsLogparser
     end
 
     def new_connection
-      base_url = @options[:api_base_path] || 'http://localhost:8080'
-      conn = Faraday.new(url: base_url) do |faraday|
+      conn = Faraday.new(url: @base_url) do |faraday|
         faraday.request :url_encoded
         faraday.response :logger if @options[:debug]
         faraday.adapter  Faraday.default_adapter
@@ -25,12 +26,12 @@ module SmsLogparser
 
     def send(data)
       uris = []
-      base_uri = ["/#{data[:customer_id]}", data[:author_id], data[:project_id]].join('/')
+      base_path = [@base_url.path, data[:customer_id], data[:author_id], data[:project_id]].join('/')
       unless data[:file] =~ /.*\.m3u8$/
-        uris << [base_uri, data[:traffic_type], data[:bytes]].join('/')
+        uris << [base_path, data[:traffic_type], data[:bytes]].join('/')
       end
       if data[:visitor_type]
-        uris << [base_uri, data[:visitor_type], 1].join('/')
+        uris << [base_path, data[:visitor_type], 1].join('/')
       end
       unless @options[:simulate]
         uris.each do |uri|
@@ -40,7 +41,7 @@ module SmsLogparser
             raise RuntimeError, "Can't send request to #{uri}. #{e.message}", caller
           end
           unless response.status == 200
-            raise RuntimeError, "Received response code (#{response.status}) from API.", caller
+            raise RuntimeError, "Received HTTP status #{response.status} from API.", caller
           end
         end
       end

data/lib/sms-logparser/cli.rb

@@ -35,7 +35,7 @@ module SmsLogparser
     map %w(-v --version) => :version
 
     desc "parse", "Check the database for pcache logs and send them to the SMS-API"
-    option :api_base_path,
+    option :api_base_url,
       aliases: %w(-a),
       desc: "Base path of the SMS API (default: http://localhost:8080/)"
     option :api_key,

data/lib/sms-logparser/version.rb

@@ -1,3 +1,3 @@
 module SmsLogparser
-  VERSION = "0.4.3"
+  VERSION = "0.5.0"
 end

metadata

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