asset_sync 0.2.4 → 0.2.5

data/lib/asset_sync/config.rb

@@ -41,7 +41,7 @@ module AssetSync
     end
 
     def manifest_path
-      default = File.join(Rails.root, 'public', Rails.application.config.assets.prefix, 'manifest.yml')
+      default = File.join(Rails.root, 'public', assets_prefix, 'manifest.yml')
       Rails.application.config.assets.manifest || default
     end
 
@@ -77,6 +77,11 @@ module AssetSync
       File.join(Rails.root, "config/asset_sync.yml")
     end
 
+    def assets_prefix
+      # Fix for Issue #38 when Rails.config.assets.prefix starts with a slash
+      Rails.application.config.assets.prefix.sub(/^\//, '')
+    end
+
     def load_yml!
       self.fog_provider          = yml["fog_provider"]
       self.fog_directory         = yml["fog_directory"]

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 => Rails.application.config.assets.prefix)
+      @bucket ||= connection.directories.get(self.config.fog_directory, :prefix => self.config.assets_prefix)
     end
 
     def keep_existing_remote_files?
@@ -35,13 +35,13 @@ 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(Rails.application.config.assets.prefix, f) }
+          return yml.values.map { |f| File.join(self.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}/#{Rails.application.config.assets.prefix}"
-      Dir["#{path}/#{Rails.application.config.assets.prefix}/**/**"].map { |f| f[path.length+1,f.length-path.length] }
+      STDERR.puts "Using: Directory Search of #{path}/#{self.config.assets_prefix}"
+      Dir["#{path}/#{self.config.assets_prefix}/**/**"].map { |f| f[path.length+1,f.length-path.length] }
     end
 
     def get_remote_files

data/lib/asset_sync/version.rb

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

metadata

@@ -1,86 +1,83 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: asset_sync
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.5
   prerelease: 
-  version: 0.2.4
 platform: ruby
-authors: 
+authors:
 - Simon Hamilton
 - David Rice
 - Phil McClure
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-06 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fog
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70216429584000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activemodel
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70216429584000
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: &70216429583380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70216429583380
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70216429582700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70216429582700
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70216429582100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: jeweler
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70216429582100
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &70216429581440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-description: After you run assets:precompile your compiled assets will be synchronised with your S3 bucket.
-email: 
+  prerelease: false
+  version_requirements: *70216429581440
+description: After you run assets:precompile your compiled assets will be synchronised
+  with your S3 bucket.
+email:
 - shamilton@rumblelabs.com
 - me@davidjrice.co.uk
 - pmcclure@rumblelabs.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.md
@@ -104,34 +101,33 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/rumblelabs/asset_sync
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: asset_sync
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Synchronises Assets in a Rails 3 application and Amazon S3/Cloudfront and Rackspace Cloudfiles
-test_files: 
+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/rackspace_spec.rb
 - spec/rackspace_with_yml/config/asset_sync.yml
 - spec/spec_helper.rb
+has_rdoc: