ftpmvc 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6696ff1bddf6f75d9672d0204132a12796e3fba9
-  data.tar.gz: b15c4843e0990bdbafd9798d25c5e0ab38237c83
+  metadata.gz: 5bc917bf062bc477474a6f8b1376c79689e04902
+  data.tar.gz: 8f254536940d5ee5ddd35e095083f5fff1c1e21e
 SHA512:
-  metadata.gz: 728265569fd9b89de5813500922b834e767708b4b2627f75527f281d632aab7516a68a91da2c367ebbd1438f15e510625358f0e1ab6dfa2ed9babaa508badce7
-  data.tar.gz: 9b11c9548e0d017e567f56ff2f219a0a7e6fdb98033fdb3f8e570c2d047fc611ca58669d404d18e5a21a70010391df6dbc71fec182f0d1630f86b92c4d40ab0c
+  metadata.gz: e33c6c0b4452e338d183fa1fd9152ff9fd7a8051b4e26b38ac7a2a898c13b9d9eb68afd169442b4b678d2cb91977356b9c4496fab7753982613332bff4dc6357
+  data.tar.gz: 94bdfacbedaa060c50846bfb75159912fa08017b0b5a2eff35b57d6413c4ada58d84731a4942db08704a18b8923dbeca54ba4e4a019ce1996f8e3133e2c86b24

data/lib/ftpmvc/application.rb

@@ -12,7 +12,7 @@ module FTPMVC
     def_delegators :auth, :authenticate
 
     def initialize(&block)
-      @fs = Directory.new('/')
+      @fs = Directory.new
       @filter_chain = Filter::FilesystemAccess.new(@fs, nil)
       instance_eval(&block) if block_given?
     end

data/lib/ftpmvc/directory.rb

@@ -5,8 +5,8 @@ module FTPMVC
   class Directory
     attr_reader :name, :index
 
-    def initialize(name, &block)
-      @name = name.to_s
+    def initialize(options={}, &block)
+      @name = options[:name]
       @index = []
       instance_eval(&block) if block_given?
     end
@@ -16,10 +16,6 @@ module FTPMVC
       file ? file.data : nil
     end
 
-    def put(path, stream)
-      puts 'foooi!!!'
-    end
-
     def resolve(path)
       path = path.gsub(%r{^/}, '')
       return self if path.empty?
@@ -32,20 +28,40 @@ module FTPMVC
       end
     end
 
-    def self.build(name, &block)
-      directory_class(name).new(name, &block)
-    end
-
     protected
 
-    def directory(name, &block)
-      Directory.build(name, &block).tap do |directory|
-        @index << directory
+    def directory(*args, &block)
+      first_arg, second_arg = args
+      
+      if first_arg.kind_of?(self.class)
+        add_directory(first_arg)
+      else
+        if first_arg.kind_of?(Hash)
+          create_and_add_directory(self.class, first_arg, &block)
+        else
+          create_and_add_directory(first_arg, second_arg || {}, &block)
+        end
+      end
+    end
+
+    def create_and_add_directory(dir, options, &block)
+      if dir.kind_of?(Symbol)
+        options[:name] = options[:name] || dir.to_s
+        dir = symbol_to_class(dir)
       end
+      add_directory(create_directory(dir, options, &block))
+    end
+
+    def add_directory(dir)
+      dir.tap { |directory| @index << directory }
+    end
+
+    def create_directory(dir_class, options, &block)
+      dir_class.new(options, &block)
     end
 
-    def self.directory_class(name)
-      ActiveSupport::Dependencies.safe_constantize("#{name.to_s.camelize}Directory") || self
+    def symbol_to_class(symbol)
+      ActiveSupport::Dependencies.safe_constantize("#{symbol.to_s.camelize}Directory")
     end
   end
 end

data/lib/ftpmvc/version.rb

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

data/spec/lib/ftpmvc/application_spec.rb

@@ -18,7 +18,7 @@ describe FTPMVC::Application do
       FTPMVC::Application.new do
         filter FTPMVC::Filter::Foo
         filesystem do
-          directory :music
+          directory name: 'music'
         end
       end
     end
@@ -30,7 +30,7 @@ describe FTPMVC::Application do
         FTPMVC::Application.new do
           filter FTPMVC::Filter::Base
           filesystem do
-            directory :music
+            directory name: 'music'
           end
         end
       end

data/spec/lib/ftpmvc/directory_spec.rb

@@ -7,24 +7,14 @@ describe FTPMVC::Directory do
   before do
     stub_const 'DocumentsDirectory', Class.new(FTPMVC::Directory)
   end
-  let(:documents) { DocumentsDirectory.new('documents') }
-  describe '.build' do
-    context 'when there is a specific directory class' do
-      it 'is an instance this specific class' do
-        expect(FTPMVC::Directory.build(:documents)).to be_a DocumentsDirectory
-      end
-      it 'is an instance of DirectoryHandler' do
-        expect(FTPMVC::Directory.build(:music)).to be_a FTPMVC::Directory
-      end
-    end
-  end
+  let(:documents) { DocumentsDirectory.new(name: 'documents') }
   
   describe '#resolve' do
     before do
       stub_const 'ConfidentialDirectory', Class.new(FTPMVC::Directory)
       allow(documents)
         .to receive(:index)
-        .and_return [ FTPMVC::File.new('contract.doc'), ConfidentialDirectory.new('confidential') ]
+        .and_return [ FTPMVC::File.new('contract.doc'), ConfidentialDirectory.new(name: 'confidential') ]
       allow_any_instance_of(ConfidentialDirectory)
         .to receive(:index)
         .and_return [ FTPMVC::File.new('passwords.txt') ]
@@ -56,23 +46,60 @@ describe FTPMVC::Directory do
   end
 
   describe '#initialize' do
-    it 'converts name to string' do
-      expect(FTPMVC::Directory.new(:pictures).name).to eq 'pictures'
-    end
     it 'yields with instance_eval' do
       my_class = nil
-      FTPMVC::Directory.new('pictures') { my_class = self.class }
+      FTPMVC::Directory.new(name: 'pictures') { my_class = self.class }
       expect(my_class).to be FTPMVC::Directory
     end
   end
 
   describe '#directory' do
     it 'adds a Directory object to content' do
-      pictures = FTPMVC::Directory.new('pictures') do
-        directory :safari
+      pictures = FTPMVC::Directory.new(name: 'pictures') do
+        directory FTPMVC::Directory, name: 'safari'
       end
       expect(pictures.resolve('safari')).to be_a FTPMVC::Directory
     end
+    context 'when a symbol is given' do
+      it 'creates an instance of the directory based on that symnol' do
+        home = FTPMVC::Directory.new(name: 'home') do
+          directory :documents, name: 'documents'
+        end
+        expect(home.resolve('documents')).to be_a DocumentsDirectory
+      end
+    end
+    context 'when a class is given' do
+      it 'creates an instance of the given class' do
+        home = FTPMVC::Directory.new(name: 'home') do
+          directory DocumentsDirectory, name: 'documents'
+        end
+        expect(home.resolve('documents')).to be_a DocumentsDirectory
+      end
+    end
+    context 'when a symbol is given and name is not' do
+      it 'sets the name based on that symbol' do
+        home = FTPMVC::Directory.new(name: 'home') do
+          directory :documents
+        end
+        expect(home.resolve('documents')).to be_a DocumentsDirectory
+      end
+    end
+    context 'when no symbol or class is given' do
+      it 'creates a FTPMVC::Directory' do
+        pictures = FTPMVC::Directory.new(name: 'pictures') do
+          directory name: 'safari'
+        end
+        expect(pictures.resolve('safari')).to be_a FTPMVC::Directory
+      end
+    end
+    context 'when an instance of directory is given' do
+      it 'uses that instance' do
+        pictures = FTPMVC::Directory.new(name: 'pictures') do
+          directory FTPMVC::Directory.new(name: 'safari')
+        end
+        expect(pictures.resolve('safari')).to be_a FTPMVC::Directory
+      end
+    end
   end
 
   describe '#get' do

data/spec/lib/ftpmvc/server_spec.rb

@@ -7,7 +7,7 @@ describe FTPMVC::Server do
   describe '#start' do
     let(:server) { FTPMVC::Server.new('127.0.0.1', 0) }
     it 'starts the FTP server' do
-      server.start(FTPMVC::Directory.new('/')) do
+      server.start(FTPMVC::Directory.new) do
         begin
           socket = TCPSocket.new('127.0.0.1', server.port)
           socket.close

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: ftpmvc
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - André Aizim Kelmanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-02-24 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
@@ -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: []