moesif_api 2.0.2 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0251e30afabbe270c78ce4240d5895c1414ab56d12b8ba6498d2bf6d6e5f7db5
-  data.tar.gz: 302d117fe223259e353e53510b139c3d1562a0f258afdbe24477fb9d3ca85015
+  metadata.gz: 4df54ebc345c812cec2fcea15554f134b13106a4e8f7081330afde4aab75be21
+  data.tar.gz: c0d0b57c8d1d804c3f80730f140bae583173fb2755cfae68a00a0123425fa0d9
 SHA512:
-  metadata.gz: aac5a817a9a29462c5c4e9f22c7f635b86a55b9af8d97e6b3f1f2d2574d8731b78ef52773bb9e1a6f3e59b27ee309e50039ac1802f4238acb4aa863a758b1acb
-  data.tar.gz: 85512bb4f2a0f0b5420dfd005ebc159b93f79ec12cc4301f3114f36543342d12e3c1c0bc538e48a889713b9efebf8b9ff1152363b2cfa9e257d5879398e4aead
+  metadata.gz: 533086975aaf0c04f403e374195c6cd5489cf155e00335e6a9927788b81681f715f2bb305ee918d31a06d937fbc00726e67f601e14db98753ded8bb43fab91d1
+  data.tar.gz: d586ba59a922b9a3c371b68b022dc940863d778ef8de6a4112f6cdd04293955f9bf308d2e3ba7e6998c5da6ffd5e3083c0b4138561236581481cc7db836d4dc8

data/lib/moesif_api/configuration.rb

@@ -8,9 +8,11 @@ module MoesifApi
     # Your Application Id for authentication/authorization
     @application_id = 'SET_ME'
 
-    @version = '2.0.2'
+    @version = '2.1.1'
 
-    @user_agent = "moesifapi-ruby/2.0.2"
+    @user_agent = "moesifapi-ruby/2.1.1"
+
+    @retry_count = 5
 
     # create the getters and setters
     class << self
@@ -18,6 +20,7 @@ module MoesifApi
       attr_accessor :application_id
       attr_accessor :version
       attr_accessor :user_agent
+      attr_accessor :retry_count
     end
   end
 end

data/lib/moesif_api/controllers/base_controller.rb

@@ -19,8 +19,13 @@ module MoesifApi
 
     def validate_response(context)
       return if context.response.status_code.between?(200, 208) # [200,208] = HTTP OK
+      res = context.response;
 
-      raise APIException.new 'HTTP Response Not OK', context
+      if res.nil?
+        raise APIException.new 'No Http Response, maybe timeout', context
+      else
+        raise APIException.new 'HTTP Response Not OK ' +  res.status_code.to_s + ' ' + res.raw_body.to_s, context
+      end
     end
 
   end

data/lib/moesif_api/http/faraday_client.rb

@@ -1,15 +1,22 @@
 require 'faraday'
-require 'faraday/net_http_persistent'
-require 'faraday/retry'
 require 'json'
 
+faraday_version = Gem.loaded_specs['faraday'].version
+
+# in faraday < 2.0 net_http_persistent and retry is build into faraday already
+# in faraday >= 2.0 we must require these plugins
+if faraday_version >= Gem::Version.new('2.0')
+  require 'faraday/net_http_persistent'
+  require 'faraday/retry'
+end
+
 module MoesifApi
   class FaradayClient < HttpClient
     def initialize
       super()
       retry_options = {
-        max: 3,
-        interval: 0.1,
+        max: Configuration.retry_count,
+        interval: 0.2,
         interval_randomness: 0.5,
         backoff_factor: 2
       }

data/lib/moesif_api/moesif_api_client.rb

@@ -15,8 +15,9 @@ module MoesifApi
     end
 
     # Initializer with authentication and configuration parameters
-    def initialize(application_id, user_agent=nil)
+    def initialize(application_id, user_agent=nil, retry_count=5)
       Configuration.application_id = application_id
+      Configuration.retry_count = retry_count
       unless user_agent.nil?
         Configuration.user_agent = user_agent
       end

data/test/controllers/controller_test_base.rb

@@ -2,7 +2,7 @@
 
 require 'json'
 require 'test/unit'
-require 'moesif_api.rb'
+require_relative '../../lib/moesif_api.rb'
 require_relative '../test_helper.rb'
 require_relative '../http_response_catcher.rb'
 
@@ -15,7 +15,7 @@ class ControllerTestBase < Test::Unit::TestCase
 
   # Called only once for a test class before any test has executed.
   def self.startup
-    @@api_client = MoesifAPIClient.new("your application id")
+    @@api_client = MoesifAPIClient.new("Your Moesif Application Id")
     @@request_timeout = 30
     @@assert_precision = 0.01
   end

data/test/controllers/test_api_controller.rb

@@ -85,6 +85,83 @@ class ApiControllerTests < ControllerTestBase
     assert_equal(@response_catcher.response.status_code, 201)
   end
 
+  def test_add_bad_event()
+    # Parameters for the API call
+
+    req_headers = JSON.parse('{'\
+      '"Host": "api.acmeinc.com",'\
+      '"Accept": "*/*",'\
+      '"Connection": "Keep-Alive",'\
+      '"User-Agent": "Dalvik/2.1.0 (Linux; U; Android 5.0.2; C6906 Build/14.5.A.0.242)",'\
+      '"Content-Type": "application/json",'\
+      '"Content-Length": "126",'\
+      '"Accept-Encoding": "gzip"'\
+    '}')
+
+    req_body = JSON.parse( '{'\
+      '"items": ['\
+        '{'\
+          '"type": 1,'\
+          '"id": "fwfrf"'\
+        '},'\
+        '{'\
+          '"type": 2,'\
+          '"id": "d43d3f"'\
+        '}'\
+      ']'\
+    '}')
+
+    rsp_headers = JSON.parse('{'\
+      '"Date": "Tue, 6 Jan 2019 23:46:49 GMT",'\
+                    '"Vary": "Accept-Encoding",'\
+      '"Pragma": "no-cache",'\
+      '"Expires": "-1",'\
+      '"Content-Type": "application/json; charset=utf-8",'\
+                    '"Cache-Control": "no-cache"'\
+    '}')
+
+    rsp_body = JSON.parse('{'\
+      '"Error": "InvalidArgumentException",'\
+      '"Message": "Missing field field_a"'\
+    '}')
+
+    metadata = JSON.parse('{'\
+      '"foo": "rubytestmeta",'\
+      '"bar": "rubytestmedat2"'\
+    '}')
+
+    event_req = EventRequestModel.new()
+    event_req.time = Time.now.utc.iso8601
+    event_req.uri = nil
+    event_req.verb = "POST"
+    event_req.api_version = "1.1.0"
+    event_req.ip_address = "61.48.220.123"
+    event_req.headers = req_headers
+    event_req.body = req_body
+
+    event_rsp = EventResponseModel.new()
+    event_rsp.time = (Time.now.utc + 2).iso8601
+    event_rsp.status = 400
+    event_rsp.headers = rsp_headers
+    event_rsp.body = rsp_body
+
+    event_model = EventModel.new()
+    event_model.request = event_req
+    event_model.response = event_rsp
+    event_model.user_id = "my_user_id"
+    event_model.company_id = "my_company_id"
+    event_model.metadata = metadata
+    event_model.session_token = "random"
+
+    # Perform the API call through the SDK function
+
+    error = assert_raises(APIException) do
+      self.class.controller.create_event(event_model)
+    end
+    puts 'error: ' + error.message;
+    assert_match(/422|400/, error.message, "The error message should contain '422' or '400'")
+  end
+
   # Add Batched Events via Ingestion API
   def test_add_batched_events()
     # Parameters for the API call

data/test/test_helper.rb

@@ -84,7 +84,7 @@ class TestHelper
     if not @cache.keys.include? url
       @cache[url] = Tempfile.new('APIMatic')
       @cache[url].binmode
-      @cache[url].write(open(url, {ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE}).read)
+      @cache[url].write(File.open(url, 'rb').read)
     else
       @cache[url].open
       @cache[url].binmode

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moesif_api
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.1
 platform: ruby
 authors:
 - Moesif, Inc
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-14 00:00:00.000000000 Z
+date: 2024-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -35,44 +35,50 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: faraday-net_http_persistent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: faraday-retry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: json_mapper
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +115,6 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- lib/moesif_api.rb
 - lib/moesif_api/api_helper.rb
 - lib/moesif_api/configuration.rb
 - lib/moesif_api/controllers/api_controller.rb

data/lib/moesif_api.rb

@@ -1,35 +0,0 @@
-
-require 'openssl'
-require 'json'
-
-# Exceptions
-require_relative 'moesif_api/exceptions/api_exception.rb'
-
-# Helper Files
-require_relative 'moesif_api/api_helper.rb'
-require_relative 'moesif_api/configuration.rb'
-require_relative 'moesif_api/moesif_api_client.rb'
-
-# Http
-require_relative 'moesif_api/http/http_call_back.rb'
-require_relative 'moesif_api/http/http_client.rb'
-require_relative 'moesif_api/http/http_method_enum.rb'
-require_relative 'moesif_api/http/http_request.rb'
-require_relative 'moesif_api/http/http_response.rb'
-require_relative 'moesif_api/http/http_context.rb'
-require_relative 'moesif_api/http/faraday_client.rb'
-
-# Models
-require_relative 'moesif_api/models/base_model.rb'
-require_relative 'moesif_api/models/event_request_model.rb'
-require_relative 'moesif_api/models/event_model.rb'
-require_relative 'moesif_api/models/event_response_model.rb'
-require_relative 'moesif_api/models/status_model.rb'
-require_relative 'moesif_api/models/user_model.rb'
-require_relative 'moesif_api/models/company_model.rb'
-require_relative 'moesif_api/models/campaign_model.rb'
-
-# Controllers
-require_relative 'moesif_api/controllers/base_controller.rb'
-require_relative 'moesif_api/controllers/api_controller.rb'
-require_relative 'moesif_api/controllers/health_controller.rb'