caleb-cloudfront_asset_host 1.0.2 → 1.0.3

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/lib/cloudfront_asset_host.rb

@@ -29,6 +29,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
+
   class << self
 
     def configure
@@ -64,17 +67,21 @@ module CloudfrontAssetHost
 
         if gzip_accepted && gzip_allowed
           host << "/#{CloudfrontAssetHost.gzip_prefix}"
+        else
+          host << "/#{CloudfrontAssetHost.plain_prefix}"
         end
+      else
+        host << "/#{CloudfrontAssetHost.plain_prefix}"
       end
 
       host
     end
 
     def cname
-      if @cname.is_a? Proc
-        @cname.call
+      if @@cname.is_a? Proc
+        @@cname.call
       else
-        @cname
+        @@cname
       end
     end
 

data/lib/cloudfront_asset_host/css_rewriter.rb

@@ -32,8 +32,15 @@ module CloudfrontAssetHost
         if url
           path = path_for_url(url, stylesheet_path)
 
-          if path.present? && File.exists?(path)
-            key = CloudfrontAssetHost.key_for_path(path) + path.gsub(Rails.public_path, '')
+          # handle paths that have a url hash in them (like svg fonts sometimes do)
+          file_path = if path.include?('#') && path.reverse.split(/#/, 2).last.reverse.end_with?('.svg')
+            path.reverse.split(/#/, 2).last.reverse
+          else
+            path
+          end
+
+          if path.present? && File.exists?(file_path)
+            key = CloudfrontAssetHost.key_for_path(file_path) + path.gsub(Rails.public_path, '')
             "url(#{CloudfrontAssetHost.asset_host}/#{key})"
           else
             puts "Could not extract path: #{path}"

data/lib/cloudfront_asset_host/uploader.rb

@@ -57,7 +57,7 @@ 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}/" << CloudfrontAssetHost.key_for_path(path) + path.gsub(Rails.public_path, '')
 
           result[key] = path
           result
@@ -111,7 +111,8 @@ module CloudfrontAssetHost
       end
 
       def s3
-        @s3 ||= RightAws::S3.new(config['access_key_id'], config['secret_access_key'])
+        env_config = config.has_key?(Rails.env) ? config[Rails.env] : config
+        @s3 ||= RightAws::S3.new(env_config['access_key_id'], env_config['secret_access_key'])
       end
 
       def config

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Menno van der Sman