k3cloud-sdk 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1200e70367f5dd2d10e943d9d58b391bf014250556fba2fbd6f567012399c870
-  data.tar.gz: 0e7ceab95445f1347f2aa56b89a7615c361bc436586141c9e92871ec639973f3
+  metadata.gz: 3fcdb39f0120d7be1d75b2b05088eae22fd6ac5d3fdb422bf25f6a472b729fb3
+  data.tar.gz: 36d2bf34f18781c5a7574b03cbe62dcdbbba8e20b2c63b23860e7c08dc3e9aac
 SHA512:
-  metadata.gz: 4ad24fe15d838fec3ebc2e970fd502a9f38aa71a59b249f244b3aa24c6d9812aef2b619d8486b4a7a9cf8fd57c66714e3e36a643e1c1082bbb8d44a44741bafb
-  data.tar.gz: 1fb9f1e076dcc3db553cfda0e7c89fc09b5bd7d2942981dd36821a6134c5a7591b119b5cb97a25078498b5b14eac4b6530f61c38ef2a45de2928499065d43bd2
+  metadata.gz: c72cc86924e218be315fb570958bd9289c58a475cc4ac6014de43447030c5f09ab642d784601e5acfea43fdefe0788bcb8ccfa9cb38e221bc549d139180bd80d
+  data.tar.gz: 311051445ab1bb7b3dd719aa17a34538337be2edafce4ce094404fc7d80e2b8b1f0549820f1ee66a3a6bc822f1606cf59af0b9f13f749ae0185e4f5882f6a725

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    k3cloud-sdk (0.2.0)
+    k3cloud-sdk (0.4.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -13,6 +13,7 @@ If bundler is not being used to manage dependencies, install the gem by executin
 
 ## Usage
 
+#### 1. Single Account Configuration:
 You'll need to configure it in `config/initializers/k3cloud.rb`:
 
 ```ruby
@@ -35,6 +36,41 @@ Then you can call the k3cloud API using the following code:
   K3cloud.execute_bill_query(data)
 ```
 
+#### 2. Multi Account Configuration:
+You'll need to configure it in `config/initializers/k3cloud.rb`:
+
+```ruby
+  config1 = K3cloud::Configuration.new do |c|
+    c.acct_id = ENV['K3CLOUD1_ACCT_ID']
+    c.user_name = ENV['K3CLOUD1_USERNAME']
+    c.app_id = ENV['K3CLOUD1_APP_ID']
+    c.app_secret= ENV['K3CLOUD1_APP_SECRET']
+    c.server_url = ENV['K3CLOUD1_SERVER_URL']
+  end
+
+  config2 = K3cloud::Configuration.new do |c|
+    c.acct_id = ENV['K3CLOUD2_ACCT_ID']
+    c.user_name = ENV['K3CLOUD2_USERNAME']
+    c.app_id = ENV['K3CLOUD2_APP_ID']
+    c.app_secret= ENV['K3CLOUD2_APP_SECRET']
+    c.server_url = ENV['K3CLOUD2_SERVER_URL']
+  end
+
+    K3cloud1 = K3cloud.new_api(config1)
+    K3cloud2 = K3cloud.new_api(config2)
+```
+
+Then you can call the k3cloud API using the following code:
+```ruby
+  data = {
+    FormId: "",
+    FieldKeys: "",
+    FilterString: ""
+  }
+  K3cloud1.execute_bill_query(data)
+  K3cloud2.execute_bill_query(data)
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/k3cloud/configuration.rb

@@ -31,7 +31,17 @@ module K3cloud
 
     attr_accessor :connect_timeout, :request_timeout
 
-    def initialize
+    def initialize(options = {})
+      @acct_id = options[:acct_id]
+      @user_name = options[:user_name]
+      @password = options[:password]
+      @app_id = options[:app_id]
+      @app_secret = options[:app_secret]
+      @server_url = options[:server_url]
+      @org_num = options[:org_num]
+      @connect_timeout = options[:connect_timeout]
+      @request_timeout = options[:request_timeout]
+
       yield(self) if block_given?
     end
 

data/lib/k3cloud/errors/k3cloud_error.rb

@@ -14,7 +14,7 @@ class K3cloudError < StandardError
 
   def self.parse(json)
     index = json.index("{")
-    json = json[index..] if index >= 0
+    json = json[index..-1] if index >= 0
 
     parsed_json = JSON.parse(json)
     kd_error = K3cloudError.new

data/lib/k3cloud/utils/md5_utils.rb

@@ -11,7 +11,7 @@ module MD5Utils
     result = ""
 
     s.each_byte do |byte|
-      result += (byte & 0xFF | -256).to_s(16)[6..]
+      result += (byte & 0xFF | -256).to_s(16)[6..-1]
     end
 
     result

data/lib/k3cloud/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module K3cloud
-  VERSION = "0.2.0"
+  VERSION = "0.4.0"
 end

data/lib/k3cloud/web_api_client.rb

@@ -58,7 +58,7 @@ module K3cloud
     def get_url_path(url)
       if url.start_with?("http")
         index = url.index("/", 10)
-        index.nil? ? url : url[index..]
+        index.nil? ? url : url[index..-1]
       else
         url
       end

data/lib/k3cloud.rb

@@ -22,11 +22,15 @@ module K3cloud
       @logger ||= ::Logger.new($stderr)
     end
 
-    def api
-      @api ||= K3cloud::K3cloudApi.new
+    def new_api(config = nil)
+      if config
+        K3cloud::K3cloudApi.new(config)
+      else
+        @default_api ||= K3cloud::K3cloudApi.new
+      end
     end
 
-    def_delegators :api, :draft, :save, :batch_save, :submit, :audit, :un_audit, :view, :execute_bill_query, :delete,
+    def_delegators :new_api, :draft, :save, :batch_save, :submit, :audit, :un_audit, :view, :execute_bill_query, :delete,
                    :cancel_assign, :push, :execute_operation, :allocate, :cancel_allocate, :group_save, :query_group_info,
                    :group_delete, :attachment_upload, :attachment_download, :query_business_info, :get_sys_report_data,
                    :flex_save, :send_msg, :disassembly, :workflow_audit, :switch_org

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: k3cloud-sdk
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - zevinto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-09 00:00:00.000000000 Z
+date: 2023-11-17 00:00:00.000000000 Z
 dependencies: []
 description: Ruby Gem for K3cloud API.
 email: