asset_sync 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd1393284c71b816a4c7adf08939bc98a3db8c85
-  data.tar.gz: dcd639f471d42d101d06203acbd395532948db5c
+  metadata.gz: 5201ed972f382f2871c2a1ac0b9a6815c09d405b
+  data.tar.gz: 623dd4f586d82eb6603b2b536a322679d16015d4
 SHA512:
-  metadata.gz: 56449736185bb8f05f762d366124ea6024811cfc3b34754a4c8f1673a29bba9cc6d423d3a523fc2a16339fd43dad702f7d3fe8c8e6d59451da7add64817e43ae
-  data.tar.gz: 28495c0ede2eb463c35afc429aa8d6b527b03a7c4595835bfcf12da5c7dcc96631f524df73ff612c9551a0faeb729abea86f294cdd367b12c987a7f1708a167d
+  metadata.gz: 94a34b39843e11ea819de2df23a48b71ee985edd709c77eb28a085e9c0be5d8c4307e4331ca77b2fa03cef8d3ba7136c700498719f06419383cc287c67f774b6
+  data.tar.gz: 667284efc400775f931a7164d251f087b6b61fdd8dbe2284eb8b50059ce3dd2593cf02c01ef714bd0bb4fb57f05203b25158476cfe49e00b163f6d36844bd459

data/CHANGELOG.md

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

@@ -12,26 +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).
+Upgraded from 1.x? Read `UPGRADING.md`
 
 ## Installation
 
-Add the gem to your Gemfile
+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.  
 
-``` ruby
-gem 'asset_sync'
-```
-
-### Optimized Fog loading
-
-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)

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

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   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')
@@ -27,6 +27,8 @@ Gem::Specification.new do |s|
   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.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/asset_sync/config.rb

@@ -1,3 +1,7 @@
+require "active_model"
+require "erb"
+require "yaml"
+
 module AssetSync
   class Config
     include ActiveModel::Validations
@@ -61,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
 
@@ -111,24 +115,24 @@ module AssetSync
     end
 
     def yml_exists?
-      defined?(Rails.root) ? File.exist?(self.yml_path) : false
+      defined?(::Rails.root) ? File.exist?(self.yml_path) : false
     end
 
     def yml
-      @yml ||= YAML.load(ERB.new(IO.read(yml_path)).result)[Rails.env] || {}
+      @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!
@@ -212,7 +216,7 @@ module AssetSync
   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/storage.rb

@@ -1,3 +1,5 @@
+require "fog/core"
+
 module AssetSync
   class Storage
     REGEXP_FINGERPRINTED_FILES = /^(.*)\/([^-]+)-[^\.]+\.([^\.]+)$/
@@ -61,7 +63,7 @@ module AssetSync
         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)$/

data/lib/asset_sync/version.rb

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

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

@@ -148,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
@@ -162,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
 
@@ -175,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
 
@@ -189,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
@@ -208,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
 

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

@@ -132,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'
@@ -154,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'
@@ -204,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.3.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
@@ -111,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
@@ -157,6 +171,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- UPGRADING.md
 - asset_sync.gemspec
 - docs/heroku.md
 - gemfiles/rails_3.1.gemfile
@@ -209,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: asset_sync
-rubygems_version: 2.6.7
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Synchronises Assets in a Rails 3 application and Amazon S3/Cloudfront and