asset_sync 0.5.0 → 0.5.2

data/.gitignore

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

data/.travis.yml

@@ -10,6 +10,10 @@ rvm:
  - ruby-head
  - jruby-head
  - ree
+env:
+ - ["FOG_DIRECTORY=asset-sync-travis","FOG_PROVIDER=AWS", {secure: "dy8Fqlg3b1ZMK1BY5z6NMQLbzAVd7GWVYY0MeCQALz76zRac0z8MyU8hkv6h\nozFry7DSdbGehGT9foOnkWTwzGzf1rzdd5cmWrUPk1wDTRgMM9SrwodPj1TU\nzsq2EFx0a79vADQN8JXkpLC1YD6kEb9aWkTxrIT9KBgw+J5H32o="}, {secure: "Hmx7D7/p2LlA2ya/xBIz21s/8MLIQCjvfYB7RWBNlWk1PfqRLAz8wX6TUVWy\nfAFktMjLnpRLRYO7AgQS4jcfQ/k0HYK9IXzqXzeI00TNm0Vwp0TCXhawiOFT\nSvUMhs2/1vRfjN0HOJ75XlWRhJzV/G5rOMiafAZLsVzN/0iiB8g="}]
 matrix:
   allow_failures:
-    - rvm: ruby-head
+    - rvm: ruby-head
+    - rvm: jruby-head
+

data/CHANGELOG.md

@@ -0,0 +1,707 @@
+# RELEASE HISTORY
+
+## v0.5.1 / 2012-10-22
+
+Version 0.5.1 (David Rice <me@davidjrice.co.uk>)
+
+Changes: 
+
+* 5 Nominal Changes
+
+    * Add a CHANGELOG.md (as generated by vclog -r -f markdown
+    * Improve documentation on ignored_files config option
+    * Allow failure of specs against ruby-head and jruby-head
+    * Merge pull request #115 from demirhanaydin/patch-1
+    * Merge support for always providing mime_type #93 from patdeegan/master
+
+
+
+## v0.5.0 / 2012-08-23
+
+Version 0.5.0 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 8 Nominal Changes
+
+    * Merge branch 'sinatra' of github.com:rumblelabs/asset_sync into sinatra
+    * Version 0.5.0, sinatra / rack support
+    * Some refactoring to further remove dependency on Rails, add spec for railsless configuration
+    * Update readme.
+    * Add public_path and prefix config options so asset_sync can be used outside Rails.
+    * Some refactoring to further remove dependency on Rails, add spec for railsless configuration
+    * Merge branch 'ejholmes/sinatra' into sinatra
+    * Version 0.4.3, removed dependency on Rails Time additions
+
+
+## v0.4.3 / 2012-08-19
+
+Version 0.4.3 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 21 Nominal Changes
+
+    * Refactor cache control and expiry hearder definition to use same value of one year
+    * Merge pull request #94 from karlfreeman/time
+      
+      Remove Rails time dependency
+    * Allow failures in ruby-head
+    * Merge pull request #88 from potomak/patch-1
+      
+      Fix defined? syntax
+    * Merge pull request #95 from bbhoss/patch-1
+      
+      Fix syntax error in documentation
+    * Describe using S3 HTTPS better
+    * Fix syntax error
+    * remove Rails time dependency
+    * Update readme.
+    * Add public_path and prefix config options so asset_sync can be used outside Rails.
+    * Fix defined? syntax
+    * Force build on travis
+    * Get specs running under jruby and travis /cc @headius :)
+    * Ignore ds_store
+    * Add jruby-openssl gem to get tests passing on jruby
+    * test all the things
+    * Add travis config for rbx
+    * Merge branch 'master' of github.com:rumblelabs/asset_sync
+    * Update README for installing on heroku, labs is no-longer a plugin
+    * Merge pull request #75 from mscottford/master
+      
+      Update asset_host configuration in README to not rely on request object
+    * Version 0.4.2, allow configuration of an array of strings or regex for files to ignore uploading. #euruko
+
+
+## v0.4.2 / 2012-06-02
+
+Version 0.4.2 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 7 Nominal Changes
+
+    * Remove errant puts from spec
+    * Merge
+    * Add option to configure ignored_files through YAML config file
+    * Removes errant end in the asset_host config example.
+    * Updates README to suggest a different asset_host configuration
+      
+      The previous version will fail in some cases because a request is not always available during asset compilation.
+    * Fix Fog warnings when running specs.
+    * Version 0.4.1, allow programatic disabling of AssetSync.config.enabled
+
+
+## v0.4.1 / 2012-05-04
+
+Version 0.4.1 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 10 Nominal Changes
+
+    * Update docs
+    * Don't default to disabled if ASSET_SYNC_ENABLED env var is not specified.
+    * Add option to ignore files
+    * Add support for ASSET_SYNC_ENABLED with env vars.
+    * Oops, should have used the accessor
+    * Add support for enabled in the yaml config.
+    * Add specs for AssetSync.enabled? configured through the initializer.
+    * Make it possible to turn off AssetSync...
+      
+      Useful when precompiling to export to a hybrid mobile app such as PhoneGap.
+      Would fix issue #66.
+    * How many times will I forget to update the release date? many
+    * Version 0.4.0, google storage support. Allow force upload of all or selected files. Travis CI enabled
+
+
+## v0.4.0 / 2012-04-26
+
+Version 0.4.0 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 22 Nominal Changes
+
+    * Add google storage options to built in initializer to allow config via ENV vars
+    * Add google storage configuration to README
+    * fix case on google provider in generator
+    * added google storage tests
+    * added google storage generators
+    * add attr_accessor for google keys
+    * add support for fog gems google storage option
+    * Oh, travisci will build an orgs repos if you configure the webhookd. Use rumblelabs/asset_sync as build status
+    * Merge branch 'master' into levent/feature/overwrite_specific_remote_files
+    * Use my travis-ci build in README
+    * Merge pull request #69 from levent/integrate_travis
+      
+      Integrate Travis CI
+    * Merge branch 'integrate_travis' into feature/overwrite_specific_remote_files
+    * Specs for uploading assets
+    * Travis build logo
+    * Setting up for Travis
+    * Updated README
+    * always_upload config option added
+    * gitignore *.swp (for vim)
+    * Add ability to ignore remote files
+    * Correct name of specs
+    * Allows specifying an array of assets to always upload to remote
+    * Version 0.3.2, set content encoding header for .gz files
+
+
+## v0.3.2 / 2012-04-18
+
+Version 0.3.2 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 11 Nominal Changes
+
+    * Remove trailing comma
+    * Merge pull request #57 from nathanhumbert/master
+      
+      Set Content-Encoding for gzip files when config.gzip? is not true
+    * Merge pull request #59 from kamui/master
+      
+      Use Rails.public_path and Pathname#join for path concat and string interpolation
+    * Merge pull request #55 from manuelmeurer/patch-1
+      
+      Remove comments taken from another gem
+    * Dir.chdir to path first to avoid a map call and path string slicing
+    * add Rails.public_path stub and make Rails.root return Pathname class to match Rails behavior
+    * Rails.root returns a Pathname, use Pathname#join instead of File.join and string interpolation
+    * use Rails.public_path instead of concat Rails.root and 'public'
+    * Set Content-Encoding for gzip files when config.gzip? is not true
+      
+      This allows a S3 bucket served via CloudFront to properly handle the
+      Accept-Encoding request header.
+    * Remove comments taken from another gem
+    * Merge branch 'master' of github.com:rumblelabs/asset_sync
+
+
+## v0.3.1 / 2012-03-07
+
+Version 0.3.1 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 6 Nominal Changes
+
+    * Version 0.3.1, improve logging of asset_sync configuration and sync events
+    * Remove some debugging stuffs
+    * Improve logging during asset_sync progress.
+    * Separate log and warn message, should not mess up heroku precompile thread as it watches STDERR for output.
+    * Improve logging, only log to STDERR if RAILS_GROUPS=assets.
+    * Version 0.3.0, all configuration can be managed via env variables, improve docs on configuration
+
+
+## v0.3.0 / 2012-03-07
+
+Version 0.3.0 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 10 Nominal Changes
+
+    * Merge pull request #50 from hampei/master
+      
+      made gzip_compression settable via ENV
+    * namespaced the ENV gzip option: ASSET_SYNC_GZIP_COMPRESSION. added option to readme
+    * made gzip_compression settable via ENV
+    * Typo
+    * Improve documentation
+    * Version 0.2.12, fix the asset_sync rake task enhancement in Rails 3.2 (still supporting earlier releases)
+    * Turns out this was an issue with Rails handling of the config.assets.digest parameter
+    * When running rake assets:precompile this config variable is modified by Rails
+    * So it therefore cannot be depended on to test wether to enhance the nondigest task or not
+    * The solution is to always enhance assets:precompile:nondigest if it exists.
+
+
+## v0.2.9 / 2012-01-30
+
+Version 0.2.9 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 3 Nominal Changes
+
+    * Merge pull request #42 from genuitytech/master
+      
+      Now correctly setting config.fog_region.
+    * Now correctly setting config.fog_region.
+    * Version 0.2.8, improve http headers. Add far future expires and cache control, public.
+
+
+## v0.2.8 / 2012-01-27
+
+Version 0.2.8 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 2 Nominal Changes
+
+    * Add far future expires header
+    * Version 0.2.7, Rails 3.2 compatibility, default Rake task improved
+
+
+## v0.2.7 / 2012-01-25
+
+Version 0.2.7 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 2 Nominal Changes
+
+    * Merge branch 'rails-3-2'
+    * Version 0.2.6, Rails 3.2 compatibility, default Rake task improved
+
+
+## v0.2.6 / 2012-01-25
+
+Version 0.2.6 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 3 Nominal Changes
+
+    * Doc
+    * Add Rails 3.2 compatible rake task
+    * Fix issue #38 for when  Rails.config.assets.prefix starts with a slash.
+
+
+## v0.2.5 / 2012-01-10
+
+Version 0.2.5 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 1 Nominal Changes
+
+    * Version 0.2.4, Support for Rails.config.assets.prefix
+
+
+## v0.2.4 / 2012-01-06
+
+Version 0.2.4 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 5 Nominal Changes
+
+    * Merge pull request #35 from siliconsalad/config_assets_prefix
+      
+      Rails.config.assets.prefix used for sync
+    * added test with Rails.config.assets.prefix set
+    * Rails.config.assets.prefix used for sync (instead of hardcoded 'assets' value)
+    * specs now use shared context to mock Rails and fixed pending tests that were failing
+    * Version 0.2.3, Rackspace London support
+
+
+## v0.2.3 / 2011-12-06
+
+Version 0.2.3 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 3 Nominal Changes
+
+    * Merge pull request #28 from robink/master
+      
+      Rackspace London support
+    * Only merge racksace_auth_url to fog config if defined
+    * Bump date for release
+
+
+## v0.2.2 / 2011-11-29
+
+Version 0.2.2 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 10 Nominal Changes
+
+    * Version 0.2.2: add fail_silently config option to avoid heroku installing the rails31_enable_runtime_asset_compilation, fixes issues #24, #29
+    * Further explanation of fail_silently option
+    * Merge pull request #29 from neilmiddleton/master
+      
+      Allow precompile to fail quietly on heroku
+    * Update README, and generator templates
+    * Changes as discussed in PR#29
+    * Disable pre-compilation on Heroku.
+    * Updated README and generators
+    * Added support for specifying rackspace_auth_url (then the possibility to use Rackspace London)
+    * Fixed typo in readme
+    * Updated version and release date
+
+
+## v0.2.12 / 2012-03-04
+
+Version 0.2.12 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 1 Nominal Changes
+
+    * Version 0.2.11, minor fix to YAML loading and improved docs
+
+
+## v0.2.11 / 2012-03-04
+
+Version 0.2.11 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 7 Nominal Changes
+
+    * Merge pull request #48 from samsoffes/patch-1
+      
+      Fix Heroku Labs plugin URL and add code coloring to readme.
+    * Fix Heroku Labs plugin URL and add code coloring to readme.
+    * Merge pull request #47 from dbalatero/dont_read_yml_file_every_time
+      
+      Cache the YML config to avoid multiple file reads.
+    * Cache the YML config to avoid multiple file reads.
+    * Fix documentation typos
+    * Move old known issues about heroku ENV variables to a docs folder, write new content referencing the recommended use of user_env_compile
+    * Version 0.2.10, fix handling of non standard Rails.config.assets.manifest path
+
+
+## v0.2.10 / 2012-02-16
+
+Version 0.2.10 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 5 Nominal Changes
+
+    * Add an AssetSync.log method for outputing sync config failure so we can stub it out easily in tests
+    * Merge pull request #44 from dbalatero/fix_nonstandard_manifest_location
+      
+      Fixes asset_sync to correctly read manifest.yml files.
+    * Fixes asset_sync to correctly read manifest.yml files.
+      
+      Rails.config.assets.manifest only points to the directory that contains
+      the manifest.yml file:
+      
+      https://github.com/rails/rails/blob/226783d1e8891a38d4a61017952528970dba903d/actionpack/lib/sprockets/railtie.rb#L36
+    * Add hack, seems required for some applications on push to Heroku, not for others
+    * Version 0.2.9 fix bug in internal initializer
+
+
+## v0.2.1 / 2011-11-21
+
+Version 0.2.1 (Phil <phil.mcclure@gmail.com>)
+
+Changes:
+
+* 4 Nominal Changes
+
+    * Only configure with ENV vars if initializer and yml file do not exist
+    * Typo in yaml, underscore need not be escaped here
+    * Fix readme
+    * Version 0.2.0
+
+
+## v0.2.0 / 2011-11-15
+
+Version 0.2.0 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 15 Nominal Changes
+
+    * Add upgrade notice to README
+    * Use fog directory
+    * Merge
+    * Fix readme
+    * Tidy readme
+    * Get AWS or Rackspace generators working correctly
+    * Remove generated rake task, no need
+    * Improve generators to generate AWS or Rackspace compatible initializer or yml
+    * Prepare 0.2.0 for release
+    * Convert readme and generators to new config options
+    * Fix fog_options
+    * Fix typo
+    * Fix bug
+    * Working on migrating the exposed config variables to reflect fog, add in a start on rackspace support. Write more specs, tidy up and document config
+    * Add specs for manifest config
+
+
+## v0.1.9 / 2011-11-06
+
+Version 0.1.9 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 37 Nominal Changes
+
+    * Document gzip compression
+    * Add note about gzip_compression
+    * Add spec to test config defaults gzip_compression to false
+    * Add gzip compression info to generated asset_sync.rb or .yml. Fix .yml example with new config settings
+    * Update gemspec
+    * Update docs to note that rake task is no longer generated within the app.
+    * Add todo
+    * Add % symbol for clarity
+    * Output % savings when uploading gzipped files. Only use gzipped files if the compressed version is actually smaller than the original.
+    * Tidy readme
+    * Get AWS or Rackspace generators working correctly
+    * Remove generated rake task, no need
+    * Improve generators to generate AWS or Rackspace compatible initializer or yml
+    * Prepare 0.2.0 for release
+    * Convert readme and generators to new config options
+    * Fix fog_options
+    * Fix bug
+    * Fix typo
+    * Working on migrating the exposed config variables to reflect fog, add in a start on rackspace support. Write more specs, tidy up and document config
+    * Add spec for gzip? config method
+    * Reorder logic to execute quicker if gzip? compression disabled and ignore .gz uploads correctly
+    * Ignore .gz assets if we are in gzip_compression mode
+    * Do not set a Vary: Accept-Encoding header, S3 does not support at all
+    * Try setting vary header a different way
+    * Set http header Vary: Accept-Encoding when storing gzipped assets to S3
+    * Add todo
+    * Refactor to computed path
+    * Add path
+    * Instead of overwriting the original file when processing the .gz, overwrite the original if a gz file exists to avoid any issues with whichever order files are processed in
+    * Bump version (no release just yet)
+    * Only handle gzip files specially if we have configured gzip_compression
+    * Overwrite original files with gzipped equivalent, improve logging to show GZIP in action, make it a configurable option, config.gzip_compression that defaults to false
+    * Upload GZIP compressed assets nicely to S3 with correct content type and encoding.
+    * Refactor upload method to make enhancing nicer
+    * Merge pull request #12 from bobbrez/master
+      
+      Minor correction to README for generated YAML file path.
+    * Correcting location of generated yml in README
+    * Comment out unnecessary logic for now
+
+
+## v0.1.8 / 2011-10-17
+
+Version 0.1.8 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 4 Nominal Changes
+
+    * Don't log any debugging info v0.1.8 should add a debug mode in future
+    * Fix specs, only require asset_sync engine and railtie if Rails is initialized
+    * Improve docs
+    * Tidy up for release of Rails 3.1.1 support.
+
+
+## v0.1.7 / 2011-10-15
+
+Version 0.1.7 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 6 Nominal Changes
+
+    * Merge pull request #7 from hone/6_rails3.1.1
+      
+      Rails 3.1.1 Compatability
+    * rails 3.1.1 support
+    * fix typo
+    * Update the generated yml config with a staging environment, use defaults more. Engine within asset sync doesn't appear to be ran even with :group => :assets in the definition. Add railtie to allow setting config.asset_sync configuration within a rails application.rb, this and moving the initializer style of config seems to work for Rails 3.1.1, also so does purely relying on the YAML config
+    * New version of asset_sync to work around Rails 3.1.1 issues. Test if config/initializers/asset_sync.rb exists and load that, otherwise provide a default initializer that is configurable with environment variables. Then merge in settings if config/asset_sync.yml is found. Add the asset_sync.rake in to lib/tasks so it is autoloaded and don't bother generating it anymore
+    * Bugfix
+
+
+## v0.1.6 / 2011-09-26
+
+Version 0.1.6 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 1 Nominal Changes
+
+    * Fix gemfile
+
+
+## v0.1.5 / 2011-09-26
+
+Version 0.1.5 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 5 Nominal Changes
+
+    * Should raise storage error if AWS S3 bucket is not found. Version 0.1.5
+    * explain further
+    * Merge branch 'master' of github.com:rumblelabs/asset_sync
+    * List known issues with heroku and possible work arounds
+    * Should raise error with no configuration
+
+
+## v0.1.4 / 2011-08-30
+
+Version 0.1.4 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 2 Nominal Changes
+
+    * Require dependancy of active_model, add config validation, better specs, version 0.1.4
+    * Tidied up read me with a DRYer use of AWS_BUCKET for asset_host.
+
+
+## v0.1.3 / 2011-08-27
+
+Version 0.1.3 (Simon Hamilton <shamilton@rumblelabs.com>)
+
+Changes:
+
+* 1 Nominal Changes
+
+    * Bump version for release
+
+
+## v0.1.2 / 2011-08-25
+
+Version 0.1.2 (Simon Hamilton <shamilton@rumblelabs.com>)
+
+Changes:
+
+* 2 Nominal Changes
+
+    * Removed public from cache control. May be causing a problem with uploads
+    * Bump version for release
+
+
+## v0.1.10 / 2011-11-15
+
+Version 0.1.10 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 7 Nominal Changes
+
+    * Improve manifest configuration by making it a boolean option only, it will automatically use the configured manifest path if different from the default. Add documentation to readme about the new option and upgrade generated configs.
+    * Merge pull request #20 from agworld/e26f5ca36dee1c2196653268ed6bb38c0226e4d2
+      
+      Fixes issues #16, #17, #18 and #19
+    * fixes https://github.com/rumblelabs/asset_sync/issues/19
+    * Implements https://github.com/rumblelabs/asset_sync/issues/17
+    * fixes https://github.com/rumblelabs/asset_sync/issues/18
+    * fixes https://github.com/rumblelabs/asset_sync/issues/16
+    * Merge branch 'gzip-compression'
+
+
+## v0.1.1 / 2011-08-24
+
+Version 0.1.1 (Simon Hamilton <shamilton@rumblelabs.com>)
+
+Changes:
+
+* 5 Nominal Changes
+
+    * Merge pull request #4 from jsmestad/patch-1
+      
+      [BUGFIX] Add support for 'existing_remote_files' configuration in YAML fi
+    * Verbose output about the delete process.
+    * Condense logic on keep
+    * [BUGFIX] Add support for 'existing_remote_files' configuration in YAML file.
+    * Version 0.1.0 ready
+
+
+## v0.1.0 / 2011-08-22
+
+Version 0.1.0 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 1 Nominal Changes
+
+    * Merge 0.0.7 from master into new refactor branch
+
+
+## v0.0.7 / 2011-08-22
+
+Version 0.0.7 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 9 Nominal Changes
+
+    * Added Cache-control header (1 year, public) on uploaded files
+    * Update README to reflect new configuration styles
+    * Extract all file manipulation methods to a storage class, update generator templates, fix a few bugs.
+    * Config class working, specs added, still @wip
+    * Refactoring
+    * Get config working and loading yml or the initializer
+    * small additions
+    * @wip working on extracting out a configuration class and allow config via an initializer alone, also support yml file usage for when that is useful
+    * merge config changes
+
+
+## v0.0.6 / 2011-08-06
+
+Version 0.0.6 (Simon Hamilton <shamilton@rumblelabs.com>)
+
+Changes:
+
+* 1 Nominal Changes
+
+    * Include ERB template rendering of yml. v0.0.5
+
+
+## v0.0.5 / 2011-08-05
+
+Version 0.0.5 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 3 Nominal Changes
+
+    * now it parses the YAML file with ERB.
+    * Set gem date for release
+    * 0.0.4 Release
+
+
+## v0.0.4 / 2011-08-05
+
+Version 0.0.4 (David Rice <me@davidjrice.co.uk>)
+
+
+## v0.0.3 / 2011-07-31
+
+Version 0.0.3 (David Rice <me@davidjrice.co.uk>)
+
+Changes:
+
+* 1 Nominal Changes
+
+    * Added homepage to gemspec
+
+
+## v0.0.2 / 2011-07-31
+
+Version 0.0.2 (Simon Hamilton <shamilton@rumblelabs.com>)
+
+Changes:
+
+* 7 Nominal Changes
+
+    * Added a rails generator to install the rake task and the config.  Just do "rails generate asset_sync:install"
+    * Updated readme
+    * Getting ready to release the gem
+    * Revert "remove version file"
+      
+      This reverts commit 7ebd853947b8d5f3b6e81f96535dfce843f2c855.
+    * remove version file
+    * Initial commit
+    * Initial commit
+
+
+## HEAD / 2012-08-27
+
+Current Development (David Rice)
+
+Changes:
+
+* 2 Nominal Changes
+
+    * Improve documentation on ignored_files config option
+    * Merge branch 'sinatra'
+

data/README.md

@@ -17,9 +17,9 @@ If you are upgrading from a version of asset_sync **< 0.2.0** (i.e. 0.1.x). All
 
 Previously there were [several issues](http://github.com/rumblelabs/asset_sync/blob/master/docs/heroku.md) with using asset_sync on Heroku as described in our [Heroku dev centre article](http://devcenter.heroku.com/articles/cdn-asset-host-rails31).
 
-Now to get everything working smoothly with using **ENV** variables to configure `asset_sync` we just need to enable the [user\_env\_compile](http://devcenter.heroku.com/articles/labs-user-env-compile) functionality. In short:
+Now to get everything working smoothly with using **ENV** variables to configure `asset_sync` we just need to enable the [user-env-compile](http://devcenter.heroku.com/articles/labs-user-env-compile) functionality. In short:
 
-    heroku labs:enable user_env_compile -a myapp
+    heroku labs:enable user-env-compile -a myapp
 
 Hopefully this will make it's way into the platform as standard.
 
@@ -63,6 +63,15 @@ S3 as the asset host and ensure precompiling is enabled.
   config.action_controller.asset_host = "//#{ENV['FOG_DIRECTORY']}.s3.amazonaws.com"
 ```
 
+Or, to use Google Storage Cloud, configure as this.
+
+``` ruby
+  #config/environments/production.rb
+  config.action_controller.asset_host = "//#{ENV['FOG_DIRECTORY']}.storage.googleapis.com"
+```
+
+
+
 On **HTTPS**: the exclusion of any protocol in the asset host declaration above will allow browsers to choose the transport mechanism on the fly. So if your application is available under both HTTP and HTTPS the assets will be served to match.
 
 > The only caveat with this is that your S3 bucket name **must not contain any periods** so, mydomain.com.s3.amazonaws.com for example would not work under HTTPS as SSL certificates from Amazon would interpret our bucket name as **not** a subdomain of s3.amazonaws.com, but a multi level subdomain. To avoid this don't use a period in your subdomain or switch to the other style of S3 URL.
@@ -70,12 +79,21 @@ On **HTTPS**: the exclusion of any protocol in the asset host declaration above
 ``` ruby
   config.action_controller.asset_host = "//s3.amazonaws.com/#{ENV['FOG_DIRECTORY']}" 
 ```
+Or
+
+``` ruby
+  config.action_controller.asset_host = "//storage.googleapis.com/#{ENV['FOG_DIRECTORY']}" 
+```
 
 Also, ensure the following are defined (in production.rb or application.rb)
 
 * **config.assets.digest** is set to **true**.
 * **config.assets.enabled** is set to **true**.
 
+Additionally, if you depend on any configuration that is setup in your `initializers` you will need to ensure that
+
+* **config.assets.initialize\_on\_precompile** is set to **true**
+
 ### AssetSync
 
 **AssetSync** supports the following methods of configuration.
@@ -128,6 +146,14 @@ heroku config:add FOG_DIRECTORY=xxxx
 heroku config:add FOG_PROVIDER=Rackspace
 ```
 
+Google Storage Cloud configuration is supported as well
+``` bash
+heroku config:add FOG_PROVIDER=Google
+heroku config:add GOOGLE_STORAGE_ACCESS_KEY_ID=xxxx 
+heroku config:add GOOGLE_STORAGE_SECRET_ACCESS_KEY=xxxx 
+heroku config:add FOG_DIRECTORY=xxxx
+```
+
 The Built-in Initializer also sets the AssetSync default for **existing_remote_files** to **keep**.
 
 ### Custom Rails Initializer (config/initializers/asset_sync.rb)
@@ -197,7 +223,7 @@ defaults: &defaults
   #  note: You will still need to expire them from the CDN's edge cache locations
   # always_upload: ['application.js', 'application.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', %r(ignore_some/\d{32}\.css)]
+  # ignored_files: ['ignore_me.js', !ruby/regexp '/ignore_some/\d{32}\.css/']
 
 development:
   <<: *defaults
@@ -229,6 +255,8 @@ AssetSync.config.gzip_compression == ENV['ASSET_SYNC_GZIP_COMPRESSION']
 * **gzip\_compression**: (`true, false`) when enabled, will automatically replace files that have a gzip compressed equivalent with the compressed version. **default:** `'false'`
 * **manifest**: (`true, false`) when enabled, will use the `manifest.yml` generated by Rails to get the list of local files to upload. **experimental**. **default:** `'false'`
 * **enabled**: (`true, false`) when false, will disable asset sync. **default:** `'true'` (enabled)
+* **ignored\_files**: an array of files to ignore e.g. `['ignore_me.js', %r(ignore_some/\d{32}\.css)]` Useful if there are some files that are created dynamically on the server and you don't want to upload on deploy **default**: `[]`
+
 
 #### Fog (Required)
 * **fog\_provider**: your storage provider *AWS* (S3) or *Rackspace* (Cloud Files) or *Google* (Google Storage)

data/Rakefile

@@ -1,6 +1,19 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec)
+namespace :spec do
+  RSpec::Core::RakeTask.new(:unit) do |spec|
+    spec.pattern = 'spec/unit/*_spec.rb'
+    spec.rspec_opts = ['--backtrace']
+  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
+  end
+end
 
-task :default => :spec
+task :default => 'spec:all'

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        = "2012-08-23"
+  s.date        = "2013-01-07"
   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"]
@@ -22,6 +22,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
   s.add_development_dependency "bundler"
   s.add_development_dependency "jeweler"
+  
+  s.add_development_dependency "rails"
+  s.add_development_dependency "uglifier"
+  s.add_development_dependency "asset_sync"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/asset_sync/engine.rb

@@ -1,42 +1,52 @@
-class Engine < Rails::Engine
-
-  engine_name "asset_sync"
-
-  initializer "asset_sync config", :group => :all do |app|
-    app_initializer = Rails.root.join('config', 'initializers', 'asset_sync.rb').to_s
-    app_yaml = Rails.root.join('config', 'asset_sync.yml').to_s
-
-    if File.exists?( app_initializer )
-      AssetSync.log "AssetSync: using #{app_initializer}"
-      load app_initializer
-    elsif !File.exists?( app_initializer ) && !File.exists?( app_yaml )
-      AssetSync.log "AssetSync: using default configuration from built-in initializer"
-      AssetSync.configure do |config|
-        config.fog_provider = ENV['FOG_PROVIDER']
-        config.fog_directory = ENV['FOG_DIRECTORY']
-        config.fog_region = ENV['FOG_REGION']
-
-        config.aws_access_key_id = ENV['AWS_ACCESS_KEY_ID']
-        config.aws_secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
-
-        config.rackspace_username = ENV['RACKSPACE_USERNAME']
-        config.rackspace_api_key = ENV['RACKSPACE_API_KEY']
-
-        config.google_storage_access_key_id = ENV['GOOGLE_STORAGE_ACCESS_KEY_ID']
-        config.google_storage_secret_access_key = ENV['GOOGLE_STORAGE_SECRET_ACCESS_KEY']
+module AssetSync
+  class Engine < Rails::Engine
+
+    engine_name "asset_sync"
+
+    initializer "asset_sync config", :group => :all do |app|
+      app_initializer = Rails.root.join('config', 'initializers', 'asset_sync.rb').to_s
+      app_yaml = Rails.root.join('config', 'asset_sync.yml').to_s
+
+      if File.exists?( app_initializer )
+        AssetSync.log "AssetSync: using #{app_initializer}"
+        load app_initializer
+      elsif !File.exists?( app_initializer ) && !File.exists?( app_yaml )
+        AssetSync.log "AssetSync: using default configuration from built-in initializer"
+        AssetSync.configure do |config|
+          config.fog_provider = ENV['FOG_PROVIDER']
+          config.fog_directory = ENV['FOG_DIRECTORY']
+          config.fog_region = ENV['FOG_REGION']
+
+          config.aws_access_key_id = ENV['AWS_ACCESS_KEY_ID']
+          config.aws_secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+
+          config.rackspace_username = ENV['RACKSPACE_USERNAME']
+          config.rackspace_api_key = ENV['RACKSPACE_API_KEY']
+
+          config.google_storage_access_key_id = ENV['GOOGLE_STORAGE_ACCESS_KEY_ID']
+          config.google_storage_secret_access_key = ENV['GOOGLE_STORAGE_SECRET_ACCESS_KEY']
+
+          if ENV.has_key? 'ASSET_SYNC_ENABLED'
+            config.enabled = ENV['ASSET_SYNC_ENABLED'] == 'true'
+          end
+          config.existing_remote_files = ENV['ASSET_SYNC_EXISTING_REMOTE_FILES'] || "keep"
+          config.gzip_compression = ENV['ASSET_SYNC_GZIP_COMPRESSION'] == 'true'
+          config.manifest = ENV['ASSET_SYNC_MANIFEST'] == 'true'
+        end
 
-        if ENV.has_key? 'ASSET_SYNC_ENABLED'
-          config.enabled = ENV['ASSET_SYNC_ENABLED'] == 'true'
+        if ENV.has_key? 'ASSET_SYNC_PREFIX'
+          config.prefix = ENV['ASSET_SYNC_PREFIX']
         end
         config.existing_remote_files = ENV['ASSET_SYNC_EXISTING_REMOTE_FILES'] || "keep"
         config.gzip_compression = ENV['ASSET_SYNC_GZIP_COMPRESSION'] == 'true'
         config.manifest = ENV['ASSET_SYNC_MANIFEST'] == 'true'
+
       end
-    end
 
-    if File.exists?( app_yaml )
-      AssetSync.log "AssetSync: YAML file found #{app_yaml} settings will be merged into the configuration"
+      if File.exists?( app_yaml )
+        AssetSync.log "AssetSync: YAML file found #{app_yaml} settings will be merged into the configuration"
+      end
     end
-  end
 
+  end
 end

data/lib/asset_sync/storage.rb

@@ -105,12 +105,15 @@ module AssetSync
     def upload_file(f)
       # 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)
       file = {
         :key => f,
         :body => File.open("#{path}/#{f}"),
         :public => true,
         :cache_control => "public, max-age=#{one_year}",
-        :expires => CGI.rfc1123_date(Time.now + one_year)
+        :expires => CGI.rfc1123_date(Time.now + one_year),
+        :content_type => mime
       }
 
       gzipped = "#{path}/#{f}.gz"
@@ -127,12 +130,9 @@ module AssetSync
 
         if gzipped_size < original_size
           percentage = ((gzipped_size.to_f/original_size.to_f)*100).round(2)
-          ext = File.extname( f )[1..-1]
-          mime = Mime::Type.lookup_by_extension( ext )
           file.merge!({
             :key => f,
             :body => File.open(gzipped),
-            :content_type     => mime,
             :content_encoding => 'gzip'
           })
           log "Uploading: #{gzipped} in place of #{f} saving #{percentage}%"

data/lib/asset_sync/version.rb

@@ -1,3 +1,3 @@
 module AssetSync
-  VERSION = "0.5.0"
+  VERSION = "0.5.2"
 end

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

@@ -27,12 +27,15 @@ defaults: &defaults
 
 development:
   <<: *defaults
+  enabled: false
 
 test:
   <<: *defaults
+  enabled: false
 
 staging:
   <<: *defaults
+  fog_directory: "<%= app_name %>-staging-assets"
 
 production:
   <<: *defaults

data/spec/dummy_app/Rakefile

@@ -0,0 +1,29 @@
+require 'rubygems'
+# require "rake"
+ENV['RAILS_ROOT'] = File.dirname(__FILE__)
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+# require 'rails/all'
+require "action_controller/railtie"
+require "sprockets/railtie"
+if defined?(Bundler)
+  Bundler.require(*Rails.groups(:assets => %w(development test)))
+end
+module AssetSyncTest
+  class Application < Rails::Application
+    config.encoding = "utf-8"
+    config.filter_parameters += [:password]
+    config.assets.enabled = true
+    config.assets.version = '1.0'
+    config.secret_token = 'bf196b4383deefa4e0120a6ef1d9af1cc45f5c4ebd04405'
+    config.session_store :cookie_store, :key => '_asset_sync_test_session', :secret => 'xxxx'
+    config.active_support.deprecation = :log
+    config.assets.compress = true
+    config.assets.digest = true
+    config.assets.prefix = ENV['ASSET_SYNC_PREFIX']
+  end
+end
+AssetSyncTest::Application.initialize!
+AssetSyncTest::Application.load_tasks
+# Rake::Task['assets:precompile:all'].invoke

data/spec/dummy_app/app/assets/javascripts/application.js

@@ -0,0 +1 @@
+console.log("hello");

data/spec/integration/aws_integration_spec.rb

@@ -0,0 +1,49 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+def bucket(name)
+  options = {
+    :provider => 'AWS',
+    :aws_access_key_id => ENV['AWS_ACCESS_KEY_ID'],
+    :aws_secret_access_key => ENV['AWS_SECRET_ACCESS_KEY']
+  }
+
+  connection = Fog::Storage.new(options)
+  connection.directories.get(ENV['FOG_DIRECTORY'], :prefix => name)
+end
+
+def execute(command)
+  app_path = File.expand_path("../../dummy_app", __FILE__)
+  Dir.chdir app_path
+  `#{command}`
+end
+
+describe "AssetSync" do
+
+  before(:each) do
+    @prefix = SecureRandom.hex(6)
+  end
+
+  after(:each) do
+    @directory = bucket(@prefix)
+    @directory.files.each do |f|
+      f.destroy
+    end
+  end
+
+  it "sync" do
+    execute "rake ASSET_SYNC_PREFIX=#{@prefix} assets:precompile"
+    bucket(@prefix).files.size.should == 5
+  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
+  end
+
+  it "sync with gzip_compression=true" do
+    execute "rake ASSET_SYNC_PREFIX=#{@prefix} ASSET_SYNC_GZIP_COMPRESSION=true assets:precompile"
+    bucket(@prefix).files.size.should == 3
+  end
+
+end
+

data/spec/spec_helper.rb

@@ -50,5 +50,5 @@ shared_context "mock Rails without_yml" do
 end
 
 def set_rails_root(path)
-  Rails.stub(:root).and_return(Pathname.new(File.join(File.dirname(__FILE__), path)))
+  Rails.stub(:root).and_return(Pathname.new(File.join(File.dirname(__FILE__), 'fixtures', path)))
 end

data/spec/{asset_sync_spec.rb → unit/asset_sync_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
 describe AssetSync do
   include_context "mock Rails without_yml"

data/spec/{google_spec.rb → unit/google_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
 describe AssetSync do
   include_context "mock Rails without_yml"

data/spec/{rackspace_spec.rb → unit/rackspace_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
 describe AssetSync do
   include_context "mock Rails"

data/spec/{railsless_spec.rb → unit/railsless_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
 describe AssetSync do
   include_context "mock without Rails"

data/spec/{storage_spec.rb → unit/storage_spec.rb}

@@ -1,5 +1,4 @@
-
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
 describe AssetSync::Storage do
   include_context "mock Rails without_yml"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asset_sync
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2013-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -93,6 +93,54 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: uglifier
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: asset_sync
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: After you run assets:precompile your compiled assets will be synchronised
   with your S3 bucket.
 email:
@@ -105,6 +153,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -121,15 +170,18 @@ files:
 - lib/generators/asset_sync/templates/asset_sync.rb
 - lib/generators/asset_sync/templates/asset_sync.yml
 - lib/tasks/asset_sync.rake
-- spec/asset_sync_spec.rb
-- spec/aws_with_yml/config/asset_sync.yml
-- spec/google_spec.rb
-- spec/google_with_yml/config/asset_sync.yml
-- spec/rackspace_spec.rb
-- spec/rackspace_with_yml/config/asset_sync.yml
-- spec/railsless_spec.rb
+- spec/dummy_app/Rakefile
+- spec/dummy_app/app/assets/javascripts/application.js
+- 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/integration/aws_integration_spec.rb
 - spec/spec_helper.rb
-- spec/storage_spec.rb
+- spec/unit/asset_sync_spec.rb
+- spec/unit/google_spec.rb
+- spec/unit/rackspace_spec.rb
+- spec/unit/railsless_spec.rb
+- spec/unit/storage_spec.rb
 homepage: https://github.com/rumblelabs/asset_sync
 licenses: []
 post_install_message: 
@@ -144,7 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 812394240063105414
+      hash: -3032835724923262885
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -153,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 812394240063105414
+      hash: -3032835724923262885
 requirements: []
 rubyforge_project: asset_sync
 rubygems_version: 1.8.24
@@ -162,12 +214,15 @@ specification_version: 3
 summary: Synchronises Assets in a Rails 3 application and Amazon S3/Cloudfront and
   Rackspace Cloudfiles
 test_files:
-- spec/asset_sync_spec.rb
-- spec/aws_with_yml/config/asset_sync.yml
-- spec/google_spec.rb
-- spec/google_with_yml/config/asset_sync.yml
-- spec/rackspace_spec.rb
-- spec/rackspace_with_yml/config/asset_sync.yml
-- spec/railsless_spec.rb
+- spec/dummy_app/Rakefile
+- spec/dummy_app/app/assets/javascripts/application.js
+- 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/integration/aws_integration_spec.rb
 - spec/spec_helper.rb
-- spec/storage_spec.rb
+- spec/unit/asset_sync_spec.rb
+- spec/unit/google_spec.rb
+- spec/unit/rackspace_spec.rb
+- spec/unit/railsless_spec.rb
+- spec/unit/storage_spec.rb