mountable_file_server 2.0.0 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 06ba105404c99a412b676531f8e1cf413dcef90e
-  data.tar.gz: 4b2a1588e17a8dc4ce720b9b88267e8a93f4fced
+SHA256:
+  metadata.gz: bcdbcf7433b4e6534d739d480d7893ba11ce8046afb4e86df05c01989938a7ce
+  data.tar.gz: 27d8021de14ef6430cde006bf2240bc0eb1f9d4bab27a1a18788764a3e82d2b7
 SHA512:
-  metadata.gz: 0f8109f98d14e82c53933a7e01a7fe7ef96ac4c321d03d57f075de188afef8432d9964126c1a838f4f6916a73de84446365d4a278c4fd7f97572bd4eaf68adb2
-  data.tar.gz: 759a235787657eeeecfdca45a6637b66686b3ca41bc8eac2c3e1018537c1fc7b5e99f117cca7c700bf648ef4ece6b55be0f51dced14e70f074384b3903456fa1
+  metadata.gz: 87b760cda1e81bdd7a483c501759f403be3b629eb9ab4c3beeff9b2658ace693efe8a46548224d8dfebf131e35acfda0008f686f7c2685dcbd9a14c13746f58b
+  data.tar.gz: 69a22adc2a6ba19487a0da1f8f63f203e008417c1b8155e282ad5930bdae457723b3e67fb6d0d6b9d492d03a884cd635a75f42aee94db408774ff5e4fd0881f1

data/.gitignore

@@ -16,4 +16,4 @@ mkmf.log
 *.sqlite3
 test/rails-dummy/tmp/
 test/rails-dummy/uploads/
-.ruby-version
+/.local-data/

data/.ruby-version

@@ -0,0 +1 @@
+2.5.8

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+# 3.0.3
+* Relax required version number of `dry-configurable` dependency
+
+# 3.0.2
+* Fix deprecation warning when calling metadata class initializer with keyword arguments.
+* Don't break when uploading a private file.
+
+# 3.0.1
+* Repair broken `FileAccessor` class.
+
+# 3.0.0
+* **Breaking Change**: Remove `MountableFileServer::Client`. Use `MountableFileServer::Adapter` instead.
+
+# 2.1.0
+* Relax Sinatra dependency so Ruby on Rails 4 can use Rack 1.X
+
 # 2.0.0
 * Remove HTTP endpoints for moving and deleting uploads due to security concerns.
 * Return 404 for unknown or malformed FIDs.

data/README.md

@@ -4,7 +4,7 @@ Mountable File Server can be used with any Ruby (on Rails) application and it re
 app only stores reference to uploaded file
 
 ## MountableFileServer::Server
-The core of Mountable File Server (MFS) is a small HTTP API that accepts file uploads and offers endpoints to interact with uploaded files. While the frontend deals directly with the HTTP API, your Ruby application will want to use the Ruby Client `MountableFileServer::Client`.
+The core of Mountable File Server (MFS) is a small HTTP API that accepts file uploads and offers endpoints to interact with uploaded files. While the frontend deals directly with the HTTP API, your Ruby application will want to use the Ruby adapter `MountableFileServer::Adapter`.
 
 
 

data/lib/mountable_file_server/adapter.rb

@@ -33,9 +33,8 @@ module MountableFileServer
     end
 
     def url_for(uid)
-      # uid = UniqueIdentifier.new uid
-      # FileAccessor.new(uid, configuration).url
-      configuration.base_url + uid
+      uid = UniqueIdentifier.new uid
+      FileAccessor.new(uid, configuration).url
     end
 
     def pathname_for(uid)

data/lib/mountable_file_server/file_accessor.rb

@@ -1,3 +1,4 @@
+require 'mountable_file_server/uri'
 require 'pathname'
 
 module MountableFileServer

data/lib/mountable_file_server/metadata.rb

@@ -39,7 +39,7 @@ module MountableFileServer
         parameters[:height] = dimensions[1]
       end
 
-      new(parameters)
+      new(**parameters)
     end
   end
 end

data/lib/mountable_file_server/rails.rb

@@ -1,6 +1,5 @@
 require 'mountable_file_server'
 require 'mountable_file_server/server'
-require 'mountable_file_server/client'
 
 module MountableFileServer
   class Engine < Rails::Engine

data/lib/mountable_file_server/server.rb

@@ -11,7 +11,7 @@ module MountableFileServer
       pathname = Pathname(params[:file][:tempfile].path)
       type = params[:type]
       fid = adapter.store_temporary(pathname, type, pathname.extname)
-      url = adapter.url_for(fid)
+      url = adapter.url_for(fid) if fid.public?
       metadata = Metadata.for_path(pathname)
 
       content_type :json

data/lib/mountable_file_server/version.rb

@@ -1,3 +1,3 @@
 module MountableFileServer
-  VERSION = "2.0.0"
+  VERSION = "3.0.3"
 end

data/mountable_file_server.gemspec

@@ -18,17 +18,17 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.1"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "minitest", "~> 5.8.0"
-  spec.add_development_dependency "rails", "~> 5.0.2"
-  spec.add_development_dependency "capybara", "~> 2.4.4"
+  spec.add_development_dependency "rails", "~> 5.0.7.2"
+  spec.add_development_dependency "capybara", "2.18.0"
   spec.add_development_dependency "sqlite3", "~> 1.3.10"
-  spec.add_development_dependency "poltergeist", "~> 1.6.0"
+  spec.add_development_dependency "poltergeist", "1.18.1"
   spec.add_development_dependency "rack-test", "~> 0.6.3"
-  spec.add_development_dependency "webmock", "~> 2.1.0"
+  spec.add_development_dependency "mocha", "1.11.2"
 
-  spec.add_runtime_dependency "sinatra", "~> 2.0.0"
-  spec.add_runtime_dependency "dry-configurable", "~> 0.1.6"
+  spec.add_runtime_dependency "sinatra", ">= 1.4.8"
+  spec.add_runtime_dependency "dry-configurable", ">= 0.1.6"
   spec.add_runtime_dependency "dimensions", "~> 1.3.0"
 end

data/shell.nix

@@ -0,0 +1,27 @@
+{
+  pkgs ? import (fetchGit {
+    url = https://github.com/NixOS/nixpkgs-channels;
+    ref = "nixos-20.03";
+  }) {},
+  ruby ? pkgs.ruby_2_5,
+  bundler ? pkgs.bundler.override { inherit ruby; }
+}:
+
+pkgs.mkShell {
+  buildInputs = with pkgs; [
+    ruby
+    bundler
+    git
+    sqlite
+    zlib
+    phantomjs
+    rubyPackages_2_5.nokogiri
+    libiconv
+  ];
+
+  shellHook = ''
+    mkdir -p .local-data/gems
+    export GEM_HOME=$PWD/.local-data/gems
+    export GEM_PATH=$GEM_HOME
+  '';
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mountable_file_server
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.3
 platform: ruby
 authors:
 - David Strauß
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-13 00:00:00.000000000 Z
+date: 1970-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 5.0.7.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 5.0.7.2
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.4
+        version: 2.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.4
+        version: 2.18.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +98,16 @@ dependencies:
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.18.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.18.1
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -123,45 +123,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.6.3
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 1.11.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 1.11.2
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.4.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.4.8
 - !ruby/object:Gem::Dependency
   name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.6
 - !ruby/object:Gem::Dependency
@@ -186,6 +186,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -194,7 +195,6 @@ files:
 - Rakefile
 - lib/mountable_file_server.rb
 - lib/mountable_file_server/adapter.rb
-- lib/mountable_file_server/client.rb
 - lib/mountable_file_server/file_accessor.rb
 - lib/mountable_file_server/metadata.rb
 - lib/mountable_file_server/rails.rb
@@ -204,6 +204,7 @@ files:
 - lib/mountable_file_server/uri.rb
 - lib/mountable_file_server/version.rb
 - mountable_file_server.gemspec
+- shell.nix
 - vendor/assets/javascripts/mountable_file_server.js
 homepage: https://github.com/stravid/mountable_file_server
 licenses:
@@ -224,8 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Simple mountable server that handles file uploads

data/lib/mountable_file_server/client.rb

@@ -1,44 +0,0 @@
-require 'net/http'
-require 'uri'
-require 'stringio'
-
-module MountableFileServer
-  class Client
-    def move_to_permanent_storage(fid)
-      if MountableFileServer.config.base_url.start_with?('http')
-        uri = ::URI.parse(MountableFileServer.config.base_url)
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.set_debug_output($stdout)
-        request = Net::HTTP::Post.new(uri.request_uri + fid + '/store-permanent')
-
-        http.request(request)
-      else
-        MountableFileServer::Server.new.call({
-          "rack.input" => StringIO.new(""),
-          "REQUEST_METHOD"=> "POST",
-          "PATH_INFO"=> "/#{fid}/store-permanent",
-        })
-      end
-    end
-
-    def remove_from_storage(fid)
-      if MountableFileServer.config.base_url.start_with?('http')
-        uri = ::URI.parse(MountableFileServer.config.base_url)
-        http = Net::HTTP.new(uri.host, uri.port)
-        request = Net::HTTP::Delete.new(uri.request_uri + fid)
-
-        http.request(request)
-      else
-        MountableFileServer::Server.new.call({
-          "rack.input" => StringIO.new(""),
-          "REQUEST_METHOD"=> "DELETE",
-          "PATH_INFO"=> "/#{fid}",
-        })
-      end
-    end
-
-    def url_for(fid)
-      MountableFileServer.config.base_url + fid
-    end
-  end
-end