foresth-cloudfront_asset_host 1.0.3.1 → 1.0.4

data/Rakefile

@@ -25,11 +25,11 @@ end
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "cloudfront_asset_host"
+    gemspec.name = "foresth-cloudfront_asset_host"
     gemspec.summary = "Rails plugin to easily and efficiently deploy your assets on Amazon's S3 or CloudFront"
     gemspec.description = "Easy deployment of your assets on CloudFront or S3 using a simple rake-task. When enabled in production, the application's asset_host and public_paths will point to the correct location."
     gemspec.email = "menno@wakoopa.com"
-    gemspec.homepage = "http://github.com/menno/cloudfront_asset_host"
+    gemspec.homepage = "http://github.com/foresth/cloudfront_asset_host"
     gemspec.authors = ["Menno van der Sman"]
     gemspec.add_dependency 'right_aws'
   end

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.4

data/cloudfront_asset_host.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{foresth-cloudfront_asset_host}
-  s.version = "1.0.3.1"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Menno van der Sman"]

data/lib/cloudfront_asset_host.rb

@@ -33,6 +33,9 @@ module CloudfrontAssetHost
   # Key-prefix under which to store gzipped assets
   mattr_accessor :gzip_prefix
   
+  # Key-prefix under which to store plain (unzipped) assets
+ 	mattr_accessor :plain_prefix
+  
   # Which extensions are likely to occur in css files
   mattr_accessor :image_extensions
 
@@ -82,7 +85,11 @@ module CloudfrontAssetHost
 
         if gzip_accepted && gzip_allowed
           host << "/#{CloudfrontAssetHost.gzip_prefix}"
+        else
+          host << "/#{CloudfrontAssetHost.plain_prefix}"
         end
+      else
+        host << "/#{CloudfrontAssetHost.plain_prefix}"
       end
 
       host

data/lib/cloudfront_asset_host/uploader.rb

@@ -64,7 +64,8 @@ module CloudfrontAssetHost
 
       def keys_with_paths
         current_paths.inject({}) do |result, path|
-          key = CloudfrontAssetHost.key_for_path(path) + path.gsub(Rails.public_path, '')
+          key = CloudfrontAssetHost.plain_prefix.present? ? "#{CloudfrontAssetHost.plain_prefix}/" : ""
+          key << CloudfrontAssetHost.key_for_path(path) + path.gsub(Rails.public_path, '')
 
           result[key] = path
           result
@@ -140,7 +141,10 @@ module CloudfrontAssetHost
       end
 
       def config
-        @config ||= YAML::load_file(CloudfrontAssetHost.s3_config)
+        @config ||= begin 
+          config = YAML::load_file(CloudfrontAssetHost.s3_config)
+          config.has_key?(Rails.env) ? config[Rails.env] : config
+        end
       end
 
     end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: foresth-cloudfront_asset_host
 version: !ruby/object:Gem::Version 
-  hash: 81
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 0
-  - 3
-  - 1
-  version: 1.0.3.1
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Menno van der Sman