handling error and test configuration

Author: subosito

.editorconfig

@@ -0,0 +1,10 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+

.simplecov

@@ -0,0 +1,6 @@
+SimpleCov.start do
+  add_filter '/test/'
+  add_filter '/bin/'
+
+  add_group 'Libraries', 'lib'
+end

lib/rubytus.rb

@@ -1,4 +1,5 @@
 require 'rubytus/version'
+require 'rubytus/error'
 require 'rubytus/handler'
 require 'rubytus/response'
 require 'rubytus/server'

lib/rubytus/configuration.rb

@@ -1,13 +1,38 @@
 module Rubytus
   class Configuration
-    attr_accessor :data_dir
-    attr_accessor :max_size
-    attr_accessor :base_path
-
-    def initialize
-      @data_dir  = ENV.fetch('TUSD_DATA_DIR', 'tus_data')
-      @max_size  = ENV.fetch('TUSD_DATASTORE_MAX_SIZE', 1024 * 1024 * 1024)
-      @base_path = ENV.fetch('TUSD_BASEPATH', '/files/')
+    attr_reader :data_dir
+    attr_reader :max_size
+    attr_reader :base_path
+
+    def initialize(options = {})
+      @data_dir  = options[:data_dir]  || ENV['TUSD_DATA_DIR']  || 'tus_data'
+      @base_path = options[:base_path] || ENV['TUSD_BASE_PATH'] || '/files/'
+      @max_size  = options[:max_size]  || ENV['TUSD_MAX_SIZE']  || 1024 * 1024 * 1024
+    end
+
+    def validate_data_dir
+      data_dir = File.expand_path(@data_dir)
+
+      begin
+        unless File.directory?(data_dir)
+          Dir.mkdir(data_dir)
+        end
+      rescue SystemCallError => _
+        raise PermissionError, "Couldn't create `data_dir` in #{data_dir}"
+      end
+
+      File.chmod(0777, data_dir)
+      @data_dir = data_dir
+    end
+
+    def validate_max_size
+      if @max_size.is_a? String
+        @max_size = @max_size.to_i
+      end
+
+      if @max_size <= 0
+        raise ConfigurationError, "Invalid `max_size`, it should be > 0 bytes"
+      end
     end
   end
 end

lib/rubytus/error.rb

@@ -0,0 +1,4 @@
+module Rubytus
+  class ConfigurationError < StandardError; end
+  class PermissionError < StandardError; end
+end

lib/rubytus/handler.rb

@@ -6,15 +6,6 @@ class Handler
 
     def initialize(configuration)
       @configuration = configuration
-      prepare
-    end
-
-    def prepare
-      # catch error if we can't make directory
-      unless File.directory?(configuration.data_dir)
-        Dir.mkdir(configuration.data_dir)
-        File.chmod(0777, configuration.data_dir)
-      end
     end
 
     def uid

lib/rubytus/server.rb

@@ -13,31 +13,36 @@ def call(env)
       @response = Rubytus::Response.new(body, status, header)
 
       if collection_path?
-        @response['Allow'] = 'POST'
-
         if @request.post?
           # create resource
+        else
+          @response['Allow'] = 'POST'
         end
       end
 
       if resource_path?
-        if @request.patch?
-          # continue previously uploaded file
-        end
-
         if @request.head?
           # fetch file metadata
+          # response: 200, Offset
+        end
+
+        if @request.patch?
+          # continue previously uploaded file
+          # request: Content-Length, Offset, (trim upload based on offset), Content-Type: application/offset+octet-stream
+          # response: 200
         end
 
         if @request.get?
           @response.write resource_path
         end
 
-        @response['Allow'] = 'HEAD,PATCH'
+        unless @request.head? or @request.patch? or @request.get?
+          @response['Allow'] = 'HEAD,PATCH'
+        end
       end
 
       # TODO: optimize!
-      unless collection_path? or resource_path?
+      if invalid_path?
         @response.status = 404
         @response.write('not found')
       end
@@ -65,6 +70,10 @@ def resource_path?
       resource_path =~ /^([a-z0-9]{32})$/
     end
 
+    def invalid_path?
+      !collection_path? || !resource_path?
+    end
+
     def resource_path
       path = @request.path
       path.slice!(@@configuration.base_path)

rubytus.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rack"
   spec.add_development_dependency "rack-test"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "simplecov"
 
   spec.add_runtime_dependency "rack"
   spec.add_runtime_dependency "puma"

test/rubytus/test_configuration.rb

@@ -0,0 +1,44 @@
+require 'test_helper'
+require 'fileutils'
+
+class TestConfiguration < MiniTest::Unit::TestCase
+  def test_initialize_with_options
+    configuration = Rubytus::Configuration.new(:base_path => '/uploads/')
+    assert_equal '/uploads/', configuration.base_path
+  end
+
+  def test_initialize_with_env
+    ENV['TUSD_BASE_PATH'] = '/uploads/'
+
+    configuration = Rubytus::Configuration.new
+    assert_equal '/uploads/', configuration.base_path
+  end
+
+  def test_validate_data_dir
+    random_name   = "/tmp/rubytus-#{rand(10000)}"
+    configuration = Rubytus::Configuration.new(:data_dir => random_name)
+    configuration.validate_data_dir
+
+    assert_equal true, File.directory?(configuration.data_dir)
+
+    FileUtils.rm_rf configuration.data_dir # cleanup
+  end
+
+  def test_validate_data_dir_permission_error
+    configuration = Rubytus::Configuration.new(:data_dir => '/opt/rubytus')
+    assert_raises(Rubytus::PermissionError) { configuration.validate_data_dir }
+  end
+
+  def test_validate_max_size_blank
+    configuration = Rubytus::Configuration.new(:max_size => '')
+    assert_raises(Rubytus::ConfigurationError) { configuration.validate_max_size }
+  end
+
+  def test_validate_max_size_with_env
+    ENV['TUSD_MAX_SIZE'] = '102400'
+
+    configuration = Rubytus::Configuration.new
+    configuration.validate_max_size
+    assert_equal 102400, configuration.max_size
+  end
+end

test/test_helper.rb

@@ -1,9 +1,11 @@
 ENV['RACK_ENV'] ||= 'test'
 
+require 'simplecov'
 require 'minitest/autorun'
 require 'turn/autorun'
 require 'rack'
 require 'rack/test'
+require 'pry'
 require 'rubytus'
 
 Turn.config do |c|