app.rb in ferver-1.2.0

- old
+ new
@@ -1,126 +1,67 @@
-require "sinatra"
-require "json"
-require "sinatra/base"
-require "ferver/file_list"
-require "ferver/file_id_request"
+require 'sinatra'
+require 'sinatra/base'
+require 'json'
+require_relative './directory_not_found_error'
+require_relative './configuration'
 
 module Ferver
   class App < Sinatra::Base
-
-    # Config
-    set :inline_templates, true
     set :app_file, __FILE__
 
-    # By default, serve files from current location when the gem 
-    #   binary is called.
-    DEFAULT_FILE_SERVER_DIR_PATH = "./"
+    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")
+    get '/' do
+      redirect to('/files')
     end
 
-    # list files; repond as html or json
-    # /files
-    get "/files" do
-      file_list = @ferver_list.files
-
-      if request.preferred_type.to_s == "application/json"
+    # list files
+    get '/files' do
+      if request.preferred_type.to_s == 'application/json'
         content_type :json
 
-        file_list.to_json
+        ferver_list.all.to_json
       else
-        @file_count = @ferver_list.file_count
-        @ferver_path = File.expand_path(get_current_ferver_path)
-        @file_list = file_list
-
-        erb :file_list_view
+        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
-    # /files/:id
-    get "/files/:id" do
-      id_request = Ferver::FileIdRequest.new(params[:id])
+    get '/files/:id' do
+      halt(400, 'Bad request') unless valid_file_request?
 
-      halt(400, "Bad request") unless id_request.valid?
-      
-      if @ferver_list.file_id_is_valid?(id_request.value)
-        file_name = @ferver_list.file_by_id(id_request.value)
-        file = FileList.path_for_file(get_current_ferver_path, file_name)
+      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))
+        send_file(file, disposition: 'attachment', filename: File.basename(file))
       else
         status 404
       end
     end
 
-
-    # Find all files in `Ferver` directory. 
-    # !Called before each request
-    #
-    before do
-      begin
-        @ferver_list = FileList.new(get_current_ferver_path)
-      rescue DirectoryNotFoundError
-        halt(500, "Ferver: Directory '#{get_current_ferver_path}' not found.")
-      end
-      
-    end
-
     private
 
-      # Return the absolute path to the directory Ferver is serving files from.
-      # This can be specified in Sinatra configuration; 
-      #   i.e. `Ferver::App.set :ferver_path, ferver_path` or the default if nil
-      #
-      def get_current_ferver_path
-        @current_ferver_path ||= begin
-          path = nil
+    attr_reader :ferver_list
 
-          if settings.respond_to?(:ferver_path) and settings.ferver_path
-            path = settings.ferver_path
-          else
-            path = DEFAULT_FILE_SERVER_DIR_PATH
-          end
-        end
-      end
+    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
-
-
-
-__END__
- 
-@@file_list_view
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title>File List &middot; Ferver</title>
-  </head>
-  <body>
-    <h3>Files served:</h3>
-    <ul>
-      <% @file_list.each_with_index do |file_name, index| %>
-
-        <li><a href="/files/<%= index %>"><%= file_name %></a></li>
-
-      <% end %>
-
-    </ul>
-
-    <p><%= @file_count %> files served from: <%= @ferver_path %></p>
-
-    <hr>
-
-    <p>Served by <a href="https://github.com/rob-murray/ferver" title="Ferver: A simple Ruby app serving files over HTTP">Ferver</a> gem v<%= Ferver::VERSION %></p>
-
-  </body>
-</html>
-
-<html>
-<body>
\ No newline at end of file