carrierwave-roz 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5498481edc0c12eb2e791116de239d290871e056
-  data.tar.gz: 9f4755fa037983ca5b3a258ad6b939034ff38b3a
+  metadata.gz: 36b825c19205373454b4a88ec4f327c9389cc3d7
+  data.tar.gz: afa85ee3e4acd1ff3cb361b992178710b2537861
 SHA512:
-  metadata.gz: fe17bb9088bc635467392cd8f4b3a5eb8844dc3e033c374a3f9876982361b1577730d4e5ca25ffe4ac19fc39197a2233aaf8d434684a23de99bef555fb6abdd3
-  data.tar.gz: 226550246e5b991a59dc6b2d4f021a31a80d99a71682a0337ec0ab45ee27b17896da8639acdb71388d29d7636a7f0bd2bdc4360f6ad7d7592b6f55042800ae99
+  metadata.gz: d137a6e5ec0ad441d6b42e5448a84990f439ab29d7ee9f0b3e430f88cd4cb7822ba0dc0fca18535411f7dc7c8dfa2790fa1ca03a2f20596c62818e5e0b0452df
+  data.tar.gz: 94310d1276810d13cc1516cc295834cbf0be38d8606c1d379c66a5a5a53799a1cbf3297003c34b3ef5c28c72b62a25baba95a3137bab648b05caf976963e43ff

data/lib/carrierwave-roz.rb

@@ -0,0 +1 @@
+require 'carrierwave_roz'

data/lib/carrierwave/storage/roz.rb

@@ -4,14 +4,18 @@ require 'ostruct'
 module CarrierWave
   module Storage
     class Roz < Abstract
+      def identifier
+        ::File.join(uploader.access_id.to_s, uploader.store_dir, uploader.filename)
+      end
+
       def store!(file)
-        f = CarrierWave::Storage::Roz::File.new(uploader, uploader.store_path)
+        f = CarrierWave::Storage::Roz::File.new(uploader, identifier)
         f.store(file)
         f
       end
 
       def retrieve!(identifier)
-        CarrierWave::Storage::Roz::File.new(uploader, uploader.store_path(identifier))
+        CarrierWave::Storage::Roz::File.new(uploader, identifier)
       end
 
       class File
@@ -35,7 +39,12 @@ module CarrierWave
         end
 
         def url(*args)
-          URI.join(uploader.files_base_url, "#{uploader.access_id}/", path).to_s
+          if path == ::File.basename(path)
+            # 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
+          end
         end
 
         def filename

data/lib/carrierwave_roz/client.rb

@@ -3,7 +3,7 @@ require 'api_auth'
 
 module CarrierwaveRoz
   class Client
-    VERSION = 'v1'
+    VERSION = 'v2'
 
     attr_reader :base_url
     attr_reader :access_id
@@ -22,18 +22,18 @@ module CarrierwaveRoz
 
       # Set Content-MD5 header.
       # This works around an incompatibility between api_auth and multipart-post.
-      # It should no longer be required if https://github.com/mgomes/api_auth/pull/47 is merged.
+      # It should no longer be required with api-auth > 1.2.3
       body = request.body_stream.read
       request.body_stream.rewind
       request['Content-MD5'] = Digest::MD5.base64digest(body)
 
-      send request, uri
+      send_request request, uri
     end
 
     def delete(path)
       uri = url_for(:delete, path: path)
 
-      send Net::HTTP::Delete.new(uri.request_uri), uri
+      send_request Net::HTTP::Delete.new(uri.request_uri), uri
     end
 
     private
@@ -44,7 +44,7 @@ module CarrierwaveRoz
       end
     end
 
-    def send(request, uri)
+    def send_request(request, uri)
       ApiAuth.sign! request, access_id, secret_key
 
       Net::HTTP.start(uri.host, uri.port) do |http|

data/lib/carrierwave_roz/version.rb

@@ -1,3 +1,3 @@
 module CarrierwaveRoz
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-roz
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Adam Crownoble
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -60,6 +60,7 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
+- lib/carrierwave-roz.rb
 - lib/carrierwave/storage/roz.rb
 - lib/carrierwave_roz.rb
 - lib/carrierwave_roz/client.rb