ocman 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 050bc6a6baa2dea31694c49f2b320dcbf95f5929
-  data.tar.gz: a1b186c12d2e6169f593832e91de398e6f2c4d11
+  metadata.gz: 53a9d30769538c25b17259be0269c4ffb5c8cb7c
+  data.tar.gz: dc01e94e3b3dd0a6768473bc24cc9e693443d4c0
 SHA512:
-  metadata.gz: 98046bfc2dda057cbd11ac2bfa82cedb918a66fc37d63547a673b6ee521c6a22aed842adaea3c5c53e87faf7138ca45c6e7b36d063d8e81b3793f50c7199aa82
-  data.tar.gz: a03e115913971f9de297fd0acb9e3c87a42d9073ef0c24fb7ee6555ad5e2016436dd835dee3122aec8d85d0893f75e09d37b5d9bda85a082ce50147f772f9697
+  metadata.gz: df4565708d6efba8eca698eb60ea641b1f8d1c213ff92c0c7be6f289b7f376a6d20525c5048e32d700623149b43aca8c0c194e7c362d811f0009976d56276887
+  data.tar.gz: 7cc0944dbc96facafa345c0c5aa042aac1b33b6886dd32a8a6fb5363ae67db72c120367f1628d0bc572f2ccbc74740be6479cfa299d24fa04b46debd393b4df7

data/lib/ocman/share.rb

@@ -1,4 +1,4 @@
-require 'json'
+require 'multi_json'
 require 'restclient'
 require 'hashie'
 
@@ -24,8 +24,7 @@ module Ocman
 
     def delete_share(user)
       share = find_share(user)
-      request_parameter = connection_params('delete', share.id)
-      request = RestClient::Request.new( request_parameter )
+      request = RestClient::Request.new( connection_params('delete', id: share.id) )
       parse_result( request.execute )
     end
 
@@ -42,32 +41,30 @@ module Ocman
     end
 
     def share_info
-      request_parameter = {
-        headers:  {
-          params: {
-            path: @path
-          },
-        },
-      }.merge connection_params('get')
-
-      request = RestClient::Request.new( request_parameter )
+      request = RestClient::Request.new( connection_params('get', path: @path) )
       parse_result( request.execute )
     end
 
     private
       def parse_result(response)
-        Hashie::Mash.new( JSON.parse(response)['ocs'] )
+        Hashie::Mash.new( MultiJson.load(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.to_s if id}?format=json"
+      def connection_params(http_method, attributes={})
+        id = attributes[:id]
+        url = Ocman.configuration.base_url + "/ocs/v1.php/apps/files_sharing/api/v1/shares" + "#{'/' + id.to_s if id}"
+
         {
           url:      url,
           method:   http_method,
           user:     Ocman.configuration.user_name,
           password: Ocman.configuration.password,
           headers:  {
-            'OCS-APIRequest': true,
+            'OCS-APIRequest' => true,
+            params: {
+              path: attributes[:path],
+              format: 'json'
+            }.reject {| key, value | value.nil? }
           }
         }
       end

data/lib/ocman/version.rb

@@ -1,3 +1,3 @@
 module Ocman
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocman
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 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-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net_dav
@@ -54,19 +54,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +81,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
-description: Ruby gem for file managment and sharing in owncloud
+description: Ruby gem for file managment and sharing in nextcloud/owncloud
 email: laboratories@toptranslation.com
 executables: []
 extensions: []
@@ -117,5 +117,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Ocman - Manages files and shares in owncloud
+summary: Ocman - Manages files and shares in nextcloud/owncloud
 test_files: []