asset_sync 0.5.3 → 0.5.4

data/.gitignore

@@ -4,8 +4,9 @@
 Gemfile.lock
 pkg/*
 *.swp
-
+coverage/*
 .env
 spec/dummy_app/public/*
 spec/dummy_app/log/*
-spec/dummy_app/tmp/*
+spec/dummy_app/tmp/*
+.rbx

data/Gemfile

@@ -1,4 +1,5 @@
 source :rubygems
 gemspec
-
+gem 'rcov',      :platforms => :mri_18, :group => [:development, :test]
+gem 'simplecov', :platforms => [:jruby, :mri_19, :ruby_19, :rbx], :group => [:development, :test], :require => false
 gem 'jruby-openssl', :platform => :jruby

data/README.md

@@ -1,4 +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)
 
 # Asset Sync
 
@@ -217,7 +218,7 @@ defaults: &defaults
   # Automatically replace files with their equivalent gzip compressed version
   # gzip_compression: true
   # Fail silently.  Useful for environments such as Heroku
-  # fail_silently = true
+  # fail_silently: true
   # 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
@@ -400,4 +401,4 @@ Inspired by:
 
 ## License
 
-MIT License. Copyright 2011 Rumble Labs Ltd. [rumblelabs.com](http://rumblelabs.com)
+MIT License. Copyright 2011-2013 Rumble Labs Ltd. [rumblelabs.com](http://rumblelabs.com)

data/Rakefile

@@ -5,14 +5,30 @@ namespace :spec do
   RSpec::Core::RakeTask.new(:unit) do |spec|
     spec.pattern = 'spec/unit/*_spec.rb'
     spec.rspec_opts = ['--backtrace']
+
+    rbx = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
+    jruby = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+    if RUBY_VERSION == '1.8.7' && !(rbx || jruby)
+      spec.rcov = true
+      spec.rcov_opts = %w{--exclude gems\/,spec\/}
+    end
   end
   RSpec::Core::RakeTask.new(:integration) do |spec|
     spec.pattern = 'spec/integration/*_spec.rb'
     spec.rspec_opts = ['--backtrace']
   end
   task :all do
-     Rake::Task['spec:unit'].execute
-     Rake::Task['spec:integration'].execute
+    Rake::Task['spec:unit'].execute
+
+    # Travis CI does not expose encrypted ENV variables for pull requests, so
+    # do not run integration specs
+    # http://about.travis-ci.org/docs/user/build-configuration/#Set-environment-variables
+    #
+    pull_request = ENV['TRAVIS_PULL_REQUEST'] == 'true'
+    ci_build = ENV['TRAVIS'] == 'true'
+    if !ci_build || (ci_build && pull_request)
+      Rake::Task['spec:integration'].execute
+    end
   end
 end
 

data/asset_sync.gemspec

@@ -6,7 +6,7 @@ require "asset_sync/version"
 Gem::Specification.new do |s|
   s.name        = "asset_sync"
   s.version     = AssetSync::VERSION
-  s.date        = "2013-01-08"
+  s.date        = "2013-01-16"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Simon Hamilton", "David Rice", "Phil McClure"]
   s.email       = ["shamilton@rumblelabs.com", "me@davidjrice.co.uk", "pmcclure@rumblelabs.com"]

data/lib/asset_sync.rb

@@ -4,6 +4,7 @@ require 'erb'
 require "asset_sync/asset_sync"
 require 'asset_sync/config'
 require 'asset_sync/storage'
+require 'asset_sync/multi_mime'
 
 
 require 'asset_sync/railtie' if defined?(Rails)

data/lib/asset_sync/asset_sync.rb

@@ -23,12 +23,17 @@ module AssetSync
     def sync
       return unless AssetSync.enabled?
 
-      if config.fail_silently?
-        self.warn config.errors.full_messages.join(', ') unless config && config.valid?
+      errors = config.valid? ? "" : config.errors.full_messages.join(', ')
+
+      if !(config && config.valid?)
+        if config.fail_silently?
+          self.warn(errors)
+        else
+          raise Config::Invalid.new(errors)
+        end
       else
-        raise Config::Invalid.new(config.errors.full_messages.join(', ')) unless config && config.valid?
+        self.storage.sync
       end
-      self.storage.sync if config && config.valid?
     end
 
     def warn(msg)

data/lib/asset_sync/multi_mime.rb

@@ -0,0 +1,18 @@
+module AssetSync
+  class MultiMime
+
+    def self.lookup(ext)
+
+      if defined?(Mime::Type)
+        Mime::Type.lookup_by_extension(ext)
+      elsif defined?(Rack::Mime)
+        ext_with_dot = ".#{ext}"
+        Rack::Mime.mime_type(ext_with_dot)
+      else
+        MIME::Types.type_for(ext).first
+      end
+
+    end
+
+  end
+end

data/lib/asset_sync/storage.rb

@@ -106,7 +106,7 @@ module AssetSync
       # TODO output files in debug logs as asset filename only.
       one_year = 31557600
       ext = File.extname(f)[1..-1]
-      mime = Mime::Type.lookup_by_extension(ext)
+      mime = MultiMime.lookup(ext)
       file = {
         :key => f,
         :body => File.open("#{path}/#{f}"),
@@ -146,7 +146,7 @@ module AssetSync
           # http://docs.amazonwebservices.com/AmazonCloudFront/latest/DeveloperGuide/ServingCompressedFiles.html
           uncompressed_filename = f[0..-4]
           ext = File.extname(uncompressed_filename)[1..-1]
-          mime = Mime::Type.lookup_by_extension( ext )
+          mime = MultiMime.lookup(ext)
           file.merge!({
             :content_type     => mime,
             :content_encoding => 'gzip'

data/lib/asset_sync/version.rb

@@ -1,3 +1,3 @@
 module AssetSync
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

data/lib/generators/asset_sync/templates/asset_sync.yml

@@ -21,9 +21,9 @@ defaults: &defaults
   # To delete existing remote files.
   # existing_remote_files: delete 
   # Automatically replace files with their equivalent gzip compressed version
-  # gzip_compression = true
+  # gzip_compression: true
   # Fail silently.  Useful for environments such as Heroku
-  # fail_silently = true
+  # fail_silently: true
 
 development:
   <<: *defaults

data/spec/spec_helper.rb

@@ -1,5 +1,13 @@
 require 'rubygems'
 require 'bundler'
+
+if RUBY_VERSION != '1.8.7'
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter 'spec'
+  end
+end
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -12,6 +20,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'asset_sync'
 
+require 'rspec'
 RSpec.configure do |config|
   config.mock_framework = :rspec
 end

data/spec/unit/asset_sync_spec.rb

@@ -192,4 +192,5 @@ describe AssetSync do
       AssetSync.config.manifest_path.should =~ /public\/custom_assets\/manifest.yml/
     end
   end
+
 end

data/spec/unit/multi_mime_spec.rb

@@ -0,0 +1,47 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe AssetSync::MultiMime do
+
+  describe 'Mime::Type' do
+
+    it 'should detect mime type' do
+      Object.send(:remove_const, :Rails) if defined?(Rails)
+      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
+
+    it 'should detect mime type' do
+      require 'rack/mime'
+      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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asset_sync
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -163,6 +163,7 @@ files:
 - lib/asset_sync/asset_sync.rb
 - lib/asset_sync/config.rb
 - lib/asset_sync/engine.rb
+- lib/asset_sync/multi_mime.rb
 - lib/asset_sync/railtie.rb
 - lib/asset_sync/storage.rb
 - lib/asset_sync/version.rb
@@ -179,6 +180,7 @@ files:
 - spec/spec_helper.rb
 - spec/unit/asset_sync_spec.rb
 - spec/unit/google_spec.rb
+- spec/unit/multi_mime_spec.rb
 - spec/unit/rackspace_spec.rb
 - spec/unit/railsless_spec.rb
 - spec/unit/storage_spec.rb
@@ -196,7 +198,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3874412606411759569
+      hash: 331776732301041592
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -205,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3874412606411759569
+      hash: 331776732301041592
 requirements: []
 rubyforge_project: asset_sync
 rubygems_version: 1.8.24
@@ -223,6 +225,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/unit/asset_sync_spec.rb
 - spec/unit/google_spec.rb
+- spec/unit/multi_mime_spec.rb
 - spec/unit/rackspace_spec.rb
 - spec/unit/railsless_spec.rb
 - spec/unit/storage_spec.rb