asset_sync 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c68bc90d034746edc2c7534f4f4385459202d0b
-  data.tar.gz: 7c9b4ae0af9fd7c185e26bfcf727a099160f1c6e
+  metadata.gz: bd1393284c71b816a4c7adf08939bc98a3db8c85
+  data.tar.gz: dcd639f471d42d101d06203acbd395532948db5c
 SHA512:
-  metadata.gz: 2def4eaad25263680713d712c9f746ab471b19a05116e90513ea7dcb1dfc513ab21883c913dfc1c40d0fe1a88c651984df7433acf5ab60b0d0476b080d43aeb4
-  data.tar.gz: 777b4d76caf40ebf28f133b2d394616a268b61a61a6f4311eb171135623ae94a7aeecb6c1aeab651ab99fed05c586bd4f8975faf92670543f9f65bff0765779f
+  metadata.gz: 56449736185bb8f05f762d366124ea6024811cfc3b34754a4c8f1673a29bba9cc6d423d3a523fc2a16339fd43dad702f7d3fe8c8e6d59451da7add64817e43ae
+  data.tar.gz: 28495c0ede2eb463c35afc429aa8d6b527b03a7c4595835bfcf12da5c7dcc96631f524df73ff612c9551a0faeb729abea86f294cdd367b12c987a7f1708a167d

data/CHANGELOG.md

@@ -18,6 +18,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
+## [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
@@ -781,6 +790,7 @@ Changes:
     * Merge branch 'sinatra'
 
 
-[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v1.2.1...HEAD
+[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v1.3.0...HEAD
+[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/README.md

@@ -229,7 +229,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/']
 
@@ -272,7 +272,7 @@ 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

data/lib/asset_sync/config.rb

@@ -115,11 +115,7 @@ module AssetSync
     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

data/lib/asset_sync/storage.rb

@@ -33,22 +33,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 +41,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
@@ -251,5 +236,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.2.1"
+  VERSION = "1.3.0"
 end

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/unit/asset_sync_spec.rb

@@ -249,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/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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asset_sync
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Simon Hamilton
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: asset_sync
-rubygems_version: 2.6.6
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Synchronises Assets in a Rails 3 application and Amazon S3/Cloudfront and