files.com 1.0.66 → 1.0.67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e4a2bc035d0e4d4e0f653c54d0b5e78a6b10a2976ae0d002dd88ce76b55c414
-  data.tar.gz: 3d8337b9ee382d61c0d63a279b25cccc72e785c52af0e99604e2171ce659eafa
+  metadata.gz: ad3dc40bcbf022324c5002a75477568d213893b79d0f0e2538a3f48720bc6135
+  data.tar.gz: 3f4b7093d51bb6ea3da0b8cfee2266f32a0b0f3570ae481c7b28c4241a68180a
 SHA512:
-  metadata.gz: 3035d31c71891d53be25324ac06d26d92ecced24ab73574cbb2b73786b3f25666d07a06d6589a1363daf289d87dea93c3f2dabfd05ac652d061050d18974da25
-  data.tar.gz: d6fcd3f9394bf481cb94dfddbcc0c92a3e5cb68c6673632dff2a4557f1fe396206a563fba5b38ad53798d14479ec3453c6e9b84b17f205d8cbcc8ea60d01ae23
+  metadata.gz: cd13285ed3725855ed062d740e3b16b8eb073f864fd8d6f93f70a80f23c237d44d84233e3e7f6c70618b862164f9ee4eb068a76d59a4153ea1373ef0dc6d4dec
+  data.tar.gz: c6d134d8fa1c968537db4c738bae87e15c8518a8440d7a253638f9bd73782464647405c54f9b8978f7f04dfeded4f1feef0bdffc5f68a9720fb10e01f6d45014

data/_VERSION

@@ -1 +1 @@
-1.0.66
+1.0.67

data/docs/auto.md

@@ -8,4 +8,4 @@
 }
 ```
 
-* `dynamic` (object): Additional data
+* `dynamic` (object): 

data/docs/behavior.md

@@ -105,7 +105,9 @@ Files::Behavior.create(
 Files::Behavior.webhook_test(
   url: "https://www.site.com/...", 
   method: "GET", 
-  encoding: "RAW"
+  encoding: "RAW", 
+  headers: "x-test-header => testvalue", 
+  body: "test-param => testvalue"
 )
 ```
 
@@ -114,6 +116,8 @@ Files::Behavior.webhook_test(
 * `url` (string): Required - URL for testing the webhook.
 * `method` (string): HTTP method(GET or POST).
 * `encoding` (string): HTTP encoding method.  Can be JSON, XML, or RAW (form data).
+* `headers` (object): Additional request headers.
+* `body` (object): Additional body parameters.
 
 
 ---

data/docs/group_user.md

@@ -4,21 +4,25 @@
 
 ```
 {
-  "name": "My Group",
-  "id": 1,
+  "group_name": "My Group",
+  "group_id": 1,
+  "user_id": 1,
   "admin": true,
   "usernames": [
 
-  ]
+  ],
+  "name": "",
+  "id": ""
 }
 ```
 
-* `name` (string): Group name
-* `id` (int64): Group ID
+* `group_name` (string): Group name
+* `group_id` (int64): Group ID
+* `user_id` (int64): User ID
 * `admin` (boolean): Is this user an administrator of this group?
 * `usernames` (array): A list of usernames for users in this group
-* `group_id` (int64): Group ID to add user to.
-* `user_id` (int64): User ID to add to group.
+* `name` (string): 
+* `id` (string): 
 
 
 ---
@@ -36,11 +40,11 @@ Files::GroupUser.list(
 
 ### Parameters
 
-* `user_id` (int64): User ID.  If provided, will return groups of which this user is a member.
+* `user_id` (int64): User ID.  If provided, will return group_users of this user.
 * `page` (int64): Current page number.
 * `per_page` (int64): Number of records to show per page.  (Max: 10,000, 1,000 or less is recommended).
 * `action` (string): Deprecated: If set to `count` returns a count of matching records rather than the records themselves.
-* `group_id` (int64): Group ID.  If provided, will return members of this group.
+* `group_id` (int64): Group ID.  If provided, will return group_users of this group.
 
 
 ---

data/docs/sso_strategy.md

@@ -4,7 +4,9 @@
 
 ```
 {
-  "protocol": "okta",
+  "protocol": [
+
+  ],
   "provider": "okta",
   "label": "My Corporate SSO Provider",
   "logo_url": "https://mysite.files.com/.../logo.png",
@@ -38,13 +40,12 @@
   "ldap_host_3": "ldap3.site.com",
   "ldap_port": 1,
   "ldap_secure": true,
-  "ldap_user_include_groups": "",
   "ldap_username": "[ldap username]",
   "ldap_username_field": "sAMAccountName"
 }
 ```
 
-* `protocol` (string): SSO Protocol
+* `protocol` (array): SSO Protocol
 * `provider` (string): Provider name
 * `label` (string): Custom label for the SSO provider on the login page.
 * `logo_url` (string): URL holding a custom logo for the SSO provider on the login page.
@@ -78,7 +79,6 @@
 * `ldap_host_3` (string): LDAP backup host
 * `ldap_port` (int64): LDAP port
 * `ldap_secure` (boolean): Use secure LDAP?
-* `ldap_user_include_groups` (string): Comma or newline separated list of group names (with optional wildcards) - if provided, only users in these groups will be added or synced.
 * `ldap_username` (string): Username for signing in to LDAP server.
 * `ldap_username_field` (string): LDAP username field
 

data/docs/status.md

@@ -17,5 +17,5 @@
 * `code` (int64): Status http code
 * `message` (string): Error message
 * `status` (string): Status message
-* `data`: 
+* `data`: Additional data
 * `errors` (array): A list of api errors

data/docs/user.md

@@ -132,6 +132,8 @@ Files::User.list(
 * `q[password_validity_days]` (string): If set, list only users with overridden password validity days setting.
 * `q[ssl_required]` (string): If set, list only users with overridden SSL required setting.
 * `search` (string): Searches for partial matches of name, username, or email.
+* `sort_by[last_login_at]` (string): If set, sort users by 'last_login_at' in either 'asc' or 'desc' direction
+* `sort_by[authenticate_until]` (string): If set, sort users by 'authenticate_until' in either 'asc' or 'desc' direction
 
 
 ---

data/files.com.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'faraday', ">= 1.0.1"
   s.add_dependency 'net-http-persistent'
   s.add_dependency 'addressable', ">= 2.7.0"
+  s.add_dependency 'concurrent-ruby', ">= 1.1.6"
 
   s.files         = `find *`.split("\n").uniq.sort.reject(&:empty?)
   s.executables   = [ "files", "files-console" ]

data/lib/files.com.rb

@@ -11,11 +11,13 @@ require "set"
 require "socket"
 require "uri"
 require "addressable/uri"
+require "concurrent/promise"
 
 $LOAD_PATH.push __dir__
 
 require "files.com/version"
 
+require "files.com/sizable_io"
 require "files.com/api"
 require "files.com/api_client"
 require "files.com/errors"

data/lib/files.com/api_client.rb

@@ -146,13 +146,19 @@ module Files
 
     def stream_download(uri, io)
       if conn.adapter == Faraday::Adapter::NetHttp
-        remote_request(:get, uri) do |req|
-          req.options.on_data = proc do |chunk, _overall_received_bytes|
-            io.write(chunk.encode!)
+        uri = URI(uri)
+        Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
+          request = Net::HTTP::Get.new uri
+          http.request request do |response|
+            io.fulfill_content_length(response.content_length) if io.respond_to?(:fulfill_content_length)
+            response.read_body do |chunk|
+              io << chunk.encode!
+            end
           end
         end
       else
         response = remote_request(:get, uri)
+        io.fulfill_content_length(response.content_length) if io.respond_to?(:fulfill_content_length)
         io.write(response.body)
       end
     end

data/lib/files.com/models/auto.rb

@@ -9,7 +9,7 @@ module Files
       @options = options || {}
     end
 
-    # object - Additional data
+    # object
     def dynamic
       @attributes[:dynamic]
     end

data/lib/files.com/models/behavior.rb

@@ -175,10 +175,14 @@ module Files
     #   url (required) - string - URL for testing the webhook.
     #   method - string - HTTP method(GET or POST).
     #   encoding - string - HTTP encoding method.  Can be JSON, XML, or RAW (form data).
+    #   headers - object - Additional request headers.
+    #   body - object - Additional body parameters.
     def self.webhook_test(params = {}, options = {})
       raise InvalidParameterError.new("Bad parameter: url must be an String") if params.dig(:url) and !params.dig(:url).is_a?(String)
       raise InvalidParameterError.new("Bad parameter: method must be an String") if params.dig(:method) and !params.dig(:method).is_a?(String)
       raise InvalidParameterError.new("Bad parameter: encoding must be an String") if params.dig(:encoding) and !params.dig(:encoding).is_a?(String)
+      raise InvalidParameterError.new("Bad parameter: headers must be an Hash") if params.dig(:headers) and !params.dig(:headers).is_a?(Hash)
+      raise InvalidParameterError.new("Bad parameter: body must be an Hash") if params.dig(:body) and !params.dig(:body).is_a?(Hash)
       raise MissingParameterError.new("Parameter missing: url") unless params.dig(:url)
 
       response, _options = Api.send_request("/behaviors/webhook/test", :post, params, options)

data/lib/files.com/models/file.rb

@@ -389,7 +389,7 @@ module Files
 
     def read_io
       @read_io ||= begin
-                     r, w = IO.pipe
+                     r, w = SizableIO.pipe
                      Thread.new do
                        download_content(w)
                      ensure

data/lib/files.com/models/group_user.rb

@@ -10,21 +10,30 @@ module Files
     end
 
     # string - Group name
-    def name
-      @attributes[:name]
+    def group_name
+      @attributes[:group_name]
     end
 
-    def name=(value)
-      @attributes[:name] = value
+    def group_name=(value)
+      @attributes[:group_name] = value
     end
 
     # int64 - Group ID
-    def id
-      @attributes[:id]
+    def group_id
+      @attributes[:group_id]
     end
 
-    def id=(value)
-      @attributes[:id] = value
+    def group_id=(value)
+      @attributes[:group_id] = value
+    end
+
+    # int64 - User ID
+    def user_id
+      @attributes[:user_id]
+    end
+
+    def user_id=(value)
+      @attributes[:user_id] = value
     end
 
     # boolean - Is this user an administrator of this group?
@@ -45,22 +54,22 @@ module Files
       @attributes[:usernames] = value
     end
 
-    # int64 - Group ID to add user to.
-    def group_id
-      @attributes[:group_id]
+    # string
+    def name
+      @attributes[:name]
     end
 
-    def group_id=(value)
-      @attributes[:group_id] = value
+    def name=(value)
+      @attributes[:name] = value
     end
 
-    # int64 - User ID to add to group.
-    def user_id
-      @attributes[:user_id]
+    # string
+    def id
+      @attributes[:id]
     end
 
-    def user_id=(value)
-      @attributes[:user_id] = value
+    def id=(value)
+      @attributes[:id] = value
     end
 
     # Parameters:
@@ -100,11 +109,11 @@ module Files
     end
 
     # Parameters:
-    #   user_id - int64 - User ID.  If provided, will return groups of which this user is a member.
+    #   user_id - int64 - User ID.  If provided, will return group_users of this user.
     #   page - int64 - Current page number.
     #   per_page - int64 - Number of records to show per page.  (Max: 10,000, 1,000 or less is recommended).
     #   action - string - Deprecated: If set to `count` returns a count of matching records rather than the records themselves.
-    #   group_id - int64 - Group ID.  If provided, will return members of this group.
+    #   group_id - int64 - Group ID.  If provided, will return group_users of this group.
     def self.list(params = {}, options = {})
       raise InvalidParameterError.new("Bad parameter: user_id must be an Integer") if params.dig(:user_id) and !params.dig(:user_id).is_a?(Integer)
       raise InvalidParameterError.new("Bad parameter: page must be an Integer") if params.dig(:page) and !params.dig(:page).is_a?(Integer)

data/lib/files.com/models/sso_strategy.rb

@@ -9,7 +9,7 @@ module Files
       @options = options || {}
     end
 
-    # string - SSO Protocol
+    # array - SSO Protocol
     def protocol
       @attributes[:protocol]
     end
@@ -179,11 +179,6 @@ module Files
       @attributes[:ldap_secure]
     end
 
-    # string - Comma or newline separated list of group names (with optional wildcards) - if provided, only users in these groups will be added or synced.
-    def ldap_user_include_groups
-      @attributes[:ldap_user_include_groups]
-    end
-
     # string - Username for signing in to LDAP server.
     def ldap_username
       @attributes[:ldap_username]

data/lib/files.com/models/status.rb

@@ -24,6 +24,7 @@ module Files
       @attributes[:status]
     end
 
+    # Additional data
     def data
       @attributes[:data]
     end

data/lib/files.com/models/user.rb

@@ -612,6 +612,8 @@ module Files
     #   q[password_validity_days] - string - If set, list only users with overridden password validity days setting.
     #   q[ssl_required] - string - If set, list only users with overridden SSL required setting.
     #   search - string - Searches for partial matches of name, username, or email.
+    #   sort_by[last_login_at] - string - If set, sort users by 'last_login_at' in either 'asc' or 'desc' direction
+    #   sort_by[authenticate_until] - string - If set, sort users by 'authenticate_until' in either 'asc' or 'desc' direction
     def self.list(params = {}, options = {})
       raise InvalidParameterError.new("Bad parameter: page must be an Integer") if params.dig(:page) and !params.dig(:page).is_a?(Integer)
       raise InvalidParameterError.new("Bad parameter: per_page must be an Integer") if params.dig(:per_page) and !params.dig(:per_page).is_a?(Integer)

data/lib/files.com/sizable_io.rb

@@ -0,0 +1,32 @@
+module Files
+  class SizableIO < IO
+    def self.pipe
+      r, w = super
+
+      w.instance_variable_set(:@read_io, r)
+
+      [r, w]
+    end
+
+    def size
+      read_io.content_length_promise.wait.value
+    end
+
+    def fulfill_content_length(length)
+      read_io.content_length = length
+      read_io.content_length_promise.execute
+    end
+
+    protected
+
+    attr_accessor :content_length
+
+    def content_length_promise
+      @content_length_promise ||= Concurrent::Promise.new { content_length }
+    end
+
+    def read_io
+      @read_io || self
+    end
+  end
+end

data/spec/models/file_spec.rb

@@ -24,8 +24,9 @@ RSpec.describe Files::File, :with_test_folder do
 
     it "returns an IO Object" do
       file = Files::File.find(test_folder.join("read.txt").to_s, {}, options)
-      expect(file.read_io.class).to eq(IO)
+      expect(file.read_io).to be_a_kind_of(IO)
       expect(file.read_io.read).to eq("contents")
+      expect(file.read_io.size).to eq("contents".length)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: files.com
 version: !ruby/object:Gem::Version
-  version: 1.0.66
+  version: 1.0.67
 platform: ruby
 authors:
 - files.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-11 00:00:00.000000000 Z
+date: 2020-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.0
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.6
 description: The Files.com Ruby client.
 email:
 - support@files.com
@@ -173,6 +187,7 @@ files:
 - lib/files.com/models/user.rb
 - lib/files.com/models/user_cipher_use.rb
 - lib/files.com/response.rb
+- lib/files.com/sizable_io.rb
 - lib/files.com/system_profiler.rb
 - lib/files.com/util.rb
 - lib/files.com/version.rb