Remove uneeded namespace and prefix and restructure project

Author: Inbal Tako

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    securenative (0.1.28)
+    securenative (0.1.29)
 
 GEM
   remote: https://rubygems.org/

README.md

@@ -50,36 +50,36 @@ To get your *API KEY*, login to your SecureNative account and go to project sett
 SecureNative can automatically load your config from *securenative.yml* file or from the file that is specified in your *SECURENATIVE_CONFIG_FILE* env variable:
 
 ```ruby
-require 'securenative/securenative'
+require 'securenative'
 
 
-secureative =  SecureNative::SecureNative.init
+secureative =  SecureNativeSDK.init
 ```
 ### Option 2: Initialize via API Key
 
 ```ruby
-require 'securenative/sdk'
+require 'securenative'
 
 
-securenative =  SecureNative::SecureNative.init_with_api_key('YOUR_API_KEY')
+securenative =  SecureNativeSDK.init_with_api_key('YOUR_API_KEY')
 ```
 
 ### Option 3: Initialize via ConfigurationBuilder
 ```ruby
-require 'securenative/sdk'
+require 'securenative'
 
 
-options = SecureNative::ConfigurationBuilder.new(api_key: 'API_KEY', max_events: 10, log_level: 'ERROR')
-SecureNative::SecureNative.init_with_options(options)                                 
+options = ConfigurationBuilder.new(api_key: 'API_KEY', max_events: 10, log_level: 'ERROR')
+SecureNativeSDK.init_with_options(options)                                 
 ```
 
 ## Getting SecureNative instance
 Once initialized, sdk will create a singleton instance which you can get: 
 ```ruby
-require 'securenative/sdk'
+require 'securenative'
 
 
-secureNative = SecureNative::SecureNative.instance
+secureNative = SecureNativeSDK.instance
 ```
 
 ## Tracking events
@@ -88,15 +88,12 @@ Once the SDK has been initialized, tracking requests sent through the SDK
 instance. Make sure you build event with the EventBuilder:
 
  ```ruby
-require 'securenative/sdk'
-require 'securenative/models/event_options'
-require 'securenative/enums/event_types'
-require 'securenative/models/user_traits'
+require 'securenative'
 
 
 def track
-    securenative = SecureNative::SecureNative.instance
-    context = SecureNative::SecureNativeContext.new(client_token: 'SECURED_CLIENT_TOKEN', ip: '127.0.0.1',
+    securenative = SecureNativeSDK.instance
+    context = SecureNative::Context.new(client_token: 'SECURED_CLIENT_TOKEN', ip: '127.0.0.1',
                                        headers: { 'user-agent' => 'Mozilla: Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:47.0) Gecko/20100101 Firefox/47.3 Mozilla/5.0 (Macintosh; Intel Mac OS X x.y; rv:42.0) Gecko/20100101 Firefox/43.4' })
 
     event_options = SecureNative::EventOptions.new(event: SecureNative::EventTypes::LOG_IN, user_id: '1234', context: context,
@@ -112,15 +109,12 @@ end
 You can also create request securenative.context from requests:
 
 ```ruby
-require 'securenative/sdk'
-require 'securenative/models/event_options'
-require 'securenative/enums/event_types'
-require 'securenative/models/user_traits'
+require 'securenative'
 
 
 def track(request)
-    securenative = SecureNative::SecureNative.instance
-    context = SecureNative::SecureNativeContext.from_http_request(request)
+    securenative = SecureNativeSDK.instance
+    context = SecureNative::Context.from_http_request(request)
 
     event_options = SecureNative::EventOptions.new(event: SecureNative::EventTypes::LOG_IN, user_id: '1234', context: context,
                                      user_traits: SecureNative::UserTraits.new(name: 'Your Name', email: 'name@gmail.com', phone: '+1234567890'),
@@ -137,15 +131,12 @@ end
 **Example**
 
 ```ruby
-require 'securenative/sdk'
-require 'securenative/models/event_options'
-require 'securenative/enums/event_types'
-require 'securenative/models/user_traits'
+require 'securenative'
 
 
 def verify(request)
-    securenative = SecureNative::SecureNative.instance
-    context = SecureNative::SecureNativeContext.from_http_request(request)
+    securenative = SecureNativeSDK.instance
+    context = SecureNative::Context.from_http_request(request)
 
     event_options = SecureNative::EventOptions.new(event: SecureNative::EventTypes::LOG_IN, user_id: '1234', context: context,
                                          user_traits: SecureNative::UserTraits.new(name: 'Your Name', email: 'name@gmail.com', phone: '+1234567890'),
@@ -163,11 +154,11 @@ end
 Apply our filter to verify the request is from us, for example:
 
 ```ruby
-require 'securenative/sdk'
+require 'securenative'
 
 
 def webhook_endpoint(request)
-    securenative = SecureNative::SecureNative.instance
+    securenative = SecureNativeSDK.instance
 
     # Checks if request is verified
     is_verified = securenative.verify_request_payload(request)
@@ -190,9 +181,9 @@ Initialize sdk as showed above.
 ### Options 2: Using ConfigurationBuilder
 
 ```ruby
-require 'securenative/sdk'
+require 'securenative'
 
-options = SecureNative::SecureNativeOptions.new(api_key: 'API_KEY', max_events: 10, log_level: 'ERROR', proxy_headers: ['CF-Connecting-IP'])
+options = SecureNative::Options.new(api_key: 'API_KEY', max_events: 10, log_level: 'ERROR', proxy_headers: ['CF-Connecting-IP'])
 
-SecureNative::SecureNative.init_with_options(options)
+SecureNativeSDK.init_with_options(options)
 ``` 

lib/securenative.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'securenative/enums/failover_strategy'
+require 'securenative/enums/risk_level'
+require 'securenative/enums/api_route'
+require 'securenative/enums/event_types'
+require 'securenative/enums/risk_level'
+require 'securenative/config/configuration_builder'
+require 'securenative/config/configuration_manager'
+require 'securenative/config/options'
+require 'securenative/utils/request_utils'
+require 'securenative/utils/version_utils'
+require 'securenative/utils/encryption_utils'
+require 'securenative/utils/signature_utils'
+require 'securenative/utils/date_utils'
+require 'securenative/utils/utils'
+require 'securenative/utils/log'
+require 'securenative/utils/ip_utils'
+require 'securenative/context/rails_context'
+require 'securenative/context/hanami_context'
+require 'securenative/context/sinatra_context'
+require 'securenative/context/context'
+require 'securenative/models/event_options'
+require 'securenative/models/user_traits'
+require 'securenative/models/request_context'
+require 'securenative/models/client_token'
+require 'securenative/models/sdk_event'
+require 'securenative/models/verify_result'
+require 'securenative/errors/invalid_options_error'
+require 'securenative/errors/sdk_Illegal_state_error'
+require 'securenative/errors/config_error'
+require 'securenative/errors/sdk_error'
+require 'securenative/errors/http_error'
+require 'securenative/http/http_client'
+require 'securenative/event_manager'
+require 'securenative/api_manager'
+require 'securenative/sdk'
+
+require 'yaml'
+require 'net/http'
+require 'uri'
+require 'json'
+require 'securerandom'
+require 'openssl'
+require 'digest'
+require 'base64'
+require 'resolv'
+require 'logger'

lib/securenative/api_manager.rb

@@ -1,41 +1,32 @@
 # frozen_string_literal: true
 
-require 'securenative/models/sdk_event'
-require 'securenative/enums/failover_strategy'
-require 'securenative/enums/risk_level'
-require 'securenative/enums/api_route'
-require 'securenative/models/verify_result'
-require 'json'
-
-module SecureNative
-  class ApiManager
-    def initialize(event_manager, securenative_options)
-      @event_manager = event_manager
-      @options = securenative_options
-    end
-
-    def track(event_options)
-      SecureNativeLogger.debug('Track event call')
-      event = SDKEvent.new(event_options, @options)
-      @event_manager.send_async(event, ApiRoute::TRACK)
-    end
+class ApiManager
+  def initialize(event_manager, securenative_options)
+    @event_manager = event_manager
+    @options = securenative_options
+  end
 
-    def verify(event_options)
-      SecureNativeLogger.debug('Verify event call')
-      event = SDKEvent.new(event_options, @options)
+  def track(event_options)
+    SecureNative::Log.debug('Track event call')
+    event = SecureNative::SDKEvent.new(event_options, @options)
+    @event_manager.send_async(event, ApiRoute::TRACK)
+  end
 
-      begin
-        res = @event_manager.send_sync(event, ApiRoute::VERIFY, false)
-        ver_result = JSON.parse(res.body)
-        return VerifyResult.new(risk_level: ver_result['riskLevel'], score: ver_result['score'], triggers: ver_result['triggers'])
-      rescue StandardError => e
-        SecureNativeLogger.debug("Failed to call verify; #{e}")
-      end
-      if @options.fail_over_strategy == FailOverStrategy::FAIL_OPEN
-        return VerifyResult.new(risk_level: RiskLevel::LOW, score: 0, triggers: nil)
-      end
+  def verify(event_options)
+    SecureNative::Log.debug('Verify event call')
+    event = SecureNative::SDKEvent.new(event_options, @options)
 
-      VerifyResult.new(risk_level: RiskLevel::HIGH, score: 1, triggers: nil)
+    begin
+      res = @event_manager.send_sync(event, ApiRoute::VERIFY, false)
+      ver_result = JSON.parse(res.body)
+      return VerifyResult.new(risk_level: ver_result['riskLevel'], score: ver_result['score'], triggers: ver_result['triggers'])
+    rescue StandardError => e
+      SecureNative::Log.debug("Failed to call verify; #{e}")
     end
+    if @options.fail_over_strategy == SecureNative::FailOverStrategy::FAIL_OPEN
+      return SecureNative::VerifyResult.new(risk_level: RiskLevel::LOW, score: 0, triggers: nil)
+    end
+
+    VerifyResult.new(risk_level: RiskLevel::HIGH, score: 1, triggers: nil)
   end
 end

lib/securenative/config/configuration_builder.rb

@@ -1,29 +1,25 @@
 # frozen_string_literal: true
 
-require 'securenative/enums/failover_strategy'
+class ConfigurationBuilder
+  attr_reader :api_key, :api_url, :interval, :max_events, :timeout, :auto_send, :disable, :log_level, :fail_over_strategy, :proxy_headers
+  attr_writer :api_key, :api_url, :interval, :max_events, :timeout, :auto_send, :disable, :log_level, :fail_over_strategy, :proxy_headers
 
-module SecureNative
-  class ConfigurationBuilder
-    attr_reader :api_key, :api_url, :interval, :max_events, :timeout, :auto_send, :disable, :log_level, :fail_over_strategy, :proxy_headers
-    attr_writer :api_key, :api_url, :interval, :max_events, :timeout, :auto_send, :disable, :log_level, :fail_over_strategy, :proxy_headers
-
-    def initialize(api_key: nil, api_url: 'https://api.securenative.com/collector/api/v1', interval: 1000,
-                   max_events: 1000, timeout: 1500, auto_send: true, disable: false, log_level: 'FATAL',
-                   fail_over_strategy: FailOverStrategy::FAIL_OPEN, proxy_headers: nil)
-      @api_key = api_key
-      @api_url = api_url
-      @interval = interval
-      @max_events = max_events
-      @timeout = timeout
-      @auto_send = auto_send
-      @disable = disable
-      @log_level = log_level
-      @fail_over_strategy = fail_over_strategy
-      @proxy_headers = proxy_headers
-    end
+  def initialize(api_key: nil, api_url: 'https://api.securenative.com/collector/api/v1', interval: 1000,
+                 max_events: 1000, timeout: 1500, auto_send: true, disable: false, log_level: 'FATAL',
+                 fail_over_strategy: SecureNative::FailOverStrategy::FAIL_OPEN, proxy_headers: nil)
+    @api_key = api_key
+    @api_url = api_url
+    @interval = interval
+    @max_events = max_events
+    @timeout = timeout
+    @auto_send = auto_send
+    @disable = disable
+    @log_level = log_level
+    @fail_over_strategy = fail_over_strategy
+    @proxy_headers = proxy_headers
+  end
 
-    def self.default_securenative_options
-      SecureNativeOptions.new
-    end
+  def self.default_securenative_options
+    Options.new
   end
-end
+end