carrierwave-roz 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44e6526a68ea136cd459fe8cf3ed620abeb40261
-  data.tar.gz: abab58648f7c0a08ab4d58ecd55cff948eeb17ea
+  metadata.gz: d3ec3a0388baa39783f30de6e8585e67ed91fcd9
+  data.tar.gz: fcd82850422ddbf883bc4deef4d7bd2c7db561a0
 SHA512:
-  metadata.gz: 8eb3efecf9fe8ef4743d72985fecce9e6528538634da9e5908733ec960ddf7a768322496fb2adf1b8e7526c07441036bdcc05136ff231f94bda1162ed4fb7d1e
-  data.tar.gz: 780287042f08a77cba1c60299d353cbdbdfee10520c124cdb383d80149bd6bd0ebe2ee946d20d142cc748f96f2f927458b978e29c4fda3aba7351a90070bf765
+  metadata.gz: 6e43144f24a1fbd94f7fb30f03f96147b8893c73528a45c14ebeefd173cfee197cef5c795e1acf859853f4fab7235a4cad77f7a7498cf13ad8f38d30b614c97b
+  data.tar.gz: af60c2ea45e9fd4c858a182a4cf56175b9b2adb3381781769ff329d855ec76f7e27043ad3d6259b3a06156a03f410f178dbd370c96d8c775fba35e35bc301504

data/lib/carrierwave/storage/roz.rb

@@ -5,7 +5,8 @@ module CarrierWave
   module Storage
     class Roz < Abstract
       def identifier
-        ::File.join(*[uploader.access_id, uploader.store_dir, uploader.filename].map(&:to_s))
+        full_filename = [uploader.version_name, uploader.filename].compact.join('_')
+        ::File.join(*[uploader.access_id, uploader.store_dir, full_filename].map(&:to_s))
       end
 
       def store!(file)
@@ -43,7 +44,9 @@ module CarrierWave
             # Backwards compatibility for when we were storing only the filename
             URI.join(uploader.files_base_url, "#{uploader.access_id.to_s}/", "#{uploader.store_dir}/", path).to_s
           else
-            URI.join(uploader.files_base_url, path).to_s
+            dirname = ::File.dirname(path)
+            basename = [uploader.version_name, ::File.basename(path)].compact.join('_')
+            URI.join(uploader.files_base_url, "#{dirname}/", basename).to_s
           end
         end
 

data/lib/carrierwave_roz/version.rb

@@ -1,3 +1,3 @@
 module CarrierwaveRoz
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-roz
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Adam Crownoble