asset_sync 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51ba6147cc39550e51d1eb1bc98420b53b0ca14fe96d90d34e7de36c8a9511b5
-  data.tar.gz: 701e692e95ed4c8ad41a8a5d14e7356ee8c013221e675d7396a8b07816f7a226
+  metadata.gz: 543b0540bba53d960c7d755b04dafb6dd7a884a3073b2043aa3f2de554a9cffb
+  data.tar.gz: debe4684fcc49e58fc717971595d3db742266aba20ea418ba6a3331a6652534f
 SHA512:
-  metadata.gz: f03b66ce2292d21a3e1a514307a3bf737c0ea856b46ee6e36aef40b93a2604b544e708f97f7b1e9fbfa81483545929cfb9e7714c4bf4172e6311e22f4cc7ffe2
-  data.tar.gz: e228c684a414b1a9859ea8df91f76b1b6c5ad4234863b46307dd76b705aa8a71f18cba5ab8c959a33ac089ca9d5c355dc26391bb16441a8c802fc0f44f97c087
+  metadata.gz: 346531ad9fb1ce2065f5becb4c3283d5f3578ff573c19a254f4895e46a863c03cbacd708aa55d616586d02f37baecc7976a52b5dc05470920bae627b30f18e6a
+  data.tar.gz: 1a7162d20dd6727c5fa1464782ac68b3f20c4ad9b5204e2ca9eb9f3e5e476599ecacfb81f89a76748fab0e714ed23194515b98f95a0632de2acbb6146bc267cf

data/.travis.yml

@@ -5,7 +5,6 @@ language: ruby
 cache:
   bundler: true
 rvm:
-  - 2.2
   - 2.3
   - 2.4
   - 2.5
@@ -18,8 +17,12 @@ gemfile:
   - gemfiles/rails_5_0.gemfile
   - gemfiles/rails_5_1.gemfile
   - gemfiles/rails_5_2.gemfile
+  - gemfiles/rails_6_0.gemfile
 before_install:
-  - gem install bundler
+  # 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
+  - "travis_retry gem update --system 2.7.8 --no-doc || travis_retry gem update --system 2.7.8 --no-rdoc --no-ri"
+  - "travis_retry gem install bundler -v '<2'"
 env:
   global:
     - FOG_DIRECTORY=asset-sync-travis
@@ -29,9 +32,19 @@ env:
 matrix:
   fast_finish: true
   allow_failures:
-    - rvm: 2.6
+    # bundler version conflict
+    - rvm: 2.3
+      gemfile: gemfiles/rails_4_2.gemfile
+    - rvm: jruby
+      gemfile: gemfiles/rails_4_2.gemfile
+    - gemfile: gemfiles/rails_6_0.gemfile
     - 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

@@ -14,3 +14,7 @@ end
 appraise "rails_5_2" do
   gem "rails", "~> 5.2.0"
 end
+
+appraise "rails_6_0" do
+  gem "rails", "~> 6.0.0.beta1"
+end

data/CHANGELOG.md

@@ -18,6 +18,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
+## [2.7.0] - 2019-03-15
+
+### Added
+
+- Adds JSON API support when using Google Storage
+  (https://github.com/AssetSync/asset_sync/pull/381)
+
+### Changed
+
+- Update `AssetSync::MultiMime.lookup` to always return strings (kind of internal change)
+  (https://github.com/AssetSync/asset_sync/pull/380)
+
+
 ## [2.6.0] - 2018-12-07
 
 ### Added
@@ -888,7 +901,8 @@ Changes:
     * Merge branch 'sinatra'
 
 
-[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.6.0...HEAD
+[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.7.0...HEAD
+[2.7.0]: https://github.com/AssetSync/asset_sync/compare/v2.6.0...v2.7.0
 [2.6.0]: https://github.com/AssetSync/asset_sync/compare/v2.5.0...v2.6.0
 [2.5.0]: https://github.com/AssetSync/asset_sync/compare/v2.4.0...v2.5.0
 [2.4.0]: https://github.com/AssetSync/asset_sync/compare/v2.3.0...v2.4.0

data/README.md

@@ -106,7 +106,7 @@ If you wish to have your assets sync to a sub-folder of your bucket instead of i
 ```ruby
   # store assets in a 'folder' instead of bucket root
   config.assets.prefix = "/production/assets"
-````
+​````
 
 Also, ensure the following are defined (in production.rb or application.rb)
 
@@ -141,7 +141,7 @@ The Built-in Initializer will configure **AssetSync** based on the contents of y
 
 Add your configuration details to **heroku**
 
-``` bash
+​``` bash
 heroku config:add AWS_ACCESS_KEY_ID=xxxx
 heroku config:add AWS_SECRET_ACCESS_KEY=xxxx
 heroku config:add FOG_DIRECTORY=xxxx
@@ -170,7 +170,17 @@ heroku config:add FOG_DIRECTORY=xxxx
 heroku config:add FOG_PROVIDER=Rackspace
 ```
 
-Google Storage Cloud configuration is supported as well
+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
+heroku config:add GOOGLE_PROJECT=xxxx
+heroku config:add GOOGLE_JSON_KEY_LOCATION=xxxx
+heroku config:add FOG_DIRECTORY=xxxx
+```
+
+If using the S3 API the following config is required
+
 ``` bash
 heroku config:add FOG_PROVIDER=Google
 heroku config:add GOOGLE_STORAGE_ACCESS_KEY_ID=xxxx
@@ -385,6 +395,14 @@ The blocks are run when local files are being scanned and uploaded
 * **rackspace\_api\_key**: your Rackspace API Key.
 
 #### Google Storage
+
+When using the JSON API
+
+- **google\_project**: your Google Cloud Project name where the Google Cloud Storage bucket resides
+- **google\_json\_key\_location**: path to the location of the service account key.  The service account key must be a JSON type key
+
+When using the S3 API
+
 * **google\_storage\_access\_key\_id**: your Google Storage access key
 * **google\_storage\_secret\_access\_key**: your Google Storage access secret
 
@@ -584,7 +602,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/gemfiles/rails_6_0.gemfile

@@ -0,0 +1,10 @@
+# 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", "~> 6.0.0.beta1"
+
+gemspec path: "../"

data/lib/asset_sync/config.rb

@@ -44,7 +44,9 @@ module AssetSync
     attr_accessor :rackspace_username, :rackspace_api_key, :rackspace_auth_url
 
     # Google Storage
-    attr_accessor :google_storage_secret_access_key, :google_storage_access_key_id
+    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_project # when using service accounts
 
     # Azure Blob with Fog::AzureRM
     attr_accessor :azure_storage_account_name
@@ -59,8 +61,10 @@ module AssetSync
     validates :aws_secret_access_key, :presence => true, :if => proc {aws? && !aws_iam?}
     validates :rackspace_username,    :presence => true, :if => :rackspace?
     validates :rackspace_api_key,     :presence => true, :if => :rackspace?
-    validates :google_storage_secret_access_key,  :presence => true, :if => :google?
-    validates :google_storage_access_key_id,      :presence => true, :if => :google?
+    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?
 
     def initialize
       self.fog_region = nil
@@ -130,6 +134,14 @@ module AssetSync
       fog_provider =~ /google/i
     end
 
+    def google_interop?
+      google? && google_json_key_location.nil?
+    end
+
+    def google_service_account?
+      google? && google_json_key_location
+    end
+
     def azure_rm?
       fog_provider =~ /azurerm/i
     end
@@ -176,8 +188,10 @@ module AssetSync
       self.rackspace_username     = yml["rackspace_username"]
       self.rackspace_auth_url     = yml["rackspace_auth_url"] if yml.has_key?("rackspace_auth_url")
       self.rackspace_api_key      = yml["rackspace_api_key"]
-      self.google_storage_secret_access_key = yml["google_storage_secret_access_key"]
-      self.google_storage_access_key_id     = yml["google_storage_access_key_id"]
+      self.google_json_key_location = yml["google_json_key_location"] if yml.has_key?("google_json_key_location")
+      self.google_project = yml["google_project"] if yml.has_key?("google_project")
+      self.google_storage_secret_access_key = yml["google_storage_secret_access_key"] if yml.has_key?("google_storage_secret_access_key")
+      self.google_storage_access_key_id     = yml["google_storage_access_key_id"] if yml.has_key?("google_storage_access_key_id")
       self.existing_remote_files  = yml["existing_remote_files"] if yml.has_key?("existing_remote_files")
       self.gzip_compression       = yml["gzip_compression"] if yml.has_key?("gzip_compression")
       self.manifest               = yml["manifest"] if yml.has_key?("manifest")
@@ -236,10 +250,14 @@ module AssetSync
         options.merge!({ :rackspace_region => fog_region }) if fog_region
         options.merge!({ :rackspace_auth_url => rackspace_auth_url }) if rackspace_auth_url
       elsif google?
-        options.merge!({
-          :google_storage_secret_access_key => google_storage_secret_access_key,
-          :google_storage_access_key_id => google_storage_access_key_id
-        })
+        if google_json_key_location
+          options.merge!({:google_json_key_location => google_json_key_location, :google_project => google_project})
+        else
+          options.merge!({
+            :google_storage_secret_access_key => google_storage_secret_access_key,
+            :google_storage_access_key_id => google_storage_access_key_id
+          })
+        end
         options.merge!({:region => fog_region}) if fog_region
       elsif azure_rm?
         require 'fog/azurerm'

data/lib/asset_sync/multi_mime.rb

@@ -11,9 +11,9 @@ module AssetSync
       end
 
       if defined?(::MIME::Types)
-        ::MIME::Types.type_for(ext).first
+        ::MIME::Types.type_for(ext).first.to_s
       elsif defined?(::Mime::Type)
-        ::Mime::Type.lookup_by_extension(ext)
+        ::Mime::Type.lookup_by_extension(ext).to_s
       elsif defined?(::Rack::Mime)
         ext_with_dot = ".#{ext}"
         ::Rack::Mime.mime_type(ext_with_dot)

data/lib/asset_sync/storage.rb

@@ -231,12 +231,6 @@ module AssetSync
         })
       end
 
-      if config.azure_rm?
-        # converts content_type from MIME::Type to String.
-        # because Azure::Storage (called from Fog::AzureRM) expects content_type as a String like "application/json; charset=utf-8"
-        file[:content_type] = file[:content_type].content_type if file[:content_type].is_a?(::MIME::Type)
-      end
-
       bucket.files.create( file ) unless ignore
       file_handle.close
       gzip_file_handle.close if gzip_file_handle

data/lib/asset_sync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AssetSync
-  VERSION = "2.6.0".freeze
+  VERSION = "2.7.0".freeze
 end

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

@@ -0,0 +1,19 @@
+defaults: &defaults
+  fog_provider: "Google"
+  google_json_key_location: 'gcs.json'
+  google_project: 'some-project'
+
+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/unit/google_spec.rb

@@ -8,8 +8,6 @@ describe AssetSync do
       AssetSync.config = AssetSync::Config.new
       AssetSync.configure do |config|
         config.fog_provider = 'Google'
-        config.google_storage_access_key_id = 'aaaa'
-        config.google_storage_secret_access_key = 'bbbb'
         config.fog_directory = 'mybucket'
         config.existing_remote_files = "keep"
       end
@@ -24,14 +22,6 @@ describe AssetSync do
       expect(AssetSync.config.existing_remote_files?).to eq(true)
     end
 
-    it "should configure google_storage_access_key_id" do
-      expect(AssetSync.config.google_storage_access_key_id).to eq("aaaa")
-    end
-
-    it "should configure google_storage_secret_access_key" do
-      expect(AssetSync.config.google_storage_secret_access_key).to eq("bbbb")
-    end
-
     it "should configure fog_directory" do
       expect(AssetSync.config.fog_directory).to eq("mybucket")
     end
@@ -47,36 +37,119 @@ describe AssetSync do
     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('google_with_yml')
-      AssetSync.config = AssetSync::Config.new
-    end
+    describe "when using S3 interop API" do
+      before(:each) do
+        AssetSync.configure do |config|
+          config.google_storage_access_key_id = 'aaaa'
+          config.google_storage_secret_access_key = 'bbbb'
+        end
+      end
 
-    it "should configure google_storage_access_key_id" do
-      expect(AssetSync.config.google_storage_access_key_id).to eq("xxxx")
-    end
+      it "should configure google_storage_access_key_id" do
+        expect(AssetSync.config.google_storage_access_key_id).to eq("aaaa")
+      end
 
-    it "should configure google_storage_secret_access_key" do
-      expect(AssetSync.config.google_storage_secret_access_key).to eq("zzzz")
-    end
+      it "should configure google_storage_secret_access_key" do
+        expect(AssetSync.config.google_storage_secret_access_key).to eq("bbbb")
+      end
 
-    it "should configure google_storage_access_key" do
-      expect(AssetSync.config.fog_directory).to eq("rails_app_test")
+      it "should return the correct fog_options" do
+        expected_fog_options = { google_storage_access_key_id: "aaaa",
+                                google_storage_secret_access_key: "bbbb",
+                                provider: "Google"}
+        expect(AssetSync.config.fog_options).to eq(expected_fog_options)
+      end
+
+      it "should not require that google_json_key_location be set" do
+        expect(AssetSync.config.valid?).to eq(true)
+      end
+
+      it "should require that google_storage_secret_access_key or access_key_id be set" do
+
+        AssetSync.configure do |config|
+          config.google_storage_access_key_id = nil
+          config.google_storage_secret_access_key = nil
+        end
+
+        expect(AssetSync.config.valid?).to eq(false)
+      end
     end
 
-    it "should configure google_storage_access_key" do
-      expect(AssetSync.config.existing_remote_files).to eq("keep")
+    describe "when using service account" do
+      before(:each) do
+        AssetSync.configure do |config|
+          config.google_json_key_location = '/path/to.json'
+          config.google_project = 'a-google-project-name'
+        end
+      end
+
+      it "should configure google_json_key_location" do
+        expect(AssetSync.config.google_json_key_location).to eq("/path/to.json")
+      end
+
+      it "should return the correct fog_options" do
+        expected_fog_options = { google_json_key_location: "/path/to.json",
+                                 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
 
-    it "should default gzip_compression to false" do
-      expect(AssetSync.config.gzip_compression).to be_falsey
+  end
+
+  describe 'from yml' do
+    describe 'when using S3 interop API' do
+      before(:each) do
+        set_rails_root('google_with_yml')
+        AssetSync.config = AssetSync::Config.new
+      end
+
+      it "should configure google_storage_access_key_id" do
+        expect(AssetSync.config.google_storage_access_key_id).to eq("xxxx")
+      end
+
+      it "should configure google_storage_secret_access_key" do
+        expect(AssetSync.config.google_storage_secret_access_key).to eq("zzzz")
+      end
+
+      it "should not configure google_json_key_location" do
+        expect(AssetSync.config.google_json_key_location).to eq(nil)
+      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
 
-    it "should default manifest to false" do
-      expect(AssetSync.config.manifest).to be_falsey
+    describe 'when using service account API' do
+      before(:each) do
+        set_rails_root('google_with_service_account_yml')
+        AssetSync.config = AssetSync::Config.new
+      end
+
+      it "should configure google_json_key_location" do
+        expect(AssetSync.config.google_json_key_location).to eq("gcs.json")
+      end
+
+      it "should not configure google_storage_secret_access_key" do
+        expect(AssetSync.config.google_storage_secret_access_key).to eq(nil)
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asset_sync
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Simon Hamilton
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-07 00:00:00.000000000 Z
+date: 2019-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -207,6 +207,7 @@ files:
 - gemfiles/rails_5_0.gemfile
 - gemfiles/rails_5_1.gemfile
 - gemfiles/rails_5_2.gemfile
+- gemfiles/rails_6_0.gemfile
 - lib/asset_sync.rb
 - lib/asset_sync/asset_sync.rb
 - lib/asset_sync/config.rb
@@ -223,6 +224,7 @@ 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/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
@@ -255,8 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: asset_sync
-rubygems_version: 2.7.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Synchronises Assets in a Rails 3 application and Amazon S3/Cloudfront and
@@ -266,6 +267,7 @@ 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/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