asset_sync 0.5.4 → 1.0.0

data/spec/unit/asset_sync_spec.rb

@@ -16,6 +16,10 @@ describe AssetSync do
       end
     end
 
+    it "should default to running on precompile" do
+      AssetSync.config.run_on_precompile.should be_true
+    end
+
     it "should default AssetSync to enabled" do
       AssetSync.config.enabled?.should be_true
       AssetSync.enabled?.should be_true
@@ -57,6 +61,18 @@ describe AssetSync do
     it "should default manifest to false" do
       AssetSync.config.manifest.should be_false
     end
+
+    it "should default log_silently to true" do
+      AssetSync.config.log_silently.should be_true
+    end
+
+    it "should default cdn_distribution_id to nil" do
+      AssetSync.config.cdn_distribution_id.should be_nil
+    end
+
+    it "should default invalidate to empty array" do
+      AssetSync.config.invalidate.should == []
+    end
   end
 
   describe 'from yml' do
@@ -70,6 +86,10 @@ describe AssetSync do
       AssetSync.enabled?.should be_true
     end
 
+    it "should configure run_on_precompile" do
+      AssetSync.config.run_on_precompile.should be_false
+    end
+
     it "should configure aws_access_key_id" do
       AssetSync.config.aws_access_key_id.should == "xxxx"
     end
@@ -107,7 +127,7 @@ describe AssetSync do
     end
 
     it "should be disabled" do
-      lambda{ AssetSync.sync }.should_not raise_error(AssetSync::Config::Invalid)
+      expect{ AssetSync.sync }.not_to raise_error()
     end
 
     after(:each) do
@@ -121,7 +141,7 @@ describe AssetSync do
     end
 
     it "should be invalid" do
-      lambda{ AssetSync.sync }.should raise_error(AssetSync::Config::Invalid)
+      expect{ AssetSync.sync }.to raise_error()
     end
   end
 
@@ -134,7 +154,7 @@ describe AssetSync do
     end
 
     it "should do nothing, without complaining" do
-      lambda{ AssetSync.sync }.should_not raise_error(AssetSync::Config::Invalid)
+      expect{ AssetSync.sync }.not_to raise_error()
     end
   end
 
@@ -148,7 +168,7 @@ describe AssetSync do
     end
 
     it "should not raise an invalid exception" do
-      lambda{ AssetSync.sync }.should_not raise_error(AssetSync::Config::Invalid)
+      expect{ AssetSync.sync }.not_to raise_error()
     end
 
     it "should output a warning to stderr" do
@@ -157,6 +177,20 @@ describe AssetSync do
     end
   end
 
+  describe 'with disabled config' do
+    before(:each) do
+      AssetSync.stub(:stderr).and_return(@stderr = StringIO.new)
+      AssetSync.config = AssetSync::Config.new
+      AssetSync.configure do |config|
+        config.enabled = false
+      end
+    end
+
+    it "should not raise an invalid exception" do
+      lambda{ AssetSync.sync }.should_not raise_error()
+    end
+  end
+
   describe 'with gzip_compression enabled' do
     before(:each) do
       AssetSync.config = AssetSync::Config.new
@@ -193,4 +227,22 @@ describe AssetSync do
     end
   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
+      AssetSync.config.valid?.should be_false
+    end
+
+    it "should raise a config invalid error" do
+      expect{ AssetSync.sync }.to raise_error()
+    end
+
+
+  end
+
 end

data/spec/unit/google_spec.rb

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

data/spec/unit/multi_mime_spec.rb

@@ -2,19 +2,30 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe AssetSync::MultiMime do
 
+  before(:each) do
+    Object.send(:remove_const, :Rails) if defined?(Rails)
+    Object.send(:remove_const, :Mime) if defined?(Mime)
+    Object.send(:remove_const, :Rack) if defined?(Rack)
+  end
+
+  after(:each) do
+    Object.send(:remove_const, :Rails) if defined?(Rails)
+    Object.send(:remove_const, :Mime) if defined?(Mime)
+    Object.send(:remove_const, :Rack) if defined?(Rack)
+  end
+
+  after(:all) do
+    require 'mime/types'
+  end
+
   describe 'Mime::Type' do
 
     it 'should detect mime type' do
-      Object.send(:remove_const, :Rails) if defined?(Rails)
+      pending "Fails on Travis CI only as of https://travis-ci.org/rumblelabs/asset_sync/builds/4188196"
       require 'rails'
       AssetSync::MultiMime.lookup('css').should == "text/css"
     end
 
-    after(:each) do
-      Object.send(:remove_const, :Rails) if defined?(Rails)
-      Object.send(:remove_const, :Mime) if defined?(Mime)
-    end
-
   end
 
   describe 'Rack::Mime' do
@@ -24,24 +35,15 @@ describe AssetSync::MultiMime do
       AssetSync::MultiMime.lookup('css').should == "text/css"
     end
 
-    after(:each) do
-      Object.send(:remove_const, :Rack) if defined?(Rack)
-    end
-
   end
 
   describe 'MIME::Types' do
 
     it 'should detect mime type' do
-      Object.send(:remove_const, :MIME) if defined?(MIME)
       require 'mime/types'
       AssetSync::MultiMime.lookup('css').should == "text/css"
     end
 
-    after(:each) do
-      Object.send(:remove_const, :MIME) if defined?(MIME)
-    end
-
   end
 
 end

data/spec/unit/storage_spec.rb

@@ -49,5 +49,146 @@ describe AssetSync::Storage do
       end
       storage.upload_files
     end
+
+    it 'should upload updated non-fingerprinted files' do
+      @local_files = [
+        'public/image.png',
+        'public/image-82389298328.png',
+        'public/image-a8389f9h324.png',
+        'public/application.js',
+        'public/application-b3389d983k1.js',
+        'public/application-ac387d53f31.js',
+        'public',
+      ]
+      @remote_files = [
+        'public/image.png',
+        'public/image-a8389f9h324.png',
+        'public/application.js',
+        'public/application-b3389d983k1.js',
+      ]
+
+      storage = AssetSync::Storage.new(@config)
+      storage.stub(:local_files).and_return(@local_files)
+      storage.stub(:get_remote_files).and_return(@remote_files)
+      File.stub(:file?).and_return(true) # Pretend they all exist
+
+      updated_nonfingerprinted_files = [
+        'public/image.png',
+        'public/application.js',
+      ]
+      (@local_files - @remote_files + updated_nonfingerprinted_files).each do |file|
+        storage.should_receive(:upload_file).with(file)
+      end
+      storage.upload_files
+    end
+
+
+    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']
+      remote_files = []
+      storage = AssetSync::Storage.new(@config)
+      storage.stub(:local_files).and_return(local_files)
+      storage.stub(:get_remote_files).and_return(remote_files)
+      File.stub(:file?).and_return(true)
+      File.stub(:open).and_return(nil)
+
+      def check_file(file)
+        case file[:key]
+        when 'file1.jpg'
+        when 'dir1/dir2/file2.jpg'
+          !file.should_not include(:cache_control, :expires)
+        when 'file1-1234567890abcdef1234567890abcdef.jpg'
+        when 'dir1/dir2/file2-1234567890abcdef1234567890abcdef.jpg'
+          file.should include(:cache_control, :expires)
+        else
+          fail
+        end
+      end
+
+      files = double()
+      local_files.count.times do
+        files.should_receive(:create) { |file| check_file(file) }
+      end
+      storage.stub_chain(:bucket, :files).and_return(files)
+      storage.upload_files
+    end
+
+    it "shoud invalidate files" do
+      @config.cdn_distribution_id = "1234"
+      @config.invalidate = ['local_image1.jpg']
+      @config.fog_provider = 'AWS'
+
+      storage = AssetSync::Storage.new(@config)
+      storage.stub(:local_files).and_return(@local_files)
+      storage.stub(:get_remote_files).and_return(@remote_files)
+      storage.stub(:upload_file).and_return(true)
+
+      mock_cdn = mock
+      Fog::CDN.should_receive(:new).and_return(mock_cdn)
+      mock_cdn.should_receive(:post_invalidation).with("1234", ["/assets/local_image1.jpg"]).and_return(stub({:body => {:id => '1234'}}))
+
+      storage.upload_files
+    end
+  end
+
+  describe '#upload_file' do
+    before(:each) do
+      # Object#remove_const does not remove the loaded
+      # file from the $" variable
+      Object.send(:remove_const, :MIME) if defined?(MIME)
+      mime_types = $".grep(/mime\/types/).first
+      $".delete(mime_types)
+      require 'mime/types'
+      @config = AssetSync::Config.new
+    end
+
+    it 'accepts custom headers per file' do
+      @config.custom_headers = {
+        "local_image2.jpg" => {
+          :cache_control => 'max-age=0'
+        }
+      }
+      storage = AssetSync::Storage.new(@config)
+      storage.stub(:local_files).and_return(@local_files)
+      storage.stub(:get_remote_files).and_return(@remote_files)
+      File.stub(:open).and_return('file') # Pretend they all exist
+
+      bucket = double
+      files = double
+
+      storage.stub(:bucket).and_return(bucket)
+      bucket.stub(:files).and_return(files)
+
+      files.should_receive(:create) do |argument|
+        argument[:cache_control].should == 'max-age=0'
+      end
+      storage.upload_file('assets/local_image2.jpg')
+    end
+
+    it 'accepts custom headers with a regular expression' do
+      @config.custom_headers = {
+        ".*\.jpg" => {
+          :cache_control => 'max-age=0'
+        }
+      }
+      storage = AssetSync::Storage.new(@config)
+      storage.stub(:local_files).and_return(@local_files)
+      storage.stub(:get_remote_files).and_return(@remote_files)
+      File.stub(:open).and_return('file') # Pretend they all exist
+      bucket = mock
+      files = mock
+      storage.stub(:bucket).and_return(bucket)
+      bucket.stub(:files).and_return(files)
+
+      files.should_receive(:create) do |argument|
+        argument[:cache_control].should == 'max-age=0'
+      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: 0.5.4
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-16 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -20,7 +20,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +94,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: uglifier
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -110,7 +110,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: uglifier
+  name: asset_sync
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -126,7 +126,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: asset_sync
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -153,12 +153,16 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
 - asset_sync.gemspec
 - docs/heroku.md
+- gemfiles/rails_3.1.gemfile
+- gemfiles/rails_3.2.gemfile
+- gemfiles/rails_4.0.gemfile
 - lib/asset_sync.rb
 - lib/asset_sync/asset_sync.rb
 - lib/asset_sync/config.rb
@@ -176,6 +180,7 @@ files:
 - spec/fixtures/aws_with_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/spec_helper.rb
 - spec/unit/asset_sync_spec.rb
@@ -198,7 +203,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 331776732301041592
+      hash: -395743351028852648
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -207,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 331776732301041592
+      hash: -395743351028852648
 requirements: []
 rubyforge_project: asset_sync
 rubygems_version: 1.8.24
@@ -221,6 +226,7 @@ test_files:
 - spec/fixtures/aws_with_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/spec_helper.rb
 - spec/unit/asset_sync_spec.rb