carrierwave-google-storage 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8a4f2b75d288ec70c7d458ce3c2ff83ebe1a892
-  data.tar.gz: 34a785ebacdaeeff8c6aa6458a484ac3722884e8
+  metadata.gz: 9b44ea3caef674bdc79ea21880533ae5ca75c967
+  data.tar.gz: cf6e32bc8128698cfc721440ea23a34f2a1cb3dd
 SHA512:
-  metadata.gz: 2b334339564c3d2995ef0707bf0a9990adb424d4f968da3f5cad689318e95b004f88213fba90b2ea046c9b17162c751cee702e70f2e5ab3102b87afdd28e77d1
-  data.tar.gz: 5ba58a130adccd9286265916caacf21982426eb04289ee2ca657871e044383910498f697a2c3da873252296fa0bce9dc6c6e3a93bd3ded06312d975d00f36e09
+  metadata.gz: ec79c50a119f99cf3947ee2b39fa0ebd8fb14fc05f1848df6f833ab8ecb4cb0479ee3a8e2aa5ce7f521a1934acd710bd1027a3fea53ec45b3c8512ea20c74e36
+  data.tar.gz: 1b5ee85ba6184c60a148db657ee9b5f3d273afdb4e18ede76a3a28541e58a9e6016ea00d0694e8005a8b203155554cb60332904455d2b37497f5343921728073

data/lib/carrierwave/google/storage/version.rb

@@ -1,7 +1,7 @@
 module Carrierwave
   module Google
     module Storage
-      VERSION = "0.2.1"
+      VERSION = "0.3.0"
     end
   end
 end

data/lib/carrierwave/storage/gcloud.rb

@@ -1,4 +1,3 @@
-
 module CarrierWave
   module Storage
     class Gcloud < Abstract

data/lib/carrierwave/storage/gcloud_file.rb

@@ -9,13 +9,12 @@ module CarrierWave
       delegate :content_type, :size, to: :file
 
       def initialize(uploader, connection, path)
-        @uploader    = uploader
-        @connection  = connection
-        @path        = path
+        @uploader, @connection, @path = uploader, connection, path
       end
 
       def file
         by_verifying_existence { @file ||= bucket.file(path) }
+        @file
       end
       alias_method :to_file, :file
       
@@ -29,7 +28,6 @@ module CarrierWave
           self.file_exists = true
           yield
         rescue Exception => exception
-          @file = nil
           self.file_exists = false if (exception.class == ::Gcloud::Storage::ApiError) && (exception.message == "Not Found")
         end
       end
@@ -60,7 +58,7 @@ module CarrierWave
       end
 
       def filename(options = {})
-        CarrierWave::Support::UriFilename.filename(file.name)
+        CarrierWave::Support::UriFilename.filename(file.url) if exists?
       end
 
       def read
@@ -69,7 +67,8 @@ module CarrierWave
       end
 
       def store(new_file)
-        bucket.create_file new_file.path, "#{uploader.store_dir}/#{new_file.filename}"
+        new_file_path = uploader.filename ?  uploader.filename : new_file.filename
+        bucket.create_file new_file.path, "#{uploader.store_dir}/#{new_file_path}" 
         self
       end
 
@@ -81,12 +80,6 @@ module CarrierWave
         return unless file_exists
         uploader.gcloud_bucket_is_public ? public_url : authenticated_url
       end
-
-      private
-
-      def bucket
-        bucket ||= connection.bucket(uploader.gcloud_bucket)
-      end
       
       def authenticated_url(options = {})
         file.signed_url
@@ -100,6 +93,12 @@ module CarrierWave
         end
       end
 
+      private
+
+      def bucket
+        bucket ||= connection.bucket(uploader.gcloud_bucket)
+      end
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-google-storage
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Jasdeep Singh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave