ftpmvc 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1ce45b7b3c0fff939bd7cc90a3806c70b41eb18
-  data.tar.gz: 45757c6f7f22060f65a9862bb965e0800df7f937
+  metadata.gz: 6696ff1bddf6f75d9672d0204132a12796e3fba9
+  data.tar.gz: b15c4843e0990bdbafd9798d25c5e0ab38237c83
 SHA512:
-  metadata.gz: 454896b3e3856d5ab9dc01035d002acb2d9b5962c424574e1e77fe621b86e48ff4dd5fe1c7ebb71124e6b9d317d1e2c04292951328a717e3af4c7e83adf31482
-  data.tar.gz: ff6da3c34fa074407dce7f2601ad0445b73b6002ce31fed4f05feab0a9096df96be7bdd66b9611cf9b9b3b853cdfbffa50cabb5f975ff43b608ed1265c53af32
+  metadata.gz: 728265569fd9b89de5813500922b834e767708b4b2627f75527f281d632aab7516a68a91da2c367ebbd1438f15e510625358f0e1ab6dfa2ed9babaa508badce7
+  data.tar.gz: 9b11c9548e0d017e567f56ff2f219a0a7e6fdb98033fdb3f8e570c2d047fc611ca58669d404d18e5a21a70010391df6dbc71fec182f0d1630f86b92c4d40ab0c

data/lib/ftpmvc/application.rb

@@ -1,7 +1,6 @@
 require 'forwardable'
 require 'ftpmvc/directory'
-require 'ftpmvc/filter'
-require 'ftpmvc/access_filesystem_filter'
+require 'ftpmvc/filter/filesystem_access'
 require 'ftpmvc/authenticator/promiscuous'
 
 module FTPMVC
@@ -14,7 +13,7 @@ module FTPMVC
 
     def initialize(&block)
       @fs = Directory.new('/')
-      @filter_chain = AccessFilesystemFilter.new(@fs, nil)
+      @filter_chain = Filter::FilesystemAccess.new(@fs, nil)
       instance_eval(&block) if block_given?
     end
 
@@ -33,8 +32,11 @@ module FTPMVC
       @exception_handler = block
     end
 
-    def filter(filter_class, options={})
-      @filter_chain = filter_class.new(@fs, @filter_chain, options)
+    def filter(filter, options={})
+      if filter.kind_of?(Symbol)
+        filter = FTPMVC::Filter.const_get(filter.to_s.camelize)
+      end
+      @filter_chain = filter.new(@fs, @filter_chain, options)
     end
 
     def authenticator(authenticator, options={})

data/lib/ftpmvc/filter/base.rb

@@ -0,0 +1,15 @@
+require 'forwardable'
+
+module FTPMVC
+  module Filter
+    class Base
+      extend Forwardable
+
+      def_delegators :@chain, :index, :get, :directory?, :exists?, :put
+
+      def initialize(fs, chain, options={})
+        @fs, @chain, @options = fs, chain, options
+      end
+    end
+  end
+end

data/lib/ftpmvc/filter/filesystem_access.rb

@@ -0,0 +1,29 @@
+require 'ftpmvc/directory'
+require 'ftpmvc/filter/base'
+
+module FTPMVC
+  module Filter
+    class FilesystemAccess < FTPMVC::Filter::Base
+      
+      def get(path)
+        @fs.resolve(::File.dirname(path)).get(::File.basename(path))
+      end
+
+      def index(path)
+        @fs.resolve(path).index
+      end
+
+      def directory?(path)
+        @fs.resolve(path).kind_of?(Directory)
+      end
+
+      def exists?(path)
+        not @fs.resolve(path).nil?
+      end
+
+      def put(path, stream)
+        @fs.resolve(::File.dirname(path)).put(::File.basename(path), stream)
+      end
+    end
+  end
+end

data/lib/ftpmvc/version.rb

@@ -1,3 +1,3 @@
 module FTPMVC
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/spec/lib/ftpmvc/application_spec.rb

@@ -3,19 +3,20 @@ require './spec/spec_helper'
 require 'ftpmvc/application'
 require 'ftpmvc/file'
 require 'ftpmvc/authenticator/basic'
+require 'ftpmvc/filter/base'
 
 describe FTPMVC::Application do
   describe '#filter' do
     before do
-      stub_const 'FooFilter', Class.new(FTPMVC::Filter)
-      allow_any_instance_of(FooFilter)
+      stub_const 'FTPMVC::Filter::Foo', Class.new(FTPMVC::Filter::Base)
+      allow_any_instance_of(FTPMVC::Filter::Foo)
         .to receive(:index)
         .and_return [ foo_file ]
     end
     let(:foo_file) { FTPMVC::File.new('foo') }
     let(:application) do
       FTPMVC::Application.new do
-        filter FooFilter
+        filter FTPMVC::Filter::Foo
         filesystem do
           directory :music
         end
@@ -27,7 +28,7 @@ describe FTPMVC::Application do
     context 'when filter chains' do
       let(:application) do
         FTPMVC::Application.new do
-          filter FTPMVC::Filter
+          filter FTPMVC::Filter::Base
           filesystem do
             directory :music
           end
@@ -37,6 +38,26 @@ describe FTPMVC::Application do
         expect(application.index('/').first.name).to eq 'music'
       end
     end
+    context 'when a symbol is given' do
+      let(:application) do
+        FTPMVC::Application.new do
+          filter :foo
+        end
+      end
+      it 'initializes a class on FTPMVC::Filter with given options' do
+        expect(application.index('/')).to eq [ foo_file ]
+      end
+    end
+    context 'when a class is given' do
+      let(:application) do
+        FTPMVC::Application.new do
+          filter FTPMVC::Filter::Foo
+        end
+      end
+      it 'initializes that class with given options' do
+        expect(application.index('/')).to eq [ foo_file ]
+      end
+    end
   end
 
   describe '#authenticator' do

data/spec/lib/ftpmvc/{access_filesystem_filter_spec.rb → filter/filesystem_access.rb}

@@ -1,15 +1,15 @@
 require './spec/spec_helper'
 
-require 'ftpmvc/access_filesystem_filter'
+require 'ftpmvc/filter/filesystem_access'
 require 'ftpmvc/file'
 
-describe FTPMVC::AccessFilesystemFilter do
+describe FTPMVC::Filter::FilesystemAccess do
   let(:filesystem) do
     FTPMVC::Directory.new('/') do
       directory :music
     end
   end
-  let(:filter) { FTPMVC::AccessFilesystemFilter.new(filesystem, nil) }
+  let(:filter) { FTPMVC::Filter::FilesystemAccess.new(filesystem, nil) }
   before do
     stub_const 'MusicDirectory', Class.new(FTPMVC::Directory)
   end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: ftpmvc
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - André Aizim Kelmanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-05 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: terminal-notifier-guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ftpd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: FTP MVC framework
@@ -115,9 +115,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -129,14 +129,14 @@ files:
 - examples/env/env_file.rb
 - ftpmvc.gemspec
 - lib/ftpmvc.rb
-- lib/ftpmvc/access_filesystem_filter.rb
 - lib/ftpmvc/application.rb
 - lib/ftpmvc/authenticator.rb
 - lib/ftpmvc/authenticator/basic.rb
 - lib/ftpmvc/authenticator/promiscuous.rb
 - lib/ftpmvc/directory.rb
 - lib/ftpmvc/file.rb
-- lib/ftpmvc/filter.rb
+- lib/ftpmvc/filter/base.rb
+- lib/ftpmvc/filter/filesystem_access.rb
 - lib/ftpmvc/format.rb
 - lib/ftpmvc/format/csv.rb
 - lib/ftpmvc/ftpd.rb
@@ -148,10 +148,10 @@ files:
 - lib/ftpmvc/version.rb
 - spec/integration/authentication_spec.rb
 - spec/integration/operation_spec.rb
-- spec/lib/ftpmvc/access_filesystem_filter_spec.rb
 - spec/lib/ftpmvc/application_spec.rb
 - spec/lib/ftpmvc/authenticator/basic_spec.rb
 - spec/lib/ftpmvc/directory_spec.rb
+- spec/lib/ftpmvc/filter/filesystem_access.rb
 - spec/lib/ftpmvc/format/csv_spec.rb
 - spec/lib/ftpmvc/server_spec.rb
 - spec/spec_helper.rb
@@ -165,12 +165,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -182,10 +182,10 @@ summary: FTP MVC framework
 test_files:
 - spec/integration/authentication_spec.rb
 - spec/integration/operation_spec.rb
-- spec/lib/ftpmvc/access_filesystem_filter_spec.rb
 - spec/lib/ftpmvc/application_spec.rb
 - spec/lib/ftpmvc/authenticator/basic_spec.rb
 - spec/lib/ftpmvc/directory_spec.rb
+- spec/lib/ftpmvc/filter/filesystem_access.rb
 - spec/lib/ftpmvc/format/csv_spec.rb
 - spec/lib/ftpmvc/server_spec.rb
 - spec/spec_helper.rb

data/lib/ftpmvc/access_filesystem_filter.rb

@@ -1,27 +0,0 @@
-require 'ftpmvc/directory'
-require 'ftpmvc/filter'
-
-module FTPMVC
-  class AccessFilesystemFilter < FTPMVC::Filter
-    
-    def get(path)
-      @fs.resolve(::File.dirname(path)).get(::File.basename(path))
-    end
-
-    def index(path)
-      @fs.resolve(path).index
-    end
-
-    def directory?(path)
-      @fs.resolve(path).kind_of?(Directory)
-    end
-
-    def exists?(path)
-      not @fs.resolve(path).nil?
-    end
-
-    def put(path, stream)
-      @fs.resolve(::File.dirname(path)).put(::File.basename(path), stream)
-    end
-  end
-end

data/lib/ftpmvc/filter.rb

@@ -1,13 +0,0 @@
-require 'forwardable'
-
-module FTPMVC
-  class Filter
-    extend Forwardable
-
-    def_delegators :@chain, :index, :get, :directory?, :exists?, :put
-
-    def initialize(fs, chain, options={})
-      @fs, @chain, @options = fs, chain, options
-    end
-  end
-end