asset_sync 2.11.0 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7e222d9419b7c2039f3db9a20676ec264eaaa233c9d954fd62a28a56bdf2968
-  data.tar.gz: 3fc2471434cd60071d283a59cef97f0ff845c4066161ce8c99b93d08435abe66
+  metadata.gz: fb865a74b05c9a16ce39367906e4b4e98e95aa1ee6513cce217c84bea8a832b6
+  data.tar.gz: 4684411bd7bddcf9daf4e6e9c1ba0b92fbf85cf67f2c9a42825b3c910e151c49
 SHA512:
-  metadata.gz: fd001d4c15476c0b72b10bf8630a08a52910189b583b000adb0b3ceea925cd66f6e0bf94e72a2774213e5133be03c4dfc6e8d9d58ba8d4b8f0b5df393a52b853
-  data.tar.gz: 8115434ee5a0d37f09350fa3e4c1e4402b47635c7b04eff6f638df65c08edca9a5ba76f05c7993ea09cc57ecd2447b16b002d85b5cb6fc0cc6d24199caddbef6
+  metadata.gz: f02951393035ba6db862849187d74f41d49529206d6d8a13b84ccca91b7d7c533fee6f0ea2440ea4b4e35ed72967d2d7489cfb6118c9fb8895e201964f146f64
+  data.tar.gz: 51e1bd03d2acd5a528fa5960ff5986c29303bb8ec03ce643cb57bce30958fc5d1fab981de815459fc9b16eab176a1717ad1873a9b4f08a7659b94f5ed8b7bd5d

data/.github/workflows/tests.yaml

@@ -0,0 +1,64 @@
+name: Tests
+
+on:
+  pull_request:
+    branches:
+      - master
+    paths-ignore:
+      - 'README.md'
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - 'README.md'
+
+jobs:
+  unit_tests:
+    name: Unit Tests
+    if: "contains(github.event.commits[0].message, '[ci skip]') == false"
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu
+        ruby:
+          - 2.5
+          - 2.6
+          - 2.7
+          - 3.0
+          - jruby
+        gemfile:
+          - gemfiles/rails_5_2.gemfile
+          - gemfiles/rails_6_0.gemfile
+          - gemfiles/rails_6_1.gemfile
+        allow_failures:
+          - false
+        include:
+          - os: ubuntu
+            ruby: ruby-head
+            gemfile: gemfiles/rails_6_1.gemfile
+            allow_failures: true
+          - os: ubuntu
+            ruby: jruby-head
+            gemfile: gemfiles/rails_6_1.gemfile
+            allow_failures: true
+        exclude:
+          - os: ubuntu
+            ruby: 3.0
+            gemfile: gemfiles/rails_5_2.gemfile
+            allow_failures: false
+    env:
+      BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
+      ALLOW_FAILURES: "${{ matrix.allow_failures }}"
+    runs-on: ${{ matrix.os }}-latest
+    continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Test
+        run: bundle exec rake spec:unit || $ALLOW_FAILURES

data/.travis.yml

@@ -2,11 +2,12 @@
 # http://docs.travis-ci.com/user/workers/container-based-infrastructure/
 sudo: false
 language: ruby
+arch:
+  - amd64
+  - ppc64le
 cache:
   bundler: true
 rvm:
-  - 2.3
-  - 2.4
   - 2.5
   - 2.6
   - 2.7
@@ -14,10 +15,9 @@ rvm:
   - jruby
   - jruby-head
 gemfile:
-  - gemfiles/rails_5_0.gemfile
-  - gemfiles/rails_5_1.gemfile
   - gemfiles/rails_5_2.gemfile
   - gemfiles/rails_6_0.gemfile
+  - gemfiles/rails_6_1.gemfile
 before_install:
   # Cannot use bundler 2.x due to dependency (mainly rails 4.2)
   # Solution from https://github.com/rails/rails/blob/4-2-stable/.travis.yml
@@ -34,11 +34,6 @@ matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
-  exclude:
-    - rvm: 2.3
-      gemfile: gemfiles/rails_6_0.gemfile
-    - rvm: 2.4
-      gemfile: gemfiles/rails_6_0.gemfile
 notifications:
   webhooks:
     urls:

data/Appraisals

@@ -1,12 +1,4 @@
 
-appraise "rails_5_0" do
-  gem "rails", "~> 5.0.0"
-end
-
-appraise "rails_5_1" do
-  gem "rails", "~> 5.1.0"
-end
-
 appraise "rails_5_2" do
   gem "rails", "~> 5.2.0"
 end
@@ -14,3 +6,7 @@ end
 appraise "rails_6_0" do
   gem "rails", "~> 6.0.0"
 end
+
+appraise "rails_6_1" do
+  gem "rails", "~> 6.1.0"
+end

data/CHANGELOG.md

@@ -18,6 +18,46 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
+## [2.14.0] - 2020-03-31
+
+### Added
+
+- Add support for fog option `google_json_key_string`
+  (https://github.com/AssetSync/asset_sync/pull/415)
+
+
+## [2.13.1] - 2021-03-01
+
+### Fixed
+
+- Fix "files to be uploaded list" generation for file names with dashes
+  (https://github.com/AssetSync/asset_sync/pull/414)
+
+
+## [2.13.0] - 2020-12-14
+
+### Added
+
+- Add Backblaze B2 Cloud Storage support
+  (https://github.com/AssetSync/asset_sync/pull/410)
+
+
+## [2.12.1] - 2020-06-17
+
+### Fixed
+
+- Fix initializer template in generator
+  (https://github.com/AssetSync/asset_sync/pull/404)
+
+
+## [2.12.0] - 2020-06-11
+
+### Added
+
+- Add option `aws_session_token` to support AWS Temporary Security Credentials
+  (https://github.com/AssetSync/asset_sync/pull/403)
+
+
 ## [2.11.0] - 2020-03-13
 
 ### Added
@@ -962,7 +1002,12 @@ Changes:
     * Merge branch 'sinatra'
 
 
-[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.11.0...HEAD
+[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.14.0...HEAD
+[2.14.0]: https://github.com/AssetSync/asset_sync/compare/v2.13.1...v2.14.0
+[2.13.1]: https://github.com/AssetSync/asset_sync/compare/v2.13.0...v2.13.1
+[2.13.0]: https://github.com/AssetSync/asset_sync/compare/v2.12.1...v2.13.0
+[2.12.1]: https://github.com/AssetSync/asset_sync/compare/v2.12.0...v2.12.1
+[2.12.0]: https://github.com/AssetSync/asset_sync/compare/v2.11.0...v2.12.0
 [2.11.0]: https://github.com/AssetSync/asset_sync/compare/v2.10.0...v2.11.0
 [2.10.0]: https://github.com/AssetSync/asset_sync/compare/v2.9.1...v2.10.0
 [2.9.1]: https://github.com/AssetSync/asset_sync/compare/v2.9.0...v2.9.1

data/README.md

@@ -38,6 +38,13 @@ gem "asset_sync"
 gem "fog-azure-rm"
 ```
 
+To use Backblaze B2, insert these.
+
+``` ruby
+gem "asset_sync"
+gem "fog-backblaze"
+```
+
 
 ### Extended Installation (Faster sync with turbosprockets)
 
@@ -77,6 +84,13 @@ Or, to use Azure Blob storage, configure as this.
   config.action_controller.asset_host = "//#{ENV['AZURE_STORAGE_ACCOUNT_NAME']}.blob.core.windows.net/#{ENV['FOG_DIRECTORY']}"
 ```
 
+Or, to use Backblaze B2, configure as this.
+
+``` ruby
+  #config/environments/production.rb
+  config.action_controller.asset_host = "//f000.backblazeb2.com/file/#{ENV['FOG_DIRECTORY']}"
+```
+
 
 On **HTTPS**: the exclusion of any protocol in the asset host declaration above will allow browsers to choose the transport mechanism on the fly. So if your application is available under both HTTP and HTTPS the assets will be served to match.
 
@@ -170,7 +184,7 @@ heroku config:add FOG_DIRECTORY=xxxx
 heroku config:add FOG_PROVIDER=Rackspace
 ```
 
-Google Storage Cloud configuration is supported as well. The preferred option is using the [GCS JSON API](https://github.com/fog/fog-google#storage) which requires that you create an appropriate service account, generate the signatures and make them accessible to asset sync at the prescribed location 
+Google Storage Cloud configuration is supported as well. The preferred option is using the [GCS JSON API](https://github.com/fog/fog-google#storage) which requires that you create an appropriate service account, generate the signatures and make them accessible to asset sync at the prescribed location
 
 ```bash
 heroku config:add FOG_PROVIDER=Google
@@ -199,6 +213,7 @@ Run the included Rake task to generate a starting point.
     rails g asset_sync:install --provider=Rackspace
     rails g asset_sync:install --provider=AWS
     rails g asset_sync:install --provider=AzureRM
+    rails g asset_sync:install --provider=Backblaze
 
 The generator will create a Rails initializer at `config/initializers/asset_sync.rb`.
 
@@ -208,6 +223,7 @@ AssetSync.configure do |config|
   config.fog_directory = ENV['FOG_DIRECTORY']
   config.aws_access_key_id = ENV['AWS_ACCESS_KEY_ID']
   config.aws_secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+  config.aws_session_token = ENV['AWS_SESSION_TOKEN'] if ENV.key?('AWS_SESSION_TOKEN')
 
   # Don't delete files from the store
   # config.existing_remote_files = 'keep'
@@ -244,7 +260,7 @@ AssetSync.configure do |config|
   #
   # Upload files concurrently
   # config.concurrent_uploads = false
-  # 
+  #
   # Number of threads when concurrent_uploads is enabled
   # config.concurrent_uploads_max_threads = 10
   #
@@ -273,6 +289,7 @@ Run the included Rake task to generate a starting point.
     rails g asset_sync:install --use-yml --provider=Rackspace
     rails g asset_sync:install --use-yml --provider=AWS
     rails g asset_sync:install --use-yml --provider=AzureRM
+    rails g asset_sync:install --use-yml --provider=Backblaze
 
 The generator will create a YAML file at `config/asset_sync.yml`.
 
@@ -382,7 +399,7 @@ To customize the overrides:
 AssetSync.configure do |config|
   # Clear the default overrides
   config.file_ext_to_mime_type_overrides.clear
-  
+
   # Add/Edit overrides
   # Will call `#to_s` for inputs
   config.file_ext_to_mime_type_overrides.add(:js, :"application/x-javascript")
@@ -391,7 +408,7 @@ end
 The blocks are run when local files are being scanned and uploaded
 
 #### Fog (Required)
-* **fog\_provider**: your storage provider *AWS* (S3) or *Rackspace* (Cloud Files) or *Google* (Google Storage) or *AzureRM* (Azure Blob)
+* **fog\_provider**: your storage provider *AWS* (S3) or *Rackspace* (Cloud Files) or *Google* (Google Storage) or *AzureRM* (Azure Blob) or *Backblaze* (Backblaze B2)
 * **fog\_directory**: your bucket name
 
 #### Fog (Optional)
@@ -425,6 +442,11 @@ When using the S3 API
 * **azure\_storage\_account\_name**: your Azure Blob access key
 * **azure\_storage\_access\_key**: your Azure Blob access secret
 
+#### Backblaze B2
+* **b2\_key\_id**: Your Backblaze B2 key ID
+* **b2\_key\_token**: Your Backblaze B2 key token
+* **b2\_bucket\_id**: Your Backblaze B2 bucket ID
+
 #### Rackspace (Optional)
 
 * **rackspace\_auth\_url**: Rackspace auth URL, for Rackspace London use: `https://lon.identity.api.rackspacecloud.com/v2.0`
@@ -550,7 +572,7 @@ AssetSync.configure do |config|
   config.prefix = 'assets'
   # Can be a `Pathname` or `String`
   # Will be converted into an `Pathname`
-  # If relative, will be converted into an absolute path 
+  # If relative, will be converted into an absolute path
   # via `::Rails.root` or `::Dir.pwd`
   config.public_path = Pathname('./public')
 end
@@ -621,7 +643,7 @@ Make sure you have a .env file with these details:-
     AWS_SECRET_ACCESS_KEY=<yoursecretkey>
     FOG_DIRECTORY=<yourbucket>
     FOG_REGION=<youbucketregion>
-    
+
     # for AzureRM provider
     AZURE_STORAGE_ACCOUNT_NAME=<youraccountname>
     AZURE_STORAGE_ACCESS_KEY=<youraccesskey>

data/asset_sync.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "fog-aws"
   s.add_development_dependency "fog-azure-rm"
+  s.add_development_dependency "fog-backblaze"
 
   s.add_development_dependency "uglifier"
   s.add_development_dependency "appraisal"

data/gemfiles/{rails_5_0.gemfile → rails_6_1.gemfile}

@@ -5,6 +5,6 @@ source "https://rubygems.org"
 gem "rcov", platforms: :mri_18, group: [:development, :test]
 gem "simplecov", platforms: [:jruby, :mri_19, :ruby_19, :mri_20, :rbx], group: [:development, :test], require: false
 gem "jruby-openssl", platform: :jruby
-gem "rails", "~> 5.0.0"
+gem "rails", "~> 6.1.0"
 
 gemspec path: "../"

data/lib/asset_sync/config.rb

@@ -37,7 +37,7 @@ module AssetSync
     attr_reader   :fog_public            # e.g. true, false, "default"
 
     # Amazon AWS
-    attr_accessor :aws_access_key_id, :aws_secret_access_key, :aws_reduced_redundancy, :aws_iam_roles, :aws_signature_version
+    attr_accessor :aws_access_key_id, :aws_secret_access_key, :aws_session_token, :aws_reduced_redundancy, :aws_iam_roles, :aws_signature_version
     attr_accessor :fog_host              # e.g. 's3.amazonaws.com'
     attr_accessor :fog_port              # e.g. '9000'
     attr_accessor :fog_path_style        # e.g. true
@@ -49,12 +49,18 @@ module AssetSync
     # Google Storage
     attr_accessor :google_storage_secret_access_key, :google_storage_access_key_id  # when using S3 interop
     attr_accessor :google_json_key_location # when using service accounts
+    attr_accessor :google_json_key_string # when using service accounts
     attr_accessor :google_project # when using service accounts
 
     # Azure Blob with Fog::AzureRM
     attr_accessor :azure_storage_account_name
     attr_accessor :azure_storage_access_key
 
+    # Backblaze B2 with Fog::Backblaze
+    attr_accessor :b2_key_id
+    attr_accessor :b2_key_token
+    attr_accessor :b2_bucket_id
+
     validates :existing_remote_files, :inclusion => { :in => %w(keep delete ignore) }
 
     validates :fog_provider,          :presence => true
@@ -66,8 +72,12 @@ module AssetSync
     validates :rackspace_api_key,     :presence => true, :if => :rackspace?
     validates :google_storage_secret_access_key,  :presence => true, :if => :google_interop?
     validates :google_storage_access_key_id,      :presence => true, :if => :google_interop?
-    validates :google_json_key_location,          :presence => true, :if => :google_service_account?
     validates :google_project,                    :presence => true, :if => :google_service_account?
+    validate(:if => :google_service_account?) do
+      unless google_json_key_location.present? || google_json_key_string.present?
+        errors.add(:base, 'must provide either google_json_key_location or google_json_key_string if using Google service account')
+      end
+    end
     validates :concurrent_uploads,    :inclusion => { :in => [true, false] }
 
     def initialize
@@ -142,17 +152,21 @@ module AssetSync
     end
 
     def google_interop?
-      google? && google_json_key_location.nil?
+      google? && google_json_key_location.nil? && google_json_key_string.nil?
     end
 
     def google_service_account?
-      google? && google_json_key_location
+      google? && (google_json_key_location || google_json_key_string)
     end
 
     def azure_rm?
       fog_provider =~ /azurerm/i
     end
 
+    def backblaze?
+      fog_provider =~ /backblaze/i
+    end
+
     def cache_asset_regexp=(cache_asset_regexp)
       self.cache_asset_regexps = [cache_asset_regexp]
     end
@@ -203,6 +217,7 @@ module AssetSync
       self.fog_scheme             = yml["fog_scheme"]
       self.aws_access_key_id      = yml["aws_access_key_id"]
       self.aws_secret_access_key  = yml["aws_secret_access_key"]
+      self.aws_session_token      = yml["aws_session_token"] if yml.has_key?("aws_session_token")
       self.aws_reduced_redundancy = yml["aws_reduced_redundancy"]
       self.aws_iam_roles          = yml["aws_iam_roles"]
       self.aws_signature_version  = yml["aws_signature_version"]
@@ -232,6 +247,10 @@ module AssetSync
       self.azure_storage_account_name = yml['azure_storage_account_name'] if yml.has_key?("azure_storage_account_name")
       self.azure_storage_access_key   = yml['azure_storage_access_key'] if yml.has_key?("azure_storage_access_key")
 
+      self.b2_key_id      = yml['b2_key_id']    if yml.has_key?("b2_key_id")
+      self.b2_key_token   = yml['b2_key_token'] if yml.has_key?("b2_key_token")
+      self.b2_bucket_id   = yml['b2_bucket_id'] if yml.has_key?("b2_bucket_id")
+
       # TODO deprecate the other old style config settings. FML.
       self.aws_access_key_id      = yml["aws_access_key"] if yml.has_key?("aws_access_key")
       self.aws_secret_access_key  = yml["aws_access_secret"] if yml.has_key?("aws_access_secret")
@@ -260,6 +279,7 @@ module AssetSync
             :aws_access_key_id => aws_access_key_id,
             :aws_secret_access_key => aws_secret_access_key
           })
+          options.merge!({:aws_session_token => aws_session_token}) if aws_session_token
         end
         options.merge!({:host => fog_host}) if fog_host
         options.merge!({:port => fog_port}) if fog_port
@@ -277,6 +297,8 @@ module AssetSync
       elsif google?
         if google_json_key_location
           options.merge!({:google_json_key_location => google_json_key_location, :google_project => google_project})
+        elsif google_json_key_string
+          options.merge!({:google_json_key_string => google_json_key_string, :google_project => google_project})
         else
           options.merge!({
             :google_storage_secret_access_key => google_storage_secret_access_key,
@@ -291,6 +313,13 @@ module AssetSync
           :azure_storage_access_key   => azure_storage_access_key,
         })
         options.merge!({:environment => fog_region}) if fog_region
+      elsif backblaze?
+        require 'fog/backblaze'
+        options.merge!({
+          :b2_key_id      => b2_key_id,
+          :b2_key_token   => b2_key_token,
+          :b2_bucket_id   => b2_bucket_id,
+        })
       else
         raise ArgumentError, "AssetSync Unknown provider: #{fog_provider} only AWS, Rackspace and Google are supported currently."
       end

data/lib/asset_sync/engine.rb

@@ -23,6 +23,7 @@ module AssetSync
 
           config.aws_access_key_id = ENV['AWS_ACCESS_KEY_ID'] if ENV.has_key?('AWS_ACCESS_KEY_ID')
           config.aws_secret_access_key = ENV['AWS_SECRET_ACCESS_KEY'] if ENV.has_key?('AWS_SECRET_ACCESS_KEY')
+          config.aws_session_token = ENV['AWS_SESSION_TOKEN'] if ENV.has_key?('AWS_SESSION_TOKEN')
           config.aws_signature_version = ENV['AWS_SIGNATURE_VERSION'] if ENV.has_key?('AWS_SIGNATURE_VERSION')
           config.aws_reduced_redundancy = ENV['AWS_REDUCED_REDUNDANCY'] == true  if ENV.has_key?('AWS_REDUCED_REDUNDANCY')
 
@@ -35,6 +36,10 @@ module AssetSync
           config.azure_storage_account_name = ENV['AZURE_STORAGE_ACCOUNT_NAME'] if ENV.has_key?('AZURE_STORAGE_ACCOUNT_NAME')
           config.azure_storage_access_key = ENV['AZURE_STORAGE_ACCESS_KEY'] if ENV.has_key?('AZURE_STORAGE_ACCESS_KEY')
 
+          config.b2_key_id    = ENV['B2_KEY_ID']    if ENV.has_key?('B2_KEY_ID')
+          config.b2_key_token = ENV['B2_KEY_TOKEN'] if ENV.has_key?('B2_KEY_TOKEN')
+          config.b2_bucket_id = ENV['B2_BUCKET_ID'] if ENV.has_key?('B2_BUCKET_ID')
+
           config.enabled = (ENV['ASSET_SYNC_ENABLED'] == 'true') if ENV.has_key?('ASSET_SYNC_ENABLED')
 
           config.existing_remote_files = ENV['ASSET_SYNC_EXISTING_REMOTE_FILES'] || "keep"

data/lib/asset_sync/storage.rb

@@ -4,7 +4,7 @@ require "asset_sync/multi_mime"
 
 module AssetSync
   class Storage
-    REGEXP_FINGERPRINTED_FILES = /^(.*)\/([^-]+)-[^\.]+\.([^\.]+)$/
+    REGEXP_FINGERPRINTED_FILES = /\A(.*)\/(.+)-[^\.]+\.([^\.]+)\z/m
     REGEXP_ASSETS_TO_CACHE_CONTROL = /-[0-9a-fA-F]{32,}$/
 
     class BucketNotFound < StandardError;
@@ -22,7 +22,13 @@ module AssetSync
 
     def bucket
       # fixes: https://github.com/rumblelabs/asset_sync/issues/18
-      @bucket ||= connection.directories.get(self.config.fog_directory, :prefix => self.config.assets_prefix)
+
+      @bucket ||= if self.config.backblaze?
+                    connection.directories.get(self.config.fog_directory)
+                  else
+                    connection.directories.get(self.config.fog_directory, :prefix => self.config.assets_prefix)
+                  end
+
     end
 
     def log(msg)

data/lib/asset_sync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AssetSync
-  VERSION = "2.11.0"
+  VERSION = "2.14.0"
 end

data/lib/generators/asset_sync/install_generator.rb

@@ -5,7 +5,7 @@ module AssetSync
 
     # Commandline options can be defined here using Thor-like options:
     class_option :use_yml,   :type => :boolean, :default => false, :desc => "Use YML file instead of Rails Initializer"
-    class_option :provider,  :type => :string,  :default => "AWS",  :desc => "Generate with support for 'AWS', 'Rackspace', 'Google', or 'AzureRM"
+    class_option :provider,  :type => :string,  :default => "AWS",  :desc => "Generate with support for 'AWS', 'Rackspace', 'Google', 'AzureRM', or 'Backblaze'"
 
     def self.source_root
       @source_root ||= File.join(File.dirname(__FILE__), 'templates')
@@ -27,6 +27,10 @@ module AssetSync
       options[:provider] == 'AzureRM'
     end
 
+    def backblaze?
+      options[:provider] == 'Backblaze'
+    end
+
     def aws_access_key_id
       "<%= ENV['AWS_ACCESS_KEY_ID'] %>"
     end
@@ -35,6 +39,10 @@ module AssetSync
       "<%= ENV['AWS_SECRET_ACCESS_KEY'] %>"
     end
 
+    def aws_session_token
+      "<%= ENV['AWS_SESSION_TOKEN'] %>"
+    end
+
     def google_storage_access_key_id
       "<%= ENV['GOOGLE_STORAGE_ACCESS_KEY_ID'] %>"
     end
@@ -59,6 +67,18 @@ module AssetSync
       "<%= ENV['AZURE_STORAGE_ACCESS_KEY'] %>"
     end
 
+    def b2_key_id
+      "<%= ENV['B2_KEY_ID'] %>"
+    end
+
+    def b2_key_token
+      "<%= ENV['B2_KEY_TOKEN'] %>"
+    end
+
+    def b2_bucket_id
+      "<%= ENV['B2_BUCKET_ID'] %>"
+    end
+
     def app_name
       @app_name ||= Rails.application.is_a?(Rails::Application) && Rails.application.class.name.sub(/::Application$/, "").downcase
     end

data/lib/generators/asset_sync/templates/asset_sync.rb

@@ -4,6 +4,7 @@ if defined?(AssetSync)
     config.fog_provider = 'AWS'
     config.aws_access_key_id = ENV['AWS_ACCESS_KEY_ID']
     config.aws_secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+    config.aws_session_token = ENV['AWS_SESSION_TOKEN'] if ENV.key?('AWS_SESSION_TOKEN')
     # To use AWS reduced redundancy storage.
     # config.aws_reduced_redundancy = true
     #
@@ -34,6 +35,12 @@ if defined?(AssetSync)
     config.azure_storage_account_name = ENV['AZURE_STORAGE_ACCOUNT_NAME']
     config.azure_storage_access_key = ENV['AZURE_STORAGE_ACCESS_KEY']
 
+    <%- elsif backblaze? -%>
+    config.fog_provider = 'Backblaze'
+    config.b2_key_id      = ENV['B2_KEY_ID']
+    config.b2_key_token   = ENV['B2_KEY_TOKEN']
+    config.b2_bucket_id   = ENV['B2_BUCKET_ID']
+
     # config.fog_directory specifies container name of Azure Blob storage
     <%- end -%>
     config.fog_directory = ENV['FOG_DIRECTORY']

data/lib/generators/asset_sync/templates/asset_sync.yml

@@ -32,8 +32,13 @@ defaults: &defaults
   fog_provider: 'AzureRM'
   azure_storage_account_name: "<%= azure_storage_account_name %>"
   azure_storage_access_key: "<%= azure_storage_access_key %>"
-
   # fog_directory specifies container name of Azure Blob storage
+  <%- elsif backblaze? -%>
+  fog_provider:   Backblaze
+  b2_key_id:      "<%= b2_key_id %>"
+  b2_key_token:   "<%= b2_key_token %>"
+  b2_bucket_id:   "<%= b2_bucket_id %>"
+  # fog_directory specifies container name of Backblaze B2 Bucket
   <%- end -%>
   fog_directory: "<%= app_name %>-assets"
 

data/spec/fixtures/backblaze_with_yml/config/asset_sync.yml

@@ -0,0 +1,20 @@
+defaults: &defaults
+  fog_provider: "Backblaze"
+  b2_key_id: 'xxxx'
+  b2_key_token: 'zzzz'
+  b2_bucket_id: '1234'
+
+development:
+  <<: *defaults
+  fog_directory: "rails_app_development"
+  existing_remote_files: keep
+
+test:
+  <<: *defaults
+  fog_directory: "rails_app_test"
+  existing_remote_files: keep
+
+production:
+  <<: *defaults
+  fog_directory: "rails_app_production"
+  existing_remote_files: delete

data/spec/integration/backblaze_intergration_spec.rb

@@ -0,0 +1,74 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require "fog/backblaze"
+
+def bucket(name)
+  options = {
+    :provider       => 'Backblaze',
+    :b2_key_id      => ENV['B2_KEY_ID'],
+    :b2_key_token   => ENV['B2_KEY_TOKEN'],
+    :b2_bucket_id   => ENV['B2_BUCKET_ID']
+  }
+  options.merge!({ :environment => ENV['FOG_REGION'] }) if ENV.has_key?('FOG_REGION')
+
+  connection = Fog::Storage.new(options)
+  connection.directories.get(ENV['FOG_DIRECTORY'])
+end
+
+def execute(command)
+  app_path = File.expand_path("../../dummy_app", __FILE__)
+  Dir.chdir app_path
+  `#{command}`
+end
+
+describe "AssetSync" do
+
+  before(:each) do
+    @prefix = SecureRandom.hex(6)
+  end
+
+  let(:app_js_regex){
+    /#{@prefix}\/application-[a-zA-Z0-9]*.js$/
+  }
+
+  let(:app_js_gz_regex){
+    /#{@prefix}\/application-[a-zA-Z0-9]*.js.gz$/
+  }
+
+  let(:files){ bucket(@prefix).files }
+
+
+  after(:each) do
+    @directory = bucket(@prefix)
+    @directory.files.each do |f|
+      f.destroy
+    end
+  end
+
+  it "sync" do
+    execute "rake ASSET_SYNC_PREFIX=#{@prefix} assets:precompile"
+
+    files = bucket(@prefix).files
+
+    app_js = files.select{ |f| f.key =~ app_js_regex }.first
+    expect(app_js.content_type).to eq("application/javascript")
+
+    app_js_gz = files.select{ |f| f.key =~ app_js_gz_regex }.first
+    expect(app_js_gz.content_type).to eq("application/javascript")
+    expect(app_js_gz.content_encoding).to eq("gzip")
+  end
+
+  it "sync with enabled=false" do
+    execute "rake ASSET_SYNC_PREFIX=#{@prefix} ASSET_SYNC_ENABLED=false assets:precompile"
+    expect(bucket(@prefix).files.size).to eq(0)
+  end
+
+  it "sync with gzip_compression=true" do
+    execute "rake ASSET_SYNC_PREFIX=#{@prefix} ASSET_SYNC_GZIP_COMPRESSION=true assets:precompile"
+    # bucket(@prefix).files.size.should == 3
+
+    app_js_path = files.select{ |f| f.key =~ app_js_regex }.first
+    app_js = files.get( app_js_path.key )
+    expect(app_js.content_type).to eq("application/javascript")
+  end
+
+end

data/spec/unit/backblaze_spec.rb

@@ -0,0 +1,150 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe AssetSync do
+  include_context "mock Rails without_yml"
+
+  describe 'with initializer' do
+    before(:each) do
+      AssetSync.config = AssetSync::Config.new
+      AssetSync.configure do |config|
+        config.fog_provider = 'Backblaze'
+        config.b2_key_id = 'aaaa'
+        config.b2_key_token = 'bbbb'
+        config.b2_bucket_id = '4567'
+        config.fog_directory = 'mybucket'
+        config.existing_remote_files = "keep"
+      end
+    end
+
+    it "should configure provider as Backblaze" do
+      expect(AssetSync.config.fog_provider).to eq('Backblaze')
+    end
+
+    it "should should keep existing remote files" do
+      expect(AssetSync.config.existing_remote_files?).to eq(true)
+    end
+
+    it "should configure b2_key_id" do
+      expect(AssetSync.config.b2_key_id).to eq("aaaa")
+    end
+
+    it "should configure b2_key_token" do
+      expect(AssetSync.config.b2_key_token).to eq("bbbb")
+    end
+
+    it "should configure b2_bucket_id" do
+      expect(AssetSync.config.b2_bucket_id).to eq("4567")
+    end
+
+    it "should configure fog_directory" do
+      expect(AssetSync.config.fog_directory).to eq("mybucket")
+    end
+
+    it "should configure existing_remote_files" do
+      expect(AssetSync.config.existing_remote_files).to eq("keep")
+    end
+
+    it "should default gzip_compression to false" do
+      expect(AssetSync.config.gzip_compression).to be_falsey
+    end
+
+    it "should default manifest to false" do
+      expect(AssetSync.config.manifest).to be_falsey
+    end
+  end
+
+  describe 'from yml' do
+    before(:each) do
+      set_rails_root('backblaze_with_yml')
+      AssetSync.config = AssetSync::Config.new
+    end
+
+    it "should configure b2_key_id" do
+      expect(AssetSync.config.b2_key_id).to eq("xxxx")
+    end
+
+    it "should configure b2_key_token" do
+      expect(AssetSync.config.b2_key_token).to eq("zzzz")
+    end
+
+    it "should configure b2_bucket_id" do
+      expect(AssetSync.config.b2_bucket_id).to eq("1234")
+    end
+
+    it "should configure fog_directory" do
+      expect(AssetSync.config.fog_directory).to eq("rails_app_test")
+    end
+
+    it "should configure existing_remote_files" do
+      expect(AssetSync.config.existing_remote_files).to eq("keep")
+    end
+
+    it "should default gzip_compression to false" do
+      expect(AssetSync.config.gzip_compression).to be_falsey
+    end
+
+    it "should default manifest to false" do
+      expect(AssetSync.config.manifest).to be_falsey
+    end
+  end
+
+  describe 'with no configuration' do
+    before(:each) do
+      AssetSync.config = AssetSync::Config.new
+    end
+
+    it "should be invalid" do
+      expect{ AssetSync.sync }.to raise_error(::AssetSync::Config::Invalid)
+    end
+  end
+
+  describe 'with fail_silent configuration' do
+    before(:each) do
+      allow(AssetSync).to receive(:stderr).and_return(StringIO.new)
+      AssetSync.config = AssetSync::Config.new
+      AssetSync.configure do |config|
+        config.fail_silently = true
+      end
+    end
+
+    it "should not raise an invalid exception" do
+      expect{ AssetSync.sync }.not_to raise_error
+    end
+  end
+
+  describe 'with gzip_compression enabled' do
+    before(:each) do
+      AssetSync.config = AssetSync::Config.new
+      AssetSync.config.gzip_compression = true
+    end
+
+    it "config.gzip? should be true" do
+      expect(AssetSync.config.gzip?).to be_truthy
+    end
+  end
+
+  describe 'with manifest enabled' do
+    before(:each) do
+      AssetSync.config = AssetSync::Config.new
+      AssetSync.config.manifest = true
+    end
+
+    it "config.manifest should be true" do
+      expect(AssetSync.config.manifest).to be_truthy
+    end
+
+    it "config.manifest_path should default to public/assets.." do
+      expect(AssetSync.config.manifest_path).to match(/public\/assets\/manifest.yml/)
+    end
+
+    it "config.manifest_path should default to public/assets.." do
+      Rails.application.config.assets.manifest = "/var/assets"
+      expect(AssetSync.config.manifest_path).to eq("/var/assets/manifest.yml")
+    end
+
+    it "config.manifest_path should default to public/custom_assets.." do
+      Rails.application.config.assets.prefix = 'custom_assets'
+      expect(AssetSync.config.manifest_path).to match(/public\/custom_assets\/manifest.yml/)
+    end
+  end
+end

data/spec/unit/google_spec.rb

@@ -99,6 +99,28 @@ describe AssetSync do
       end
     end
 
+    describe "when using service account with JSON key string" do
+      before(:each) do
+        AssetSync.configure do |config|
+          config.google_json_key_string = 'a-google-json-key-string'
+          config.google_project = 'a-google-project-name'
+        end
+      end
+
+      it "should configure google_json_key_string" do
+        expect(AssetSync.config.google_json_key_string).to eq("a-google-json-key-string")
+      end
+
+      it "should return the correct fog_options" do
+        expected_fog_options = { google_json_key_string: "a-google-json-key-string",
+                                 google_project: 'a-google-project-name',
+                                provider: "Google"}
+        expect(AssetSync.config.fog_options).to eq(expected_fog_options)
+      end
+      it "should not require that google_storage_secret_access_key or access_key_id be set" do
+        expect(AssetSync.config.valid?).to eq(true)
+      end
+    end
   end
 
   describe 'from yml' do

data/spec/unit/storage_spec.rb

@@ -137,17 +137,22 @@ describe AssetSync::Storage do
 
     it 'should upload updated non-fingerprinted files' do
       @local_files = [
-        'public/image.png',
-        'public/image-82389298328.png',
-        'public/image-a8389f9h324.png',
+        'public/great-image.png',
+        'public/great-image-82389298328.png',
+        'public/great-image-a8389f9h324.png',
+        "public/new\nline.js",
+        "public/new\nline-aaaaaaaaaaa.js",
+        "public/new\nline-bbbbbbbbbbb.js",
         'public/application.js',
         'public/application-b3389d983k1.js',
         'public/application-ac387d53f31.js',
         'public',
       ]
       @remote_files = [
-        'public/image.png',
-        'public/image-a8389f9h324.png',
+        'public/great-image.png',
+        'public/great-image-a8389f9h324.png',
+        "public/new\nline.js",
+        "public/new\nline-aaaaaaaaaaa.js",
         'public/application.js',
         'public/application-b3389d983k1.js',
       ]
@@ -158,7 +163,8 @@ describe AssetSync::Storage do
       allow(File).to receive(:file?).and_return(true) # Pretend they all exist
 
       updated_nonfingerprinted_files = [
-        'public/image.png',
+        'public/great-image.png',
+        "public/new\nline.js",
         'public/application.js',
       ]
       (@local_files - @remote_files + updated_nonfingerprinted_files).each do |file|
@@ -436,6 +442,7 @@ describe AssetSync::Storage do
         allow(directory).to receive(:files).and_return([file])
         allow(file).to receive(:key).and_return('public/image.png')
         allow(connection).to receive(:directories).and_return(directories)
+        allow(config).to receive(:backblaze?).and_return(false)
         expect(connection).not_to receive(:delete_multiple_objects)
         expect(file).to receive(:destroy)
 

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: asset_sync
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.14.0
 platform: ruby
 authors:
 - Simon Hamilton
 - David Rice
 - Phil McClure
 - Toby Osbourn
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-13 00:00:00.000000000 Z
+date: 2021-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -153,6 +153,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fog-backblaze
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -193,6 +207,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".github/workflows/tests.yaml"
 - ".gitignore"
 - ".travis.yml"
 - Appraisals
@@ -203,10 +218,9 @@ files:
 - UPGRADING.md
 - asset_sync.gemspec
 - docs/heroku.md
-- gemfiles/rails_5_0.gemfile
-- gemfiles/rails_5_1.gemfile
 - gemfiles/rails_5_2.gemfile
 - gemfiles/rails_6_0.gemfile
+- gemfiles/rails_6_1.gemfile
 - lib/asset_sync.rb
 - lib/asset_sync/asset_sync.rb
 - lib/asset_sync/config.rb
@@ -223,15 +237,18 @@ files:
 - spec/dummy_app/app/assets/javascripts/application.js
 - spec/fixtures/aws_with_yml/config/asset_sync.yml
 - spec/fixtures/azure_rm_with_yml/config/asset_sync.yml
+- spec/fixtures/backblaze_with_yml/config/asset_sync.yml
 - spec/fixtures/google_with_service_account_yml/config/asset_sync.yml
 - spec/fixtures/google_with_yml/config/asset_sync.yml
 - spec/fixtures/rackspace_with_yml/config/asset_sync.yml
 - spec/fixtures/with_invalid_yml/config/asset_sync.yml
 - spec/integration/aws_integration_spec.rb
 - spec/integration/azure_rm_integration_spec.rb
+- spec/integration/backblaze_intergration_spec.rb
 - spec/spec_helper.rb
 - spec/unit/asset_sync_spec.rb
 - spec/unit/azure_rm_spec.rb
+- spec/unit/backblaze_spec.rb
 - spec/unit/google_spec.rb
 - spec/unit/multi_mime_spec.rb
 - spec/unit/rackspace_spec.rb
@@ -241,7 +258,7 @@ homepage: https://github.com/rumblelabs/asset_sync
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -256,8 +273,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Synchronises Assets in a Rails 3 application and Amazon S3/Cloudfront and
   Rackspace Cloudfiles
@@ -266,15 +283,18 @@ test_files:
 - spec/dummy_app/app/assets/javascripts/application.js
 - spec/fixtures/aws_with_yml/config/asset_sync.yml
 - spec/fixtures/azure_rm_with_yml/config/asset_sync.yml
+- spec/fixtures/backblaze_with_yml/config/asset_sync.yml
 - spec/fixtures/google_with_service_account_yml/config/asset_sync.yml
 - spec/fixtures/google_with_yml/config/asset_sync.yml
 - spec/fixtures/rackspace_with_yml/config/asset_sync.yml
 - spec/fixtures/with_invalid_yml/config/asset_sync.yml
 - spec/integration/aws_integration_spec.rb
 - spec/integration/azure_rm_integration_spec.rb
+- spec/integration/backblaze_intergration_spec.rb
 - spec/spec_helper.rb
 - spec/unit/asset_sync_spec.rb
 - spec/unit/azure_rm_spec.rb
+- spec/unit/backblaze_spec.rb
 - spec/unit/google_spec.rb
 - spec/unit/multi_mime_spec.rb
 - spec/unit/rackspace_spec.rb

data/gemfiles/rails_5_1.gemfile

@@ -1,10 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rcov", platforms: :mri_18, group: [:development, :test]
-gem "simplecov", platforms: [:jruby, :mri_19, :ruby_19, :mri_20, :rbx], group: [:development, :test], require: false
-gem "jruby-openssl", platform: :jruby
-gem "rails", "~> 5.1.0"
-
-gemspec path: "../"