bfs-ftp 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e46d16067aed45ba5b08ed78f8aef03c9a5bba71e1d3907a889342ce1f4947ca
-  data.tar.gz: a877150fc240a0b79060d3c15295f734965b0d8ad04f09aac2ad565bddfc6c34
+  metadata.gz: d222bfc10f937a2ad321be7eb63c1408057cc77b5d1807ed8229310f3482444a
+  data.tar.gz: 1a50538331195f067090a9b0d3fbd1afb1b0eb1b611d730d09a3433f3668b9be
 SHA512:
-  metadata.gz: cba1489d833132157c36c56259eb7bc3f7be852549a2915d72b9506606b966d9be3528d264023515b63ce74ce9b7bdd361e20d1a2d7666434750befa03f0cd16
-  data.tar.gz: f152b36ca6a2548c8a4aee5a6c6f18e373bb5ddb65226ab9a7e4b0693b1d25557158df0ad9dee6515e549eb053aa8db871e0632d999f6c9effaf14b72d3024a1
+  metadata.gz: 845561eeac7af25ebe8616a6c0bb0c30ad7cbc287ff0f6d7df31456b03c3e3c755358927c503d9bb3b41a4c7d8b82d00e51e96406ea018b884da016444a959e5
+  data.tar.gz: 6e2d0c34cadee4fc961e1a495df04fed73ec98918d5ae0fc5e7a673272a7abf7daf665f33c915adbac6666bbbf79655589a34db8ca135970234cbfcebd85e8e8

data/lib/bfs/bucket/ftp.rb

@@ -1,11 +1,12 @@
 require 'bfs'
 require 'net/ftp/list'
-require 'cgi'
 
 module BFS
   module Bucket
     # FTP buckets are operating on ftp servers
     class FTP < Abstract
+      attr_reader :perm
+
       # Initializes a new bucket
       # @param [String] host the host name
       # @param [Hash] opts options
@@ -49,11 +50,9 @@ module BFS
       end
 
       # Creates a new file and opens it for writing
-      def create(path, encoding: nil, perm: nil, **_opts, &block)
+      def create(path, encoding: self.encoding, perm: self.perm, **_opts, &block)
         path = norm_path(path)
-
-        enc  = encoding || @encoding
-        temp = BFS::TempWriter.new(path, encoding: enc, perm: perm) do |t|
+        temp = BFS::TempWriter.new(path, encoding: encoding, perm: perm) do |t|
           mkdir_p File.dirname(path)
           @client.put(t, path)
         end
@@ -67,14 +66,13 @@ module BFS
       end
 
       # Opens an existing file for reading
-      def open(path, encoding: nil, tempdir: nil, **_opts, &block)
+      def open(path, encoding: self.encoding, perm: self.perm, tempdir: nil, **_opts, &block)
         path = norm_path(path)
-        enc  = encoding || @encoding
-        temp = Tempfile.new(File.basename(path), tempdir, encoding: enc)
+        temp = Tempfile.new(File.basename(path), tempdir, encoding: encoding, perm: perm)
         temp.close
 
         @client.get(path, temp.path)
-        File.open(temp.path, encoding: enc, &block)
+        File.open(temp.path, encoding: encoding, &block)
       rescue Net::FTPPermError
         raise BFS::FileNotFound, path
       end
@@ -116,13 +114,10 @@ module BFS
   end
 end
 
-BFS.register('ftp', 'sftp') do |url|
-  params = CGI.parse(url.query.to_s)
-
-  BFS::Bucket::FTP.new url.host,
+BFS.register('ftp', 'sftp') do |url, opts|
+  BFS::Bucket::FTP.new url.host, **opts,
                        username: url.user ? CGI.unescape(url.user) : nil,
                        password: url.password ? CGI.unescape(url.password) : nil,
                        port: url.port,
-                       ssl: params.key?('ssl') || url.scheme == 'sftp',
-                       prefix: params.key?('prefix') ? params['prefix'].first : nil
+                       ssl: opts.key?(:ssl) || url.scheme == 'sftp'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs-ftp
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2020-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bfs
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: net-ftp-list
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: FTP adapter for bfs