ftpmvc 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db6918bfb3978caecece0f47529a1e836dac2dfb
-  data.tar.gz: 79a3e106de3a7e3a80d0845804b3e84b59af5f9e
+  metadata.gz: bf2e9baaad49d9a071156187fb937b34bad1034a
+  data.tar.gz: 8af18d576a62518dc608c109b0a1714857d7c864
 SHA512:
-  metadata.gz: c601daf5f12119af5952dae5a1d2ad1b6f9468feea6c9895c405899263fb7bbbd8b6ff8babcd8d46a2b62f22c3aaa5c24922e9ffc5a1733c8cacf4b519493574
-  data.tar.gz: 15c01d4753f94966c89878047aa6894ec82f912fa231d8f174a9f0a45d25c2241fc4ed5ab2351db1c9d606299796ca5aa09ad889fe79d7f05446cea95cef077d
+  metadata.gz: 48e3c95a03c80d3765ca612b176a68e28eadebd76d3b6c55164947324edc253bcc2657699e614a96525e3164c2357380d9b2cb9309c867a3a4980e14ae88487f
+  data.tar.gz: 5c232bcd9e543591d318431a41abf286763717a2879267ca6152a867e229787468139b2d47b5c84a15c8aec9b9a2429130d55ed601d6b5ab0749b746cdaf281a

data/ftpmvc.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "terminal-notifier-guard"
   spec.add_development_dependency "codeclimate-test-reporter"
-  spec.add_dependency "em-ftpd"
+  spec.add_dependency "ftpd"
   spec.add_dependency "activesupport"
 end

data/lib/ftpmvc/access_filesystem_filter.rb

@@ -12,12 +12,12 @@ module FTPMVC
       @fs.resolve(path).index
     end
 
-    def size(path)
-      @fs.resolve(::File.dirname(path)).size(::File.basename(path))
+    def directory?(path)
+      @fs.resolve(path).kind_of?(Directory)
     end
 
-    def directory?(path)
-      @fs.directory?(path)
+    def exists?(path)
+      not @fs.resolve(path).nil?
     end
   end
 end

data/lib/ftpmvc/application.rb

@@ -8,7 +8,7 @@ module FTPMVC
   class Application
     extend Forwardable
 
-    def_delegators :@filter_chain, :index, :size, :get, :directory?
+    def_delegators :@filter_chain, :index, :get, :directory?, :exists?
     def_delegators :auth, :authenticate
 
     def initialize(&block)

data/lib/ftpmvc/directory.rb

@@ -11,16 +11,6 @@ module FTPMVC
       instance_eval(&block) if block_given?
     end
 
-    def size(path)
-      io = get(path)
-      return nil if io.nil?
-      total_size = 0
-      while buffer = io.read(1024)
-        total_size += buffer.size
-      end
-      total_size
-    end
-
     def get(path)
       file = resolve(path)
       file ? file.data : nil
@@ -42,10 +32,6 @@ module FTPMVC
       directory_class(name).new(name, &block)
     end
 
-    def directory?(path)
-      resolve(path).kind_of?(Directory)
-    end
-
     protected
 
     def directory(name, &block)

data/lib/ftpmvc/filter.rb

@@ -4,7 +4,7 @@ module FTPMVC
   class Filter
     extend Forwardable
 
-    def_delegators :@chain, :index, :size, :get, :directory?
+    def_delegators :@chain, :index, :get, :directory?, :exists?
 
     def initialize(fs, chain, options={})
       @fs, @chain, @options = fs, chain, options

data/lib/ftpmvc/ftpd.rb

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

data/lib/ftpmvc/ftpd/driver.rb

@@ -0,0 +1,20 @@
+require 'ftpmvc/ftpd/file_system'
+
+module FTPMVC
+  module Ftpd
+    class Driver
+      def initialize(application)
+        @application = application
+      end
+
+      def authenticate(username, password)
+        @application.authenticate(username, password)
+      end
+
+      def file_system(username)
+        FileSystem.new(@application)
+      end
+
+    end
+  end
+end

data/lib/ftpmvc/ftpd/file_system.rb

@@ -0,0 +1,41 @@
+module FTPMVC
+  module Ftpd
+    class FileSystem
+      def initialize(application)
+        @application = application
+      end
+
+      def dir(path)
+        @application.index(path[/^[^*]*/]).map { |node| ::File.join(path, node.name) }
+      end
+
+      def directory?(path)
+        @application.directory?(path)
+      end
+
+      def read(path)
+        yield @application.get(path)
+      end
+
+      def accessible?(path)
+        true
+      end
+
+      def exists?(path)
+        @application.exists?(path)
+      end
+
+      def file_info(path)
+        ::Ftpd::FileInfo.new(
+          :ftype => directory?(path) ? 'directory' : 'file',
+          :group => 'nogroup',
+          :mode => 0777,
+          :mtime => Time.now,
+          :nlink => 33,
+          :owner => 'nobody',
+          :path => path,
+          :size => 0)
+      end
+    end
+  end
+end

data/lib/ftpmvc/server.rb

@@ -1,5 +1,5 @@
-require 'em-ftpd'
-require 'ftpmvc/driver'
+require 'ftpd'
+require 'ftpmvc/ftpd'
 
 module FTPMVC
   class Server
@@ -11,30 +11,25 @@ module FTPMVC
     end
 
     def start_in_new_thread(application)
-      queue = Queue.new
-      server_thread = Thread.new do
-        begin
-          start(application) do |server|
-            queue << server
-          end
-        rescue => e
-          $strerr.puts "Server error: #{e.class}: #{e.message}"
-        end
-      end
-      queue.pop
+      driver = Ftpd::Driver.new(application)
+      @server = ::Ftpd::FtpServer.new(driver)
+      @server.interface, @server.port = @address, @port
+      @server.start
+      @port = @server.bound_port
+      self
     end
 
     def start(application)
-      EM.epoll
-      EM::run do
-        @signature = EM::start_server(@host, @port, EM::FTPD::Server, Driver, application)
-        @port = Socket.unpack_sockaddr_in(EM.get_sockname(@signature)).first
-        yield self if block_given?
-      end
+      start_in_new_thread(application)
+      yield self if block_given?
+      # Manter o instance_variable_get até o pull request #29 ser aprovado
+      # o uma nova versão ficar disponível.
+      @server.instance_variable_get(:@server_thread).join
+      # @server.join
     end
     
     def stop
-      EM.stop_server(@signature)
+      @server.stop
     end
   end
 end

data/lib/ftpmvc/test_helpers.rb

@@ -11,7 +11,7 @@ module FTPMVC
           ftp.connect('127.0.0.1', server.port)
           yield ftp
         ensure
-          ftp.close
+          ftp.close rescue nil
         end
       ensure
         server.stop

data/lib/ftpmvc/version.rb

@@ -1,3 +1,3 @@
 module FTPMVC
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/spec/integration/operation_spec.rb

@@ -1,11 +1,12 @@
 require './spec/spec_helper'
-require 'ftpmvc/application'
+
+require 'ftpmvc'
 
 describe 'Operation' do
   before do
     music_directory_class = Class.new(FTPMVC::Directory) do
-      def size(path)
-        69
+      def index
+        [ FTPMVC::File.new('pink_floyd.mp3') ]
       end
 
       def get(path)
@@ -39,19 +40,35 @@ describe 'Operation' do
     end
   end
   describe 'SIZE' do
-    it 'checks if directory exists' do
+    it 'is the file size' do
       with_application(app) do |ftp|
         ftp.login
-        expect(ftp.size('/music/pink_floyd.mp3')).to eq 69
+        expect(ftp.size('/music/pink_floyd.mp3')).to eq 7
       end
     end
   end
   describe 'GET' do
-    it 'checks if directory exists' do
+    it 'is the file content' do
       with_application(app) do |ftp|
         ftp.login
         expect(get(ftp, '/music/pink_floyd.mp3')).to eq 'content'
       end
     end
   end
+  describe 'GET' do
+    it 'is the file content' do
+      with_application(app) do |ftp|
+        ftp.login
+        expect(get(ftp, '/music/pink_floyd.mp3')).to eq 'content'
+      end
+    end
+  end
+  describe 'MDTM' do
+    it 'is the modification time of a file' do
+      with_application(app) do |ftp|
+        ftp.login
+        expect(ftp.mdtm('/music/pink_floyd.mp3')).to be_a_kind_of String
+      end
+    end
+  end
 end

data/spec/lib/ftpmvc/access_filesystem_filter_spec.rb

@@ -57,19 +57,4 @@ describe FTPMVC::AccessFilesystemFilter do
         .to eq 'Pink Floyd'
     end
   end
-
-  describe '#bytes' do
-    before do
-      allow_any_instance_of(MusicDirectory)
-        .to receive(:get).with('songs.txt')
-        .and_return StringIO.new('Pink Floyd')
-      allow_any_instance_of(MusicDirectory)
-        .to receive(:get).with('documents.txt')
-        .and_return nil
-    end
-    it 'is the return of the directory' do
-      expect(filter.size('/music/songs.txt'))
-        .to eq 10
-    end
-  end
 end

data/spec/lib/ftpmvc/directory_spec.rb

@@ -75,25 +75,6 @@ describe FTPMVC::Directory do
     end
   end
 
-  describe '#size' do
-    before do
-      allow(documents)
-        .to receive(:get).with('password.txt')
-        .and_return StringIO.new('12345678')
-      allow(documents)
-        .to receive(:get).with('users.txt')
-        .and_return nil
-    end
-    it 'is the size in bytes of #get return' do
-      expect(documents.size('password.txt')).to eq 8
-    end
-    context 'when #get returns nil' do
-      it 'is nil' do
-        expect(documents.size('users.txt')).to be_nil
-      end
-    end
-  end
-
   describe '#get' do
     let(:password_txt) { FTPMVC::File.new('password.txt') }
     before do

data/spec/lib/ftpmvc/server_spec.rb

@@ -1,6 +1,7 @@
 require './spec/spec_helper'
 
 require 'ftpmvc/server'
+require 'ftpmvc/directory'
 
 describe FTPMVC::Server do
   describe '#start' do

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ if ENV.include?('CODECLIMATE_REPO_TOKEN')
 end
 
 require 'ftpmvc/test_helpers'
+require 'active_support/dependencies'
 
 RSpec.configure do |config|
   config.include FTPMVC::TestHelpers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ftpmvc
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - André Aizim Kelmanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: em-ftpd
+  name: ftpd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -135,11 +135,13 @@ files:
 - lib/ftpmvc/authenticator/basic.rb
 - lib/ftpmvc/authenticator/promiscuous.rb
 - lib/ftpmvc/directory.rb
-- lib/ftpmvc/driver.rb
 - lib/ftpmvc/file.rb
 - lib/ftpmvc/filter.rb
 - lib/ftpmvc/format.rb
 - lib/ftpmvc/format/csv.rb
+- lib/ftpmvc/ftpd.rb
+- lib/ftpmvc/ftpd/driver.rb
+- lib/ftpmvc/ftpd/file_system.rb
 - lib/ftpmvc/server.rb
 - lib/ftpmvc/test_helpers.rb
 - lib/ftpmvc/version.rb
@@ -186,3 +188,4 @@ test_files:
 - spec/lib/ftpmvc/format/csv_spec.rb
 - spec/lib/ftpmvc/server_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/lib/ftpmvc/driver.rb

@@ -1,30 +0,0 @@
-require 'em-ftpd'
-require 'ftpmvc/directory'
-
-module FTPMVC
-  class Driver
-    def initialize(application)
-      @application = application
-    end
-
-    def dir_contents(path)
-      yield @application.index(path).map { |node| EM::FTPD::DirectoryItem.new(name: node.name) }
-    end
-
-    def authenticate(username, password)
-      yield @application.authenticate(username, password)
-    end
-
-    def change_dir(path)
-      yield @application.directory?(path)
-    end
-
-    def get_file(path)
-      yield @application.get(path)
-    end
-
-    def bytes(path)
-      yield @application.size(path)
-    end
-  end
-end