asset_sync 0.2.3 → 0.2.4

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        = "2011-12-06"
+  s.date        = "2012-01-06"
   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/config.rb

@@ -41,7 +41,7 @@ module AssetSync
     end
 
     def manifest_path
-      default = File.join(Rails.root, 'public', 'assets', 'manifest.yml')
+      default = File.join(Rails.root, 'public', Rails.application.config.assets.prefix, 'manifest.yml')
       Rails.application.config.assets.manifest || default
     end
 
@@ -56,7 +56,7 @@ module AssetSync
     def aws?
       fog_provider == 'AWS'
     end
-    
+
     def fail_silently?
       fail_silently == true
     end
@@ -90,7 +90,7 @@ module AssetSync
       self.gzip_compression       = yml["gzip_compression"] if yml.has_key?("gzip_compression")
       self.manifest               = yml["manifest"] if yml.has_key?("manifest")
       self.fail_silently          = yml["fail_silently"] if yml.has_key?("fail_silently")
-      
+
       # TODO deprecate the other old style config settings. FML.
       self.aws_access_key_id      = yml["aws_access_key"] if yml.has_key?("aws_access_key")
       self.aws_secret_access_key  = yml["aws_access_secret"] if yml.has_key?("aws_access_secret")

data/lib/asset_sync/storage.rb

@@ -15,7 +15,7 @@ module AssetSync
 
     def bucket
       # fixes: https://github.com/rumblelabs/asset_sync/issues/18
-      @bucket ||= connection.directories.get(self.config.fog_directory, :prefix => 'assets')
+      @bucket ||= connection.directories.get(self.config.fog_directory, :prefix => Rails.application.config.assets.prefix)
     end
 
     def keep_existing_remote_files?
@@ -27,7 +27,7 @@ module AssetSync
     end
 
     def local_files
-      @local_files ||= get_local_files 
+      @local_files ||= get_local_files
     end
 
     def get_local_files
@@ -35,14 +35,14 @@ module AssetSync
         if File.exists?(self.config.manifest_path)
           yml = YAML.load(IO.read(self.config.manifest_path))
           STDERR.puts "Using: Manifest #{self.config.manifest_path}"
-          return yml.values.map { |f| File.join('assets', f) }
+          return yml.values.map { |f| File.join(Rails.application.config.assets.prefix, f) }
         else
           STDERR.puts "Warning: manifest.yml not found at #{self.config.manifest_path}"
         end
       end
-      STDERR.puts "Using: Directory Search of #{path}/assets"
-      Dir["#{path}/assets/**/**"].map { |f| f[path.length+1,f.length-path.length] }
-    end 
+      STDERR.puts "Using: Directory Search of #{path}/#{Rails.application.config.assets.prefix}"
+      Dir["#{path}/#{Rails.application.config.assets.prefix}/**/**"].map { |f| f[path.length+1,f.length-path.length] }
+    end
 
     def get_remote_files
       raise BucketNotFound.new("#{self.config.fog_provider} Bucket: #{self.config.fog_directory} not found.") unless bucket
@@ -65,7 +65,7 @@ module AssetSync
       remote_files = get_remote_files
       # fixes: https://github.com/rumblelabs/asset_sync/issues/19
       from_remote_files_to_delete = remote_files - local_files
-      
+
       STDERR.puts "Flagging #{from_remote_files_to_delete.size} file(s) for deletion"
       # Delete unneeded remote files
       bucket.files.each do |f|

data/lib/asset_sync/version.rb

@@ -1,3 +1,3 @@
 module AssetSync
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/spec/asset_sync_spec.rb

@@ -1,162 +1,150 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-
-describe AssetSync, 'with initializer' do
-
-  before(:all) do
-    Rails.root = 'without_yml'
-    AssetSync.config = AssetSync::Config.new
-    AssetSync.configure do |config|
-      config.fog_provider = 'AWS'
-      config.aws_access_key_id = 'aaaa'
-      config.aws_secret_access_key = 'bbbb'
-      config.fog_directory = 'mybucket'
-      config.fog_region = 'eu-west-1'
-      config.existing_remote_files = "keep"
+describe AssetSync do
+  include_context "mock Rails without_yml"
+
+  describe 'with initializer' do
+    before(:each) do
+      AssetSync.config = AssetSync::Config.new
+      AssetSync.configure do |config|
+        config.fog_provider = 'AWS'
+        config.aws_access_key_id = 'aaaa'
+        config.aws_secret_access_key = 'bbbb'
+        config.fog_directory = 'mybucket'
+        config.fog_region = 'eu-west-1'
+        config.existing_remote_files = "keep"
+      end
     end
-  end
 
-  it "should configure provider as AWS" do
-    AssetSync.config.fog_provider.should == 'AWS'
-    AssetSync.config.should be_aws
-  end
+    it "should configure provider as AWS" do
+      AssetSync.config.fog_provider.should == 'AWS'
+      AssetSync.config.should be_aws
+    end
 
-  it "should should keep existing remote files" do
-    AssetSync.config.existing_remote_files?.should == true
-  end
+    it "should should keep existing remote files" do
+      AssetSync.config.existing_remote_files?.should == true
+    end
 
-  it "should configure aws_access_key" do
-    AssetSync.config.aws_access_key_id.should == "aaaa"
-  end
+    it "should configure aws_access_key" do
+      AssetSync.config.aws_access_key_id.should == "aaaa"
+    end
 
-  it "should configure aws_access_key" do
-    AssetSync.config.aws_secret_access_key.should == "bbbb"
-  end
+    it "should configure aws_access_key" do
+      AssetSync.config.aws_secret_access_key.should == "bbbb"
+    end
 
-  it "should configure aws_access_key" do
-    AssetSync.config.fog_directory.should == "mybucket"
-  end
+    it "should configure aws_access_key" do
+      AssetSync.config.fog_directory.should == "mybucket"
+    end
 
-  it "should configure aws_access_key" do
-    AssetSync.config.fog_region.should == "eu-west-1"
-  end
+    it "should configure aws_access_key" do
+      AssetSync.config.fog_region.should == "eu-west-1"
+    end
 
-  it "should configure aws_access_key" do
-    AssetSync.config.existing_remote_files.should == "keep"
-  end
+    it "should configure aws_access_key" do
+      AssetSync.config.existing_remote_files.should == "keep"
+    end
 
-  it "should default gzip_compression to false" do
-    AssetSync.config.gzip_compression.should be_false
-  end
+    it "should default gzip_compression to false" do
+      AssetSync.config.gzip_compression.should be_false
+    end
 
-  it "should default manifest to false" do
-    AssetSync.config.manifest.should be_false
+    it "should default manifest to false" do
+      AssetSync.config.manifest.should be_false
+    end
   end
 
-end
-
-
-describe AssetSync, 'from yml' do
-
-  before(:all) do
-    Rails.root = 'aws_with_yml'
-    AssetSync.config = AssetSync::Config.new
-  end
+  describe 'from yml' do
+    before(:each) do
+      set_rails_root('aws_with_yml')
+      AssetSync.config = AssetSync::Config.new
+    end
 
-  it "should configure aws_access_key_id" do
-    AssetSync.config.aws_access_key_id.should == "xxxx"
-  end
+    it "should configure aws_access_key_id" do
+      AssetSync.config.aws_access_key_id.should == "xxxx"
+    end
 
-  it "should configure aws_secret_access_key" do
-    AssetSync.config.aws_secret_access_key.should == "zzzz"
-  end
+    it "should configure aws_secret_access_key" do
+      AssetSync.config.aws_secret_access_key.should == "zzzz"
+    end
 
-  it "should configure aws_access_key" do
-    AssetSync.config.fog_directory.should == "rails_app_test"
-  end
+    it "should configure aws_access_key" do
+      AssetSync.config.fog_directory.should == "rails_app_test"
+    end
 
-  it "should configure aws_access_key" do
-    AssetSync.config.fog_region.should == "eu-west-1"
-  end
+    it "should configure aws_access_key" do
+      AssetSync.config.fog_region.should == "eu-west-1"
+    end
 
-  it "should configure aws_access_key" do
-    AssetSync.config.existing_remote_files.should == "keep"
-  end
+    it "should configure aws_access_key" do
+      AssetSync.config.existing_remote_files.should == "keep"
+    end
 
-  it "should default gzip_compression to false" do
-    AssetSync.config.gzip_compression.should be_false
-  end
+    it "should default gzip_compression to false" do
+      AssetSync.config.gzip_compression.should be_false
+    end
 
-  it "should default manifest to false" do
-    AssetSync.config.manifest.should be_false
+    it "should default manifest to false" do
+      AssetSync.config.manifest.should be_false
+    end
   end
-  
-end
 
-describe AssetSync, 'with no configuration' do
-
-  before(:all) do
-    Rails.root = 'without_yml'
-    AssetSync.config = AssetSync::Config.new
-  end
+  describe 'with no configuration' do
+    before(:each) do
+      AssetSync.config = AssetSync::Config.new
+    end
 
-  it "should be invalid" do
-    lambda{ AssetSync.sync }.should raise_error(AssetSync::Config::Invalid)
+    it "should be invalid" do
+      lambda{ AssetSync.sync }.should raise_error(AssetSync::Config::Invalid)
+    end
   end
 
-end
-
-describe AssetSync, 'with fail_silent configuration' do
-
-  before(:all) do
-    Rails.root = 'without_yml'
-    AssetSync.config = AssetSync::Config.new
-    AssetSync.configure do |config|
-      config.fail_silently = true
+  describe 'with fail_silent configuration' do
+    before(:each) do
+      AssetSync.config = AssetSync::Config.new
+      AssetSync.configure do |config|
+        config.fail_silently = true
+      end
     end
-  end
 
-  it "should not raise an invalid exception" do
-    lambda{ AssetSync.sync }.should_not raise_error(AssetSync::Config::Invalid)
+    it "should not raise an invalid exception" do
+      lambda{ AssetSync.sync }.should_not raise_error(AssetSync::Config::Invalid)
+    end
   end
 
-end
-
-describe AssetSync, 'with gzip_compression enabled' do
-
-  before(:all) do
-    Rails.root = 'without_yml'
-    AssetSync.config = AssetSync::Config.new
-    AssetSync.config.gzip_compression = true
-  end
+  describe 'with gzip_compression enabled' do
+    before(:each) do
+      AssetSync.config = AssetSync::Config.new
+      AssetSync.config.gzip_compression = true
+    end
 
-  it "config.gzip? should be true" do
-    AssetSync.config.gzip?.should be_true
+    it "config.gzip? should be true" do
+      AssetSync.config.gzip?.should be_true
+    end
   end
 
-end
-
-describe AssetSync, 'with manifest enabled' do
+  describe 'with manifest enabled' do
+    before(:each) do
+      AssetSync.config = AssetSync::Config.new
+      AssetSync.config.manifest = true
+    end
 
-  before(:all) do
-    Rails.root = 'without_yml'
-    AssetSync.config = AssetSync::Config.new
-    AssetSync.config.manifest = true
-  end
+    it "config.manifest should be true" do
+      AssetSync.config.manifest.should be_true
+    end
 
-  it "config.manifest should be true" do
-    AssetSync.config.manifest.should be_true
-  end
+    it "config.manifest_path should default to public/assets.." do
+      AssetSync.config.manifest_path.should =~ /public\/assets\/manifest.yml/
+    end
 
-  it "config.manifest_path should default to public/assets.." do
-    pending
-    AssetSync.config.manifest_path.should =~ "public/assets/manifest.yml"
-  end
+    it "config.manifest_path should default to public/assets.." do
+      Rails.application.config.assets.manifest = "/var/assets/manifest.yml"
+      AssetSync.config.manifest_path.should == "/var/assets/manifest.yml"
+    end
 
-  it "config.manifest_path should default to public/assets.." do
-    pending
-    Rails.app.config.assets.manifest = "/var/assets/manifest.yml"
-    AssetSync.config.manifest_path.should == "/var/assets/manifest.yml"
+    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/
+    end
   end
-
 end

data/spec/rackspace_spec.rb

@@ -1,91 +1,90 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
+describe AssetSync do
+  include_context "mock Rails"
+
+  describe 'using Rackspace with initializer' do
+    before(:each) do
+      set_rails_root('without_yml')
+      AssetSync.config = AssetSync::Config.new
+      AssetSync.configure do |config|
+        config.fog_provider          = 'Rackspace'
+        config.fog_directory         = 'mybucket'
+        config.fog_region            = 'dunno'
+        config.rackspace_username    = 'aaaa'
+        config.rackspace_api_key     = 'bbbb'
+        config.existing_remote_files = 'keep'
+      end
+    end
 
-describe AssetSync, 'using Rackspace with initializer' do
-
-  before(:all) do
-    Rails.root = 'without_yml'
-    AssetSync.config = AssetSync::Config.new
-    AssetSync.configure do |config|
-      config.fog_provider          = 'Rackspace'
-      config.fog_directory         = 'mybucket'
-      config.fog_region            = 'dunno'
-      config.rackspace_username    = 'aaaa'
-      config.rackspace_api_key     = 'bbbb'
-      config.existing_remote_files = 'keep'
+    it "should configure provider as Rackspace" do
+      AssetSync.config.fog_provider.should == 'Rackspace'
+      AssetSync.config.should be_rackspace
     end
-  end
 
-  it "should configure provider as Rackspace" do
-    AssetSync.config.fog_provider.should == 'Rackspace'
-    AssetSync.config.should be_rackspace
-  end
+    it "should keep existing remote files" do
+      AssetSync.config.existing_remote_files?.should == true
+    end
 
-  it "should keep existing remote files" do
-    AssetSync.config.existing_remote_files?.should == true
-  end
+    it "should configure rackspace_username" do
+      AssetSync.config.rackspace_username.should == "aaaa"
+    end
 
-  it "should configure rackspace_username" do
-    AssetSync.config.rackspace_username.should == "aaaa"
-  end
+    it "should configure rackspace_api_key" do
+      AssetSync.config.rackspace_api_key.should == "bbbb"
+    end
 
-  it "should configure rackspace_api_key" do
-    AssetSync.config.rackspace_api_key.should == "bbbb"
-  end
+    it "should configure fog_directory" do
+      AssetSync.config.fog_directory.should == "mybucket"
+    end
 
-  it "should configure fog_directory" do
-    AssetSync.config.fog_directory.should == "mybucket"
-  end
+    it "should configure fog_region" do
+      AssetSync.config.fog_region.should == "dunno"
+    end
 
-  it "should configure fog_region" do
-    AssetSync.config.fog_region.should == "dunno"
-  end
+    it "should configure existing_remote_files" do
+      AssetSync.config.existing_remote_files.should == "keep"
+    end
 
-  it "should configure existing_remote_files" do
-    AssetSync.config.existing_remote_files.should == "keep"
-  end
+    it "should configure existing_remote_files" do
+      AssetSync.config.existing_remote_files.should == "keep"
+    end
 
-  it "should configure existing_remote_files" do
-    AssetSync.config.existing_remote_files.should == "keep"
-  end
+    it "should default rackspace_auth_url to false" do
+      AssetSync.config.rackspace_auth_url.should be_false
+    end
 
-  it "should default rackspace_auth_url to false" do
-    AssetSync.config.rackspace_auth_url.should be_false
   end
 
-end
-
-
-describe AssetSync, 'using Rackspace from yml' do
+  describe 'using Rackspace from yml' do
 
-  before(:all) do
-    Rails.root = 'rackspace_with_yml'
-    AssetSync.config = AssetSync::Config.new
-  end
+    before(:each) do
+      set_rails_root('rackspace_with_yml')
+      AssetSync.config = AssetSync::Config.new
+    end
 
-  it "should keep existing remote files" do
-    AssetSync.config.existing_remote_files?.should == true
-  end
+    it "should keep existing remote files" do
+      AssetSync.config.existing_remote_files?.should == true
+    end
 
-  it "should configure rackspace_username" do
-    AssetSync.config.rackspace_username.should == "xxxx"
-  end
+    it "should configure rackspace_username" do
+      AssetSync.config.rackspace_username.should == "xxxx"
+    end
 
-  it "should configure rackspace_api_key" do
-    AssetSync.config.rackspace_api_key.should == "zzzz"
-  end
+    it "should configure rackspace_api_key" do
+      AssetSync.config.rackspace_api_key.should == "zzzz"
+    end
 
-  it "should configure fog_directory" do
-    AssetSync.config.fog_directory.should == "rails_app_test"
-  end
+    it "should configure fog_directory" do
+      AssetSync.config.fog_directory.should == "rails_app_test"
+    end
 
-  it "should configure fog_region" do
-    AssetSync.config.fog_region.should == "eu-west-1"
-  end
+    it "should configure fog_region" do
+      AssetSync.config.fog_region.should == "eu-west-1"
+    end
 
-  it "should configure existing_remote_files" do
-    AssetSync.config.existing_remote_files.should == "keep"
+    it "should configure existing_remote_files" do
+      AssetSync.config.existing_remote_files.should == "keep"
+    end
   end
-
-
-end
+end

data/spec/spec_helper.rb

@@ -12,20 +12,31 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'asset_sync'
 
-class Rails
-
-  @@path = 'without_yml'
+RSpec.configure do |config|
+  config.mock_framework = :rspec
+end
 
-  def self.env
-    "test"
+shared_context "mock Rails" do
+  before(:each) do
+    unless defined? Rails
+      Rails = mock 'Rails'
+    end
+    Rails.stub(:env).and_return('test')
+    Rails.stub :application => mock('application')
+    Rails.application.stub :config => mock('config')
+    Rails.application.config.stub :assets => ActiveSupport::OrderedOptions.new
+    Rails.application.config.assets.prefix = '/assets'
   end
+end
 
-  def self.root=(path)
-    @@path = path
-  end
+shared_context "mock Rails without_yml" do
+  include_context "mock Rails"
 
-  def self.root
-    File.expand_path(File.join('spec', @@path))
+  before(:each) do
+    set_rails_root('without_yml')
   end
+end
 
-end
+def set_rails_root(path)
+  Rails.stub(:root).and_return(File.join(File.dirname(__FILE__), path))
+end

metadata

@@ -2,7 +2,7 @@
 name: asset_sync
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Simon Hamilton
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-06 00:00:00 Z
+date: 2012-01-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fog