ruby-skynet 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb80cbb14beb4fa727a20399973d876850dfb44b3e2517ea38729e846d7da1df
-  data.tar.gz: 8b4797841897b02b9a8df14ce213354c9caba633259155c4d8928b6859542da7
+  metadata.gz: 69e91f4fb679501098bfe4f595eddcbd72b7a89d24e98618f10927ca1f3ded3e
+  data.tar.gz: 0113ba2ed43c53d7b9d4f6daeeca01d47acdab5cb80923b9095b3ddaaf6d42f8
 SHA512:
-  metadata.gz: 724501a11c22b573fe401d3d508ef3f37df6d2d151cff3ad83a7c12300da559b4a7ad5c03009670fd31d2dfc1303b3ce7fc12f6908ca8f84fed18f70afb001f8
-  data.tar.gz: 196798e349d2812c8dcec81520da20f74ef3de522fd5c039d1d12cad251842077418371d52fa0319aa5268f4a474b59892ecba531869984d88852e1265b7f508
+  metadata.gz: 8268872ad64745251cdb33723eec0b613e30d0b45f89d57845d51a526ac37a208a6d3921a8663c5fb9d8ec67d89fb7f0810a2fa702ddf54b0e5fccb665e5ad75
+  data.tar.gz: 3b7a37c79e7c32077a73c4eca1314dffe6238ad03940255e5aa86efaaf7e23ee815fd9dc97819177bda2c7891f79009c9b2d3c8bbe0e48c437860ff66814124b

data/lib/skynet/download.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-require_relative 'helper.rb'
+require_relative 'helper'
 
 # Module for handling inbound requests
 module Download
-
   # Array with http redirect & http permanent code
   # Used to determine if the GET request should start downloading or follow redirect
   HTTP_REDIRECT_PERMANENT = [301, 302].freeze
@@ -12,12 +11,12 @@ module Download
 
   # Download file from the skynet portal
   # file_name & skylink is required, the rest is optional since they come with default values
-  def download_file(file_name, skylink, options = {}, stream = true)
+  def download_file(file_name, skylink, override_options = {}, stream: true)
     options = Helper::Download.default_options
-    options = Helper::Download.default_options.merge(options) unless options.empty?
+    options = Helper::Download.default_options.merge(override_options) unless override_options.empty?
 
     portal  = options[:portal_url]
-    skylink = Skynet.strip_prefix(skylink)
+    skylink = Helper::Download.strip_prefix(skylink)
     url = "#{portal}#{skylink}?attachment=#{options[:download]}"
 
     File.open(file_name, 'w') do |file|

data/lib/skynet/helper.rb

@@ -1,14 +1,15 @@
 # frozen_string_literal: true
 
-# Class with general settings
+# Module with helpful utilities and default settings
 module Helper
-
   # The default skynet portal
   PORTAL_URL = 'https://siasky.net/'
 
+  # Prefix for the protocol
+  URI_SKYNET_PREFIX = 'sia://'
+
   # Module for keeping download settings
   module Download
-
     # Default options for the download module
     def self.default_options
       {
@@ -16,11 +17,21 @@ module Helper
         download: true
       }
     end
+
+    # Removes the Skynet::URI_SKYNET_PREFIX constant from string
+    def self.strip_prefix(str)
+      return nil if str.nil?
+
+      if str.index(URI_SKYNET_PREFIX).nil?
+        str
+      else
+        str.delete_prefix(URI_SKYNET_PREFIX)
+      end
+    end
   end
 
   # Module for keeping upload settings
   module Upload
-
     # Default options for the upload module
     def self.default_options
       {
@@ -28,8 +39,19 @@ module Helper
         portal_upload_path: 'skynet/skyfile',
         portal_file_fieldname: 'file',
         portal_directory_fieldname: 'files[]',
-        custom_filename: nil,
+        custom_filename: nil
       }
     end
+
+    # Removes "./" from a given filename if provided
+    def self.strip_dotslash_path(file_path)
+      return nil if file_path.nil?
+
+      if file_path.start_with?('./')
+        file_path.delete_prefix('./')
+      else
+        file_path
+      end
+    end
   end
 end

data/lib/skynet/upload.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'helper.rb'
+require_relative 'helper'
 
 # Module for handling outbound requests
 module Upload
@@ -21,57 +21,29 @@ module Upload
   end
 
   # Uploads file to the skynet, file_path is required but options are optional since default values are provided
-  def upload_file(file_path, options = {})
+  def upload_file(file_path, override_options = {})
     options = Helper::Upload.default_options
-    options = Helper::Upload.default_options.merge(options) unless options.empty?
+    options = Helper::Upload.default_options.merge(override_options) unless override_options.empty?
     return "File #{file_path} does not exist!" unless File.exist?(file_path)
 
     host = options[:portal_url]
     path = options[:portal_upload_path]
     filename = options[:custom_filename] || file_path
+    filename = Helper::Upload.strip_dotslash_path(filename)
 
     url = "#{host}#{path}?filename=#{filename}"
-    binary_content = IO.read(file_path, mode: 'rb')
+    binary_content = File.readlines(file_path, mode: 'rb').join
 
     header_data = http_post_header({
-      headers: {
-        'Content-Disposition' => 'attachment; filename="#{filename}"'
-      },
-      body: binary_content,
-      options[:portal_file_fieldname] => filename
-    })
+                                     headers: {
+                                       'Content-Disposition' => "attachment; filename='#{filename}'"
+                                     },
+                                     body: binary_content,
+                                     options[:portal_file_fieldname] => filename
+                                   })
 
     upload_request = HTTParty.post(url, header_data)
     parsed_request = upload_request.to_hash
-    "Upload successful, skylink: " + parsed_request['skylink']
+    "Upload successful, skylink: #{parsed_request['skylink']}"
   end
-
-  # Still work in progress
-  # Uploads a whole directory to the skynet
-  # def upload_directory(directory_path, options = {})
-  #   options = Helper::Upload.default_options
-  #   options = Helper::Upload.default_options.merge(options) unless options.empty?
-  #   return "Given path is not a directory!" unless Dir.exist?(directory_path)
-
-  #   directory_entries = Dir.glob("#{directory_path}/*")
-
-  #   binary_content = IO.read(filename, mode: 'rb')
-
-  #  header_data = http_post_header({
-  #    headers: {
-  #      'Content-Disposition' => 'attachment; ' + filename
-  #    },
-  #    body: binary_content,
-  #    options[:portal_directory_fieldname] => filename
-  #  })
-
-  #   host = options[:portal_url]
-  #   path = options[:portal_upload_path]
-  #   dir_name = options[:custom_filename] || directory_path
-  #   url = "#{host}#{path}?filename=#{dir_name}"
-
-  #   upload_request = HTTParty.post(url, header_data)
-  #   parsed_request = upload_request.to_hash
-  #   "Upload successful, skylink: " + parsed_request['skylink']
-  # end
 end

data/lib/skynet.rb

@@ -1,26 +1,11 @@
 # frozen_string_literal: true
 
 require 'httparty'
-require_relative 'skynet/download.rb'
-require_relative 'skynet/upload.rb'
+require_relative 'skynet/download'
+require_relative 'skynet/upload'
 
 # The entrypoint for the SDK
 class Skynet
-
-  # Prefix for the protocol
-  URI_SKYNET_PREFIX = 'sia://'
-
   extend Download
   extend Upload
-
-  # Removes the Skynet::URI_SKYNET_PREFIX constant from string
-  def self.strip_prefix(str)
-    return nil if str.nil?
-
-    if str.index(URI_SKYNET_PREFIX).nil?
-      str
-    else
-      str.delete_prefix(URI_SKYNET_PREFIX)
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-skynet
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - beyarz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-04 00:00:00.000000000 Z
+date: 2021-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -115,7 +115,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.2.21
 description: Ruby gem for integrating Sia Skynet into Ruby apps
-email: ''
+email: beyar-123@live.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Sia skynet gem