rails · dhh · Aug 4, 2017 · Jul 8, 2017 · Jul 8, 2017 · Jul 8, 2017
diff --git a/.travis.yml b/.travis.yml
@@ -40,6 +40,8 @@ script: 'ci/travis.rb'
 env:
   global:
     - "JRUBY_OPTS='--dev -J-Xmx1024M'"
+    - "AWS_ACCESS_KEY_ID=AKIAIDIA2E7SSMYGNB7A"
+    - secure: "XohvFnYff1yf8qlawCujI+CIqHK08KOw34pPprd4QYuG0SJCzBdNN7efBBj5gLX1PI6DwkDLNv51Oi31xPh7yJFuzRAkB0FPdyKM7UyYZ7BMaTqx8LVC89lZJ8VIu19kDP/8sdOm0HN/huOM5kO3jZJFLpi2Tj313TjmzWZFPq0="
   matrix:
     - "GEM=railties"
     - "GEM=ap,ac"

diff --git a/Gemfile b/Gemfile
@@ -92,6 +92,17 @@ group :cable do
   gem "sprockets-export", require: false
 end
 
+group :storage do
+  gem "aws-sdk", "~> 2", require: false
+  gem "google-cloud-storage", "~> 1.3", require: false
+
+  # Contains fix to be able to test using StringIO
+  gem "azure-core", git: "https://github.com/dixpac/azure-ruby-asm-core.git"
+  gem "azure-storage", require: false
+
+  gem "mini_magick"
+end
+
 # Add your own local bundler stuff.
 local_gemfile = File.expand_path(".Gemfile", __dir__)
 instance_eval File.read local_gemfile if File.exist? local_gemfile

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -6,6 +6,15 @@ GIT
     queue_classic (3.2.0.RC1)
       pg (>= 0.17, < 0.20)
 
+GIT
+  remote: https://github.com/dixpac/azure-ruby-asm-core.git
+  revision: 4403389747f44a94b73e7a7522d1ea11f8b1a266
+  specs:
+    azure-core (0.1.8)
+      faraday (~> 0.9)
+      faraday_middleware (~> 0.10)
+      nokogiri (~> 1.7)
+
 GIT
   remote: https://github.com/erikhuda/thor.git
   revision: df5ba2b653a28087b3617d6c082b00866b0c0d6c
@@ -82,6 +91,9 @@ PATH
       activemodel (= 5.2.0.alpha)
       activesupport (= 5.2.0.alpha)
       arel (= 9.0.0.alpha)
+    activestorage (5.2.0.alpha)
+      actionpack (= 5.2.0.alpha)
+      activerecord (= 5.2.0.alpha)
     activesupport (5.2.0.alpha)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
@@ -95,6 +107,7 @@ PATH
       activejob (= 5.2.0.alpha)
       activemodel (= 5.2.0.alpha)
       activerecord (= 5.2.0.alpha)
+      activestorage (= 5.2.0.alpha)
       activesupport (= 5.2.0.alpha)
       bundler (>= 1.3.0)
       railties (= 5.2.0.alpha)
@@ -113,6 +126,19 @@ GEM
       public_suffix (~> 2.0, >= 2.0.2)
     amq-protocol (2.2.0)
     ast (2.3.0)
+    aws-sdk (2.10.19)
+      aws-sdk-resources (= 2.10.19)
+    aws-sdk-core (2.10.19)
+      aws-sigv4 (~> 1.0)
+      jmespath (~> 1.0)
+    aws-sdk-resources (2.10.19)
+      aws-sdk-core (= 2.10.19)
+    aws-sigv4 (1.0.1)
+    azure-storage (0.11.4.preview)
+      azure-core (~> 0.1)
+      faraday (~> 0.9)
+      faraday_middleware (~> 0.10)
+      nokogiri (~> 1.6)
     backburner (1.4.1)
       beaneater (~> 1.0)
       concurrent-ruby (~> 1.0.1)
@@ -168,11 +194,14 @@ GEM
     daemons (1.2.4)
     dalli (2.7.6)
     dante (0.2.0)
+    declarative (0.0.9)
+    declarative-option (0.1.0)
     delayed_job (4.1.3)
       activesupport (>= 3.0, < 5.2)
     delayed_job_active_record (4.1.2)
       activerecord (>= 3.0, < 5.2)
       delayed_job (>= 3.0, < 5)
+    digest-crc (0.4.1)
     em-hiredis (0.3.1)
       eventmachine (~> 1.0)
       hiredis (~> 0.6.0)
@@ -195,6 +224,8 @@ GEM
     execjs (2.7.0)
     faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.12.0)
+      faraday (>= 0.7.4, < 1.0)
     faye (1.2.4)
       cookiejar (>= 0.3.0)
       em-http-request (>= 0.3.0)
@@ -211,14 +242,41 @@ GEM
     ffi (1.9.18-x86-mingw32)
     globalid (0.4.0)
       activesupport (>= 4.2.0)
+    google-api-client (0.13.1)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (~> 0.5)
+      httpclient (>= 2.8.1, < 3.0)
+      mime-types (~> 3.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.0)
+    google-cloud-core (1.0.0)
+      google-cloud-env (~> 1.0)
+      googleauth (~> 0.5.1)
+    google-cloud-env (1.0.1)
+      faraday (~> 0.11)
+    google-cloud-storage (1.3.0)
+      digest-crc (~> 0.4)
+      google-api-client (~> 0.13.0)
+      google-cloud-core (~> 1.0)
+    googleauth (0.5.3)
+      faraday (~> 0.12)
+      jwt (~> 1.4)
+      logging (~> 2.0)
+      memoist (~> 0.12)
+      multi_json (~> 1.11)
+      os (~> 0.9)
+      signet (~> 0.7)
     hiredis (0.6.1)
     http_parser.rb (0.6.0)
+    httpclient (2.8.3)
     i18n (0.8.6)
+    jmespath (1.3.1)
     jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (2.1.0)
+    jwt (1.5.6)
     kindlerb (1.2.0)
       mustache
       nokogiri
@@ -227,15 +285,21 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
+    little-plugger (1.1.4)
+    logging (2.2.2)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.6)
       mime-types (>= 1.16, < 4)
+    memoist (0.16.0)
     metaclass (0.0.4)
     method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
+    mini_magick (4.8.0)
     mini_portile2 (2.2.0)
     minitest (5.10.2)
     minitest-bisect (1.4.0)
@@ -263,6 +327,7 @@ GEM
       mini_portile2 (~> 2.2.0)
     nokogiri (1.8.0-x86-mingw32)
       mini_portile2 (~> 2.2.0)
+    os (0.9.6)
     parallel (1.11.2)
     parser (2.4.0.0)
       ast (~> 2.2)
@@ -303,6 +368,10 @@ GEM
     redis (3.3.3)
     redis-namespace (1.5.3)
       redis (~> 3.0, >= 3.0.4)
+    representable (3.0.4)
+      declarative (< 0.1.0)
+      declarative-option (< 0.2.0)
+      uber (< 0.2.0)
     resque (1.27.4)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
@@ -314,6 +383,7 @@ GEM
       redis (~> 3.3)
       resque (~> 1.26)
       rufus-scheduler (~> 3.2)
+    retriable (3.1.1)
     rubocop (0.49.1)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
@@ -345,6 +415,11 @@ GEM
       rack-protection (>= 1.5.0)
       redis (~> 3.3, >= 3.3.3)
     sigdump (0.2.4)
+    signet (0.7.3)
+      addressable (~> 2.3)
+      faraday (~> 0.9)
+      jwt (~> 1.5)
+      multi_json (~> 1.10)
     simple_uuid (0.4.0)
     sinatra (2.0.0)
       mustermann (~> 1.0)
@@ -384,6 +459,7 @@ GEM
       thread_safe (~> 0.1)
     tzinfo-data (1.2017.2)
       tzinfo (>= 1.0.0)
+    uber (0.1.0)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.3.0)
@@ -411,6 +487,9 @@ DEPENDENCIES
   activerecord-jdbcpostgresql-adapter (>= 1.3.0)
   activerecord-jdbcsqlite3-adapter (>= 1.3.0)
   arel!
+  aws-sdk (~> 2)
+  azure-core!
+  azure-storage
   backburner
   bcrypt (~> 3.1.11)
   benchmark-ips
@@ -425,12 +504,14 @@ DEPENDENCIES
   delayed_job_active_record
   em-hiredis
   erubis (~> 2.7.0)
+  google-cloud-storage (~> 1.3)
   hiredis
   jquery-rails
   json (>= 2.0.0)
   kindlerb (~> 1.2.0)
   libxml-ruby
   listen (>= 3.0.5, < 3.2)
+  mini_magick
   minitest-bisect
   mocha (~> 0.14)
   mysql2 (>= 0.4.4)

diff --git a/actionview/lib/action_view/helpers/form_helper.rb b/actionview/lib/action_view/helpers/form_helper.rb
@@ -9,6 +9,7 @@
 require_relative "../record_identifier"
 require "active_support/core_ext/module/attribute_accessors"
 require "active_support/core_ext/hash/slice"
+require "active_support/core_ext/hash/compact"
 require "active_support/core_ext/string/output_safety"
 require "active_support/core_ext/string/inflections"
 
@@ -1193,7 +1194,7 @@ def hidden_field(object_name, method, options = {})
       #   file_field(:attachment, :file, class: 'file_input')
       #   # => <input type="file" id="attachment_file" name="attachment[file]" class="file_input" />
       def file_field(object_name, method, options = {})
-        Tags::FileField.new(object_name, method, self, options).render
+        Tags::FileField.new(object_name, method, self, convert_direct_upload_option_to_url(options)).render
       end
 
       # Returns a textarea opening and closing tag set tailored for accessing a specified attribute (identified by +method+)
@@ -2316,6 +2317,10 @@ def convert_to_legacy_options(options)
             options[:include_id] = !options.delete(:skip_id)
           end
         end
+
+        def convert_direct_upload_option_to_url(options)
+          options.merge('data-direct-upload-url': options.delete(:direct_upload) ? rails_direct_uploads_url : nil).compact
+        end
     end
   end
 

diff --git a/actionview/lib/action_view/helpers/form_tag_helper.rb b/actionview/lib/action_view/helpers/form_tag_helper.rb
@@ -274,7 +274,7 @@ def hidden_field_tag(name, value = nil, options = {})
       #   file_field_tag 'file', accept: 'text/html', class: 'upload', value: 'index.html'
       #   # => <input accept="text/html" class="upload" id="file" name="file" type="file" value="index.html" />
       def file_field_tag(name, options = {})
-        text_field_tag(name, nil, options.merge(type: :file))
+        text_field_tag(name, nil, convert_direct_upload_option_to_url(options.merge(type: :file)))
       end
 
       # Creates a password field, a masked text field that will hide the users input behind a mask character.
@@ -904,6 +904,10 @@ def set_default_disable_with(value, tag_options)
 
           tag_options.delete("data-disable-with")
         end
+
+        def convert_direct_upload_option_to_url(options)
+          options.merge('data-direct-upload-url': options.delete(:direct_upload) ? rails_direct_uploads_url : nil).compact
+        end
     end
   end
 end
diff --git a/activestorage/.babelrc b/activestorage/.babelrc
@@ -0,0 +1,5 @@
+{
+  "presets": [
+    ["env", { "modules": false } ]
+  ]
+}
diff --git a/activestorage/.codeclimate.yml b/activestorage/.codeclimate.yml
@@ -0,0 +1,7 @@
+engines:
+  rubocop:
+    enabled: true
+
+ratings:
+  paths:
+  - "**.rb"
diff --git a/activestorage/.eslintrc b/activestorage/.eslintrc
@@ -0,0 +1,19 @@
+{
+  "extends": "eslint:recommended",
+  "rules": {
+    "semi": ["error", "never"],
+    "quotes": ["error", "double"],
+    "no-unused-vars": ["error", { "vars": "all", "args": "none" }]
+  },
+  "plugins": [
+    "import"
+  ],
+  "env": {
+    "browser": true,
+    "es6": true
+  },
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "module"
+  }
+}
diff --git a/activestorage/.gitignore b/activestorage/.gitignore
@@ -0,0 +1,6 @@
+.byebug_history
+node_modules
+test/dummy/db/*.sqlite3
+test/dummy/db/*.sqlite3-journal
+test/dummy/log/*.log
+test/dummy/tmp/
diff --git a/activestorage/CHANGELOG.md b/activestorage/CHANGELOG.md
@@ -0,0 +1,3 @@
+*   Added to Rails.
+
+    *DHH*
diff --git a/activestorage/MIT-LICENSE b/activestorage/MIT-LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2017 David Heinemeier Hansson, Basecamp
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.