ferver 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d2f0cc442e5c638817dbd7465cac6033cbafa38
-  data.tar.gz: 3344fc4b12b37de5ec6e08da1694c093172a6bbe
+  metadata.gz: e42a62e59a7371617918ea1c1a52702b6765ade1
+  data.tar.gz: 7144fe5b0a7167319a4f1837980f55796fabb554
 SHA512:
-  metadata.gz: 98f244dec47ab5c2dd7cd9d1ac687115763a63872622d03dd602d002125d38169210af42d66ad1eb3b8bd53d0edb72e068cf2cd7a7363debd62be2f57ce7f1b1
-  data.tar.gz: a111d09816eefba4e1da78e7e5af7d7172d6526d5cb14988dca5b4d6d8d4f27c54a4005963b937ec4d10bead859cc9c536e2f20015342fc55f10b3fa7cf0c11a
+  metadata.gz: 1d3ee2dfde1b61732967fc3cd2011702dec256256ae73dd3110c956588fdbb39f954b44c3dc0f5798c04597309d8f306d3f72caa8fabc49a731ba864ab17cc04
+  data.tar.gz: 7c658dfd826f29d134eb31fe0eb56a3973e5860c72446826cf3a7674e91063681a518a5adc1db1fb44b9940c19d27984773f5fd5258706cff0083118faecca79

data/CHANGELOG.md

@@ -0,0 +1,87 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+## 1.2.1 - 2014-11-14 - XX
+
+### Added
+
+- State minimum Ruby version
+
+### Deprecated
+- Nothing.
+
+### Removed
+- Nothing.
+
+
+## 1.2.0 - 2014-06-15 - 72dc58b
+
+### Added
+- Use named command line arguments.
+- `Rake s` alias of `Rake server`.
+- Testing on `Ruby 2.1.1`.
+
+### Deprecated
+- Nothing.
+
+### Removed
+- Nothing.
+
+### Fixed
+- Code refactoring.
+
+## 1.1.0 - 2014-03-18 - 59d6ddf
+
+### Added
+- Run **Sinatra** in production mode when started from `bin/`.
+
+### Deprecated
+- Nothing.
+
+### Removed
+- Nothing.
+
+### Fixed
+- #7 : Crash when directory does not exist.
+
+## 1.0.0 - 2014-03-08 - 0522648
+
+### Added
+- Redesign `Ferver` into a **Rubygem**.
+
+### Deprecated
+- Nothing.
+
+### Removed
+- Nothing.
+
+### Fixed
+- Nothing.
+
+## 1.0.0-beta - 2014-01-31 - 8f27a55
+
+### Added
+- Nothing.
+
+### Deprecated
+- Nothing.
+
+### Removed
+- Nothing.
+
+### Fixed
+- Negotiate `content-type` vai HTTP Accept request header.
+
+## 0.9.0-beta - 2014-01-28 - 09a7504
+
+### Added
+- Initial release.
+
+### Deprecated
+- Nothing.
+
+### Removed
+- Nothing.
+
+### Fixed
+- Nothing.

data/README.md

@@ -75,7 +75,7 @@ curl -i -H "Accept: application/json" http://localhost:4567/files
 
 #### Download a file
 
-Files are available via their index in the list, e.g. `http://localhost:4567/files/:id`
+Files are available via their zero based index in the list, e.g. `http://localhost:4567/files/:id`
 
 For example to download file appearing third in the list displayed earlier, request `http://localhost:4567/files/2`
 

data/ferver.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q(Ferver is a super, simple ruby gem to serve files over http; useful as a basic file server to quickly share files on your local network.)
   spec.homepage      = 'https://github.com/rob-murray/ferver'
   spec.license       = 'MIT'
+  spec.required_ruby_version = '>= 1.9.3'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/lib/ferver.rb

@@ -1,4 +1,5 @@
 require_relative 'ferver/app'
+require_relative 'ferver/controller'
 require_relative 'ferver/configuration'
 require_relative 'ferver/directory_not_found_error'
 require_relative 'ferver/file_id_request'
@@ -6,8 +7,6 @@ require_relative 'ferver/file_list'
 require_relative 'ferver/version'
 
 module Ferver
-  autoload :App, 'ferver/app'
-
   # By default, serve files from current location when the gem is called.
   DEFAULT_FILE_SERVER_DIR_PATH = './'
 

data/lib/ferver/app.rb

@@ -1,67 +1,15 @@
 require 'sinatra'
 require 'sinatra/base'
-require 'json'
-require_relative './directory_not_found_error'
-require_relative './configuration'
+require_relative './controller'
 
 module Ferver
-  class App < Sinatra::Base
+  class App < Sinatra::Application
     set :app_file, __FILE__
 
-    before do
-      @ferver_list = FileList.new(current_ferver_path)
+    configure do
+      set :views, './views'
     end
 
-    error Ferver::DirectoryNotFoundError do
-      halt 500, "Ferver: Directory '#{current_ferver_path}' not found."
-    end
-
-    # redirect to file list
-    get '/' do
-      redirect to('/files')
-    end
-
-    # list files
-    get '/files' do
-      if request.preferred_type.to_s == 'application/json'
-        content_type :json
-
-        ferver_list.all.to_json
-      else
-        erb :index, locals: { file_list: ferver_list.all,
-                              ferver_path: File.expand_path(current_ferver_path),
-                              file_count: ferver_list.size }
-      end
-    end
-
-    # download file
-    get '/files/:id' do
-      halt(400, 'Bad request') unless valid_file_request?
-
-      if ferver_list.file_id_is_valid?(file_id_request.value)
-        file_name = ferver_list.file_by_id(file_id_request.value)
-        file = FileList.path_for_file(current_ferver_path, file_name)
-
-        send_file(file, disposition: 'attachment', filename: File.basename(file))
-      else
-        status 404
-      end
-    end
-
-    private
-
-    attr_reader :ferver_list
-
-    def file_id_request
-      @file_id_request ||= FileIdRequest.new(params[:id])
-    end
-
-    def valid_file_request?
-      file_id_request.valid?
-    end
-
-    def current_ferver_path
-      Ferver.configuration.directory_path
-    end
+    use Controller
   end
 end

data/lib/ferver/controller.rb

@@ -0,0 +1,65 @@
+require 'sinatra'
+require 'sinatra/base'
+require 'json'
+require_relative './directory_not_found_error'
+require_relative './configuration'
+
+module Ferver
+  class Controller < Sinatra::Base
+    before do
+      @ferver_list = FileList.new(current_ferver_path)
+    end
+
+    error Ferver::DirectoryNotFoundError do
+      halt 500, "Ferver: Directory '#{current_ferver_path}' not found."
+    end
+
+    # redirect to file list
+    get '/' do
+      redirect to('/files')
+    end
+
+    # list files
+    get '/files' do
+      if request.preferred_type.to_s == 'application/json'
+        content_type :json
+
+        ferver_list.all.to_json
+      else
+        erb :index, locals: { file_list: ferver_list.all,
+                              ferver_path: File.expand_path(current_ferver_path),
+                              file_count: ferver_list.size }
+      end
+    end
+
+    # download file
+    get '/files/:id' do
+      halt(400, 'Bad request') unless valid_file_request?
+
+      if ferver_list.file_id_valid?(file_id_request.value)
+        file_name = ferver_list.file_by_id(file_id_request.value)
+        file = FileList.path_for_file(current_ferver_path, file_name)
+
+        send_file(file, disposition: 'attachment', filename: File.basename(file))
+      else
+        status 404
+      end
+    end
+
+    private
+
+    attr_reader :ferver_list
+
+    def file_id_request
+      @file_id_request ||= FileIdRequest.new(params[:id])
+    end
+
+    def valid_file_request?
+      file_id_request.valid?
+    end
+
+    def current_ferver_path
+      Ferver.configuration.directory_path
+    end
+  end
+end

data/lib/ferver/file_list.rb

@@ -5,9 +5,10 @@ require 'forwardable'
 module Ferver
   class FileList
     extend Forwardable
-    def_delegators :@files, :size, :each
     include Enumerable
 
+    def_delegators :@files, :size, :each
+
     # Create a new instance with a path
     #
     def initialize(path)
@@ -27,7 +28,7 @@ module Ferver
 
     # Is the file id a valid id for Ferver to serve
     #
-    def file_id_is_valid?(file_id)
+    def file_id_valid?(file_id)
       file_id < files.size
     end
 

data/lib/ferver/version.rb

@@ -1,3 +1,3 @@
 module Ferver
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/spec/ferver_spec.rb

@@ -149,7 +149,7 @@ describe 'ferver' do
 
       context 'when requesting a file out of range' do
         before do
-          allow(file_list).to receive(:file_id_is_valid?).with(3).and_return(false)
+          allow(file_list).to receive(:file_id_valid?).with(3).and_return(false)
           get '/files/3'
         end
 

data/spec/file_list_spec.rb

@@ -116,12 +116,12 @@ describe Ferver::FileList do
     context 'when requesting valid file_id' do
       # TODO: possible to redesign this
 
-      it '#file_id_is_valid? should return true for first file' do
-        expect(subject.file_id_is_valid?(0)).to be_truthy
+      it '#file_id_valid? should return true for first file' do
+        expect(subject.file_id_valid?(0)).to be_truthy
       end
 
-      it '#file_id_is_valid? should return true for second file' do
-        expect(subject.file_id_is_valid?(1)).to be_truthy
+      it '#file_id_valid? should return true for second file' do
+        expect(subject.file_id_valid?(1)).to be_truthy
       end
 
       it '#file_by_id should return the correct file for the first file' do
@@ -135,7 +135,7 @@ describe Ferver::FileList do
 
     context 'when requesting invalid file_id' do
       it 'should return false for invalid file_id' do
-        expect(subject.file_id_is_valid?(2)).to be_falsey
+        expect(subject.file_id_valid?(2)).to be_falsey
       end
 
       it 'should raise_error if file_by_id is called' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ferver
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Rob Murray
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-15 00:00:00.000000000 Z
+date: 2014-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -149,6 +149,7 @@ files:
 - ".rspec"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -158,6 +159,7 @@ files:
 - lib/ferver.rb
 - lib/ferver/app.rb
 - lib/ferver/configuration.rb
+- lib/ferver/controller.rb
 - lib/ferver/directory_not_found_error.rb
 - lib/ferver/file_id_request.rb
 - lib/ferver/file_list.rb
@@ -180,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -188,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: A simple web app to serve files over HTTP.