ocman 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9b6c5a93e1ce80f30eec7cc7ebd3c11c8be2c0512ea324a9484ad5ac666c3ac
-  data.tar.gz: e7ca5f0a864fa059ff03bb8f5f5c98ebe7268ace7d9bd5a8e84cad7422559110
+  metadata.gz: 01adcff61e626c6b19883ece249e25d7b7df6f5a1223aeb35b8ac117dc5eb1ab
+  data.tar.gz: f0231c022308483bdc19b490632d653e17c7692aa8680036423e8495bd49b7ea
 SHA512:
-  metadata.gz: da5099014ba64acfb2c616f4fd8fbdb18b0959c5955d2982c049f7e21ed14f83d67be08cb8e29f0b202b0e7acab261e72f2264ebb88ef99f19a24265525dae05
-  data.tar.gz: 6b877d329b726ecbc741dcc503ccab5de9afdeba6df45917520b5e99ff5b25fa8429cd7269368e2167e3beb45e887090ec7594bee6aa2e7faeddbbb1909561a8
+  metadata.gz: a1623d11c9a31c730a3169dbae68e2454c7f03873b14254b31c4296d9cbd55bbbdd4fb64b6c00a71969795e9864087ad44d960f16966779c77c8dabbed3d8f53
+  data.tar.gz: 5a8fa49d48f2d1a3e66fcf7af8dddcef628567b70c835966276312c48aeb981fa43d0877adcbd728f3aea3c745069ad33050ef06a53e4cbe9f02e0523bf0693e

data/lib/ocman.rb

@@ -35,8 +35,12 @@ module Ocman
     Ocman::Folder.list(path, options)
   end
 
-  def self.create_folder(path)
-    Ocman::Folder.create(path)
+  def self.create_folder(path, recursive: false)
+    if recursive
+      Ocman::Folder.create_recursive(path)
+    else
+      Ocman::Folder.create(path)
+    end
   end
 
   ### files

data/lib/ocman/dav.rb

@@ -11,10 +11,8 @@ module Ocman
       connection.mkdir(uri(path))
     end
 
-    def ls(path, options = {})
-      connection.find(uri(path), options) do |item|
-        yield(item)
-      end
+    def ls(path, options = {}, &block)
+      connection.find(uri(path), options, &block)
     end
 
     def put(file_path, path, options = {})

data/lib/ocman/folder.rb

@@ -7,8 +7,17 @@ require 'erb'
 module Ocman
   class Folder
     class << self
+      def create_recursive(path)
+        path_list(path).each do |path_part|
+          next if ignore404 { list(path_part) }
+
+          create(path_part)
+        end
+      end
+
       def create(path)
         Ocman::Dav.new.mkdir(escape_path(path))
+        wait_for_folder(path)
       end
 
       def list(path, options = {})
@@ -30,6 +39,33 @@ module Ocman
         def escape_path(path)
           path.split('/').map { |segment| ERB::Util.url_encode(segment) }.join('/')
         end
+
+        def wait_for_folder(path)
+          wait_time = 1
+          retries = 0
+          loop do
+            raise TimeoutError if retries >= 3
+            break if Ocman.list(path)
+
+            sleep wait_time
+            wait_time *= 2
+            retries += 1
+          end
+        end
+
+        def ignore404
+          yield
+        rescue Net::HTTPServerException => e
+          raise unless e.to_s.match?(/404.*Not found/i)
+
+          nil
+        end
+
+        def path_list(path)
+          path.split('/').reduce([]) do |acc, segment|
+            acc << [acc.last, segment].compact.join('/')
+          end
+        end
     end
   end
 end

data/lib/ocman/share.rb

@@ -65,12 +65,12 @@ module Ocman
           params: {
             path: attributes[:path],
             format: 'json'
-          }.reject { |_key, value| value.nil? }
+          }.compact
         }
       end
 
       def share_url(id = nil)
-        Ocman.configuration.base_url + '/ocs/v1.php/apps/files_sharing/api/v1/shares' + ('/' + id.to_s if id).to_s
+        "#{Ocman.configuration.base_url}/ocs/v1.php/apps/files_sharing/api/v1/shares#{"/#{id}" if id}"
       end
   end
 end

data/lib/ocman/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ocman
-  VERSION = '1.3.1'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocman
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Waldemar Gribele
@@ -129,28 +129,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 1.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 1.6.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.37.1
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.37.1
+        version: 2.1.0
 description: Ruby gem for file managment and sharing in nextcloud/owncloud
 email: laboratories@toptranslation.com
 executables: []
@@ -177,14 +191,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Ocman - Manages files and shares in nextcloud/owncloud