ftpmvc 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bc917bf062bc477474a6f8b1376c79689e04902
-  data.tar.gz: 8f254536940d5ee5ddd35e095083f5fff1c1e21e
+  metadata.gz: 99e6b62e7638ae4f505f7c91665ec8eaa095605d
+  data.tar.gz: dc5cef1794af707277f782d773572b20c46f16de
 SHA512:
-  metadata.gz: e33c6c0b4452e338d183fa1fd9152ff9fd7a8051b4e26b38ac7a2a898c13b9d9eb68afd169442b4b678d2cb91977356b9c4496fab7753982613332bff4dc6357
-  data.tar.gz: 94bdfacbedaa060c50846bfb75159912fa08017b0b5a2eff35b57d6413c4ada58d84731a4942db08704a18b8923dbeca54ba4e4a019ce1996f8e3133e2c86b24
+  metadata.gz: 9fd37e86b63ff1f728736f66b2190dd4387bc2765164e77c86363ea371d8e8483fa3a259695151a9bd6e5737f240a764a3d2cbbab25369dab815a992833adb05
+  data.tar.gz: 98b8152bcdf05e8aa4a5b8b983c8720f714ce2ffa26529210505af5fa98f67930cd8a87bde4d4f37532f8ad9dc5ea1e51c20c8540f01fa71b5b103c32238662d

data/lib/ftpmvc/application.rb

@@ -1,5 +1,6 @@
 require 'forwardable'
 require 'ftpmvc/directory'
+require 'ftpmvc/logger'
 require 'ftpmvc/filter/filesystem_access'
 require 'ftpmvc/authenticator/promiscuous'
 

data/lib/ftpmvc/filter/base.rb

@@ -7,8 +7,17 @@ module FTPMVC
 
       def_delegators :@chain, :index, :get, :directory?, :exists?, :put
 
+      attr_reader :options
+
       def initialize(fs, chain, options={})
         @fs, @chain, @options = fs, chain, options
+        setup
+      end
+
+      protected
+
+      def setup
+        # may be implemented by children
       end
     end
   end

data/lib/ftpmvc/filter/filesystem_access.rb

@@ -21,8 +21,8 @@ module FTPMVC
         not @fs.resolve(path).nil?
       end
 
-      def put(path, stream)
-        @fs.resolve(::File.dirname(path)).put(::File.basename(path), stream)
+      def put(path, input)
+        @fs.resolve(::File.dirname(path)).put(::File.basename(path), input)
       end
     end
   end

data/lib/ftpmvc/ftpd/file_system.rb

@@ -1,4 +1,5 @@
 require 'ftpmvc/logger'
+require 'ftpmvc/ftpd/input'
 
 module FTPMVC
   module Ftpd
@@ -27,7 +28,7 @@ module FTPMVC
 
       def write(path, stream)
         logger.debug { "FTPMVC::Ftpd::FileSystem#write(#{path}, ...)" }
-        @application.put(path, stream)
+        @application.put(path, Input.new(stream))
       end
 
       def accessible?(path)

data/lib/ftpmvc/ftpd/input.rb

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

data/lib/ftpmvc/ftpd.rb

@@ -1,2 +1,3 @@
 require 'ftpmvc/ftpd/driver'
 require 'ftpmvc/ftpd/file_system'
+require 'ftpmvc/ftpd/input'

data/lib/ftpmvc/input.rb

@@ -0,0 +1,9 @@
+module FTPMVC
+  module Input
+    def read_all
+      ''.tap do |content|
+        read { |chunk| content << chunk }
+      end
+    end
+  end
+end

data/lib/ftpmvc/string_input.rb

@@ -0,0 +1,14 @@
+module FTPMVC
+  class StringInput
+
+    include Input
+    
+    def initialize(s)
+      @s = s
+    end
+
+    def read
+      yield @s
+    end
+  end
+end

data/lib/ftpmvc/version.rb

@@ -1,3 +1,3 @@
 module FTPMVC
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/lib/ftpmvc.rb

@@ -5,3 +5,4 @@ require 'ftpmvc/application'
 require 'ftpmvc/format'
 require 'ftpmvc/authenticator'
 require 'ftpmvc/logger'
+require 'ftpmvc/input'

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

@@ -59,12 +59,12 @@ describe FTPMVC::Filter::FilesystemAccess do
   end
 
   describe '#put' do
-    let(:stream) { double('stream') }
+    let(:input) { double('input') }
     it 'forwards to directory' do
       expect_any_instance_of(MusicDirectory)
         .to receive(:put)
-        .with 'songs.txt', stream
-      filter.put('/music/songs.txt', stream)
+        .with 'songs.txt', input
+      filter.put('/music/songs.txt', input)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ftpmvc
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.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
@@ -142,8 +142,11 @@ files:
 - lib/ftpmvc/ftpd.rb
 - lib/ftpmvc/ftpd/driver.rb
 - lib/ftpmvc/ftpd/file_system.rb
+- lib/ftpmvc/ftpd/input.rb
+- lib/ftpmvc/input.rb
 - lib/ftpmvc/logger.rb
 - lib/ftpmvc/server.rb
+- lib/ftpmvc/string_input.rb
 - lib/ftpmvc/test_helpers.rb
 - lib/ftpmvc/version.rb
 - spec/integration/authentication_spec.rb