ocman 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f44e8cb97b1fd6dc39f2fd724cb05e6fe9ed4ae8
-  data.tar.gz: 7d00214d85b57b0ec70e61c24de3cc7e60c9e7d2
+  metadata.gz: b467fa767a7773a1283eaa3ad400d7cb34c0bb46
+  data.tar.gz: 56914c50955ebf829aca69a1e11039b9e1a4c863
 SHA512:
-  metadata.gz: 7bf19200aac815168d15692b66ba4fce28f742e73233f54f16d2740a209ca0e4d366754bfe4dcfc4f95de27c6e2aabb8aff29c10e74e58f65cda780580df54cc
-  data.tar.gz: 4189165a0badd2f117d476aebdd8846f1839ac521c135f101eaf5d4be9808d644789b7de39004023ac4502d0ca7921067a1588df249a249c953f3c76c07ed138
+  metadata.gz: 6d9673d0c2a1452b86733c30a5aeabbaaa19666cda43897a5a7d789a3706745c5b12dc5145006d5d16a12ba1c345595718129ad257ec22d55baf7a5cdc9ce825
+  data.tar.gz: 1fe95fff4e1062cf7e4c12324794bd462c4921bf0f2144efbb3ac9969b9397f966f8dfe21f2c8557752e019ad08ca89d89fadccd67ae3e49062b2c38b9b4d28f

data/lib/ocman/dav.rb

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

data/lib/ocman/folder.rb

@@ -6,10 +6,10 @@ module Ocman
       Ocman::Dav.new.mkdir(URI.encode(path))
     end
 
-    def self.list(path)
+    def self.list(path, options={})
       accu = []
 
-      Ocman::Dav.new.ls(URI.encode(path)) do |item|
+      Ocman::Dav.new.ls(URI.encode(path), options) do |item|
         accu << Hashie::Mash.new({
           path: URI.decode(item.uri.to_s.gsub(Ocman::Dav.url(path), '').gsub('/', '')),
           type: item.type.to_s,

data/lib/ocman/share.rb

@@ -1,3 +1,5 @@
+require 'json'
+require 'restclient'
 require 'hashie'
 
 module Ocman
@@ -54,23 +56,16 @@ module Ocman
 
     private
       def parse_result(response)
-        response = Hash.from_xml(response)['ocs']
-        result = Hashie::Mash.new
-        result.meta = response['meta']
-        result.data = (response['data']['element'] rescue nil)
-        result
+        Hashie::Mash.new( JSON.parse(response)['ocs'] )
       end
 
       def connection_params(http_method, id=nil)
-        url = Ocman.configuration.base_url + "/ocs/v1.php/apps/files_sharing/api/v1/shares" + "#{'/' + id if id}"
+        url = Ocman.configuration.base_url + "/ocs/v1.php/apps/files_sharing/api/v1/shares" + "#{'/' + id.to_s if id}?format=json"
         {
           url:      url,
           method:   http_method,
           user:     Ocman.configuration.user_name,
-          password: Ocman.configuration.password,
-          headers:  {
-            'OCS-APIRequest': true,
-          }
+          password: Ocman.configuration.password
         }
       end
   end

data/lib/ocman/version.rb

@@ -1,3 +1,3 @@
 module Ocman
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

data/lib/ocman.rb

@@ -28,8 +28,8 @@ module Ocman
   end
 
   ### folder
-  def self.list(path)
-    Ocman::Folder.list(path)
+  def self.list(path, options={})
+    Ocman::Folder.list(path, options)
   end
 
   def self.create_folder(path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocman
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Waldemar Gribele
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net_dav
@@ -45,28 +45,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
 description: Ruby gem for file managment and sharing in owncloud
 email: laboratories@toptranslation.com
 executables: []