isaca 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c38c95789f898eb26dcd03fc06bcff1926c8c58b
-  data.tar.gz: 6d75fb5d7416ec8c914d6fdb4a3e3dd25a30f50e
+  metadata.gz: 673f78f81502f22ce8a21209d12a7962c60949e9
+  data.tar.gz: 696908574a010e26180f4f85530ed99820ccfb5b
 SHA512:
-  metadata.gz: adf4b9e63ca46bd02322db1bace60dd34318fe3c153e6c61c525aa2565e01043170395fa05e85cfb4e119a44f3dded0e3b22a0850c915786d3dee1c6aef2bb8c
-  data.tar.gz: 9b1ead55d0c97c50c2c7bdffb78c7bf5e4871d5f5f5d974a33ba9cccd15cf0745a3ec5f4566ff1b44730c184f6b9533b89114104ff733844f5b776fe81ecd4a8
+  metadata.gz: 26288e7fa7ea9811390a27e19d2f2e932cebc1d809b6d04613838d9b6d0a224e17fc97e58f5e49a865b59add6b58d52f36640f3cbefac0c6b961343b4108ecf3
+  data.tar.gz: 206e1394350fd730dacc42e493510d2bf76412e5d94017062f3261ffe05e3086cc3539be655bc75ff88252b713f0800b7437f9cae84c95768848fe32b3c5c1ec

data/.gitignore

@@ -71,4 +71,6 @@ fabric.properties
 .idea/
 
 
-# End of https://www.gitignore.io/api/rubymine+all
+# End of https://www.gitignore.io/api/rubymine+all
+
+log/

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isaca (0.1.6)
+    isaca (0.1.7)
       faraday (~> 0.14.0)
 
 GEM

data/lib/isaca/helpers.rb

@@ -7,10 +7,6 @@ module ISACA
       (string_time.nil? || string_time.empty?) ? nil : DateTime.strptime(string_time, format)
     end
 
-    def self.parse_json(string)
-      JSON.parse(string)
-    end
-
     def self.parse_boolean(string)
       string == 'True' ? true : false
     end

data/lib/isaca/models/get_user_details_by_token.rb

@@ -8,6 +8,8 @@ module ISACA
       attr_accessor :email
       attr_accessor :username
       attr_accessor :country
+      attr_accessor :privacy
+      attr_accessor :marketing
 
       def initialize(hash)
         @imis_id = hash['ID']
@@ -17,6 +19,22 @@ module ISACA
         @email = hash['Email']
         @username = hash['UserName']
         @country = hash['Country']
+
+        if hash['PRIVACY'] == '1'
+          @privacy = true
+        elsif hash['PRIVACY'] == '0'
+          @privacy = false
+        else
+          @privacy = nil
+        end
+
+        if hash['MARKETING'] == '1'
+          @marketing = true
+        elsif hash['MARKETING'] == '0'
+          @marketing = false
+        else
+          @marketing = nil
+        end
       end
     end
   end

data/lib/isaca/requests/authenticate_user.rb

@@ -8,7 +8,10 @@ module ISACA
           request.params['password'] = password
         end
 
-        response.status == 200 ? ISACA::Model::AuthenticateUser.new(ISACA::Helpers.parse_json(response.body)) : nil
+        data = JSON.parse(response.body)
+        ISACA.logger.debug(data) if ISACA.configuration.debug
+
+        response.status == 200 ? ISACA::Model::AuthenticateUser.new(data) : nil
       end
     end
   end

data/lib/isaca/requests/get_user_by_id.rb

@@ -7,7 +7,10 @@ module ISACA
           request.params['ID'] = id
         end
 
-        response.status == 200 ? ISACA::Model::GetUserByID.new(ISACA::Helpers.parse_json(response.body)) : nil
+        data = JSON.parse(response.body)
+        ISACA.logger.debug(data) if ISACA.configuration.debug
+
+        response.status == 200 ? ISACA::Model::GetUserByID.new(data) : nil
       end
     end
   end

data/lib/isaca/requests/get_user_details_by_token.rb

@@ -7,8 +7,10 @@ module ISACA
           request.params['token'] = token
         end
 
-        data = JSON.parse(response.body, quirks_mode: true)
-        response.status == 200 ? ISACA::Model::GetUserDetailsByToken.new(ISACA::Helpers.parse_json(data)) : nil
+        data = JSON.parse(JSON.parse(response.body, quirks_mode: true))
+        ISACA.logger.debug(data) if ISACA.configuration.debug
+
+        response.status == 200 ? ISACA::Model::GetUserDetailsByToken.new(data) : nil
       end
     end
   end

data/lib/isaca/requests/submit_cpe.rb

@@ -1,6 +1,19 @@
 module ISACA
   module Request
     module SubmitCPE
+      def self.get(imis_id, result, cpe)
+        response = ISACA::Request.get do |request|
+          request.path = request.path + '/SubmitCPE'
+          request.params['id'] = imis_id
+          request.params['result'] = result
+          request.params['cpe'] = cpe
+        end
+
+        data = JSON.parse(response.body)
+        ISACA.logger.debug(data) if ISACA.configuration.debug
+
+        response.status == 200 ? ISACA::Model::SubmitCPE.new(data) : nil
+      end
     end
   end
 end

data/lib/isaca/version.rb

@@ -1,3 +1,3 @@
 module ISACA
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/isaca.rb

@@ -13,15 +13,26 @@ require 'isaca/models/get_user_details_by_token'
 require 'isaca/models/submit_cpe'
 
 require 'isaca/version'
+require 'fileutils'
 require 'openssl'
+require 'logger'
 
 module ISACA
   class << self
     attr_accessor :configuration
+    attr_accessor :logger
 
     def configuration
       @configuration ||= Configuration.new
     end
+
+    def logger
+      path = 'log/isaca.log'
+      dir = File.dirname(path)
+      FileUtils.mkdir_p(dir) unless File.directory?(dir)
+
+      @logger ||= Logger.new(path)
+    end
   end
 
   def self.configure
@@ -35,9 +46,12 @@ module ISACA
     attr_accessor :secret_pass
     attr_accessor :user_agent
     attr_accessor :verify_ssl
+    attr_writer :logger
+    attr_accessor :debug
 
     def initialize
       @verify_ssl = true
+      @debug = false
     end
 
     def secret_pass
@@ -72,6 +86,10 @@ module ISACA
 
       raise ConfigurationError.new(msg)
     end
+
+    def logger=(logger)
+      ISACA.logger = logger
+    end
   end
 
   class ConfigurationError < StandardError; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isaca
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Matt Orahood
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday