mountable_file_server 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc6b91b6cf9ef96d1231d0f403e7f468fd75d1f4
-  data.tar.gz: 9b00ac82aff5a58988d8154d91ccc8e465684d55
+  metadata.gz: 53f16655a84e2cec6640805c435f917ce77d482a
+  data.tar.gz: eaa590e6d805b01e5e488308a5bab98406c17732
 SHA512:
-  metadata.gz: f2a1ecd0b539c510c677273bf44fac23df744c0c48ee225c13ea8dd964e2a03bfa1f9f6fb1df61ba0857b6cbafd3a725ce5cfae96d8217d17baae991b3d71789
-  data.tar.gz: a3dbbe1fbcba59f7e70963827c17f1b506e151bc1f8c45a9300939c42aef5a5b457d8d8e15e10478e01498a00a64f6f1a400d47e0f0b5a81f77433e2a2e1c91d
+  metadata.gz: 2e1aae6f8f4547649c2b53af4f8771b6d15f393895e4a72eff662d7ae585d023efc06065639de25356f12b7da4608972c737259c1cb4dc25aaee0dab406f0a4e
+  data.tar.gz: beb7392313d97415fb62acc49073981dc9682d6eeb828a1b6dd1f8c5e57238fcc1e6263959fb0a4e10065d9d1e5292228167bbef0776545f6c32efb9a3384eb6

data/.travis.yml

@@ -1,3 +1,12 @@
 language: ruby
 rvm:
+  - 2.2.3
+  - 2.1.7
   - 2.0.0
+  - 1.9.3
+before_script:
+  - cd test/rails-dummy
+  - bundle exec rake db:create db:migrate
+  - cd ../../
+script:
+  - bundle exec rake test

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+# 0.0.2 - 24.08.2015
+* Internal refactorings.
+* Introduce `Adapter` class to have one point of contact.
+
+**Breaking Changes**
+* Files are stored under their full unique identifier in every storage.
+* Remove `Access` class.
+* Signature of `Storage` methods changed.

data/README.md

@@ -1,64 +1,108 @@
-The fundamental idea is that your application only deals with identifiers of uploaded files in string form. No need to handle files directly. It should not complicate testing. It should allow files that are publicly accessible and private files that are not. Uploads happen via Ajax without additional work on the application developers side. It allows easy customization and adaption of the file upload process on the frontend to give a good user experience.
+MountableFileServer was born out of my frustations with existing Ruby based file upload solutions. It is certainly not comparable with existing feature-rich plug-and-play solutions that are tied to Ruby on Rails.
 
-While it is possible to use in an Ruby on Rails application the gem itself does not depend on it and does not assume you use it.
+The fundamental idea is that your application should not be tied to files or handling the upload process. Instead this is handled by a dedicated server which can be run as independet process or be mounted inside your application. It accepts file uploads and returns an unique identifier for the file. This unique identifier is basically a string and the only thing your application has to remember in order to work with uploaded files.
 
-## Concept
-You mount a tiny Sinatra application, the `MountableFileServer::Endpoint`, at an URL path of your choosing. The endpoint accepts AJAX file uploads and can also deliver requested files that are already permanently stored. (Later on we take a closer look in which scenarios it makes sense to deliver file requests via the endpoint instead of your webserver.)
+* JavaScript function to upload files via AJAX.
+* JavaScript events regarding the uploads various states.
+* Uploaded files are stored on disk.
+* Filenames are unique and random sequences of charaters.
+* Uploaded files are stored temporary until they are explicitly moved to permanent storage by the application.
+* Uploaded files can be of public or private nature.
+* Private files can't be accessed via an URL.
 
-For every uploaded file the endpoint responds with an unique identifier, a simple string. This identifier allows you to identify an uploaded file later on. Therefore it is the only thing your application needs to know and persist. The JavaScript provided by the gem handles the AJAX file upload and writes the identifier to a hidden input field with the same `name` attribute as the original file input field. When the form is submitted your application only deals with a simple string value from a hidden input field instead of an actual file upload.
+Things it does not do:
 
-At first a newly uploaded file is only stored temporarly, when the user submits the form and your application deemed it valid and persists the data it is the applications responsibility to move the uploaded file to the permanent storage using the `MountableFileServer::Storage` class. This is necessary to prevent accumulating file garbage due to abandoned forms where an upload already happened.
+* Image processing. Processing images has nothing to do with uploading files. [MountableImageProcessor]() is recommended for adding on the fly image processing to your application.
 
-## Moving Parts
-`MountableFileServer::Endpoint` is a Sinatra application that can be mounted anywhere you want. It accepts uploads and responds with requested files if necessary. `MountableFileServer::Storage` is responsible for working with the actual files. Both take a `MountableFileServer::Configuration` which is used to define key settings specific to your usage scenario.
+## Install & Setup
+Add the MountableFileServer gem to your Gemfile and `bundle install`. Make sure you include `vendor/assets/javascripts/mountable_file_server.js` in your frontend code.
 
-## Configuration
 ~~~ruby
-configuration = MountableFileServer::Configuration.new stored_at: '~/uploads', mounted_at: '/uploads'
+gem 'mountable_file_server', '~> 0.0.2'
 ~~~
 
+If your application is built upon Ruby on Rails you can add a require statement in your Gemfile. This includes an Ruby on Rails engine which allows you to require the JavaScript.
+
 ~~~ruby
-storage = MountableFileServer::Storage.new config
-upload = MountableFileServer::Upload.new file: file_parameters[:tempfile].read, type: 'public'
+gem 'mountable_file_server', '~> 0.0.2', require: 'mountable_file_server/rails'
+~~~
 
-identifier = storage.store_temporary upload: upload
-storage.move_to_permanent_storage identifier: identifier
+~~~javascript
+//= require mountable_file_server
+~~~
+
+Once installed it is time to run the server so file uploads can be made. The server is called `MountableFileServer::Endpoint` and is a minimal Sinatra application which can be run as usual. You can also mount an endpoint inside your existing application. With Ruby on Rails this would look like this.
 
-storage.path_for identifier: identifier
-storage.url_for identifier: identifier
+~~~ruby
+Rails.application.routes.draw do
+  mount MountableFileServer::Endpoint, at: MountableFileServer.configuration.mounted_at
+end
 ~~~
 
-~~~html
-<input type="file" name="avatar" data-endpoint="/uploads" data-type="public">
+## Configuration
+As seen in the previous section there is a global configuration at `MountableFileServer.configuration` available.  
+This is an instance of the `MountableFileServer::Configration` class. The global configuration is a default argument for all classes that require access to the configuration. In situations where you have multiple endpoints with different settings you can pass in you own configuration objects instead.
+
+The global configuration can be configured through a block.
+
+~~~ruby
+MountableFileServer.configure do |configuration|
+  configuration.mounted_at = '/uploads'
+  configuration.stored_at = '/path/to/desired/uploads/directory'
+end
 ~~~
 
+In order to build correct URLs for public files the `mounted_at` attribute should be set to the path where the endpoint is mounted.
+
+The `stored_at` attribute tells the MountableFileServer where to store uploaded files. It will automatically create this and all needed subdirectories. This directory should not be within the root of your webserver. Otherwise private files are accessible to the internet.
+
+## Usage
+The idea is to upload a file with AJAX rather than sending it with the usual form submit. After the upload, an unique identifier (`uid`), is added to the form as a hidden element. Instead of dealing with a file upload your application only has to store the `uid`, a simple string value.
+
+Using the `MountableFileServer::Adapter` your application can work with the uploaded file, the only thing needed is the `uid`.
+
+## JavaScript API
+On the JavaScript side you use `uploadFiles(element, files)` to upload files to the endpoint. The `element` argument is a DOM element that needs two data attributes. `data-endpoint` specifies where the AJAX request should be sent to, this probably matches the `mounted_at` configuration option. `data-type` tells the endpoint if the uploaded files should be treated as public or private files. Possible values are `public` or `private`.
+
+The `files` argument is an array of `File` objects or an `FileList` object. These objects are for example returned when a user selects files using an `input` element.
+
+Following events will be dispatched on the element that was passed to `uploadFiles`. When you are listening to one of these events you can access the described attributes on the `event.detail` object.
+
+`upload:start` is dispatched when the upload starts.  
+It has the attributes `uploadId` and `file`. The `uploadId` is local and can be used to identify events in a scenario where multiple files are uploaded. The `file` attribute is the original `File` object and useful for showing a preview or other information about the file.
+
+`upload:progress` is continuously dispatched while the upload is happening.  
+It has the attributes `uploadId` and `progress`. The `progress` attribute is the original [ProgressEvent](https://developer.mozilla.org/en-US/docs/Web/API/ProgressEvent) object of the AJAX request.
+
+`upload:success` is dispatched when the upload succeeded.  
+It has the attributes `uploadId`, `uid` and `wasLastUpload`. The `uid` attribute is the unique identifier generated by the MountableFileServer. You will want to add it to your form and store it along your other data. The `wasLastUpload` attribute indicates if this was the last upload in progress.
+
+## Ruby API
+The `MountableFileServer::Adapter` class allows you to interact with uploaded files. It takes a `MountableFileServer::Configuration` instance as argument and uses `MountableFileServer.configuration` by default.
+
+`MountableFileServer::Adapter#store_temporary(input, type, extension)`  
+Stores the input as file in the temporary storage and returns the `uid` of the file. `input` can be a path to a file or an [IO](http://ruby-doc.org/core-2.2.2/IO.html) object. `type` can be `public` or `private` and the `extension` argument specifies the extension the file should have.
 
+`MountableFileServer::Adapter#store_permanent(input, type, extension)`  
+Stores the input as file in the permanent storage and returns the `uid` of the file. `input` can be a path to a file or an [IO](http://ruby-doc.org/core-2.2.2/IO.html) object. `type` can be `public` or `private` and the `extension` argument specifies the extension the file should have.
 
-Wieso ist MFS besser?
+`MountableFileServer::Adapter#move_to_permanent_storage(uid)`  
+Moves a file from the temporary storage to the permanent one. This is mostly used in a scenario where users upload files. A file uploaded through the endpoint is initially only stored in the temporary storage. The application has to move it explicitly to the permanent storage. For example after all validations passed.
 
-Losgekoppelt von der Anwendung / Active Record
-Beispiel Schaltwerk beim Fahrrad im Bezug auf Versionen
-Komplexe Lösungen mit hunderten Issues wo probleme erwähnt werden
-Erlaubt es einfach gute UI zu machen
-Upload passiert nicht im Request zum Controller
-Private Uploads
+`MountableFileServer::Adapter#remove_from_permanent_storage(uid)`  
+Removes the file from the permanent storage.
 
-Funktioniert nur wenn du Dateien auf deinem Server hast.
-Nichts für Gem Installier Programmierer die erwarten das ein Gem ihren UseCase ohne zusätzlichen Aufwand löst.
+`MountableFileServer::Adapter#url_for(uid)`  
+Returns the URL for an uploaded file. Only works for public files, if you pass the `uid` of a private file an error will be raised.
 
+`MountableFileServer::Adapter#pathname_for(id)`  
+Returns a [Pathname](http://ruby-doc.org/stdlib-2.2.2/libdoc/pathname/rdoc/Pathname.html) object for the uploaded file. The pathname will always point to the file on disk independent from the files type or current storage location.
 
-Open Fragen:
-Upload nur auf Gruppe X einschränken
+## Example
+TBW
 
+## Deployment
+TBW
 
-Example1:Topic: Realestatephotography
-Subtopic: Housesforsale
-Angle: Picturesthatinspirebuyers Oneword: Preparation
-What: Is wrong with most advertising photos? Why: Are they wrong?
-How: Can they be improved?
-Who: Is best to take the photos?
-Objections:
-Lack of time
-Houses still sell Cost Deception
-Example: Changingagents/changingpictures/ sale
-Summary: Advantages
+## License
+[MIT](https://github.com/stravid/mountable_file_server/blob/master/LICENSE.txt)

data/lib/mountable_file_server/adapter.rb

@@ -0,0 +1,49 @@
+module MountableFileServer
+  class Adapter
+    attr_reader :configuration
+
+    def initialize(configuration = MountableFileServer.configuration)
+      @configuration = configuration
+    end
+
+    def store_temporary(input, type, extension)
+      uid = generate_random_uid type, extension
+      Storage.new(configuration).store_temporary uid, input
+      uid
+    end
+
+    def store_permanent(input, type, extension)
+      uid = generate_random_uid type, extension
+      Storage.new(configuration).store_permanent uid, input
+      uid
+    end
+
+    def move_to_permanent_storage(uid)
+      uid = UniqueIdentifier.new uid
+      Storage.new(configuration).move_to_permanent_storage uid
+    end
+
+    def remove_from_permanent_storage(uid)
+      uid = UniqueIdentifier.new uid
+      Storage.new(configuration).remove_from_permanent_storage uid
+    end
+
+    def url_for(uid)
+      uid = UniqueIdentifier.new uid
+      FileAccessor.new(uid, configuration).url
+    end
+
+    def pathname_for(uid)
+      uid = UniqueIdentifier.new uid
+      FileAccessor.new(uid, configuration).pathname
+    end
+
+    private
+    def generate_random_uid(type, extension)
+      loop do
+        uid = UniqueIdentifier.generate_for type, extension
+        break uid unless FileAccessor.new(uid, configuration).exist?
+      end
+    end
+  end
+end

data/lib/mountable_file_server/configuration.rb

@@ -1,8 +1,8 @@
 module MountableFileServer
   class Configuration
-    attr_reader :mounted_at, :stored_at
+    attr_accessor :mounted_at, :stored_at
 
-    def initialize(mounted_at:, stored_at:)
+    def initialize(mounted_at = '', stored_at = '')
       @mounted_at = mounted_at
       @stored_at = stored_at
     end

data/lib/mountable_file_server/endpoint.rb

@@ -1,23 +1,26 @@
-require 'sinatra'
+require 'sinatra/base'
 require 'url_safe_base64'
 require 'mini_magick'
+require 'pathname'
 
 module MountableFileServer
   class Endpoint < Sinatra::Base
     attr_reader :configuration
 
-    def initialize(configuration)
+    def initialize(configuration = MountableFileServer.configuration)
       @configuration = configuration
       super
     end
 
     post '/' do
-      path = params[:file][:tempfile].path
-      filename = params[:file][:filename]
+      pathname = Pathname(params[:file][:tempfile].path)
       type = params[:type]
-      storage = Storage.new configuration
+      adapter = Adapter.new configuration
+      uid = adapter.store_temporary(pathname, type, pathname.extname)
 
-      storage.store_temporary(path: path, type: type, filename: filename).to_str
+
+      content_type :json
+      { uid: uid }.to_json
     end
 
     get '/*' do

data/lib/mountable_file_server/file_accessor.rb

@@ -0,0 +1,42 @@
+require 'pathname'
+
+module MountableFileServer
+  MissingFile = Class.new(ArgumentError)
+  NotAccessibleViaURL = Class.new(ArgumentError)
+
+  class FileAccessor
+    attr_reader :uid, :configuration
+
+    def initialize(uid, configuration = MountableFileServer.configuration)
+      @uid = uid
+      @configuration = configuration
+    end
+
+    def temporary_pathname
+      Pathname(configuration.stored_at) + 'tmp' + uid
+    end
+
+    def permanent_pathname
+      Pathname(configuration.stored_at) + uid.type +  uid
+    end
+
+    def pathname
+      pathnames.find(-> { raise MissingFile }) { |p| p.file? }
+    end
+
+    def exist?
+      pathnames.any? { |p| p.file? }
+    end
+
+    def url
+      raise NotAccessibleViaURL unless uid.public?
+
+      URI.new (Pathname(configuration.mounted_at) + uid).to_s
+    end
+
+    private
+    def pathnames
+      [permanent_pathname, temporary_pathname]
+    end
+  end
+end

data/lib/mountable_file_server/storage.rb

@@ -1,52 +1,34 @@
 module MountableFileServer
   class Storage
-    attr_reader :access
+    attr_reader :configuration
 
-    def initialize(configuration)
-      @access = Access.new configuration
+    def initialize(configuration = MountableFileServer.configuration)
+      @configuration = configuration
     end
 
-    def store_temporary(path:, type:, filename:)
-      file_to_be_stored = File.new path
-      identifier = random_identifier filename: filename, type: type
-      path = access.temporary_path_for identifier: identifier
-
-      File.open(path, 'wb') do |file|
-        file.write file_to_be_stored.read
-      end
-
-      identifier
-    end
-
-    def store_permanently(path:, type:, filename:)
-      identifier = store_temporary path: path, type: type, filename: filename
-      move_to_permanent_storage identifier: identifier
-      identifier
+    def store_temporary(uid, input)
+      destination = FileAccessor.new(uid, configuration).temporary_pathname
+      destination.dirname.mkpath
+      IO.copy_stream input, destination
     end
 
-    def move_to_permanent_storage(identifier:)
-      identifier = Identifier.new identifier
-      from = access.temporary_path_for identifier: identifier
-      to = access.path_for identifier: identifier
-
-      FileUtils.move from, to
+    def store_permanent(uid, input)
+      destination = FileAccessor.new(uid, configuration).permanent_pathname
+      destination.dirname.mkpath
+      IO.copy_stream input, destination
     end
 
-    def remove_from_permanent_storage(identifier:)
-      identifier = Identifier.new identifier
-      path = access.path_for identifier: identifier
+    def move_to_permanent_storage(uid)
+      source = FileAccessor.new(uid, configuration).temporary_pathname
+      destination = FileAccessor.new(uid, configuration).permanent_pathname
+      destination.dirname.mkpath
 
-      FileUtils.rm path
+      source.rename destination
     end
 
-  private
-    def random_identifier(filename:, type:)
-      loop do
-        identifier = Identifier.generate_for filename: filename, type: type
-        path = access.temporary_path_for identifier: identifier
-
-        break identifier unless File.exists?(path)
-      end
+    def remove_from_permanent_storage(uid)
+      source = FileAccessor.new(uid, configuration).permanent_pathname
+      source.delete
     end
   end
 end

data/lib/mountable_file_server/unique_identifier.rb

@@ -0,0 +1,30 @@
+require 'securerandom'
+
+module MountableFileServer
+  UnknownType = Class.new(ArgumentError)
+
+  class UniqueIdentifier < String
+    attr_reader :type, :filename
+
+    def initialize(string)
+      @type, @filename = /(\w+)-(.+)$/.match(string).captures
+
+      raise UnknownType.new(type) unless known_type?
+
+      super.freeze
+    end
+
+    def self.generate_for(type, extension)
+      new "#{type}-#{SecureRandom.hex}#{extension}"
+    end
+
+    def public?
+      type == 'public'
+    end
+
+    private
+    def known_type?
+      ['public', 'private'].include?(type)
+    end
+  end
+end

data/lib/mountable_file_server/uri.rb

@@ -0,0 +1,33 @@
+require 'uri'
+require 'pathname'
+require 'url_safe_base64'
+
+module MountableFileServer
+  class URI < String
+    def initialize(string)
+      super.freeze
+    end
+
+    def uid
+      UniqueIdentifier.new filename
+    end
+
+    def encoded_processing_instructions
+      /\.(\w+)\./.match(filename).captures.first
+    end
+
+    def decoded_processing_instructions
+      UrlSafeBase64.decode64 encoded_processing_instructions
+    end
+
+    def filename
+      Pathname(::URI.parse(self).path).basename.to_s
+    end
+
+    def resize(instructions)
+      encoded_instructions = UrlSafeBase64.encode64 instructions
+
+      URI.new self.gsub('.', ".#{encoded_instructions}.")
+    end
+  end
+end

data/lib/mountable_file_server/version.rb

@@ -1,3 +1,3 @@
 module MountableFileServer
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/mountable_file_server.rb

@@ -2,8 +2,23 @@ require "mountable_file_server/version"
 
 module MountableFileServer
   require "mountable_file_server/configuration"
+  require "mountable_file_server/file_accessor"
+  require "mountable_file_server/unique_identifier"
   require "mountable_file_server/storage"
+  require "mountable_file_server/uri"
+
+  require "mountable_file_server/adapter"
   require "mountable_file_server/endpoint"
-  require "mountable_file_server/identifier"
-  require "mountable_file_server/access"
- end
+
+  class << self
+    attr_writer :configuration
+  end
+
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+
+  def self.configure
+    yield(configuration)
+  end
+end

data/mountable_file_server.gemspec

@@ -20,15 +20,16 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "rails"
-  spec.add_development_dependency "capybara"
-  spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "poltergeist"
-  spec.add_development_dependency "rack-test"
-  spec.add_development_dependency "bogus"
+  spec.add_development_dependency "minitest", "~> 5.8.0"
+  spec.add_development_dependency "rails", "~> 4.2.3"
+  spec.add_development_dependency "capybara", "~> 2.4.4"
+  spec.add_development_dependency "sqlite3", "~> 1.3.10"
+  spec.add_development_dependency "poltergeist", "~> 1.6.0"
+  spec.add_development_dependency "rack-test", "~> 0.6.3"
+  spec.add_development_dependency "bogus", "~> 0.1.6"
 
-  spec.add_runtime_dependency "sinatra"
+  spec.add_runtime_dependency "rack", "~> 1.6"
+  spec.add_runtime_dependency "sinatra", "~> 1.4.5"
   spec.add_runtime_dependency "mini_magick"
   spec.add_runtime_dependency "url_safe_base64"
 end

data/vendor/assets/javascripts/mountable_file_server.js

@@ -24,9 +24,11 @@
       if (xhr.readyState === 4 && xhr.status === 200) {
         finishedUploads.push(uploadId);
 
+        response = JSON.parse(xhr.responseText);
+
         dispatchEvent($element, 'upload:success', {
           uploadId: uploadId,
-          identifier: xhr.responseText,
+          uid: response.uid,
           wasLastUpload: lastUploadId == finishedUploads.length
         });
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mountable_file_server
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - David Strauß
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,114 +42,128 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.8.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.3
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.4
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.10
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: bogus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.6
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -187,19 +201,20 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/mountable_file_server.rb
-- lib/mountable_file_server/access.rb
-- lib/mountable_file_server/access_helper.rb
-- lib/mountable_file_server/ajax_upload_helper.rb
+- lib/mountable_file_server/adapter.rb
 - lib/mountable_file_server/configuration.rb
 - lib/mountable_file_server/endpoint.rb
-- lib/mountable_file_server/identifier.rb
+- lib/mountable_file_server/file_accessor.rb
 - lib/mountable_file_server/rails.rb
 - lib/mountable_file_server/storage.rb
+- lib/mountable_file_server/unique_identifier.rb
+- lib/mountable_file_server/uri.rb
 - lib/mountable_file_server/version.rb
 - mountable_file_server.gemspec
 - vendor/assets/javascripts/mountable_file_server.js

data/lib/mountable_file_server/access.rb

@@ -1,44 +0,0 @@
-require 'url_safe_base64'
-
-module MountableFileServer
-  class Access
-    NotAccessibleViaURL = Class.new(ArgumentError)
-
-    attr_reader :configuration
-
-    def initialize(configuration)
-      @configuration = configuration
-    end
-
-    def temporary_path_for(identifier:)
-      File.join configuration.stored_at, 'tmp', identifier
-    end
-
-    def path_for(identifier:)
-      identifier = Identifier.new identifier
-      File.join configuration.stored_at, identifier.type, identifier.filename
-    end
-
-    def url_for(identifier:, resize: nil)
-      identifier = Identifier.new identifier
-
-      raise NotAccessibleViaURL unless identifier.public?
-
-      if resize
-        resize_part = UrlSafeBase64.encode64 resize
-        File.join configuration.mounted_at, identifier.filename.gsub('.', ".#{resize_part}.")
-      else
-        File.join configuration.mounted_at, identifier.filename
-      end
-    end
-
-    def file_for(identifier:)
-      paths = [
-                path_for(identifier: identifier),
-                temporary_path_for(identifier: identifier)
-              ]
-
-      File.new paths.find { |path| File.file? path }
-    end
-  end
-end

data/lib/mountable_file_server/access_helper.rb

@@ -1,7 +0,0 @@
-# module MountableFileServer
-#   module AccessHelper
-#     def path_for_upload(filename)
-#       File.join(MountableFileServer.configuration.mounted_at, filename)
-#     end
-#   end
-# end

data/lib/mountable_file_server/ajax_upload_helper.rb

@@ -1,18 +0,0 @@
-# module MountableFileServer
-#   module AjaxUploadHelper
-#     module FormBuilder
-#       def ajax_upload_field(method, options = {})
-#         @template.ajax_upload_field(@object_name, method, objectify_options(options))
-#       end
-#     end
-
-#     def ajax_upload_field(object_name, method, options = {})
-#       file_input = file_field(object_name, method, options.merge({ data: { 'upload-url' => MountableFileServer.public_upload_url } }))
-#       hidden_input = hidden_field(object_name, method, options)
-#       content_tag(:div, class: MountableFileServer.configuration.input_class) do
-#         concat file_input
-#         concat hidden_input
-#       end
-#     end
-#   end
-# end

data/lib/mountable_file_server/identifier.rb

@@ -1,37 +0,0 @@
-require 'securerandom'
-
-module MountableFileServer
-  class Identifier
-    attr_reader :type, :filename
-
-    def self.generate_for(filename:, type:)
-      extension = File.extname filename
-
-      new "#{type}-#{SecureRandom.hex}#{extension}"
-    end
-
-    def initialize(identifier)
-      @type = /(\w+)-\w+/.match(identifier)[1]
-      @filename = /\w+-(.+)$/.match(identifier)[1]
-
-      raise ArgumentError.new("Unkown type `#{type}`") unless valid_type?
-    end
-
-    def to_str
-      "#{type}-#{filename}"
-    end
-
-    def ==(other)
-      to_str == other.to_str
-    end
-
-    def public?
-      type == 'public'
-    end
-
-  private
-    def valid_type?
-      ['public', 'private'].include?(type)
-    end
-  end
-end