Merge pull request #13 from securenative/dev

Fix httpclient collision

Author: inbaltako

Gemfile

@@ -3,9 +3,9 @@ source "https://rubygems.org"
 gemspec
 gem "rspec"
 gem "rake"
-gem "httpclient"
 gem "parseconfig"
 gem "simplecov", :require => false, :group => :test
+gem "codecov", :require => false, :group => :test
 gem "webmock", :require => false, :group => :test
 gem "rails", :require => false, :group => :test
 gem "hanami", :require => false, :group => :test

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    securenative (0.1.18)
+    securenative (0.1.19)
 
 GEM
   remote: https://rubygems.org/
@@ -64,6 +64,11 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     builder (3.2.4)
+    codecov (0.2.6)
+      colorize
+      json
+      simplecov
+    colorize (0.8.1)
     concurrent-ruby (1.1.7)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -148,10 +153,10 @@ GEM
     http_router (0.11.2)
       rack (>= 1.0.0)
       url_mount (~> 0.2.1)
-    httpclient (2.8.3)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     inflecto (0.0.2)
+    json (2.3.1)
     loofah (2.6.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -256,8 +261,8 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 2.0)
+  codecov
   hanami
-  httpclient
   parseconfig
   rails
   rake

README.md

@@ -36,7 +36,7 @@ gem 'securenative'
 
 Then execute:
 
-    $ bundle
+    $ bundle install
 
 Or install it yourself as:
 

VERSION

@@ -1 +1 @@
-0.1.18
+0.1.19

lib/event_manager.rb

@@ -64,7 +64,7 @@ def send_sync(event, resource_path, retry_sending)
     SecureNativeLogger.debug("Attempting to send event #{event}")
     res = @http_client.post(resource_path, EventManager.serialize(event).to_json)
 
-    if res.status_code != 200
+    if res.code != 200
       SecureNativeLogger.info("SecureNative failed to call endpoint #{resource_path} with event #{event}. adding back to queue")
       item = QueueItem.new(resource_path, EventManager.serialize(event).to_json, retry_sending)
       @queue.append(item)

lib/http/securenative_http_client.rb

@@ -1,18 +1,19 @@
 # frozen_string_literal: true
 
-require 'httpclient'
+require 'net/http'
+require 'uri'
+require 'json'
 
 class SecureNativeHttpClient
   AUTHORIZATION_HEADER = 'Authorization'
   VERSION_HEADER = 'SN-Version'
   USER_AGENT_HEADER = 'User-Agent'
-  USER_AGENT_HEADER_VALUE = 'SecureNative-python'
+  USER_AGENT_HEADER_VALUE = 'SecureNative-ruby'
   CONTENT_TYPE_HEADER = 'Content-Type'
   CONTENT_TYPE_HEADER_VALUE = 'application/json'
 
   def initialize(securenative_options)
     @options = securenative_options
-    @client = HTTPClient.new
   end
 
   def _headers
@@ -25,8 +26,13 @@ def _headers
   end
 
   def post(path, body)
-    url = "#{@options.api_url}/#{path}"
+    uri = URI.parse("#{@options.api_url}/#{path}")
     headers = _headers
-    @client.post(url, body, headers)
+
+    client = Net::HTTP.new(uri.host, uri.port)
+    request = Net::HTTP::Post.new(uri.request_uri, headers)
+    request.body = body.to_json
+
+    client.request(request)
   end
 end

spec/spec_event_manager.rb

@@ -27,35 +27,60 @@ def initialize
     event = SampleEvent.new
 
     res_body = '{"data": true}'
-    stub_request(:any, 'https://api.securenative-stg.com/collector/api/v1/some-path/to-api').to_return(body: res_body.to_json, status: 200)
+    stub_request(:any, 'http://api.securenative-stg.com:443/collector/api/v1/some-path/to-api')
+      .with(headers: {
+              'Accept' => '*/*',
+              'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+              'Authorization' => 'YOUR_API_KEY',
+              'Content-Type' => 'application/json',
+              'Sn-Version' => '0.1.19',
+              'User-Agent' => 'SecureNative-ruby'
+            }).to_return(status: 200, body: '', headers: {})
     event_manager = EventManager.new(options)
 
     event_manager.start_event_persist
-    data = event_manager.send_sync(event, 'some-path/to-api', false)
+    res = event_manager.send_sync(event, 'some-path/to-api', false)
     event_manager.stop_event_persist
 
-    expect('"{\"data\": true}"').to eq(data.body.to_s)
+    expect(res.code).to eq('200')
   end
 
   it 'fails when send sync event status code is 401' do
     options = ConfigurationBuilder.new(api_key: 'YOUR_API_KEY', api_url: 'https://api.securenative-stg.com/collector/api/v1')
     event = SampleEvent.new
 
-    stub_request(:post, 'https://api.securenative-stg.com/collector/api/v1/some-path/to-api').to_return(status: 401)
+    stub_request(:any, 'http://api.securenative-stg.com:443/collector/api/v1/some-path/to-api')
+      .with(headers: {
+              'Accept' => '*/*',
+              'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+              'Authorization' => 'YOUR_API_KEY',
+              'Content-Type' => 'application/json',
+              'Sn-Version' => '0.1.19',
+              'User-Agent' => 'SecureNative-ruby'
+            }).to_return(status: 401, body: '', headers: {})
+
     event_manager = EventManager.new(options)
     res = event_manager.send_sync(event, 'some-path/to-api', false)
 
-    expect(res.status_code).to eq(401)
+    expect(res.code).to eq('401')
   end
 
   it 'fails when send sync event status code is 500' do
     options = ConfigurationBuilder.new(api_key: 'YOUR_API_KEY', api_url: 'https://api.securenative-stg.com/collector/api/v1')
     event = SampleEvent.new
 
-    stub_request(:post, 'https://api.securenative-stg.com/collector/api/v1/some-path/to-api').to_return(status: 500)
+    stub_request(:post, 'http://api.securenative-stg.com:443/collector/api/v1/some-path/to-api')
+      .with(headers: {
+              'Accept' => '*/*',
+              'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+              'Authorization' => 'YOUR_API_KEY',
+              'Content-Type' => 'application/json',
+              'Sn-Version' => '0.1.19',
+              'User-Agent' => 'SecureNative-ruby'
+            }).to_return(status: 500, body: '', headers: {})
     event_manager = EventManager.new(options)
     res = event_manager.send_sync(event, 'some-path/to-api', false)
 
-    expect(res.status_code).to eq(500)
+    expect(res.code).to eq('500')
   end
 end

spec/spec_securenative_http_client.rb

@@ -9,13 +9,22 @@
   it 'makes a simple post call' do
     options = ConfigurationBuilder.new(api_key: 'YOUR_API_KEY', api_url: 'https://api.securenative-stg.com/collector/api/v1')
 
-    stub_request(:post, 'https://api.securenative-stg.com/collector/api/v1/track')
-      .with(body: { event: 'SOME_EVENT_NAME' }).to_return(status: 200)
+    stub_request(:post, 'http://api.securenative-stg.com:443/collector/api/v1/track')
+      .with(body: '"{\\"event\\": \\"SOME_EVENT_NAME\\"}"',
+            headers: {
+              'Accept': '*/*',
+              'Accept-Encoding': 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+              'Authorization': 'YOUR_API_KEY',
+              'Content-Type': 'application/json',
+              'Sn-Version': '0.1.19',
+              'User-Agent': 'SecureNative-ruby'
+            })
+      .to_return(status: 200, body: '', headers: {})
     client = SecureNativeHttpClient.new(options)
     payload = '{"event": "SOME_EVENT_NAME"}'
 
     res = client.post('track', payload)
 
-    expect(res.status_code).to eq(200)
+    expect(res.code).to eq('200')
   end
 end