paperclip-remote_assets 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6481d8da11f4581db7bb6d9560a1ff8730fcf6fd
-  data.tar.gz: e2560ae2ea2497a7844a147cd0fc53d188b533fa
+  metadata.gz: 8f2492873d2b543667d59b27e1355c80c14a692b
+  data.tar.gz: dab9d11741e5065c8eb89cfabd313d53c8649961
 SHA512:
-  metadata.gz: 33eb6314f6c643e1cda1bc530630a8046f1b44c70de09cdbb63a5b32ecd9428f14c488822e22b3c91791a97d334d2dfe814e3d2461790e7f23b892e49e4e8d65
-  data.tar.gz: 41e11aaf79923890ee62213a8453738b7b1fea3dc5fcc06553f1dbbdce34b8fa380845877fdcf71422850da4386b99164e785419ccb1e6aaa11dfe79b6ee8acc
+  metadata.gz: 66db547ecbd44968c2a8ca688a92f6a1a6fc232c74456cc491bc5fafe4fec2dfc1611ff7bf555dd7207ad2b5f291b020635bfc9f18ba8ecf8441ff04089c65ad
+  data.tar.gz: 42d922ab0644cf2abdafd7837de7b81e7781d0740aa125da4f5846a9b09b1f217cfce043ea8c15e5eb063f5e5de106b785726876b7b7adda10337abad49a5c6a

data/README.md

@@ -8,7 +8,7 @@ the middleware checks if the file exists in your `public/system` folder and
 redirects to the remote target if it doesn't.
 
 > **Note** : This only works if your local assets storing path matches the
-remote one. Your remote path should start with /system/ too.
+remote one.
 
 ## Installation
 
@@ -43,7 +43,19 @@ alternatively, in some initializer or environment file :
 Paperclip::RemoteAssets.remote_root = 'http://www.my-production-domain.com'
 ```
 
-That's all.
+If your remote assets root path does not start with `/system`, you can set
+the following flag, so the middleware strips the leading `/system` from the
+requested path.
+
+```bash
+ENV['REMOTE_ASSETS_ROOT_INCLUDES_SYSTEM'] = 'false'
+```
+
+alternatively, in some initializer or environment file :
+
+```ruby
+Paperclip::RemoteAssets.remote_root_includes_system = false
+```
 
 ## Contributing
 

data/lib/paperclip/remote_assets/middleware.rb

@@ -1,6 +1,8 @@
 module Paperclip
   module RemoteAssets
     class Middleware
+      SYSTEM_PREFIX_REGEX = /\A\/system\//
+
       attr_reader :app
 
       def initialize(app)
@@ -18,10 +20,14 @@ module Paperclip
       private
 
       def remote_asset?(path)
-        path.match(/\A\/system\//) && !File.exist?(Rails.root.join('public', path))
+        path.match(SYSTEM_PREFIX_REGEX) && !File.exist?(Rails.root.join('public', path))
       end
 
       def remote_asset_path_for(path)
+        unless Paperclip::RemoteAssets.remote_root_includes_system?
+          path = path.gsub(SYSTEM_PREFIX_REGEX, '/')
+        end
+
         File.join(Paperclip::RemoteAssets.remote_root, path)
       end
     end

data/lib/paperclip/remote_assets/version.rb

@@ -1,5 +1,5 @@
 module Paperclip
   module RemoteAssets
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/paperclip/remote_assets.rb

@@ -7,10 +7,19 @@ module Paperclip
     autoload :Middleware
 
     mattr_writer :remote_root
+    mattr_writer :remote_root_includes_system
 
     def self.remote_root
       @@remote_root ||= ENV['REMOTE_ASSETS_ROOT']
     end
+
+    def self.remote_root_includes_system?
+      @@remote_root_includes_system ||= if ENV.key?('REMOTE_ASSETS_ROOT_INCLUDES_SYSTEM')
+        ENV['REMOTE_ASSETS_ROOT_INCLUDES_SYSTEM'] == 'true'
+      else
+        true
+      end
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-remote_assets
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - vala
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails