asset_sync 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 629deff4029487b164c47ee0a479cf5111461a15
-  data.tar.gz: 06e62f086d0a574def1741993066f42cf11b96da
+  metadata.gz: 5201ed972f382f2871c2a1ac0b9a6815c09d405b
+  data.tar.gz: 623dd4f586d82eb6603b2b536a322679d16015d4
 SHA512:
-  metadata.gz: d37ddb643b78c91cdb24f1c8cf0fe3fb25162ace2c934eb6488ef8baf9eba8d080d892cdf85846eb0892677d58b2aea7b7a7baf3b35717de2082710d06ee8f75
-  data.tar.gz: fcb7bfb3c0a9b67fb341fb4eb8c4ca18e16e106e8eea852c150186685f59d75e97765246c90c2779feb4b4a1ebd707df9edc457a0db3fcf973e9994d0efce2e5
+  metadata.gz: 94a34b39843e11ea819de2df23a48b71ee985edd709c77eb28a085e9c0be5d8c4307e4331ca77b2fa03cef8d3ba7136c700498719f06419383cc287c67f774b6
+  data.tar.gz: 667284efc400775f931a7164d251f087b6b61fdd8dbe2284eb8b50059ce3dd2593cf02c01ef714bd0bb4fb57f05203b25158476cfe49e00b163f6d36844bd459

data/.travis.yml

@@ -36,6 +36,7 @@ matrix:
     - rvm: 2.1.2
       gemfile: gemfiles/rails_4.1.gemfile
   allow_failures:
+    - rvm: 1.9.2
     - rvm: rbx-2
     - rvm: ruby-head
     - rvm: jruby-head

data/CHANGELOG.md

@@ -1,4 +1,64 @@
-# RELEASE HISTORY
+# Change Log
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+
+## [Unreleased]
+
+### Added
+
+- Nothing
+
+### Changed
+
+- Nothing
+
+### Fixed
+
+- Nothing
+
+
+## [2.0.0] - 2016-12-21
+
+### Changed
+
+- [BREAKING] require “fog-core” instead of “fog” as runtime requirement
+
+
+## [1.3.0] - 2016-11-30
+
+### Changed
+
+- Add regex support to always_upload (https://github.com/AssetSync/asset_sync/pull/333)
+- Stop failing sliently when YAML file does not contain key for rails environment (https://github.com/AssetSync/asset_sync/pull/270)
+- Stop failing sliently when YAML file cannot be parsed due to syntax error
+
+
+## [1.2.1] - 2016-08-19
+
+### Fixed
+
+- Respect value of option `log_silently` even when `ENV['RAILS_GROUPS'] == 'assets'`
+
+
+## [1.2.0] - 2016-08-17
+
+### Added
+
+- Support for `fog_path_style` config option (AWS only) (https://github.com/AssetSync/asset_sync/pull/302)
+
+### Changed
+
+- Set Expires and Cache-Control headers for .gz files (https://github.com/AssetSync/asset_sync/pull/329)
+
+### Fixed
+
+- Add missing runtime dependency declaration for `mime-types` to gemspec (https://github.com/AssetSync/asset_sync/pull/328)
+- Update outdated error message for unknown AssetSync provider (https://github.com/AssetSync/asset_sync/pull/298)
+- Allow hash digest in file name with over 32 chars (for sprockets 3+) (https://github.com/AssetSync/asset_sync/pull/315)
+- Fix `config.log_silently?` (https://github.com/AssetSync/asset_sync/pull/324)
+- Stop using deprecated Ruby API (https://github.com/AssetSync/asset_sync/pull/276)
+
 
 ## v1.1.0 / 2014-08-13
 
@@ -736,3 +796,9 @@ Changes:
     * Improve documentation on ignored_files config option
     * Merge branch 'sinatra'
 
+
+[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.0.0...HEAD
+[2.0.0]: https://github.com/AssetSync/asset_sync/compare/v1.3.0...v2.0.0
+[1.3.0]: https://github.com/AssetSync/asset_sync/compare/v1.2.1...v1.3.0
+[1.2.1]: https://github.com/AssetSync/asset_sync/compare/v1.2.0...v1.2.1
+[1.2.0]: https://github.com/AssetSync/asset_sync/compare/v1.1.0...v1.2.0

data/Gemfile

@@ -3,3 +3,4 @@ gemspec
 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', '4.1.5'

data/README.md

@@ -1,5 +1,5 @@
 [![Build Status](https://secure.travis-ci.org/rumblelabs/asset_sync.png)](http://travis-ci.org/rumblelabs/asset_sync)
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/rumblelabs/asset_sync)
+[![Code Climate](https://codeclimate.com/github/rumblelabs/asset_sync/badges/gpa.svg)](https://codeclimate.com/github/rumblelabs/asset_sync)
 
 # Asset Sync
 
@@ -12,55 +12,20 @@ This was initially built and is intended to work on [Heroku](http://heroku.com)
 
 ## Upgrading?
 
-If you are upgrading from a version of asset_sync **< 0.2.0** (i.e. 0.1.x). All of the references to config variables have changed to reference those used in **Fog**. Ensure to backup your `asset_sync.rb` or `asset_sync.yml` files and re-run the generator. You may also then need to update your ENV configuration variables (or you can change the ones that are referenced).
-
-## Heroku Labs (BETA)
-
-Previously there were [several issues](http://github.com/rumblelabs/asset_sync/blob/master/docs/heroku.md) with using asset_sync on Heroku as described in our [Heroku dev center article](http://devcenter.heroku.com/articles/cdn-asset-host-rails31).
-
-Now to get everything working smoothly with using **ENV** variables to configure `asset_sync` we just need to enable the [user-env-compile](http://devcenter.heroku.com/articles/labs-user-env-compile) functionality. In short:
-
-    heroku labs:enable user-env-compile -a myapp
-
-Hopefully this will make it's way into the platform as standard.
+Upgraded from 1.x? Read `UPGRADING.md`
 
 ## Installation
 
-Add the gem to your Gemfile
-
-``` ruby
-gem 'asset_sync'
-```
-
-If you want, you can put it within your **:assets** group in your Gemfile.
-
-``` ruby
-group :assets do
-  gem 'sass-rails',   '~> 3.2.3'
-  gem 'coffee-rails', '~> 3.2.1'
-  gem 'uglifier', '>= 1.0.3'
-  gem 'asset_sync'
-end
-```
-
-This is good practice when pre-compiling your assets as it will reduce load time and server memory in production. The only caveat being, you may not be able to use a custom initializer, without perhaps wrapping it with.
-
-``` ruby
-if defined?(AssetSync)
-...
-end
-```
-
-### Optimized Fog loading
+Since 2.x, Asset Sync depends on gem `fog-core` instead of `fog`.  
+This is due to `fog` is including many unused storage provider gems as its dependencies.  
 
-Since AssetSync doesn't know which parts of Fog you intend to use, it will just load the entire library.
-If you prefer to load fewer classes into your application, which will reduce load time and memory use,
-you need to load those parts of Fog yourself *before* loading AssetSync:
+Asset Sync has no idea about what provider will be used,  
+so you are responsible for bundling the right gem for the provider to be used.  
 
 In your Gemfile:
 ```ruby
-gem "fog", "~>1.20", require "fog/aws/storage"
 gem "asset_sync"
+gem "fog-aws"
 ```
 
 ### Extended Installation (Faster sync with turbosprockets)
@@ -141,7 +106,8 @@ If you need more control over configuration you will want to use a **custom rail
 
 Configuration using a **YAML** file (a common strategy for Capistrano deployments) is also supported.
 
-The recommend way to configure **asset_sync** is by using **environment variables** however it's up to you, it will work fine if you hard code them too. The main reason is that then your access keys are not checked into version control.
+The recommend way to configure **asset_sync** is by using **environment variables** however it's up to you, it will work fine if you hard code them too. The main reason why using environment variables is recommended is so your access keys are not checked into version control.
+
 
 ### Built-in Initializer (Environment Variables)
 
@@ -221,6 +187,10 @@ AssetSync.configure do |config|
   #
   # Fail silently.  Useful for environments such as Heroku
   # config.fail_silently = true
+  #
+  # Log silently. Default is `true`. But you can set it to false if more logging message are preferred.
+  # Logging messages are sent to `STDOUT` when `log_silently` is falsy
+  # config.log_silently = true
 end
 ```
 
@@ -253,7 +223,7 @@ defaults: &defaults
   # Always upload. Useful if you want to overwrite specific remote assets regardless of their existence
   #  eg: Static files in public often reference non-fingerprinted application.css
   #  note: You will still need to expire them from the CDN's edge cache locations
-  # always_upload: ['application.js', 'application.css']
+  # always_upload: ['application.js', 'application.css', !ruby/regexp '/application-/\d{32}\.css/']
   # Ignored files. Useful if there are some files that are created dynamically on the server and you don't want to upload on deploy.
   # ignored_files: ['ignore_me.js', !ruby/regexp '/ignore_some/\d{32}\.css/']
 
@@ -296,7 +266,8 @@ AssetSync.config.gzip_compression == ENV['ASSET_SYNC_GZIP_COMPRESSION']
 
 #### Fog (Optional)
 
-* **fog\_region**: the region your storage bucket is in e.g. *eu-west-1*
+* **fog\_region**: the region your storage bucket is in e.g. *eu-west-1* (AWS),  *ord* (Rackspace)
+* **fog\_path\_style**: To use buckets with dot in names, check https://github.com/fog/fog/issues/2381#issuecomment-28088524
 
 #### AWS
 
@@ -341,6 +312,44 @@ production:
   fog_region: 'eu-west-1'
 ```
 
+### Amazon (AWS) IAM Users
+
+Amazon has switched to the more secure IAM User security policy model. When generating a user & policy for asset_sync you will need to ensure the policy has the following permissions.
+You __must__ give the user permission to **s3:ListAllMyBuckets** as well as give permission to both the bucket, as well as the bucket's contents (/*). If not given all these permissions you'll see the error ```Expected(200) <=> Actual(403 Forbidden) ```
+
+IAM User Policy Example (replace "bucket_name" with your bucket):
+``` json
+{
+  "Statement": [
+    {
+      "Action": [
+        "s3:ListAllMyBuckets"
+      ],
+      "Effect": "Allow",
+      "Resource": "arn:aws:s3:::*"
+    },
+    {
+      "Action": "s3:*",
+      "Effect": "Allow",
+      "Resource": "arn:aws:s3:::bucket_name"
+    },
+    {
+      "Action": "s3:*",
+      "Effect": "Allow",
+      "Resource": "arn:aws:s3:::bucket_name/*"
+    }
+  ]
+}
+```
+
+If you want to use IAM roles you must set ```config.aws_iam_roles = true``` in your initializers.
+```
+AssetSync.configure do |config|
+  # ...
+  config.aws_iam_roles = true
+end
+```
+
 
 ## Automatic gzip compression
 
@@ -428,6 +437,18 @@ namespace :assets do
 end
 ```
 
+## Running the specs
+
+Make sure you have a .env file with these details:-
+
+    AWS_ACCESS_KEY_ID=<yourkeyid>
+    AWS_SECRET_ACCESS_KEY=<yoursecretkey>
+    FOG_DIRECTORY=<yourbucket>
+
+Make sure the bucket has read/write permissions.  Then to run the tests:-
+
+    foreman run rake
+
 ## Todo
 
 1. Add some before and after filters for deleting and uploading

data/UPGRADING.md

@@ -0,0 +1,25 @@
+# Guide to upgrading from AssetSync 1.x to 2.x
+
+Make sure that you're running the latest AssetSync 1.x release.
+
+This upgrading guide touches on:
+- Changed dependencies
+
+
+## Changed dependencies
+Asset Sync now depends on gem `fog-core` instead of `fog`.  
+This is due to `fog` is including many unused storage provider gems as its dependencies.  
+
+Asset Sync has no idea about what provider will be used,  
+so you are responsible for bundling the right gem for the provider to be used.  
+
+For example, when using AWS as fog provider:
+```ruby
+# Gemfile
+gem "asset_sync"
+gem "fog-aws"
+```
+
+If you don't install the required gem,  
+Fog will complain (by exception) about it when provider is set by Asset Sync.  
+

data/asset_sync.gemspec

@@ -14,16 +14,21 @@ Gem::Specification.new do |s|
   s.summary     = %q{Synchronises Assets in a Rails 3 application and Amazon S3/Cloudfront and Rackspace Cloudfiles}
   s.description = %q{After you run assets:precompile your compiled assets will be synchronised with your S3 bucket.}
 
+  s.license = 'MIT'
+
   s.rubyforge_project = "asset_sync"
 
-  s.add_dependency('fog', ">= 1.8.0")
+  s.add_dependency("fog-core")
   s.add_dependency('unf')
   s.add_dependency('activemodel')
+  s.add_dependency('mime-types')
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "bundler"
   s.add_development_dependency "jeweler"
 
+  s.add_development_dependency "fog-aws"
+
   s.add_development_dependency "uglifier"
   s.add_development_dependency "appraisal"
 

data/lib/asset_sync/asset_sync.rb

@@ -57,7 +57,7 @@ module AssetSync
     end
 
     def log(msg)
-      stdout.puts msg if config.log_silently?
+      stdout.puts msg unless config.log_silently?
     end
 
     def enabled?

data/lib/asset_sync/config.rb

@@ -1,3 +1,7 @@
+require "active_model"
+require "erb"
+require "yaml"
+
 module AssetSync
   class Config
     include ActiveModel::Validations
@@ -24,6 +28,7 @@ module AssetSync
     attr_accessor :fog_provider          # Currently Supported ['AWS', 'Rackspace']
     attr_accessor :fog_directory         # e.g. 'the-bucket-name'
     attr_accessor :fog_region            # e.g. 'eu-west-1'
+    attr_accessor :fog_path_style        # e.g true
 
     # Amazon AWS
     attr_accessor :aws_access_key_id, :aws_secret_access_key, :aws_reduced_redundancy, :aws_iam_roles
@@ -60,12 +65,12 @@ module AssetSync
       self.run_on_precompile = true
       self.cdn_distribution_id = nil
       self.invalidate = []
-      load_yml! if defined?(Rails) && yml_exists?
+      load_yml! if defined?(::Rails) && yml_exists?
     end
 
     def manifest_path
       directory =
-        Rails.application.config.assets.manifest || default_manifest_directory
+        ::Rails.application.config.assets.manifest || default_manifest_directory
       File.join(directory, "manifest.yml")
     end
 
@@ -78,7 +83,7 @@ module AssetSync
     end
 
     def aws?
-      fog_provider == 'AWS'
+      fog_provider =~ /aws/i
     end
 
     def aws_rrs?
@@ -94,7 +99,7 @@ module AssetSync
     end
 
     def log_silently?
-      ENV['RAILS_GROUPS'] == 'assets' || self.log_silently == false
+      !!self.log_silently
     end
 
     def enabled?
@@ -102,36 +107,32 @@ module AssetSync
     end
 
     def rackspace?
-      fog_provider == 'Rackspace'
+      fog_provider =~ /rackspace/i
     end
 
     def google?
-      fog_provider == 'Google'
+      fog_provider =~ /google/i
     end
 
     def yml_exists?
-      defined?(Rails.root) ? File.exists?(self.yml_path) : false
+      defined?(::Rails.root) ? File.exist?(self.yml_path) : false
     end
 
     def yml
-      begin
-        @yml ||= YAML.load(ERB.new(IO.read(yml_path)).result)[Rails.env] rescue nil || {}
-      rescue Psych::SyntaxError
-        @yml = {}
-      end
+      @yml ||= ::YAML.load(::ERB.new(IO.read(yml_path)).result)[::Rails.env] || {}
     end
 
     def yml_path
-      Rails.root.join("config", "asset_sync.yml").to_s
+      ::Rails.root.join("config", "asset_sync.yml").to_s
     end
 
     def assets_prefix
       # Fix for Issue #38 when Rails.config.assets.prefix starts with a slash
-      self.prefix || Rails.application.config.assets.prefix.sub(/^\//, '')
+      self.prefix || ::Rails.application.config.assets.prefix.sub(/^\//, '')
     end
 
     def public_path
-      @public_path || Rails.public_path
+      @public_path || ::Rails.public_path
     end
 
     def load_yml!
@@ -139,6 +140,7 @@ module AssetSync
       self.fog_provider           = yml["fog_provider"]
       self.fog_directory          = yml["fog_directory"]
       self.fog_region             = yml["fog_region"]
+      self.fog_path_style         = yml["fog_path_style"]
       self.aws_access_key_id      = yml["aws_access_key_id"]
       self.aws_secret_access_key  = yml["aws_secret_access_key"]
       self.aws_reduced_redundancy = yml["aws_reduced_redundancy"]
@@ -203,17 +205,18 @@ module AssetSync
           :google_storage_access_key_id => google_storage_access_key_id
         })
       else
-        raise ArgumentError, "AssetSync Unknown provider: #{fog_provider} only AWS and Rackspace are supported currently."
+        raise ArgumentError, "AssetSync Unknown provider: #{fog_provider} only AWS, Rackspace and Google are supported currently."
       end
 
       options.merge!({:region => fog_region}) if fog_region && !rackspace?
+      options.merge!({:path_style => fog_path_style}) if fog_path_style && aws?
       return options
     end
 
   private
 
     def default_manifest_directory
-      File.join(Rails.public_path, assets_prefix)
+      File.join(::Rails.public_path, assets_prefix)
     end
   end
 end

data/lib/asset_sync/engine.rb

@@ -7,10 +7,10 @@ module AssetSync
       app_initializer = Rails.root.join('config', 'initializers', 'asset_sync.rb').to_s
       app_yaml = Rails.root.join('config', 'asset_sync.yml').to_s
 
-      if File.exists?( app_initializer )
+      if File.exist?( app_initializer )
         AssetSync.log "AssetSync: using #{app_initializer}"
         load app_initializer
-      elsif !File.exists?( app_initializer ) && !File.exists?( app_yaml )
+      elsif !File.exist?( app_initializer ) && !File.exist?( app_yaml )
         AssetSync.log "AssetSync: using default configuration from built-in initializer"
         AssetSync.configure do |config|
           config.fog_provider = ENV['FOG_PROVIDER'] if ENV.has_key?('FOG_PROVIDER')
@@ -44,7 +44,7 @@ module AssetSync
 
       end
 
-      if File.exists?( app_yaml )
+      if File.exist?( app_yaml )
         AssetSync.log "AssetSync: YAML file found #{app_yaml} settings will be merged into the configuration"
       end
     end

data/lib/asset_sync/storage.rb

@@ -1,3 +1,5 @@
+require "fog/core"
+
 module AssetSync
   class Storage
     REGEXP_FINGERPRINTED_FILES = /^(.*)\/([^-]+)-[^\.]+\.([^\.]+)$/
@@ -33,22 +35,7 @@ module AssetSync
     end
 
     def ignored_files
-      files = []
-      Array(self.config.ignored_files).each do |ignore|
-        case ignore
-          when Regexp
-            files += self.local_files.select do |file|
-              file =~ ignore
-            end
-          when String
-            files += self.local_files.select do |file|
-              file.split('/').last == ignore
-            end
-          else
-            log "Error: please define ignored_files as string or regular expression. #{ignore} (#{ignore.class}) ignored."
-        end
-      end
-      files.uniq
+      expand_file_names(self.config.ignored_files)
     end
 
     def local_files
@@ -56,7 +43,7 @@ module AssetSync
     end
 
     def always_upload_files
-      self.config.always_upload.map { |f| File.join(self.config.assets_prefix, f) }
+      expand_file_names(self.config.always_upload)
     end
 
     def files_with_custom_headers
@@ -73,10 +60,10 @@ module AssetSync
           log "Using: Rails 4.0 manifest access"
           manifest = Sprockets::Manifest.new(ActionView::Base.assets_manifest.environment, ActionView::Base.assets_manifest.dir)
           return manifest.assets.values.map { |f| File.join(self.config.assets_prefix, f) }
-        elsif File.exists?(self.config.manifest_path)
+        elsif File.exist?(self.config.manifest_path)
           log "Using: Manifest #{self.config.manifest_path}"
           yml = YAML.load(IO.read(self.config.manifest_path))
-   
+
           return yml.map do |original, compiled|
             # Upload font originals and compiled
             if original =~ /^.+(eot|svg|ttf|woff)$/
@@ -91,7 +78,8 @@ module AssetSync
       end
       log "Using: Directory Search of #{path}/#{self.config.assets_prefix}"
       Dir.chdir(path) do
-        Dir["#{self.config.assets_prefix}/**/**"]
+        to_load = self.config.assets_prefix.present? ? "#{self.config.assets_prefix}/**/**" : '**/**'
+        Dir[to_load]
       end
     end
 
@@ -136,7 +124,9 @@ module AssetSync
         :content_type => mime
       }
 
-      if /-[0-9a-fA-F]{32}$/.match(File.basename(f,File.extname(f)))
+      uncompressed_filename = f.sub(/\.gz\z/, '')
+      basename = File.basename(uncompressed_filename, File.extname(uncompressed_filename))
+      if /-[0-9a-fA-F]{32,}$/.match(basename)
         file.merge!({
           :cache_control => "public, max-age=#{one_year}",
           :expires => CGI.rfc1123_date(Time.now + one_year)
@@ -150,8 +140,8 @@ module AssetSync
         log "Overwriting #{f} with custom headers #{files_with_custom_headers[f].to_s}"
       elsif key = self.config.custom_headers.keys.detect {|k| f.match(Regexp.new(k))}
         headers = {}
-        self.config.custom_headers[key].each do |key, value|
-          headers[key.to_sym] = value
+        self.config.custom_headers[key].each do |k, value|
+          headers[k.to_sym] = value
         end
         file.merge! headers
         log "Overwriting matching file #{f} with custom headers #{headers.to_s}"
@@ -166,7 +156,7 @@ module AssetSync
         # as we will overwrite file.css with file.css.gz if it exists.
         log "Ignoring: #{f}"
         ignore = true
-      elsif config.gzip? && File.exists?(gzipped)
+      elsif config.gzip? && File.exist?(gzipped)
         original_size = File.size("#{path}/#{f}")
         gzipped_size = File.size(gzipped)
 
@@ -248,5 +238,24 @@ module AssetSync
       end.compact
     end
 
+    def expand_file_names(names)
+      files = []
+      Array(names).each do |name|
+        case name
+          when Regexp
+            files += self.local_files.select do |file|
+              file =~ name
+            end
+          when String
+            files += self.local_files.select do |file|
+              file.split('/').last == name
+            end
+          else
+            log "Error: please define file names as string or regular expression. #{name} (#{name.class}) ignored."
+        end
+      end
+      files.uniq
+    end
+
   end
 end

data/lib/asset_sync/version.rb

@@ -1,3 +1,3 @@
 module AssetSync
-  VERSION = "1.1.0"
+  VERSION = "2.0.0"
 end

data/lib/asset_sync.rb

@@ -1,6 +1,3 @@
-require 'fog' unless defined?(::Fog)
-require 'active_model'
-require 'erb'
 require "asset_sync/asset_sync"
 require 'asset_sync/config'
 require 'asset_sync/storage'

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

@@ -38,4 +38,8 @@ AssetSync.configure do |config|
   #
   # Fail silently.  Useful for environments such as Heroku
   # config.fail_silently = true
+  #
+  # Log silently. Default is `true`. But you can set it to false if more logging message are preferred.
+  # Logging messages are sent to `STDOUT` when `log_silently` is falsy
+  # config.log_silently = true
 end

data/spec/dummy_app/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 ENV['RAILS_ROOT'] = File.dirname(__FILE__)
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 # require 'rails/all'
 require "action_controller/railtie"
 require "sprockets/railtie"

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

@@ -4,6 +4,7 @@ defaults: &defaults
   aws_secret_access_key: "zzzz"
   region: "eu-west-1"
   run_on_precompile: false
+  fog_path_style: true
 
 development:
   <<: *defaults

data/spec/integration/aws_integration_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/../spec_helper'
+require "fog/aws"
 
 def bucket(name)
   options = {
@@ -23,12 +24,12 @@ describe "AssetSync" do
     @prefix = SecureRandom.hex(6)
   end
 
-  let(:app_js_regex){ 
-    /#{@prefix}\/application-[a-zA-Z0-9]*.js$/ 
+  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(:app_js_gz_regex){
+    /#{@prefix}\/application-[a-zA-Z0-9]*.js.gz$/
   }
 
   let(:files){ bucket(@prefix).files }

data/spec/unit/asset_sync_spec.rb

@@ -12,6 +12,7 @@ describe AssetSync do
         config.aws_secret_access_key = 'bbbb'
         config.fog_directory = 'mybucket'
         config.fog_region = 'eu-west-1'
+        config.fog_path_style = 'true'
         config.existing_remote_files = "keep"
       end
     end
@@ -50,6 +51,10 @@ describe AssetSync do
       expect(AssetSync.config.fog_region).to eq("eu-west-1")
     end
 
+    it "should configure path_style" do
+      expect(AssetSync.config.fog_path_style).to be_truthy
+    end
+
     it "should configure existing_remote_files" do
       expect(AssetSync.config.existing_remote_files).to eq("keep")
     end
@@ -66,6 +71,18 @@ describe AssetSync do
       expect(AssetSync.config.log_silently).to be_truthy
     end
 
+    it "log_silently? should reflect the configuration" do
+      AssetSync.config.log_silently = false
+      expect(AssetSync.config.log_silently?).to eq(false)
+    end
+
+    it "log_silently? should always be true if ENV['RAILS_GROUPS'] == 'assets'" do
+      AssetSync.config.log_silently = false
+      allow(ENV).to receive(:[]).with('RAILS_GROUPS').and_return('assets')
+
+      expect(AssetSync.config.log_silently?).to eq(false)
+    end
+
     it "should default cdn_distribution_id to nil" do
       expect(AssetSync.config.cdn_distribution_id).to be_nil
     end
@@ -106,6 +123,10 @@ describe AssetSync do
       expect(AssetSync.config.fog_region).to eq("eu-west-1")
     end
 
+    it "should configure path_style" do
+      expect(AssetSync.config.fog_path_style).to be_truthy
+    end
+
     it "should configure existing_remote_files" do
       expect(AssetSync.config.existing_remote_files).to eq("keep")
     end
@@ -127,7 +148,7 @@ describe AssetSync do
     end
 
     it "should be disabled" do
-      expect{ AssetSync.sync }.not_to raise_error()
+      expect{ AssetSync.sync }.not_to raise_error
     end
 
     after(:each) do
@@ -141,7 +162,7 @@ describe AssetSync do
     end
 
     it "should be invalid" do
-      expect{ AssetSync.sync }.to raise_error()
+      expect{ AssetSync.sync }.to raise_error(::AssetSync::Config::Invalid)
     end
   end
 
@@ -154,7 +175,7 @@ describe AssetSync do
     end
 
     it "should do nothing, without complaining" do
-      expect{ AssetSync.sync }.not_to raise_error()
+      expect{ AssetSync.sync }.not_to raise_error
     end
   end
 
@@ -168,7 +189,7 @@ describe AssetSync do
     end
 
     it "should not raise an invalid exception" do
-      expect{ AssetSync.sync }.not_to raise_error()
+      expect{ AssetSync.sync }.not_to raise_error
     end
 
     it "should output a warning to stderr" do
@@ -187,7 +208,7 @@ describe AssetSync do
     end
 
     it "should not raise an invalid exception" do
-      expect{ AssetSync.sync }.not_to raise_error()
+      expect{ AssetSync.sync }.not_to raise_error
     end
   end
 
@@ -228,18 +249,12 @@ describe AssetSync do
   end
 
   describe 'with invalid yml' do
-
     before(:each) do
       set_rails_root('with_invalid_yml')
-      AssetSync.config = AssetSync::Config.new
-    end
-
-    it "config should be invalid" do
-      expect(AssetSync.config.valid?).to be_falsey
     end
 
-    it "should raise a config invalid error" do
-      expect{ AssetSync.sync }.to raise_error()
+    it "an error" do
+      expect{ AssetSync::Config.new }.to raise_error(Psych::SyntaxError)
     end
   end
 end

data/spec/unit/google_spec.rb

@@ -86,7 +86,7 @@ describe AssetSync do
     end
 
     it "should be invalid" do
-      expect{ AssetSync.sync }.to raise_error()
+      expect{ AssetSync.sync }.to raise_error(::AssetSync::Config::Invalid)
     end
   end
 
@@ -100,7 +100,7 @@ describe AssetSync do
     end
 
     it "should not raise an invalid exception" do
-      expect{ AssetSync.sync }.not_to raise_error()
+      expect{ AssetSync.sync }.not_to raise_error
     end
   end
 

data/spec/unit/storage_spec.rb

@@ -6,7 +6,7 @@ describe AssetSync::Storage do
   describe '#upload_files' do
     before(:each) do
       @local_files = ["local_image2.jpg", "local_image1.jpg", "local_stylesheet1.css", "local_stylesheet2.css"]
-      @remote_files = ["local_image.jpg", "local_stylesheet1.css"]
+      @remote_files = ["local_image.jpg", "local_image3.svg", "local_image4.svg", "local_stylesheet1.css"]
       @config = AssetSync::Config.new
     end
 
@@ -23,7 +23,7 @@ describe AssetSync::Storage do
     end
 
     it 'should allow force overwriting of specific files' do
-      @config.always_upload = ['local_image.jpg']
+      @config.always_upload = ['local_image.jpg', /local_image\d\.svg/]
 
       storage = AssetSync::Storage.new(@config)
       allow(storage).to receive(:local_files).and_return(@local_files)
@@ -84,8 +84,20 @@ describe AssetSync::Storage do
 
 
     it 'should correctly set expire date' do
-      local_files = ['file1.jpg', 'file1-1234567890abcdef1234567890abcdef.jpg']
-      local_files += ['dir1/dir2/file2.jpg', 'dir1/dir2/file2-1234567890abcdef1234567890abcdef.jpg']
+      local_files = [
+        'file1.jpg',
+        'file1-1234567890abcdef1234567890abcdef.jpg',
+        'file1-1234567890abcdef1234567890abcdef.jpg.gz',
+        'file1-1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef.jpg',
+        'file1-1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef.jpg.gz'
+      ]
+      local_files += [
+        'dir1/dir2/file2.jpg',
+        'dir1/dir2/file2-1234567890abcdef1234567890abcdef.jpg',
+        'dir1/dir2/file2-1234567890abcdef1234567890abcdef.jpg.gz',
+        'dir1/dir2/file2-1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef.jpg',
+        'dir1/dir2/file2-1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef.jpg.gz'
+      ]
       remote_files = []
       storage = AssetSync::Storage.new(@config)
       allow(storage).to receive(:local_files).and_return(local_files)
@@ -99,7 +111,13 @@ describe AssetSync::Storage do
         when 'dir1/dir2/file2.jpg'
           !expect(file).not_to include(:cache_control, :expires)
         when 'file1-1234567890abcdef1234567890abcdef.jpg'
+        when 'file1-1234567890abcdef1234567890abcdef.jpg.gz'
+        when 'file1-1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef.jpg'
+        when 'file1-1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef.jpg.gz'
         when 'dir1/dir2/file2-1234567890abcdef1234567890abcdef.jpg'
+        when 'dir1/dir2/file2-1234567890abcdef1234567890abcdef.jpg.gz'
+        when 'dir1/dir2/file2-1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef.jpg'
+        when 'dir1/dir2/file2-1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef.jpg.gz'
           expect(file).to include(:cache_control, :expires)
         else
           fail
@@ -114,7 +132,7 @@ describe AssetSync::Storage do
       storage.upload_files
     end
 
-    it "shoud invalidate files" do
+    it "should invalidate files" do
       @config.cdn_distribution_id = "1234"
       @config.invalidate = ['local_image1.jpg']
       @config.fog_provider = 'AWS'
@@ -136,7 +154,12 @@ describe AssetSync::Storage do
     before(:each) do
       # Object#remove_const does not remove the loaded
       # file from the $" variable
-      #Object.send(:remove_const, :MIME) if defined?(MIME)
+      #
+      # So we need do both
+      #
+      # 1. Remove constant(s) to avoid warning messages
+      # 2. Remove loaded file(s)
+      Object.send(:remove_const, :MIME) if defined?(MIME)
       mime_types = $".grep(/mime\/types/).first
       $".delete(mime_types)
       require 'mime/types'
@@ -186,9 +209,5 @@ describe AssetSync::Storage do
       end
       storage.upload_file('assets/some_longer_path/local_image2.jpg')
     end
-
-    after(:each) do
-      #Object.send(:remove_const, :MIME) if defined?(MIME)
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asset_sync
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Simon Hamilton
@@ -14,19 +14,19 @@ cert_chain: []
 date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: fog-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: unf
   requirement: !ruby/object:Gem::Requirement
@@ -55,6 +55,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  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: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +111,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fog-aws
+  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
@@ -143,6 +171,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- UPGRADING.md
 - asset_sync.gemspec
 - docs/heroku.md
 - gemfiles/rails_3.1.gemfile
@@ -176,7 +205,8 @@ files:
 - spec/unit/railsless_spec.rb
 - spec/unit/storage_spec.rb
 homepage: https://github.com/rumblelabs/asset_sync
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -194,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: asset_sync
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Synchronises Assets in a Rails 3 application and Amazon S3/Cloudfront and