fclay 0.1.45 → 0.1.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ad333cfb2a580016e4f97990656059d30f60d4c
-  data.tar.gz: 9ce6765e218bba54c7c31cd606ebb95bf8779a10
+  metadata.gz: 6ab6904daef5ad6af4ee6d8dc265cd731298d2ba
+  data.tar.gz: 8b99722c842ef393c41307b1c8d3695768b19b05
 SHA512:
-  metadata.gz: 85dc73bdb4126a7ecc4950929177a0cdc1f20482686bb527f89ac4a77976e4102233b84fa10379621fecb6ceded20432f65dd06df30103cd1968296767033cee
-  data.tar.gz: ed9ee1c731ee18a4effac48d43597aaa397a2a6c19b8e858018dfc0d1e1b88207fda3fb9ae295c8211187acbc510064d077fb4e4007dc57df2a7cf8b5f89d9ed
+  metadata.gz: 77783239ea607673a91fe65b3ca69105b4073ecd4bae284cdfacfa074f5ba5e060e7f223cf64ef13b8e39fe60591398a4805f50a75575b8d698b9c956f3ef49b
+  data.tar.gz: 4cf19d2e0c08dcbc5d0f29b5cca672a71e544b608721632970311d1d4f7602dc41605f4c37931a9c23d8d32da8428c66184cd1996c6caf4b6534f1e186574b20

data/README.md

@@ -52,8 +52,8 @@ Configuring with `config\initializers\fclay.rb`:
     config.storage_policy = "s3"
     config.remote_storages = {
       "s3" => {
-        kind: 'aws',
-        storage_policy: "storage_policy_name",
+        kind: 's3',
+        bucket: "bucket_name",
       }
     }
   end

data/lib/fclay/attachment.rb

@@ -1,70 +1,70 @@
 require 'base64'
 
-module Fclay  
+module Fclay
   module Attachment
 
     extend ActiveSupport::Concern
-    
+
     CALLBACKS = [:process,:upload,:delete]
-    
-    
-    included do 
-      
+
+
+    included do
+
       callbacks = CALLBACKS
-     
+
       case fclay_options[:without].class.name
         when "Symbol"
           callbacks.clear if fclay_options[:without] == :all
         when "Array"
           callbacks -= fclay_options[:without]
-      end 
-      
+      end
+
       before_save :process_file if callbacks.include? :process
       after_save :process_upload if callbacks.include? :upload
       before_destroy :delete_files if callbacks.include? :delete
-    
+
     end
 
     attr_accessor :file
-    
+
     def delete_files
-      
-      case self.file_location 
+
+      case self.file_location
         when 's3'
           delete_remote_files
         when 'local'
           delete_local_files
       end
-    
+
     end
-    
+
     def process_upload
       return unless need_upload
-      if self.class.fclay_options[:processing] == :foreground       
+      if self.class.fclay_options[:processing] == :foreground
         upload
       else
         upload_later
       end
     end
-    
+
     def need_upload
       Fclay.configuration.storage_policy != :local && self.file_location == "local"
     end
-    
+
     def upload_later
-      
+
       self.try(:log,"upload_later() called, need_upload: #{need_upload}")
       if need_upload
-        job = Fclay::UploadJob.perform_later(self.class.name,self.id) 
+        job = Fclay::UploadJob.perform_later(self.class.name,self.id)
         self.try(:log,"sheduled! job id: #{job.provider_job_id}")
       end
-        
+
     end
-    
+
     def upload
       Fclay::Attachment.upload self.class.name,self.id
     end
-    
+
     def self.upload type,id
       type = type.safe_constantize
       return unless type
@@ -73,7 +73,7 @@ module Fclay
       return if !uploading_object || !uploading_object.need_upload
       content_type  = uploading_object.try(:content_type)
       bucket = Fclay.remote_storage.bucket_object
-      
+
       uploading_object.try(:log,"Start uploading")
       (uploading_object.class.fclay_options[:styles] || [nil]).each do |style|
        obj = bucket.object(uploading_object.remote_file_path(style))
@@ -88,7 +88,7 @@ module Fclay
       uploading_object.try(:log,"Sucessful uploaded! file_status: 'idle', file_location: #{Fclay.remote_storage.name}")
       uploading_object.delete_local_files
       uploading_object.try(:uploaded)
-      
+
 
     end
 
@@ -96,9 +96,9 @@ module Fclay
      errors.add(:file, 'must be present') if id.blank? && !@file
     end
 
-    def file_size_mb 
+    def file_size_mb
 
-      "#{((self.file_size >> 10).to_f / 1024).round(2)} Mb" if self.file_size 
+      "#{((self.file_size >> 10).to_f / 1024).round(2)} Mb" if self.file_size
 
     end
 
@@ -113,7 +113,7 @@ module Fclay
           remote_file_url(style)
         end
     end
-    
+
     def final_file_url(style=nil)
       return self.file_name if self.file_location == "external_link"
       if Fclay.configuration.storage_policy != :local
@@ -134,7 +134,7 @@ module Fclay
     end
 
     def local_file_url(style=nil)
-      url = Fclay.configuration.local_storage_host 
+      url = Fclay.configuration.local_storage_host
       url += "#{Fclay.configuration.local_url}/#{self.class.name.tableize}"
       url += "/#{style.to_s}" if style
       url += "/#{file_name}"
@@ -142,12 +142,12 @@ module Fclay
     end
 
     def short_local_file_url(style=nil)
-  
+
     end
 
-    def local_file_dir(style=nil) 
+    def local_file_dir(style=nil)
      dir = "#{Rails.root.to_s + Fclay.configuration.local_folder}/#{self.class.name.tableize}"
-     dir += "/#{style.to_s}" if style   
+     dir += "/#{style.to_s}" if style
      dir
     end
 
@@ -156,10 +156,10 @@ module Fclay
       path += "#{self.class.name.tableize}"
       path += "/#{style.to_s}" if style
       path += "/#{file_name}"
-      path    
+      path
     end
 
-    def delete_tmp_file 
+    def delete_tmp_file
        FileUtils.rm(@file.try(:path) || @file[:path],{:force => true}) if @file
        @file = nil
     end
@@ -173,58 +173,58 @@ module Fclay
     end
 
     def process_file
-      self.try(:log,"process_file called") 
-      self.try(:log,"@file: #{@file.try(:to_s)}")        
+      self.try(:log,"process_file called")
+      self.try(:log,"@file: #{@file.try(:to_s)}")
       return unless @file
-      
+
       delete_files
       path = @file.try(:path) || @file.try(:[],:path)
-      
-      self.try(:log,"fetched path: #{path.try(:to_s)}") 
+
+      self.try(:log,"fetched path: #{path.try(:to_s)}")
       return unless path
-      
+
       self.content_type = @file.try(:content_type) || @file.try(:[],:content_type) if self.respond_to?(:'content_type=')
-      
+
       if path[0..3] == "http"
         self.file_status = 'idle'
         self.file_location = 'external_link'
         self.file_name = path
-      else                
+      else
         create_dirs
         fetch_file_name
 
-        (self.class.fclay_options[:styles] || [nil]).each do |style|  
+        (self.class.fclay_options[:styles] || [nil]).each do |style|
           FileUtils.cp(path,local_file_path(style))
           `chmod 777 #{local_file_path(style)}`
         end
-        
+        self.original_file_name = @file.try(:original_filename) || @file.try(:[],:content_type)
         delete_tmp_file
         set_file_size self.class.fclay_options[:styles].try(:first)
         self.file_location = 'local'
         self.file_status = need_upload ? "processing" : "idle"
-        self.try(:log,"file_processed,  file_status: #{self.file_status}") 
+        self.try(:log,"file_processed,  file_status: #{self.file_status}")
       end
     end
-    
+
     def fetch_file_name
-      
+
       return if self.file_name.present?
       ext = fetch_extension
 
       self.file_name = try(:fclay_attachment_filename)
       self.file_name = SecureRandom.hex unless self.file_name
       self.file_name += ".#{ext}" if ext
-      
+
     end
-    
+
     def fetch_extension
       ext = self.class.fclay_options[:extension]
       return nil if ext == false
-      return ext.to_s if ext 
+      return ext.to_s if ext
       @file.original_filename.split(".").try(:last) if @file.try(:original_filename)
     end
 
-    def delete_local_files 
+    def delete_local_files
 
        begin
           (self.class.fclay_options[:styles] || [nil]).each do |style|
@@ -234,32 +234,31 @@ module Fclay
           Rails.logger.info "Deleting Media #{id} sync file not found"
        end
        true
-       
-    end  
+
+    end
 
     def delete_remote_files
-      
+
       (self.class.fclay_options[:styles] || [nil]).each do |style|
         Fclay.remote_storage.bucket_object.object(remote_file_path(style)).delete
       end
     end
-    
+
     def set_file_size style=nil
       self.file_size = File.size local_file_path(style)
     end
-    
+
     def self.resolve_file_url navigation_complex_id,type,file_name,style=nil
-  
+
       return "" if file_name.nil? || type.nil?
-  
+
       path = "http://s3.amazonaws.com/#{Fclay.remote_storage.bucket_name}"
       path += "/navigation_complex/#{navigation_complex_id}" if navigation_complex_id
       path += "/#{type}"
       path += "/#{style.to_s}" if style
       path += "/#{file_name}"
       path
-    end 
+    end
 
   end
 end
-

data/lib/fclay/version.rb

@@ -1,3 +1,3 @@
 module Fclay
-  VERSION = "0.1.45"
+  VERSION = "0.1.46"
 end

data/lib/generators/fclay/templates/fclay_migration.rb.erb

@@ -1,13 +1,14 @@
-class <%= migration_class_name %> < ActiveRecord::Migration
+class <%= migration_class_name %> < ActiveRecord::Migration[5.1]
   def change
-      
+
     add_column :<%= table_name %>, :file_name, :string
+    add_column :<%= table_name %>, :original_file_name, :string
     add_column :<%= table_name %>, :file_size, :integer
     add_column :<%= table_name %>, :file_status, :string, :default => "new"
     add_column :<%= table_name %>, :file_location, :string
     add_column :<%= table_name %>, :content_type, :string
-    
+
   end
 
-  
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fclay
 version: !ruby/object:Gem::Version
-  version: 0.1.45
+  version: 0.1.46
 platform: ruby
 authors:
 - Rustam Galiev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2018-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Summary