asset_sync 1.0.0 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 629deff4029487b164c47ee0a479cf5111461a15
+  data.tar.gz: 06e62f086d0a574def1741993066f42cf11b96da
+SHA512:
+  metadata.gz: d37ddb643b78c91cdb24f1c8cf0fe3fb25162ace2c934eb6488ef8baf9eba8d080d892cdf85846eb0892677d58b2aea7b7a7baf3b35717de2082710d06ee8f75
+  data.tar.gz: fcb7bfb3c0a9b67fb341fb4eb8c4ca18e16e106e8eea852c150186685f59d75e97765246c90c2779feb4b4a1ebd707df9edc457a0db3fcf973e9994d0efce2e5

data/.travis.yml

@@ -3,7 +3,7 @@ rvm:
   - 1.9.2
   - 1.9.3
   - jruby-19mode
-  - rbx-19mode
+  - rbx-2
   - ruby-head
   - jruby-head
 gemfile:
@@ -23,12 +23,19 @@ matrix:
       gemfile: gemfiles/rails_4.0.gemfile
     - rvm: jruby-19mode
       gemfile: gemfiles/rails_4.0.gemfile
-    - rvm: rbx-19mode
+    - rvm: rbx-2
       gemfile: gemfiles/rails_4.0.gemfile
     - rvm: 2.0.0
       gemfile: gemfiles/rails_3.2.gemfile
     - rvm: 2.0.0
       gemfile: gemfiles/rails_4.0.gemfile
+    - rvm: 2.1.2
+      gemfile: gemfiles/rails_4.1.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails_4.1.gemfile
+    - rvm: 2.1.2
+      gemfile: gemfiles/rails_4.1.gemfile
   allow_failures:
+    - rvm: rbx-2
     - rvm: ruby-head
     - rvm: jruby-head

data/Appraisals

@@ -9,3 +9,7 @@ end
 appraise "rails-4.0" do
   gem "rails", "~> 4.0.0"
 end
+
+appraise "rails-4.1" do
+  gem "rails", "~> 4.1.0"
+end

data/CHANGELOG.md

@@ -1,5 +1,36 @@
 # RELEASE HISTORY
 
+## v1.1.0 / 2014-08-13
+
+Version 1.1.0 (Toby Osbourn <tosbourn@rumblelabs.com>)
+
+Changes:
+
+* 1 Change
+
+    * Bumping master to 1.1.0 - preparing to update RubyGems
+
+## v0.5.6 / 2014-08-12
+
+Version 0.5.6 (Toby Osbourn <tosbourn@rumblelabs.com>)
+
+Changes:
+
+* 1 Change
+
+    * Merged in support for optimized fog loading
+
+## v0.5.5 / 2014-08-12
+
+Version 0.5.5 (Toby Osbourn <tosbourn@rumblelabs.com>)
+
+Changes:
+
+* 2 Nominal Changes
+
+    * Merged some spec changes to get Travis to pass the build correctly
+    * Support using AWS IAM Roles
+
 ## v0.5.1 / 2012-10-22
 
 Version 0.5.1 (David Rice <me@davidjrice.co.uk>)

data/README.md

@@ -50,6 +50,19 @@ if defined?(AssetSync)
 ...
 end
 ```
+
+### 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:
+
+In your Gemfile:
+```ruby
+gem "fog", "~>1.20", require "fog/aws/storage"
+gem "asset_sync"
+```
+
 ### Extended Installation (Faster sync with turbosprockets)
 
 It's possible to improve **asset:precompile** time if you are using Rails 3.2.x
@@ -95,7 +108,7 @@ Or
 ``` ruby
   config.action_controller.asset_host = "//storage.googleapis.com/#{ENV['FOG_DIRECTORY']}"
 ```
-On **non default S3 bucket region**: If your bucket is set to a region that is not the default US Standard (us-east-1) you must use the first style of url ``//#{ENV['FOG_DIRECTORY']}.s3.amazonaws.com`` or amazon will return a 301 permanently moved when assets are requested. Note the caveat above about bucket names and periods. 
+On **non default S3 bucket region**: If your bucket is set to a region that is not the default US Standard (us-east-1) you must use the first style of url ``//#{ENV['FOG_DIRECTORY']}.s3.amazonaws.com`` or amazon will return a 301 permanently moved when assets are requested. Note the caveat above about bucket names and periods.
 
 If you wish to have your assets sync to a sub-folder of your bucket instead of into the root add the following to your ``production.rb`` file
 

data/asset_sync.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.version     = AssetSync::VERSION
   s.date        = "2013-08-26"
   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"]
+  s.authors     = ["Simon Hamilton", "David Rice", "Phil McClure", "Toby Osbourn"]
+  s.email       = ["shamilton@rumblelabs.com", "me@davidjrice.co.uk", "pmcclure@rumblelabs.com", "tosbourn@rumblelabs.com"]
   s.homepage    = "https://github.com/rumblelabs/asset_sync"
   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.}
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "asset_sync"
 
   s.add_dependency('fog', ">= 1.8.0")
+  s.add_dependency('unf')
   s.add_dependency('activemodel')
 
   s.add_development_dependency "rspec"
@@ -24,7 +25,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "jeweler"
 
   s.add_development_dependency "uglifier"
-  s.add_development_dependency "asset_sync"
   s.add_development_dependency "appraisal"
 
   s.files         = `git ls-files`.split("\n")

data/gemfiles/rails_4.1.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+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.0"
+
+gemspec :path => "../"

data/lib/asset_sync.rb

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

data/lib/asset_sync/config.rb

@@ -26,7 +26,7 @@ module AssetSync
     attr_accessor :fog_region            # e.g. 'eu-west-1'
 
     # Amazon AWS
-    attr_accessor :aws_access_key_id, :aws_secret_access_key, :aws_reduced_redundancy
+    attr_accessor :aws_access_key_id, :aws_secret_access_key, :aws_reduced_redundancy, :aws_iam_roles
 
     # Rackspace
     attr_accessor :rackspace_username, :rackspace_api_key, :rackspace_auth_url
@@ -39,8 +39,8 @@ module AssetSync
     validates :fog_provider,          :presence => true
     validates :fog_directory,         :presence => true
 
-    validates :aws_access_key_id,     :presence => true, :if => :aws?
-    validates :aws_secret_access_key, :presence => true, :if => :aws?
+    validates :aws_access_key_id,     :presence => true, :if => proc {aws? && !aws_iam?}
+    validates :aws_secret_access_key, :presence => true, :if => proc {aws? && !aws_iam?}
     validates :rackspace_username,    :presence => true, :if => :rackspace?
     validates :rackspace_api_key,     :presence => true, :if => :rackspace?
     validates :google_storage_secret_access_key,  :presence => true, :if => :google?
@@ -85,6 +85,10 @@ module AssetSync
       aws_reduced_redundancy == true
     end
 
+    def aws_iam?
+      aws_iam_roles == true
+    end
+
     def fail_silently?
       fail_silently || !enabled?
     end
@@ -138,6 +142,7 @@ module AssetSync
       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"]
+      self.aws_iam_roles          = yml["aws_iam_roles"]
       self.rackspace_username     = yml["rackspace_username"]
       self.rackspace_auth_url     = yml["rackspace_auth_url"] if yml.has_key?("rackspace_auth_url")
       self.rackspace_api_key      = yml["rackspace_api_key"]
@@ -173,10 +178,16 @@ module AssetSync
     def fog_options
       options = { :provider => fog_provider }
       if aws?
-        options.merge!({
-          :aws_access_key_id => aws_access_key_id,
-          :aws_secret_access_key => aws_secret_access_key
-        })
+        if aws_iam?
+          options.merge!({
+            :use_iam_profile => true
+          })
+        else
+          options.merge!({
+            :aws_access_key_id => aws_access_key_id,
+            :aws_secret_access_key => aws_secret_access_key
+          })
+        end
       elsif rackspace?
         options.merge!({
           :rackspace_username => rackspace_username,

data/lib/asset_sync/multi_mime.rb

@@ -1,3 +1,5 @@
+require 'mime/types'
+
 module AssetSync
   class MultiMime
 
@@ -9,10 +11,10 @@ module AssetSync
         ext_with_dot = ".#{ext}"
         Rack::Mime.mime_type(ext_with_dot)
       else
-        MIME::Types.type_for(ext).first
+        ::MIME::Types.type_for(ext).first
       end
 
     end
 
   end
-end
+end

data/lib/asset_sync/version.rb

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

data/spec/integration/aws_integration_spec.rb

@@ -43,7 +43,6 @@ describe "AssetSync" do
 
   it "sync" do
     execute "rake ASSET_SYNC_PREFIX=#{@prefix} assets:precompile"
-    # bucket(@prefix).files.size.should == 5
 
     files = bucket(@prefix).files
 
@@ -51,16 +50,16 @@ describe "AssetSync" do
     app_js_gz_path = files.select{ |f| f.key =~ app_js_gz_regex }.first
 
     app_js = files.get( app_js_path.key )
-    app_js.content_type.should == "text/javascript"
+    expect(app_js.content_type).to eq("text/javascript")
 
     app_js_gz = files.get( app_js_gz_path.key )
-    app_js_gz.content_type.should == "text/javascript"
-    app_js_gz.content_encoding.should == "gzip"
+    expect(app_js_gz.content_type).to eq("text/javascript")
+    expect(app_js_gz.content_encoding).to eq("gzip")
   end
 
   it "sync with enabled=false" do
     execute "rake ASSET_SYNC_PREFIX=#{@prefix} ASSET_SYNC_ENABLED=false assets:precompile"
-    bucket(@prefix).files.size.should == 0
+    expect(bucket(@prefix).files.size).to eq(0)
   end
 
   it "sync with gzip_compression=true" do
@@ -69,7 +68,7 @@ describe "AssetSync" do
 
     app_js_path = files.select{ |f| f.key =~ app_js_regex }.first
     app_js = files.get( app_js_path.key )
-    app_js.content_type.should == "text/javascript"
+    expect(app_js.content_type).to eq("text/javascript")
   end
 
 end

data/spec/spec_helper.rb

@@ -32,22 +32,21 @@ shared_context "mock without Rails" do
     if defined? Rails
       Object.send(:remove_const, :Rails)
     end
-    AssetSync.stub(:log)
+    allow(AssetSync).to receive(:log)
   end
 end
 
 
 shared_context "mock Rails" do
   before(:each) do
-    unless defined? Rails
-      Rails = double 'Rails'
-    end
-    Rails.stub(:env).and_return('test')
-    Rails.stub :application => double('application')
-    Rails.application.stub :config => double('config')
-    Rails.application.config.stub :assets => ActiveSupport::OrderedOptions.new
+    Object.send(:remove_const, :Rails) if defined? Rails
+    Rails = double 'Rails'
+    allow(Rails).to receive(:env).and_return('test')
+    allow(Rails).to receive_messages :application => double('application')
+    allow(Rails.application).to receive_messages :config => double('config')
+    allow(Rails.application.config).to receive_messages :assets => ActiveSupport::OrderedOptions.new
     Rails.application.config.assets.prefix = '/assets'
-    AssetSync.stub(:log)
+    allow(AssetSync).to receive(:log)
   end
 end
 
@@ -56,10 +55,10 @@ shared_context "mock Rails without_yml" do
 
   before(:each) do
     set_rails_root('without_yml')
-    Rails.stub(:public_path).and_return(Rails.root.join('public').to_s)
+    allow(Rails).to receive(:public_path).and_return(Rails.root.join('public').to_s)
   end
 end
 
 def set_rails_root(path)
-  Rails.stub(:root).and_return(Pathname.new(File.join(File.dirname(__FILE__), 'fixtures', path)))
+  allow(Rails).to receive(:root).and_return(Pathname.new(File.join(File.dirname(__FILE__), 'fixtures', path)))
 end

data/spec/unit/asset_sync_spec.rb

@@ -17,61 +17,61 @@ describe AssetSync do
     end
 
     it "should default to running on precompile" do
-      AssetSync.config.run_on_precompile.should be_true
+      expect(AssetSync.config.run_on_precompile).to be_truthy
     end
 
     it "should default AssetSync to enabled" do
-      AssetSync.config.enabled?.should be_true
-      AssetSync.enabled?.should be_true
+      expect(AssetSync.config.enabled?).to be_truthy
+      expect(AssetSync.enabled?).to be_truthy
     end
 
     it "should configure provider as AWS" do
-      AssetSync.config.fog_provider.should == 'AWS'
-      AssetSync.config.should be_aws
+      expect(AssetSync.config.fog_provider).to eq('AWS')
+      expect(AssetSync.config).to be_aws
     end
 
     it "should should keep existing remote files" do
-      AssetSync.config.existing_remote_files?.should == true
+      expect(AssetSync.config.existing_remote_files?).to eq(true)
     end
 
     it "should configure aws_access_key" do
-      AssetSync.config.aws_access_key_id.should == "aaaa"
+      expect(AssetSync.config.aws_access_key_id).to eq("aaaa")
     end
 
     it "should configure aws_secret_access_key" do
-      AssetSync.config.aws_secret_access_key.should == "bbbb"
+      expect(AssetSync.config.aws_secret_access_key).to eq("bbbb")
     end
 
     it "should configure aws_access_key" do
-      AssetSync.config.fog_directory.should == "mybucket"
+      expect(AssetSync.config.fog_directory).to eq("mybucket")
     end
 
     it "should configure fog_region" do
-      AssetSync.config.fog_region.should == "eu-west-1"
+      expect(AssetSync.config.fog_region).to eq("eu-west-1")
     end
 
     it "should configure existing_remote_files" do
-      AssetSync.config.existing_remote_files.should == "keep"
+      expect(AssetSync.config.existing_remote_files).to eq("keep")
     end
 
     it "should default gzip_compression to false" do
-      AssetSync.config.gzip_compression.should be_false
+      expect(AssetSync.config.gzip_compression).to be_falsey
     end
 
     it "should default manifest to false" do
-      AssetSync.config.manifest.should be_false
+      expect(AssetSync.config.manifest).to be_falsey
     end
 
     it "should default log_silently to true" do
-      AssetSync.config.log_silently.should be_true
+      expect(AssetSync.config.log_silently).to be_truthy
     end
 
     it "should default cdn_distribution_id to nil" do
-      AssetSync.config.cdn_distribution_id.should be_nil
+      expect(AssetSync.config.cdn_distribution_id).to be_nil
     end
 
     it "should default invalidate to empty array" do
-      AssetSync.config.invalidate.should == []
+      expect(AssetSync.config.invalidate).to eq([])
     end
   end
 
@@ -82,40 +82,40 @@ describe AssetSync do
     end
 
     it "should default AssetSync to enabled" do
-      AssetSync.config.enabled?.should be_true
-      AssetSync.enabled?.should be_true
+      expect(AssetSync.config.enabled?).to be_truthy
+      expect(AssetSync.enabled?).to be_truthy
     end
 
     it "should configure run_on_precompile" do
-      AssetSync.config.run_on_precompile.should be_false
+      expect(AssetSync.config.run_on_precompile).to be_falsey
     end
 
     it "should configure aws_access_key_id" do
-      AssetSync.config.aws_access_key_id.should == "xxxx"
+      expect(AssetSync.config.aws_access_key_id).to eq("xxxx")
     end
 
     it "should configure aws_secret_access_key" do
-      AssetSync.config.aws_secret_access_key.should == "zzzz"
+      expect(AssetSync.config.aws_secret_access_key).to eq("zzzz")
     end
 
     it "should configure fog_directory" do
-      AssetSync.config.fog_directory.should == "rails_app_test"
+      expect(AssetSync.config.fog_directory).to eq("rails_app_test")
     end
 
     it "should configure fog_region" do
-      AssetSync.config.fog_region.should == "eu-west-1"
+      expect(AssetSync.config.fog_region).to eq("eu-west-1")
     end
 
     it "should configure existing_remote_files" do
-      AssetSync.config.existing_remote_files.should == "keep"
+      expect(AssetSync.config.existing_remote_files).to eq("keep")
     end
 
     it "should default gzip_compression to false" do
-      AssetSync.config.gzip_compression.should be_false
+      expect(AssetSync.config.gzip_compression).to be_falsey
     end
 
     it "should default manifest to false" do
-      AssetSync.config.manifest.should be_false
+      expect(AssetSync.config.manifest).to be_falsey
     end
   end
 
@@ -160,7 +160,7 @@ describe AssetSync do
 
   describe 'with fail_silent configuration' do
     before(:each) do
-      AssetSync.stub(:stderr).and_return(@stderr = StringIO.new)
+      allow(AssetSync).to receive(:stderr).and_return(@stderr = StringIO.new)
       AssetSync.config = AssetSync::Config.new
       AssetSync.configure do |config|
         config.fail_silently = true
@@ -173,13 +173,13 @@ describe AssetSync do
 
     it "should output a warning to stderr" do
       AssetSync.sync
-      @stderr.string.should =~ /can't be blank/
+      expect(@stderr.string).to match(/can't be blank/)
     end
   end
 
   describe 'with disabled config' do
     before(:each) do
-      AssetSync.stub(:stderr).and_return(@stderr = StringIO.new)
+      allow(AssetSync).to receive(:stderr).and_return(@stderr = StringIO.new)
       AssetSync.config = AssetSync::Config.new
       AssetSync.configure do |config|
         config.enabled = false
@@ -187,7 +187,7 @@ describe AssetSync do
     end
 
     it "should not raise an invalid exception" do
-      lambda{ AssetSync.sync }.should_not raise_error()
+      expect{ AssetSync.sync }.not_to raise_error()
     end
   end
 
@@ -198,7 +198,7 @@ describe AssetSync do
     end
 
     it "config.gzip? should be true" do
-      AssetSync.config.gzip?.should be_true
+      expect(AssetSync.config.gzip?).to be_truthy
     end
   end
 
@@ -209,21 +209,21 @@ describe AssetSync do
     end
 
     it "config.manifest should be true" do
-      AssetSync.config.manifest.should be_true
+      expect(AssetSync.config.manifest).to be_truthy
     end
 
     it "config.manifest_path should default to public/assets.." do
-      AssetSync.config.manifest_path.should =~ /public\/assets\/manifest.yml/
+      expect(AssetSync.config.manifest_path).to match(/public\/assets\/manifest.yml/)
     end
 
     it "config.manifest_path should default to public/assets.." do
       Rails.application.config.assets.manifest = "/var/assets"
-      AssetSync.config.manifest_path.should == "/var/assets/manifest.yml"
+      expect(AssetSync.config.manifest_path).to eq("/var/assets/manifest.yml")
     end
 
     it "config.manifest_path should default to public/custom_assets.." do
       Rails.application.config.assets.prefix = 'custom_assets'
-      AssetSync.config.manifest_path.should =~ /public\/custom_assets\/manifest.yml/
+      expect(AssetSync.config.manifest_path).to match(/public\/custom_assets\/manifest.yml/)
     end
   end
 
@@ -235,14 +235,11 @@ describe AssetSync do
     end
 
     it "config should be invalid" do
-      AssetSync.config.valid?.should be_false
+      expect(AssetSync.config.valid?).to be_falsey
     end
 
     it "should raise a config invalid error" do
       expect{ AssetSync.sync }.to raise_error()
     end
-
-
   end
-
 end