onlyoffice_api 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4da6935cc3d256a7b5b39d6b02f7a4a038e908cd8a7949c34f89e124da984a9a
-  data.tar.gz: f7baefc1910689ff41da8deaab16c70a8776a1cd40878876993ab072cfbd2c20
+  metadata.gz: bdbcfc630b8186f0ce844c741c43a3a80873823d5cd826a4499490c1b07600df
+  data.tar.gz: 51be328e7d6d9a061baf729481d22b498fd84502d4f74d5e898c6820e9cd9516
 SHA512:
-  metadata.gz: a3e475df99ffaaef22bb7d140d3e18968f735a666142cf6722909402e43c54d5bb26a3efc3db6964434d8499afef36fa449549d248c477c29c9e9d77464b641c
-  data.tar.gz: 036ac1d16df32299bf439f5e04c4e5b4dd5f31d1bbb27d8dca654d98c6a1c3b1c59b176aa650d63b3ab97f8daf050e4a7bbba2fa19964a30f3023129177e39d4
+  metadata.gz: beddc9c36885235acef44a1b2d2306c18c7d57dd91e94a267d219937e3deadcce2462292409f62dab2a220a5c86629651b997eb30fb996d8766b6c406ec5d960
+  data.tar.gz: 944ac964b667783207b6e95541456f1168c2f216f6041e8e97202c4ea99bcde87fa86345878f6b1a654fd4024bbda735900c9f9064b0cc5dcf0e2e1f1505a6e2

data/lib/onlyoffice_api.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative 'onlyoffice_api/onlyoffice_api_instance'
 require_relative 'teamlab/version'
 require_relative 'teamlab/config'
 require_relative 'teamlab/request'

data/lib/onlyoffice_api/onlyoffice_api_instance.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require_relative '../teamlab/config'
+
+module Teamlab
+  # Class for multiuser instance
+  class OnlyofficeApiInstance
+    def initialize(params = {})
+      @config = Config.new(params)
+      auth_response = Teamlab::Request.new(@config, 'authentication').post('', userName: @config.username, password: @config.password).body
+      raise "Cannot get response token for #{auth_response}" if auth_response['response'].nil? || auth_response['response']['token'].nil?
+
+      @config.token = auth_response['response']['token']
+      @config.headers = { 'authorization' => @config.token }
+    end
+
+    def people
+      @people ||= Teamlab::People.new(@config)
+    end
+
+    def group
+      @group ||= Teamlab::Group.new(@config)
+    end
+
+    def settings
+      @settings ||= Teamlab::Settings.new(@config)
+    end
+
+    def files
+      @files ||= Teamlab::Files.new(@config)
+    end
+
+    def project
+      @project ||= Teamlab::Project.new(@config)
+    end
+
+    def portal
+      @portal ||= Teamlab::Portal.new(@config)
+    end
+
+    def crm
+      @crm ||= Teamlab::Crm.new(@config)
+    end
+
+    def community
+      @community ||= Teamlab::Community.new(@config)
+    end
+
+    def calendar
+      @calendar ||= Teamlab::Calendar.new(@config)
+    end
+
+    def mail
+      @mail ||= Teamlab::Mail.new(@config)
+    end
+
+    def mailserver
+      @mailserver ||= Teamlab::MailServer.new(@config)
+    end
+
+    def feed
+      @feed ||= Teamlab::Feed.new(@config)
+    end
+  end
+end

data/lib/teamlab/config.rb

@@ -8,7 +8,7 @@ module Teamlab
   def self.configure(&block)
     @config ||= Config.new
     yield @config if block
-    auth_response = Teamlab::Request.new('authentication').post('', userName: @config.username, password: @config.password).body
+    auth_response = Teamlab::Request.new(nil, 'authentication').post('', userName: @config.username, password: @config.password).body
     raise "Cannot get response token for #{auth_response}" if auth_response['response'].nil? || auth_response['response']['token'].nil?
 
     @config.token = auth_response['response']['token']
@@ -24,8 +24,11 @@ module Teamlab
     # @return [Net::HTTP::Proxy] connection proxy
     attr_accessor :proxy
 
-    def initialize
+    def initialize(params = {})
       default_configuration
+      @server = params[:server]
+      @username = params[:username]
+      @password = params[:password]
     end
 
     def default_configuration

data/lib/teamlab/modules/calendar.rb

@@ -2,8 +2,8 @@
 
 module Teamlab
   class Calendar
-    def initialize
-      @request = Teamlab::Request.new('calendar')
+    def initialize(config = nil)
+      @request = Teamlab::Request.new(config, 'calendar')
     end
 
     def get_default_access

data/lib/teamlab/modules/community.rb

@@ -13,8 +13,8 @@ module Teamlab
     include CommunityForums
     include CommunityWiki
 
-    def initialize
-      @request = Teamlab::Request.new('community')
+    def initialize(config = nil)
+      @request = Teamlab::Request.new(config, 'community')
     end
   end
 end

data/lib/teamlab/modules/crm.rb

@@ -25,8 +25,8 @@ module Teamlab
     include CrmTasks
     include CrmUserFields
 
-    def initialize
-      @request = Teamlab::Request.new('crm')
+    def initialize(config = nil)
+      @request = Teamlab::Request.new(config, 'crm')
     end
   end
 end

data/lib/teamlab/modules/feed.rb

@@ -2,8 +2,8 @@
 
 module Teamlab
   class Feed
-    def initialize
-      @request = Teamlab::Request.new('feed')
+    def initialize(config = nil)
+      @request = Teamlab::Request.new(config, 'feed')
     end
 
     # TODO: find out how it should work api.onlyoffice.com missing documentation

data/lib/teamlab/modules/files.rb

@@ -2,8 +2,8 @@
 
 module Teamlab
   class Files
-    def initialize
-      @request = Teamlab::Request.new('files')
+    def initialize(config = nil)
+      @request = Teamlab::Request.new(config, 'files')
     end
 
     # region File Creation

data/lib/teamlab/modules/group.rb

@@ -6,8 +6,8 @@ module Teamlab
   class Group
     include GroupHelper
 
-    def initialize
-      @request = Teamlab::Request.new('group')
+    def initialize(config = nil)
+      @request = Teamlab::Request.new(config, 'group')
     end
 
     def get_groups

data/lib/teamlab/modules/mail.rb

@@ -25,8 +25,8 @@ module Teamlab
     include MailSettings
     include MailTags
 
-    def initialize
-      @request = Teamlab::Request.new('mail')
+    def initialize(config = nil)
+      @request = Teamlab::Request.new(config, 'mail')
     end
 
     # @return [Teamlab::Response] Returns all Mail running operations (only complex)

data/lib/teamlab/modules/mailserver.rb

@@ -11,8 +11,8 @@ module Teamlab
     include MailserverDomains
     include MailserverMailboxes
 
-    def initialize
-      @request = Teamlab::Request.new('mailserver')
+    def initialize(config = nil)
+      @request = Teamlab::Request.new(config, 'mailserver')
     end
   end
 end

data/lib/teamlab/modules/people.rb

@@ -5,8 +5,8 @@ module Teamlab
   class People
     include PeopleReassign
 
-    def initialize
-      @request = Teamlab::Request.new('people')
+    def initialize(config = nil)
+      @request = Teamlab::Request.new(config, 'people')
     end
 
     def get_people

data/lib/teamlab/modules/portals.rb

@@ -2,8 +2,8 @@
 
 module Teamlab
   class Portal
-    def initialize
-      @request = Teamlab::Request.new('portal')
+    def initialize(config = nil)
+      @request = Teamlab::Request.new(config, 'portal')
     end
 
     def invite_user_url

data/lib/teamlab/modules/project.rb

@@ -30,8 +30,8 @@ module Teamlab
     include ProjectsTemplates
     include ProjectsTime
 
-    def initialize
-      @request = Teamlab::Request.new('project')
+    def initialize(config = nil)
+      @request = Teamlab::Request.new(config, 'project')
     end
   end
 end

data/lib/teamlab/modules/settings.rb

@@ -5,8 +5,8 @@ module Teamlab
     # @return [String] id of global admin of portal
     GLOBAL_ADMIN_ID = '00000000-0000-0000-0000-000000000000'
 
-    def initialize
-      @request = Teamlab::Request.new('settings')
+    def initialize(config = nil)
+      @request = Teamlab::Request.new(config, 'settings')
     end
 
     def get_settings

data/lib/teamlab/request.rb

@@ -9,7 +9,8 @@ module Teamlab
   class Request
     include HTTParty
 
-    def initialize(api_additive)
+    def initialize(config, api_additive)
+      @config = config
       @api_additive = api_additive.to_s
     end
 
@@ -49,8 +50,24 @@ module Teamlab
       response
     end
 
+    def server
+      @config&.server || Teamlab.config.server
+    end
+
+    def api_path
+      @config&.api_path || Teamlab.config.api_path
+    end
+
+    def headers
+      @config&.headers || Teamlab.config.headers
+    end
+
+    def proxy
+      @config&.proxy || Teamlab.config.proxy
+    end
+
     def generate_request_url(command)
-      Teamlab.config.server + Teamlab.config.api_path + @api_additive + command
+      server + api_path + @api_additive + command
     end
 
     def parse_args(args, type)
@@ -58,7 +75,7 @@ module Teamlab
       opts = {}
       opts[:body] = args.last.instance_of?(Hash) ? args.pop : {}
       opts[:body].delete_if { |_key, value| value == [] }
-      opts[:headers] = Teamlab.config.headers
+      opts[:headers] = headers
       opts = init_proxy(opts)
       opts[:query] = opts.delete(:body) if type == :get
       [command, opts]
@@ -67,12 +84,12 @@ module Teamlab
     # @param opts [Hash] options to init
     # @return [Hash] options
     def init_proxy(opts)
-      return opts unless Teamlab.config.proxy
+      return opts unless proxy
 
-      opts[:http_proxyaddr] ||= Teamlab.config.proxy.proxy_address
-      opts[:http_proxyport] ||= Teamlab.config.proxy.proxy_port
-      opts[:http_proxyuser] ||= Teamlab.config.proxy.proxy_user
-      opts[:http_proxypass] ||= Teamlab.config.proxy.proxy_pass
+      opts[:http_proxyaddr] ||= proxy.proxy_address
+      opts[:http_proxyport] ||= proxy.proxy_port
+      opts[:http_proxyuser] ||= proxy.proxy_user
+      opts[:http_proxypass] ||= proxy.proxy_pass
       opts
     end
   end

data/lib/teamlab/response.rb

@@ -23,10 +23,10 @@ module Teamlab
 
     def generate_err_msg(http_response)
       "API request failed\n\noriginal request:\n"\
-      "#{http_response.request.http_method} #{http_response.request.path}\nbody: "\
-      "#{JSON.pretty_generate(http_response.request.options[:body])}"\
-      "\n\nresponse:\n"\
-      "#{prettify_response(http_response.parsed_response)}"
+        "#{http_response.request.http_method} #{http_response.request.path}\nbody: "\
+        "#{JSON.pretty_generate(http_response.request.options[:body])}"\
+        "\n\nresponse:\n"\
+        "#{prettify_response(http_response.parsed_response)}"
     end
 
     def prettify_response(msg)

data/lib/teamlab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Teamlab
-  VERSION = '0.11.0'
+  VERSION = '0.12.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlyoffice_api
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-22 00:00:00.000000000 Z
+date: 2021-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -177,6 +177,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/onlyoffice_api.rb
+- lib/onlyoffice_api/onlyoffice_api_instance.rb
 - lib/teamlab/config.rb
 - lib/teamlab/modules/calendar.rb
 - lib/teamlab/modules/community.rb
@@ -263,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.21
 signing_key: 
 specification_version: 4
 summary: Ruby gem for OnlyOffice. Formerly known as `teamlab`.