ftpmvc-gpg 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e496802a7d34286f1ee248f9015e53516c62167
-  data.tar.gz: 7040b38ea69dbe17320ee88f0f68f942f3836adf
+  metadata.gz: 46d0c3cb7a9f589b541eeeed74100c71ed3b5fac
+  data.tar.gz: ab39079c0dd1e4cf3422095ea1f7d9f11a44bfb0
 SHA512:
-  metadata.gz: 5232706bcf4a74d7675d685ddb080789cd0772d9772b5d22f5be9275e1ab7cd3303bd0e66f6ee67e61ace52b5e3bd8f9dfc3918ccf5eacb75644fb4f1818cd02
-  data.tar.gz: f1b49f3732872892026ae81d679ed5bacf5621223dc831b59bd04c2c3be566952504c5f926cda5bb6a4fb9d43709efa01bad0b5ed2a021f7a8d077e9d0d8fcb8
+  metadata.gz: 3b9cf85cc40517a6793c10bc45fed0dccde27a5d95caa4f9658e3ca18bad8fc86a530385ed643007848c15630ee037a033b3ab6f5234840bcf1aa9493c9ac620
+  data.tar.gz: 5c51f19670e91ecb200157c5e2d8afbd9e6669241d0fd1fbecdc25112f719cbb837d45f8df5edd04be40062f975b6b74e73f88518576013f406c72e27ddbca41

data/ftpmvc-gpg.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "guard-rspec"
-  spec.add_dependency "ftpmvc", '>= 0.8.0'
+  spec.add_dependency "ftpmvc", '>= 0.9.0'
   spec.add_dependency "gpgme"
 end

data/lib/ftpmvc/filter/gpg.rb

@@ -1,6 +1,6 @@
 require 'ftpmvc/filter/base'
+require 'ftpmvc/gpg/input'
 require 'gpgme'
-require 'ftpd/stream'
 
 module FTPMVC
   module Filter
@@ -32,12 +32,8 @@ module FTPMVC
         @chain.directory?(remove_extension(path))
       end
 
-      def put(path, stream)
-        buffer = ''
-        while bytes = stream.read
-          buffer << bytes
-        end
-        @chain.put(remove_extension(path), ::Ftpd::Stream.new(@crypto.decrypt(buffer), 'B'))
+      def put(path, input)
+        @chain.put(remove_extension(path), FTPMVC::GPG::Input.new(@crypto.decrypt(input.read_all)))
       end
 
       protected

data/lib/ftpmvc/gpg.rb

@@ -1,2 +1,3 @@
 require 'ftpmvc/gpg/version'
+require 'ftpmvc/gpg/input'
 require 'ftpmvc/filter/gpg'

data/lib/ftpmvc/gpg/input.rb

@@ -0,0 +1,20 @@
+require 'ftpmvc/input'
+
+module FTPMVC
+  module GPG
+    class Input
+
+      include FTPMVC::Input
+      
+      def initialize(data)
+        @data = data
+      end
+
+      def read
+        while chunk = @data.read(GPGME::Data::BLOCK_SIZE)
+          yield chunk
+        end
+      end
+    end
+  end
+end

data/lib/ftpmvc/gpg/version.rb

@@ -1,5 +1,5 @@
 module FTPMVC
   module GPG
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/spec/integration/ftpmvc/filter/gpg_spec.rb

@@ -85,8 +85,8 @@ describe FTPMVC::Filter::Gpg do
         StringIO.new('secret')
       end
 
-      def put(path, stream)
-        @received_data = stream.read
+      def put(path, input)
+        @received_data = input.read_all
       end
     end
   end

data/spec/lib/ftpmvc/filter/gpg_spec.rb

@@ -1,14 +1,14 @@
 require 'ftpmvc/filter/gpg'
+require 'ftpmvc/string_input'
 require 'ftpmvc/file'
 require 'ftpmvc/directory'
-require 'ftpd/stream'
 
 describe FTPMVC::Filter::Gpg do
   let(:other_filter_class) do
     Class.new(FTPMVC::Filter::Base) do
-      attr_reader :received_stream
-      def put(path, stream)
-        @received_stream = stream
+      attr_reader :input
+      def put(path, input)
+        @input = input
       end
     end
   end
@@ -100,7 +100,7 @@ describe FTPMVC::Filter::Gpg do
     end
 
   describe '#put' do
-    let(:stream) { Ftpd::Stream.new(StringIO.new('encrypted content'), 'B') }
+    let(:input) { FTPMVC::StringInput.new('encrypted content') }
     before do
       allow_any_instance_of(GPGME::Crypto)
         .to receive(:decrypt)
@@ -110,12 +110,12 @@ describe FTPMVC::Filter::Gpg do
     it 'removes .pgp extension from filename' do
       expect(other_filter)
         .to receive(:put)
-        .with('/secret/passwords.txt', kind_of(Ftpd::Stream))
-      gpg_filter.put('/secret/passwords.txt.pgp', stream)
+        .with('/secret/passwords.txt', kind_of(FTPMVC::Input))
+      gpg_filter.put('/secret/passwords.txt.pgp', input)
     end
-    it 'decrypts the stream' do
-      gpg_filter.put('/secret/passwords.txt.pgp', stream)
-      expect(other_filter.received_stream.read).to eq 'decrypted content'
+    it 'decrypts the input' do
+      gpg_filter.put('/secret/passwords.txt.pgp', input)
+      expect(other_filter.input.read_all).to eq 'decrypted content'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ftpmvc-gpg
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - André Aizim Kelmanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: gpgme
   requirement: !ruby/object:Gem::Requirement
@@ -98,6 +98,7 @@ files:
 - ftpmvc-gpg.gemspec
 - lib/ftpmvc/filter/gpg.rb
 - lib/ftpmvc/gpg.rb
+- lib/ftpmvc/gpg/input.rb
 - lib/ftpmvc/gpg/version.rb
 - spec/fixtures/data.gpg
 - spec/integration/ftpmvc/filter/gpg_spec.rb