Restructure project

Author: Inbal Tako

README.md

@@ -12,6 +12,7 @@
   <a href="https://codecov.io/gh/securenative/securenative-ruby">
     <img src="https://codecov.io/gh/securenative/securenative-ruby/branch/master/graph/badge.svg" />
   </a>
+  <a href="https://badge.fury.io/rb/securenative"><img src="https://badge.fury.io/rb/securenative.svg" alt="Gem Version" height="18"></a>
 </p>
 <p align="center">
   <a href="https://docs.securenative.com">Documentation</a> |
@@ -60,19 +61,15 @@ secureative =  SecureNative.init
 require 'securenative'
 
 
-securenative =  SecureNative.init_with_api_key("YOUR_API_KEY")
+securenative =  SecureNative.init_with_api_key('YOUR_API_KEY')
 ```
 
 ### Option 3: Initialize via ConfigurationBuilder
 ```ruby
 require 'securenative'
 
 
-securenative = SecureNative.init_with_options(SecureNative.config_builder
-                                        .with_api_key("API_KEY")
-                                        .with_max_events(10)
-                                        .with_log_level("ERROR")
-                                        .build)
+securenative = SecureNative.init_with_options(SecureNative.config_builder(api_key = 'API_KEY', max_event = 10, log_level = 'ERROR'))                                 
 ```
 
 ## Getting SecureNative instance
@@ -94,22 +91,17 @@ require 'securenative'
 require 'securenative/enums/event_types'
 require 'securenative/event_options_builder'
 require 'securenative/models/user_traits'
+require 'securenative/context/context_builder'
 
 
 securenative = SecureNative.instance
 
-context = SecureNative.context_builder
-        .with_ip("127.0.0.1")
-        .with_client_token("SECURED_CLIENT_TOKEN")
-        .with_headers({"user-agent" => "Mozilla/5.0 (iPad; U; CPU OS 3_2_1 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Mobile/7B405"})
-        .build
+context = securenative.context_builder(ip = '127.0.0.1', client_token = 'SECURED_CLIENT_TOKEN',
+        headers = { 'user-agent' => 'Mozilla/5.0 (iPad; U; CPU OS 3_2_1 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Mobile/7B405' })
 
-event_options = EventOptionsBuilder(EventTypes::LOG_IN)
-        .with_user_id("USER_ID")
-        .with_user_traits(UserTraits("USER_NAME", "USER_EMAIL"))
-        .with_context(context)
-        .with_properties({"prop1" => "CUSTOM_PARAM_VALUE", "prop2" => true, "prop3" => 3})
-        .build
+event_options = EventOptionsBuilder(event_type = EventTypes::LOG_IN,
+        user_id = 'USER_ID', user_traits = UserTraits('USER_NAME', 'USER_EMAIL'),
+        context = context, properties = {prop1 => 'CUSTOM_PARAM_VALUE', prop2 => true, prop3 => 3}).build
 
 securenative.track(event_options)
  ```
@@ -127,12 +119,9 @@ def track(request)
     securenative = SecureNative.instance
     context = SecureNative.context_builder.from_http_request(request).build
 
-    event_options = EventOptionsBuilder(EventTypes::LOG_IN)
-        .with_user_id("USER_ID")
-        .with_user_traits(UserTraits("USER_NAME", "USER_EMAIL"))
-        .with_context(context)
-        .with_properties({"prop1" => "CUSTOM_PARAM_VALUE", "prop2" => true, "prop3" => 3})
-        .build
+    event_options = EventOptionsBuilder(event_type = EventTypes::LOG_IN,
+            user_id = 'USER_ID', user_traits = UserTraits('USER_NAME', 'USER_EMAIL'),
+            context = context, properties = {prop1 => 'CUSTOM_PARAM_VALUE', prop2 => true, prop3 => 3}).build
 
     securenative.track(event_options)
 end
@@ -153,12 +142,9 @@ def track(request)
     securenative = SecureNative.instance
     context = SecureNative.context_builder.from_http_request(request).build
 
-    event_options = EventOptionsBuilder(EventTypes::LOG_IN)
-        .with_user_id("USER_ID")
-        .with_user_traits(UserTraits("USER_NAME", "USER_EMAIL"))
-        .with_context(context)
-        .with_properties({"prop1" => "CUSTOM_PARAM_VALUE", "prop2" => true, "prop3" => 3})
-        .build
+    event_options = EventOptionsBuilder(event_type = EventTypes::LOG_IN,
+        user_id = 'USER_ID', user_traits = UserTraits('USER_NAME', 'USER_EMAIL'),
+        context = context, properties = {prop1 => 'CUSTOM_PARAM_VALUE', prop2 => true, prop3 => 3}).build
 
     verify_result = securenative.verify(event_options)
     verify_result.risk_level  # Low, Medium, High

lib/config/configuration_builder.rb

@@ -0,0 +1,26 @@
+class ConfigurationBuilder
+  attr_reader :api_key, :api_url, :interval, :max_events, :timeout, :auto_send, :disable, :log_level, :fail_over_strategy
+  attr_writer :api_key, :api_url, :interval, :max_events, :timeout, :auto_send, :disable, :log_level, :fail_over_strategy
+
+  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)
+    @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
+  end
+
+  def self.default_config_builder
+    ConfigurationBuilder()
+  end
+
+  def self.default_securenative_options
+    SecureNativeOptions()
+  end
+end

lib/models/request_context.rb

@@ -40,15 +40,14 @@ def self.load_config
 
     properties = read_resource_file(resource_path)
 
-    ConfigurationBuilder()
-      .with_api_key(_get_env_or_default(properties, 'SECURENATIVE_API_KEY', options.api_key))
-      .with_api_url(_get_env_or_default(properties, 'SECURENATIVE_API_URL', options.api_url))
-      .with_interval(_get_env_or_default(properties, 'SECURENATIVE_INTERVAL', options.interval))
-      .with_max_events(_get_env_or_default(properties, 'SECURENATIVE_MAX_EVENTS', options.max_events))
-      .with_timeout(_get_env_or_default(properties, 'SECURENATIVE_TIMEOUT', options.timeout))
-      .with_auto_send(_get_env_or_default(properties, 'SECURENATIVE_AUTO_SEND', options.auto_send))
-      .with_disable(_get_env_or_default(properties, 'SECURENATIVE_DISABLE', options.disable))
-      .with_log_level(_get_env_or_default(properties, 'SECURENATIVE_LOG_LEVEL', options.log_level))
-      .with_fail_over_strategy(_get_env_or_default(properties, 'SECURENATIVE_FAILOVER_STRATEGY', options.fail_over_strategy))
+    ConfigurationBuilder(_get_env_or_default(properties, 'SECURENATIVE_API_KEY', options.api_key),
+                         _get_env_or_default(properties, 'SECURENATIVE_API_URL', options.api_url),
+                         _get_env_or_default(properties, 'SECURENATIVE_INTERVAL', options.interval),
+                         _get_env_or_default(properties, 'SECURENATIVE_MAX_EVENTS', options.max_events),
+                         _get_env_or_default(properties, 'SECURENATIVE_TIMEOUT', options.timeout),
+                         _get_env_or_default(properties, 'SECURENATIVE_AUTO_SEND', options.auto_send),
+                         _get_env_or_default(properties, 'SECURENATIVE_DISABLE', options.disable),
+                         _get_env_or_default(properties, 'SECURENATIVE_LOG_LEVEL', options.log_level),
+                         _get_env_or_default(properties, 'SECURENATIVE_FAILOVER_STRATEGY', options.fail_over_strategy))
   end
 end

lib/api_manager.rb lib/securenative/api_manager.rblib/api_manager.rb renamed to lib/securenative/api_manager.rb

@@ -1,41 +1,36 @@
 class ContextBuilder
-  def initialize
-    @context = SecureNativeContext()
+  attr_reader :context
+
+  def initialize(client_token = nil, ip = nil, remote_ip = nil, headers = nil, url = nil, method = nil, body = nil)
+    @context = SecureNativeContext(client_token, ip, remote_ip, headers, url, method, body)
   end
 
-  def with_client_token(client_token)
+  def client_token(client_token)
     @context.client_token = client_token
-    self
   end
 
-  def with_ip(ip)
+  def ip(ip)
     @context.ip = ip
-    self
   end
 
-  def with_remote_ip(remote_ip)
+  def remote_ip(remote_ip)
     @context.remote_ip = remote_ip
-    self
   end
 
-  def with_headers(headers)
+  def headers(headers)
     @context.headers = headers
-    self
   end
 
-  def with_url(url)
+  def url(url)
     @context.url = url
-    self
   end
 
-  def with_method(method)
+  def method(method)
     @context.method = method
-    self
   end
 
-  def with_body(body)
+  def body(body)
     @context.body = body
-    self
   end
 
   def self.default_context_builder
@@ -57,17 +52,8 @@ def self.from_http_request(request)
 
     client_token = RequestUtils.get_secure_header_from_request(headers) if Utils.null_or_empty?(client_token)
 
-    ContextBuilder()
-      .with_url(request.url)
-      .with_method(request.method)
-      .with_headers(headers)
-      .with_client_token(client_token)
-      .with_ip(RequestUtils.get_client_ip_from_request(request))
-      .with_remote_ip(RequestUtils.get_remote_ip_from_request(request))
-      .with_body(nil)
-  end
-
-  def build
-    @context
+    ContextBuilder(url = request.url, method = request.method, header = headers, client_token = client_token,
+                   client_ip = RequestUtils.get_client_ip_from_request(request),
+                   remote_ip = RequestUtils.get_remote_ip_from_request(request), nil)
   end
 end