activestorage_legacy 0.1 → 0.1.1.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 641d8ce0e8c7828cdd8ccd3b41f5994d75698e46
-  data.tar.gz: 66f621576457137902df0a1817f9909040f02e01
+  metadata.gz: 38861fa3326360757802b47e045a59e82add4e89
+  data.tar.gz: cbd0c1f00330494ec383294c412bb476f8d55ee4
 SHA512:
-  metadata.gz: db0f82ec409b926125cc67609bd0c6e644d246a0ed07a2327b7c84bc80a24f39a3f4ce1ce7dd3384ab9b7ac692f2b9d37b1bea9ecce16e68d03aa2ad3f38d6a6
-  data.tar.gz: ede2c0c22ab30843eb579ce988c9781962886effebde370853b9e109107ab06936325405ae8446873427ab6aa036cbb95ac67f6db4f7cada53e8cb58ee7cbd5f
+  metadata.gz: 75eda55611fcc25cc7748daaa4f865a667b2e5c1f31e066459980d345b023585c96d47b6e24d6e6f36b25423647b5bca6bb53a9fa5fc0458a22899c680a57dda
+  data.tar.gz: a27d898f7c7a45d5aafc28c6786fed32111e0b719eb3d19b054f4c816c80b8bde7ba9583615033fbbcd20e36b3e225f97ea673c05222f29a0bc882d4f81faa8f

data/.github/workflows/gem-push.yml

@@ -17,6 +17,7 @@ jobs:
         with:
           ruby-version: 2.3.8
           bundler-cache: true
+          bundler: 1
       - name: Publish to RubyGems
         run: |
           mkdir -p $HOME/.gem

data/.github/workflows/ruby-tests.yml

@@ -21,6 +21,7 @@ jobs:
       with:
         ruby-version: 2.3.8
         bundler-cache: true
+        bundler: 1
     - name: Install dependencies
       run: bundle install
     - name: Setup Code Climate test-reporter

data/.gitignore

@@ -7,3 +7,5 @@ test/dummy/tmp/
 
 .idea
 coverage
+
+Gemfile.lock

data/Gemfile

@@ -11,9 +11,10 @@ gem "byebug"
 
 group :test do
   gem "simplecov"
+  gem 'strong_parameters'
 end
 
-gem "sqlite3"
+gem "sqlite3", "~> 1.3.0"
 gem "httparty"
 
 gem "aws-sdk", "~> 2", require: false

data/README.md

@@ -9,7 +9,11 @@ See the complete list of changes in https://github.com/rails/activestorage/compa
 
 ## Installation
 
-1. Add `gem "activestorage_legacy", git: "https://github.com/rails/activestorage.git"` to your Gemfile.
+1. Add `activestorage_legacy` and `strong_parameters` to your Gemfile:
+```ruby
+gem 'strong_parameters'
+gem 'activestorage_legacy'
+```
 2. Add `require "active_storage"` to config/application.rb, after `require "rails/all"` line.
 3. Run `rake activestorage:install` to create needed directories, migrations, and configuration.
 4. Configure the storage service in `config/environments/*` with `config.active_storage.service = :local`

data/activestorage.gemspec

@@ -3,9 +3,11 @@
   $LOAD_PATH.unshift(path) unless $LOAD_PATH.include?(path)
 end
 
+require_relative "lib/active_storage/version"
+
 Gem::Specification.new do |s|
   s.name     = "activestorage_legacy"
-  s.version  = "0.1"
+  s.version  = ActiveStorage.version
   s.authors  = "David Heinemeier Hansson"
   s.email    = "david@basecamp.com"
   s.summary  = "Attach cloud and local files in Rails applications"
@@ -16,12 +18,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency "rails", ">= 3.2.22.4"
   s.add_dependency "sidekiq", ">= 4.2.0"
-  s.add_dependency "strong_parameters"
   s.add_dependency "mini_magick", ">= 4.0"
   s.add_dependency "marcel", ">= 1.0"
 
-  s.add_development_dependency "bundler", "~> 1.15"
-
   s.files      = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- test/*`.split("\n")
 end

data/app/models/active_storage/attachment.rb

@@ -1,6 +1,6 @@
 require "active_storage/blob"
 require "active_storage/patches/delegation"
-require "strong_parameters"
+require "strong_parameters" if Rails.version < '4.0'
 
 # Attachments associate records with blobs. Usually that's a one record-many blobs relationship,
 # but it is possible to associate many different records with the same blob. If you're doing that,
@@ -9,8 +9,8 @@ require "strong_parameters"
 class ActiveStorage::Attachment < ActiveRecord::Base
   self.table_name = "active_storage_attachments"
 
-  attr_protected
-  include ActiveModel::ForbiddenAttributesProtection
+  attr_protected if defined?(attr_protected)
+  include ActiveModel::ForbiddenAttributesProtection if defined?(ActiveModel::ForbiddenAttributesProtection)
 
   belongs_to :record, polymorphic: true
   belongs_to :blob, class_name: "ActiveStorage::Blob"

data/app/models/active_storage/blob.rb

@@ -4,7 +4,7 @@ require "active_storage/purge_blob_worker"
 require "active_storage/purge_attachment_worker"
 require "active_storage/variant"
 require "active_storage/variation"
-require "strong_parameters"
+require "strong_parameters" if Rails.version < '4.0'
 
 # A blob is a record that contains the metadata about a file and a key for where that file resides on the service.
 # Blobs can be created in two ways:
@@ -22,8 +22,8 @@ require "strong_parameters"
 class ActiveStorage::Blob < ActiveRecord::Base
   self.table_name = "active_storage_blobs"
 
-  attr_protected
-  include ActiveModel::ForbiddenAttributesProtection
+  attr_protected if defined?(attr_protected)
+  include ActiveModel::ForbiddenAttributesProtection if defined?(ActiveModel::ForbiddenAttributesProtection)
 
   has_secure_token :key
   store :metadata, coder: JSON

data/lib/active_storage/gem_version.rb

@@ -7,7 +7,7 @@ module ActiveStorage
   module VERSION
     MAJOR = 0
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
     PRE   = "alpha"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activestorage_legacy
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1.alpha
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
-- !ruby/object:Gem::Dependency
-  name: strong_parameters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
 description: 
 email: david@basecamp.com
 executables: []
@@ -109,7 +81,6 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -249,9 +220,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.2.3

data/Gemfile.lock

@@ -1,271 +0,0 @@
-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)
-
-PATH
-  remote: .
-  specs:
-    activestorage_legacy (0.1)
-      marcel (>= 1.0)
-      mini_magick (>= 4.0)
-      rails (>= 3.2.22.4)
-      sidekiq (>= 4.2.0)
-      strong_parameters
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (3.2.22.5)
-      actionpack (= 3.2.22.5)
-      mail (~> 2.5.4)
-    actionpack (3.2.22.5)
-      activemodel (= 3.2.22.5)
-      activesupport (= 3.2.22.5)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.22.5)
-      activesupport (= 3.2.22.5)
-      builder (~> 3.0.0)
-    activerecord (3.2.22.5)
-      activemodel (= 3.2.22.5)
-      activesupport (= 3.2.22.5)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.22.5)
-      activemodel (= 3.2.22.5)
-      activesupport (= 3.2.22.5)
-    activesupport (3.2.22.5)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    addressable (2.8.4)
-      public_suffix (>= 2.0.2, < 6.0)
-    arel (3.0.3)
-    ast (2.3.0)
-    aws-sdk (2.10.7)
-      aws-sdk-resources (= 2.10.7)
-    aws-sdk-core (2.10.7)
-      aws-sigv4 (~> 1.0)
-      jmespath (~> 1.0)
-    aws-sdk-resources (2.10.7)
-      aws-sdk-core (= 2.10.7)
-    aws-sigv4 (1.0.0)
-    azure-storage (0.11.4.preview)
-      azure-core (~> 0.1)
-      faraday (~> 0.9)
-      faraday_middleware (~> 0.10)
-      nokogiri (~> 1.6)
-    builder (3.0.4)
-    byebug (9.0.6)
-    capybara (2.18.0)
-      addressable
-      mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (>= 2.0, < 4.0)
-    concurrent-ruby (1.2.2)
-    connection_pool (2.2.5)
-    declarative (0.0.20)
-    declarative-option (0.1.0)
-    digest-crc (0.6.4)
-      rake (>= 12.0.0, < 14.0.0)
-    docile (1.3.5)
-    erubis (2.7.0)
-    faraday (0.12.1)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.12.0)
-      faraday (>= 0.7.4, < 1.0)
-    google-api-client (0.32.1)
-      addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.5, < 0.10.0)
-      httpclient (>= 2.8.1, < 3.0)
-      mini_mime (~> 1.0)
-      representable (~> 3.0)
-      retriable (>= 2.0, < 4.0)
-      signet (~> 0.10)
-    google-cloud-core (1.3.2)
-      google-cloud-env (~> 1.0)
-    google-cloud-env (1.2.1)
-      faraday (~> 0.11)
-    google-cloud-storage (1.21.1)
-      addressable (~> 2.5)
-      digest-crc (~> 0.4)
-      google-api-client (~> 0.26)
-      google-cloud-core (~> 1.2)
-      googleauth (>= 0.6.2, < 0.10.0)
-      mini_mime (~> 1.0)
-    googleauth (0.9.0)
-      faraday (~> 0.12)
-      jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
-      multi_json (~> 1.11)
-      os (>= 0.9, < 2.0)
-      signet (~> 0.7)
-    hike (1.2.3)
-    httparty (0.15.5)
-      multi_xml (>= 0.5.2)
-    httpclient (2.8.3)
-    i18n (0.9.5)
-      concurrent-ruby (~> 1.0)
-    jmespath (1.3.1)
-    journey (1.0.4)
-    json (1.8.6)
-    jwt (2.3.0)
-    mail (2.5.5)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    marcel (1.0.2)
-    memoist (0.16.2)
-    mime-types (1.25.1)
-    mini_magick (4.8.0)
-    mini_mime (1.1.2)
-    mini_portile2 (2.2.0)
-    minitest (5.15.0)
-    multi_json (1.15.0)
-    multi_xml (0.6.0)
-    multipart-post (2.0.0)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
-    os (1.1.4)
-    parallel (1.11.2)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    polyglot (0.3.5)
-    power_assert (2.0.3)
-    powerpack (0.1.1)
-    public_suffix (4.0.7)
-    rack (1.4.7)
-    rack-cache (1.13.0)
-      rack (>= 0.4)
-    rack-protection (2.2.4)
-      rack
-    rack-ssl (1.3.4)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (3.2.22.5)
-      actionmailer (= 3.2.22.5)
-      actionpack (= 3.2.22.5)
-      activerecord (= 3.2.22.5)
-      activeresource (= 3.2.22.5)
-      activesupport (= 3.2.22.5)
-      bundler (~> 1.0)
-      railties (= 3.2.22.5)
-    railties (3.2.22.5)
-      actionpack (= 3.2.22.5)
-      activesupport (= 3.2.22.5)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rainbow (2.2.2)
-      rake
-    rake (12.0.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    redis (4.4.0)
-    representable (3.0.4)
-      declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
-      uber (< 0.2.0)
-    retriable (3.1.2)
-    rr (3.1.0)
-    rubocop (0.49.1)
-      parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
-    sidekiq (5.2.8)
-      connection_pool (~> 2.2, >= 2.2.2)
-      rack (< 2.1.0)
-      rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 5)
-    signet (0.11.0)
-      addressable (~> 2.3)
-      faraday (~> 0.9)
-      jwt (>= 1.5, < 3.0)
-      multi_json (~> 1.10)
-    simplecov (0.17.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sprockets (2.2.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.13)
-    strong_parameters (0.2.3)
-      actionpack (~> 3.0)
-      activemodel (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-    test-unit (3.6.1)
-      power_assert
-    test-unit-activesupport (1.1.1)
-      activesupport
-      test-unit
-    test-unit-capybara (1.1.1)
-      capybara (>= 2.1.0)
-      json
-      test-unit (>= 2.5.3)
-    test-unit-notify (1.0.4)
-      test-unit (>= 2.4.9)
-    test-unit-rails (1.0.4)
-      rails
-      test-unit-activesupport (>= 1.0.2)
-      test-unit-capybara
-      test-unit-notify
-      test-unit-rr
-    test-unit-rr (1.0.5)
-      rr (>= 1.1.1)
-      test-unit (>= 2.5.2)
-    thor (1.2.2)
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.62)
-    uber (0.1.0)
-    unicode-display_width (1.3.0)
-    xpath (3.2.0)
-      nokogiri (~> 1.8)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activestorage_legacy!
-  aws-sdk (~> 2)
-  azure-core!
-  azure-storage
-  bundler (~> 1.15)
-  byebug
-  google-cloud-storage
-  httparty
-  mini_magick
-  minitest (~> 5.15)
-  rails (~> 3.2.22.4)
-  rake
-  rubocop
-  simplecov
-  sqlite3
-  test-unit (~> 3.6)
-  test-unit-rails (~> 1.0)
-
-BUNDLED WITH
-   1.17.3