pcloud 0.0.4 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 488c8b94851e3db065174d08c512e6ecb55b0217d67df05f403c7616404491c8
-  data.tar.gz: 56d94559f29edd8f1ce9e94307a1674ad880bc772aae137346efe3a63e9df91a
+  metadata.gz: d3df45fba37065a0d00e1ef805a2754f6d7da0cfb62a780bcd6e2f9a73bb3dad
+  data.tar.gz: 975423282e2a3919243368ace288b2f61d47eeb5408ee34f7f6578ad4852799d
 SHA512:
-  metadata.gz: 3a80966ba741f5b3c9b8d4b522143db68f9f5e4561ac811df29c6ce6d0ccfae9b3ecf27fc81b9fbde57548e134245427e7cdb4a65a881d98c661dde4e24e6e3c
-  data.tar.gz: 19b0ab6b6a4475a93994183f05a4ee3e72bad7a70176a2c859e30e022fbef36e778d33857a724f759901264417c7b96ee6785a48a77786490a3f3f458258eeee
+  metadata.gz: c2b0b1fbca1e202c8503259bf8035defab0a1dea551f94e907323c447511a37f250225b7e942fe73c1ffe581023ddd89d7e36992220bf47fa722230cc8e00b87
+  data.tar.gz: '088f4cec04d35a5eb422f2ae59e4d6affdf849dd4614bbe99edad6212233ffaf0b44c29812103b0aa0c23101276f0fd38967d2d1816324597d348a36a7589886'

data/CHANGELOG.md

@@ -0,0 +1,80 @@
+# Changelog
+
+### [0.3.2](https://www.github.com/7urkm3n/pcloud/compare/v0.3.1...v0.3.2) (2021-09-05)
+
+
+### Bug Fixes
+
+* filehandle error fixed ([45fae7c](https://www.github.com/7urkm3n/pcloud/commit/45fae7c42fd483b86d42c80fd9e6a11619933a40))
+
+### [0.3.1](https://www.github.com/7urkm3n/pcloud/compare/v0.3.0...v0.3.1) (2021-09-04)
+
+
+### Bug Fixes
+
+* version update ([9bf5268](https://www.github.com/7urkm3n/pcloud/commit/9bf52681a94e6b17ec721778bfaeee39c1750a36))
+
+## [0.3.0](https://www.github.com/7urkm3n/pcloud/compare/v0.2.0...v0.3.0) (2021-09-04)
+
+
+### ⚠ BREAKING CHANGES
+
+* initialization
+
+### Bug Fixes
+
+* initialization ([6dc7735](https://www.github.com/7urkm3n/pcloud/commit/6dc77359c4bd3003ad05ed54705bfa70a6a95e62))
+
+## [0.2.0](https://www.github.com/7urkm3n/pcloud/compare/v0.1.0...v0.2.0) (2021-09-04)
+
+
+### ⚠ BREAKING CHANGES
+
+* major update
+
+### Features
+
+* major update ([3c1a191](https://www.github.com/7urkm3n/pcloud/commit/3c1a1914606391739f08e29c264528ba3d02d112))
+
+## 0.1.0 (2021-08-19)
+
+### Features
+
+- version 0.1.0 ([bafbe4b](https://www.github.com/7urkm3n/pcloud/commit/bafbe4b1d0301eb99446c703176eb35d6dc41336))
+
+### Bug Fixes
+
+- fixing workflow ([858cab4](https://www.github.com/7urkm3n/pcloud/commit/858cab495be548013c3e61756e626ce17cd38db3))
+- workflows works, testing version auto bump ([9de8276](https://www.github.com/7urkm3n/pcloud/commit/9de82767c31c1ae003e268910b23108bba4f2e8c))
+
+#### v0.0.4
+
+##### Updates
+
+- Minor changes
+- Upload and Download added and avilable now
+- Post method is avilable now.
+- Upload/Download async version is on work.
+
+#### v0.0.3
+
+##### Updates
+
+- Minor updates
+- Upload and Download added - needs maintain
+- Post method fixed and added back
+
+#### v0.0.2
+
+##### Updates
+
+- Minor updates
+- Test files added
+- Removed `Post` method temporarily
+
+#### v0.0.1
+
+##### Publish
+
+- Available get Method
+- Incoming {Upload|Download} files

data/README.md

@@ -2,25 +2,28 @@
 
 This Gem provides a Ruby interface to [Pcloud.com](https://docs.pcloud.com).
 
-[![Build Status](https://github.com/7urkm3n/pcloud/workflows/build/badge.svg?branch=master)](https://github.com/7urkm3n/pcloud/actions?query=workflow%3Abuild) [![Gem Downloads](https://badgen.net/rubygems/dt/pcloud)](https://rubygems.org/gems/pcloud) [![Gem Version](https://badge.fury.io/rb/pcloud.svg)](https://badge.fury.io/rb/pcloud)
+[![Build Status](https://github.com/7urkm3n/pcloud/workflows/release/badge.svg?branch=main)](https://github.com/7urkm3n/pcloud/actions?query=workflow%3Arelease) [![Gem Downloads](https://badgen.net/rubygems/dt/pcloud)](https://rubygems.org/gems/pcloud) [![Gem Version](https://badge.fury.io/rb/pcloud.svg)](https://badge.fury.io/rb/pcloud)
 
 <!-- [![Gem Version](https://badgen.net/rubygems/v/pcloud)](https://rubygems.org/gems/pcloud) -->
 
+##### Want to contribute? [Doc Link](https://github.com/7urkm3n/pcloud/CONTRIBUTE.md)
+
 ## Installation and Configuration
 
 Add `pcloud` to your Gemfile, and then run `bundle install`
 
-``` ruby
+```ruby
 gem 'pcloud'
 ```
 
 or install via gem
 
-``` bash
+```bash
 gem install pcloud
 ```
 
 ###### Rails
+
 to generate `Rails` initializer file
 
 ```bash
@@ -35,87 +38,109 @@ config/initializers/pcloud.rb
 
 ### Instantiating a client
 
-``` ruby
+```ruby
 require 'pcloud'
 
 pcloud = Pcloud::Client.new(
   username: 'email',
   password: 'password',
-)
-```
+).authenticate
 
+pcloud.get("listfolder", folderid: 0)
+```
 
 ### Global configuration
 
 The library can also be configured globally on the `Pcloud` class.
 
-``` ruby
+```ruby
 Pcloud.username = 'email'
 Pcloud.password = 'password'
+Pcloud.authenticate
+
+Pcloud.get("listfolder", folderid: 0)
 ```
 
-<!-- ### Logging
+### Logging
 
 By default errors are logged in STDOUT level, also `Rails.logger` available.
 
-``` ruby
+```ruby
 Pcloud.logger = Rails.logger
-``` -->
+```
+
+### Working with methods
 
-## Working with methods
+Available methods:
 
-Currently, only available custom Get method. 
+- <b> Get </b>
+- <b> Post </b>
+- <b> File handling </b>
 
-File Upload and Download methods are coming soon.
+###### addition!
 
+> Some apis need to be `raw` format, just add `raw` in params. `params: {fileid: ..987, raw: true}`
+> For example `gettextfile` https://docs.pcloud.com/methods/streaming/gettextfile.html
 
-#### Get methods
+#### Get method
 
-``` ruby
+```ruby
 Pcloud.get("getip")
 Pcloud.get("getdigest")
 
 # with params
-Pcloud.get("listfolder", folderid: 0)
+params = {folderid: 0}
+Pcloud.get("listfolder", params)
 ```
-<!-- Pcloud.get("createfolder", folderid: 0, name: "new folder name", ...) -->
-
-#### Post methods
 
-``` ruby
-# if any of pcloud endpoints requires payload on POST request, please create an issue.
+#### Post method
 
-# with params
-Pcloud.post("createfolder", folderid: 0, name: "new folder name")
+```ruby
+payload = {}
+params = {folderid: 0, name: "new folder name"}
+Pcloud.post("createfolder", payload, params)
 ```
 
-#### [Files](https://docs.pcloud.com/methods/file/)
+### [File methods](https://docs.pcloud.com/methods/file/)
+
 ##### [Download File](https://docs.pcloud.com/methods/file/downloadfile.html)
 
-``` ruby
-#obtain filelink from: https://docs.pcloud.com/methods/streaming/getfilelink.html
+```ruby
+# optional params: filename, destination
+# destination by default current_path
+Pcloud.file.download({fileid: 987532135})
 
 Pcloud.file.download(
-  url: filelink,                           #required
-  destination: "#{Dir.pwd}/Downloads",     #required
-  filename: "hehe.txt"                     #optional
+  fileid: 987532135,                   #required
+  destination: "#{Dir.pwd}/Downloads", #optional
+  filename: "hehe.txt"                 #optional
 )
 ```
 
-##### [Upload File](https://docs.pcloud.com/methods/file/uploadfile.html)
+##### [Download Folder](#)
 
-``` ruby
-# still in BETA! -  
-# only supports single file download
+```ruby
+# optional params: filename, destination
+# destination by default current_path
+Pcloud.file.download_folder({folderid: 123456789})
+```
+
+##### [Upload File](https://docs.pcloud.com/methods/file/uploadfile.html)
 
-file = File.open("/Users/7urkm3n/Downloads/anything.file")
+```ruby
 params = {
-  folderid: 0,                #required
-  filename: "anything.txt"    #required
+  folderid: 0,  #required
+  nopartial: 1,
 }
-payload = {file: file}
+# multiple uploads
+file1 = File.open("./Rakefile")
+file2 = File.open("./README.md")
+file3 = File.open("./Gemfile")
+payload = { files: [file1,file2,file3] }
+
 Pcloud.file.upload(params, payload)
 ```
 
 ### Supported Ruby versions
+
 2.2+

data/lib/pcloud/client.rb

@@ -1,51 +1,63 @@
 require 'json'
 require 'rest-client'
+require_relative './request'
+require_relative "./files/file_handler"
 
 module Pcloud
   class Client
     attr_writer :username, :password
+    attr_accessor :auth_token
 
     def initialize(options = {})
       @username, @password = options.values_at(:username, :password)
+      @auth_token = options[:auth_token]
     end
 
-    def get(path, params = {})
-      resource(path).get(params)
+    def get(path, params={})
+      request(:get, path, params)
     end
 
-    def post(path, params = {})
-      resource(path).post(params)
+    def post(path, payload={}, params={})
+      request(:post, path, params, payload)
     end
 
     def file
-      Resource.new(self).file()
+      @file ||= FileHandler.new(self)
     end
 
     def http_client
-      @client ||= RestClient::Resource.new(BASE_URL)
+      @http_client ||= RestClient::Resource.new(BASE_URL)
     end
 
-    def auth
-      @auth ||= begin
-        raise ConfigurationError, :username unless @username
-        raise ConfigurationError, :password unless @password
-        digest = JSON.parse(RestClient.get("#{BASE_URL}/getdigest"))['digest']
-        passworddigest = digest_data(@password + digest_data( @username.downcase ) + digest)
-        JSON.parse(
-          RestClient.get("#{BASE_URL}/userinfo?getauth=1&logout=1", 
-          {params: {username: @username, digest: digest, passworddigest: passworddigest}})
-        )['auth']
-      end
+    def authenticate(options = {})
+      @auth_token = authorize(options)['auth']
+      self
     end
 
-    private
-
-    def resource(path)
-      Resource.new(self, path)
+    def request(verb, path, params, payload = {})
+      Pcloud::Request.call(self, verb, path, params, payload)
+    end
+    
+  private
+    def authorize(options)
+      raise ConfigurationError, :username unless @username
+      raise ConfigurationError, :password unless @password
+      digest = JSON.parse(RestClient.get("#{BASE_URL}/getdigest"))['digest']
+      passworddigest = digest_data(@password + digest_data( @username.downcase ) + digest)
+      [:username, :digest, :passworddigest, :password].each { |k| options.delete(k) }
+      params = {params: {
+        username: @username, 
+        digest: digest, 
+        passworddigest: passworddigest,
+        device: "pcloud-ruby",
+        getauth: 1
+      }.merge!(options)}
+      JSON.parse(RestClient.get("#{BASE_URL}/userinfo", params)) #['auth']
     end
 
     def digest_data text
       Digest::SHA1.hexdigest(text)
     end
+    
   end
 end

data/lib/pcloud/exceptions.rb

@@ -6,6 +6,11 @@ module Pcloud
       super "missing key `#{key}' in the client configuration"
     end
   end
+  class NotFoundError < Error
+    def initialize(key, message)
+      super "not found `#{key}' with value of #{message}"
+    end
+  end
   class HTTPError < Error
     def initialize(key, message)
       super "#{key} Bad request: #{message}"

data/lib/pcloud/files/file_handler.rb

@@ -1,35 +1,49 @@
-require 'RestClient'
+require 'open-uri'
+require 'zip'
 
 module Pcloud
   class FileHandler
+
     def initialize(client)
       @client = client
     end
 
     def upload(params, payload)
-      create_request(:post, 'uploadfile', params, payload).call
+      @client.request(:post, 'uploadfile', params, payload)
     end
 
     def download(params)
-      url = params[:url]
-      begin
-        res = RestClient.get(url)
-      rescue => e
-        raise HTTPError.new(:HTTPError, e.message)
-      end
-      
-      filename = params[:filename] ? params[:filename] : url.split("/").last
-      File.open("#{params[:destination]}/#{filename}", 'wb' ) do |f|
-        f.write 
+      # destination = params[:destination] ? params[:destination] : '.'
+      # data = request(:get, "getfilelink", {fileid: params[:fileid], forcedownload: 1})
+      # url = "https://#{data[:hosts][0]+data[:path]}"
+      # IO.copy_stream(URI.open(url), "#{destination}/#{url.split("/").last}")
+      # File.write("#{destination}/#{url.split("/").last}", URI.open(url).read)
+
+      destination = params[:destination] || '.'
+      filename = params[:filename] || nil
+      if !filename
+        stat = @client.request(:get, "stat", {fileid: params[:fileid]})
+        raise NotFoundError.new(:fileid, params[:fileid]) if stat[:error]
+        filename = stat[:metadata][:name]
       end
-      res.code
-    end
+      File.write("#{destination}/#{filename}", @client.request(:get, "gettextfile", {fileid: params[:fileid], raw: true}))
+    end 
 
-    private
+    def download_folder(params)
+      data = @client.request(:get, "listfolder", {folderid: params[:folderid]})
+      raise NotFoundError.new(:folderid, params[:folderid]) if data[:error]
 
-    def create_request(verb, path, params, payload = {})
-      Request.new(@client, verb, path, params, payload)
+      destination = params[:destination] || '.'
+      folder_name = params[:filename] || data[:metadata][:name] << ".zip"
+      stringio = Zip::OutputStream::write_buffer do |zio|
+        data[:metadata][:contents].each do |content|
+          zio.put_next_entry(content[:name])
+          zio.write(@client.request(:get, "gettextfile", {fileid: content[:fileid], raw: true}))
+        end
+      end
+      stringio.rewind #reposition buffer pointer to the beginning
+      File.new("#{destination}/#{folder_name}","wb").write(stringio.sysread) #write buffer to zipfile
     end
-    
+
   end
 end

data/lib/pcloud/request.rb

@@ -1,46 +1,43 @@
 module Pcloud
-  class Request
-    def initialize(client, verb, path, params, payload)
-      @client, @verb, @path, @params, @payload = client, verb, path, params, payload
-    end
-
-    def call
-      params = {params: {}}
-      params[:params].merge!(@params, {auth: @client.auth})
-      http = @client.http_client
-      res = case @verb
-            when :get
-              begin
-                http[@path].get(params)
-              rescue => e
-                handle_response(e.http_code, e.message)
-              end
-            when :post
-              begin
-                http[@path].post(@payload, params)
-              rescue => e
-                handle_response(e.http_code, e.message)
+  module Request
+    class << self
+      def call(client, verb, path, params, payload={})
+        params = {params: {}.merge!(params, {auth: client.auth_token})}
+        http = client.http_client
+        res = case verb
+              when :get
+                begin
+                  http[path].get(params)
+                rescue => e
+                  handle_response(e.http_code, e.message)
+                end
+              when :post
+                begin
+                  http[path].post(payload, params)
+                rescue => e
+                  handle_response(e.http_code, e.message)
+                end
+              else
+                raise "Unsupported verb (get and post available): #{verb}"
               end
-            else
-              raise "Unsupported verb: #{@verb}"
-            end
-      JSON.parse(res.body, { symbolize_names: true })
-    end
+        return res.body if params[:params][:raw]
+        JSON.parse(res.body, { symbolize_names: true })
+      end
 
     private
 
-    def handle_response(status_code, body)
-      case status_code
-      when 400
-        raise HTTPError.new(:HTTPError, body)
-      when 401
-        raise AuthenticationError, body
-      when 404
-        raise HTTPError.new(:HTTPError, body)
-      else
-        raise Error, "Unknown error (status code #{status_code}): #{body}"
+      def handle_response(status_code, body)
+        case status_code
+        when 400
+          raise HTTPError.new(:HTTPError, body)
+        when 401
+          raise AuthenticationError, body
+        when 404
+          raise HTTPError.new(:HTTPError, body)
+        else
+          raise Error, "Unknown error (status code #{status_code}): #{body}"
+        end
       end
     end
-
   end
 end

data/lib/pcloud/version.rb

@@ -1,3 +1,3 @@
 module Pcloud
-  VERSION = '0.0.4'
+  VERSION = '0.3.2'
 end

data/lib/pcloud.rb

@@ -1,17 +1,21 @@
 autoload 'Logger', 'logger'
 require 'forwardable'
-require 'pcloud/client'
+require_relative 'pcloud/client'
 
 module Pcloud
   BASE_URL = 'https://api.pcloud.com'.freeze
 
   class << self
     extend Forwardable
-    def_delegators :default_client, :username=, :password=
-    def_delegators :default_client, :get
+    def_delegators :client, :auth_token=, :username=, :password=
+    def_delegators :client, :get, :post, :file, :authenticate
 
     attr_writer :logger
 
+    def client
+      @client ||= Pcloud::Client.new
+    end
+
     def logger
       @logger ||= begin
         log = Logger.new($stdout)
@@ -20,13 +24,8 @@ module Pcloud
       end
     end
 
-    def default_client
-      @default_client ||= Pcloud::Client.new
-    end
   end
 end
 
-require 'pcloud/version'
-require 'pcloud/request'
-require 'pcloud/resource'
-require 'pcloud/exceptions'
+require_relative './pcloud/version'
+require_relative './pcloud/exceptions'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pcloud
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.3.2
 platform: ruby
 authors:
 - Rovshen Gurdov
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2020-09-03 00:00:00.000000000 Z
+date: 2021-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.2
 description: Pcloud is cloud storage upload/download/share from pcloud.com. Please,
   check available methods in Github Doc...
 email:
@@ -60,7 +60,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Changelog.md
+- CHANGELOG.md
 - LICENSE
 - README.md
 - lib/generators/pcloud.rb
@@ -70,14 +70,13 @@ files:
 - lib/pcloud/exceptions.rb
 - lib/pcloud/files/file_handler.rb
 - lib/pcloud/request.rb
-- lib/pcloud/resource.rb
 - lib/pcloud/version.rb
-homepage: https://github.com/7urkm3n/pcloud/
+homepage: https://github.com/7urkm3n/pcloud
 licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/7urkm3n/pcloud/issues
-  changelog_uri: https://github.com/7urkm3n/pcloud/blob/master/Changelog.md
+  changelog_uri: https://github.com/7urkm3n/pcloud/blob/master/CHANGELOG.md
   documentation_uri: https://github.com/7urkm3n/pcloud
   source_code_uri: https://github.com/7urkm3n/pcloud
 post_install_message: 
@@ -95,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Secure and simple to use cloud storage for your datas...

data/Changelog.md

@@ -1,32 +0,0 @@
-### Changelogs:
-
-#### v0.0.4
-##### Updates
-* Minor changes
-* Upload and Download added and avilable now
-* Post method is avilable now.
-* Upload/Download async version is on work.
-
-#### v0.0.3
-##### Updates
-* Minor updates
-* Upload and Download added - needs maintain
-* Post method fixed and added back
-
-#### v0.0.2
-##### Updates
-* Minor updates
-* Test files added
-* Removed `Post` method temporarily
-
-#### v0.0.1
-##### Publish
-* Available get Method
-* Incoming {Upload|Download} files
-
-
-
-<!-- === 0.0.2 / 2020-09-...
-==== Updates | Enhancements
-* Added to {Upload|Download} files.
- -->

data/lib/pcloud/resource.rb

@@ -1,29 +0,0 @@
-require "#{Dir.pwd}/lib/pcloud/files/file_handler"
-
-module Pcloud
-  class Resource
-
-    def initialize(client, path = "")
-      @client, @path = client, path
-    end
-
-    def get(params)
-      create_request(:get, params).call
-    end
-
-    def post(params, payload = {})
-      create_request(:post, params, payload).call
-    end
-
-    def file
-      @file ||= FileHandler.new(@client)
-    end
-    
-    private
-
-    def create_request(verb, params, payload = {})
-      Request.new(@client, verb, @path, params, payload)
-    end
-
-  end
-end