fclay 0.1.32 → 0.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 617b2ade10dd98cdc08901e6668f7227ab1d027d
-  data.tar.gz: 530b54c36a3d8b4dd96d849ff23b5151f116a655
+  metadata.gz: 108744d0ed9af40db54c6f50de1766747560f5cd
+  data.tar.gz: c063c8c9dd569de1c838f3af2cbf63d4f93f74b1
 SHA512:
-  metadata.gz: e9a5062ddbb2101d5a3f0c4529ebd20e0dd0908eeb81187be3c3571f2612c397f868db0ac53c1c166d75854af7c3698ee94e2323bc5def5ba91fbabc0a743db9
-  data.tar.gz: 13984e0cd0a7416cd7180a070f49cfd4016293ec4b9219f28a5d42886a1b28cf1b1481ae0f121622d83b718a90f1a95cd0e932f4a535734a4589a7ffa7fa190a
+  metadata.gz: 00cec2b28094d4c4946c3345f63dc771077328082764b1832cde0f55f2680d65ad923d458cb3f9f9f1887ca2deed60859bf46fac13918b2a03b5563d2a0fb4f7
+  data.tar.gz: c70b0c4f7119ede4cb2b437bc60f5d9bfd40e25918a0ec9bdbb7371d35d0067f8b0c03f7afab29a9deaf7040f867c940a654ddd6dab19b2de36ca8e56e66b358

data/lib/fclay/attachment.rb

@@ -44,7 +44,7 @@ module Fclay
     
     def upload_later
       
-      self.try(:log,"upload_later called, need_upload: #{need_upload}")
+      self.try(:log,"upload_later() called, need_upload: #{need_upload}")
       if need_upload
         job = Fclay::UploadJob.perform_later(self.class.name,self.id) 
         self.try(:log,"sheduled! job id: #{job.provider_job_id}")
@@ -57,27 +57,30 @@ module Fclay
     end
     
     def self.upload type,id
-
-       type = type.safe_constantize
-       return unless type
-       uploading_object = type.find_by_id(id)
-       return if !uploading_object || !uploading_object.need_upload
-       content_type  = uploading_object.try(:content_type)
-       bucket = Fclay.remote_storage.bucket_object
-       
-       (uploading_object.class.fclay_options[:styles] || [nil]).each do |style|
-         obj = bucket.object(uploading_object.remote_file_path(style))
-         obj.put({
-           body: File.read(uploading_object.local_file_path(style)),
-           acl: "public-read",
-           content_type: uploading_object.class.fclay_options[:content_type]
-         })
-       end
+      self.try(:log,"upload('#{type}',#{id}) called")
+      type = type.safe_constantize
+      return unless type
+      uploading_object = type.find_by_id(id)
+      self.try(:log,"uploading_object: #{uploading_object}  uploading_object.need_upload: #{uploading_object.need_upload}")
+      return if !uploading_object || !uploading_object.need_upload
+      content_type  = uploading_object.try(:content_type)
+      bucket = Fclay.remote_storage.bucket_object
       
-      # uploading_object.update_attributes(:file_status => 'idle', :file_location => Fclay.remote_storage.name)
+      self.try(:log,"Start uploading")
+      (uploading_object.class.fclay_options[:styles] || [nil]).each do |style|
+       obj = bucket.object(uploading_object.remote_file_path(style))
+       obj.put({
+         body: File.read(uploading_object.local_file_path(style)),
+         acl: "public-read",
+         content_type: uploading_object.class.fclay_options[:content_type]
+       })
+      end
+
       type.where(:id => id).update_all(:file_status => 'idle', :file_location => Fclay.remote_storage.name)
+      self.try(:log,"Sucessful uploaded! file_status: 'idle', file_location: #{Fclay.remote_storage.name}")
       uploading_object.delete_local_files
       uploading_object.try(:uploaded)
+      
 
     end
 

data/lib/fclay/version.rb

@@ -1,3 +1,3 @@
 module Fclay
-  VERSION = "0.1.32"
+  VERSION = "0.1.33"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fclay
 version: !ruby/object:Gem::Version
-  version: 0.1.32
+  version: 0.1.33
 platform: ruby
 authors:
 - Rustam Galiev