fclay 1.49.0 → 1.50.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: add0decdc4f678145b9ddc714b3ae55add7f39cd
-  data.tar.gz: 2030edd4a18c7a3d9570cf1d58af8076ae3822ef
+  metadata.gz: 0cd4d68a9d0de6f8479283f6dd5abb91ef0322ed
+  data.tar.gz: b1f5fb353758cc9dd143421f670ae745492489fc
 SHA512:
-  metadata.gz: 060d5315197a69415598616fbf73355d715225da9df0c98b8bebfbc4649904a71ad928606720d45bcfb264e152d4278b3d6fc350b1269d63d714138fe2b09841
-  data.tar.gz: 1d976d08a30b4cada18df30fa492f6ea05cac905c298f6b1482953ffc327024a11e6167a785964fc13efd1888be9ca1ab9938d838e4c8bc210c899b53aa75ec6
+  metadata.gz: 527bae9df327302246fda7d59fd1c0c1fa0b3bde9e79d752acf06b811e48f93fd37ffc32644ae13d66993478038864ac679e553306d39b06166bbc14d1e8fe7a
+  data.tar.gz: 011fd5a2a2d059637686282f7e6d7cd2f7e800414d48d5a1a29fedded072458b0a642849bae89a0fc86144ec1eeb9d2909e2bd310a5013d3205eab2ee9616738

data/lib/fclay.rb

@@ -4,53 +4,51 @@ require 'fclay/upload_job'
 require "fclay/attachment"
 require "fclay/includer"
 require "fclay/remote_storage"
+require 'fclay/remote_storage/provider'
 
 module Fclay
-  class << self  
+  class << self
     def configure(&block)
       yield(configuration)
       validate_configuration
       configuration
     end
-  
+
     def remote_storage
       @_remote_storage ||= RemoteStorage.new(configuration.storage_policy,configuration.remote_storages[configuration.storage_policy])
     end
-  
+
     def configuration
       @_configuration ||= Configuration.new
     end
-      
+
     def validate_configuration
-      validate_remote_storages unless configuration.storage_policy == :local 
+      validate_remote_storages unless configuration.storage_policy == :local
     end
-    
+
     def validate_remote_storages
       raise ArgumentError, "remote storage '#{configuration.storage_policy}' not set" unless configuration.remote_storages[configuration.storage_policy].present?
-        
+
       validate_s3 if configuration.remote_storages[configuration.storage_policy][:kind] == "s3"
-      
-          
+
+
     end
-    
+
     def validate_s3
-      
+
       raise ArgumentError, "Aws constant not definded. Missed aws-sdk gem?" unless defined? Aws
       %w(AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_REGION).each do |key|
         raise ArgumentError, "Missed ENV[\"#{key}\"]" unless ENV[key]
       end
-        
-      
+
+
     end
-    
-    
+
+
     ActiveSupport.on_load(:active_record) do
       extend Fclay::Includer
     end
-    
-  end
-  
-end
-
 
+  end
 
+end

data/lib/fclay/attachment.rb

@@ -28,14 +28,7 @@ module Fclay
     attr_accessor :file
 
     def delete_files
-
-      case self.file_location
-        when 's3'
-          delete_remote_files
-        when 'local'
-          delete_local_files
-      end
-
+      self.file_location == 'local' ? delete_local_files : delete_remote_files
     end
 
     def safe_delete_files
@@ -77,30 +70,14 @@ module Fclay
       Fclay::Attachment.upload self.class.name,self.id
     end
 
-    def self.upload type,id
+    def self.upload(type, id)
       type = type.safe_constantize
       return unless type
       uploading_object = type.find_by_id(id)
       uploading_object.try(:log,"Fclay::upload() called, uploading_object: #{uploading_object}, uploading_object.need_upload: #{uploading_object.try(: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.try(:log,"Start uploading")
-      (uploading_object.class.fclay_options[:styles].try(:keys) || [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: content_type
-       })
-      end
-
-      type.where(:id => id).update_all(:file_status => 'idle', :file_location => Fclay.remote_storage.name)
-      uploading_object.try(:log,"Sucessful uploaded! file_status: 'idle', file_location: #{Fclay.remote_storage.name}")
-      uploading_object.delete_local_files
-      uploading_object.try(:uploaded)
 
+      Fclay::RemoteStorage::Provider.upload(uploading_object)
 
     end
 
@@ -115,15 +92,17 @@ module Fclay
     end
 
     def file_url(style=nil)
-      return "" unless self.file_location
+      return '' unless self.file_location
+
       case self.file_location
-        when "external_link"
-          self.file_name
-        when "local"
-          local_file_url(style)
-        else
-          remote_file_url(style)
-        end
+      when "external_link"
+        self.file_name
+      when "local"
+        local_file_url(style)
+      else
+        remote_file_url(style)
+      end
+
     end
 
     def final_file_url(style=nil)
@@ -136,8 +115,9 @@ module Fclay
     end
 
     def remote_file_url(style=nil)
-      host = Fclay.remote_storage.host || "https://#{Fclay.remote_storage.bucket_name}.s3.amazonaws.com"
-      "#{host}/#{remote_file_path(style)}"
+      # host = Fclay.remote_storage.host || "https://#{Fclay.remote_storage.bucket_name}.s3.amazonaws.com"
+      # "#{host}/#{remote_file_path(style)}"
+      Fclay::RemoteStorage::Provider.remote_file_url(self, style)
     end
 
     def local_file_path(style=nil)
@@ -164,7 +144,7 @@ module Fclay
      dir
     end
 
-    def remote_file_path(style=nil)
+    def remote_file_path(style = nil)
       path = ""
       path += "#{self.class.name.tableize}"
       path += "/#{style.to_s}" if style
@@ -179,7 +159,7 @@ module Fclay
 
     def create_dirs
 
-     (self.class.fclay_options[:styles] || [nil]).each do |style|
+     (self.class.fclay_options[:styles].try(:keys) || [nil]).each do |style|
        FileUtils.mkdir_p(local_file_dir(style))
      end
 
@@ -206,7 +186,7 @@ module Fclay
         create_dirs
         fetch_file_name
 
-        (self.class.fclay_options[:styles] || [nil]).each do |style|
+        (self.class.fclay_options[:styles].try(:keys) || [nil]).each do |style|
           FileUtils.cp(path,local_file_path(style))
           `chmod 777 #{local_file_path(style)}`
         end
@@ -240,7 +220,7 @@ module Fclay
     def delete_local_files
 
        begin
-          (self.class.fclay_options[:styles] || [nil]).each do |style|
+          (self.class.fclay_options[:styles].try(:keys) || [nil]).each do |style|
             FileUtils.rm(local_file_path(style),{:force => true})
           end
        rescue
@@ -251,17 +231,14 @@ module Fclay
     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
+      Fclay::RemoteStorage::Provider.delete_files(self)
     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
+    def self.resolve_file_url(navigation_complex_id, type, file_name, style = nil)
 
       return "" if file_name.nil? || type.nil?
 

data/lib/fclay/remote_storage/base.rb

@@ -0,0 +1,17 @@
+class Fclay::RemoteStorage::Base
+
+  attr_accessor :name, :uploading_object, :storage, :options
+
+  def upload(options = {})
+    uploading_object.update(file_status: 'idle', file_location: name)
+    uploading_object.try(:log, "Sucessful uploaded! file_status: 'idle', file_location: #{name}")
+    uploading_object.try(:uploaded)
+  end
+
+  def delete_files
+  end
+
+  def self.url
+  end
+
+end

data/lib/fclay/remote_storage/provider.rb

@@ -0,0 +1,64 @@
+require_relative './ssh'
+require_relative './s3'
+
+class Fclay::RemoteStorage::Provider
+
+  def self.get_provider_class(storage)
+    case storage
+    when 'ssh'
+      Fclay::RemoteStorage::SSH
+    when 's3'
+      Fclay::RemoteStorage::S3
+    else
+      raise 'Unsupported storage type'
+    end
+  end
+
+  def self.provider_for(storage, uploading_object)
+    klass = get_provider_class(storage)
+    klass.new(uploading_object)
+  end
+
+
+  def self.upload(uploading_object)
+    options = uploading_object.class.fclay_options
+
+    if options[:primary].present?
+      storage = provider_for(options[:primary], uploading_object)
+      storage.upload
+
+      if options[:secondary].present?
+        storage = provider_for(options[:secondary], uploading_object)
+        storage.upload(without_update: true)
+      end
+    else
+      storage = provider_for(Fclay.configuration.storage_policy, uploading_object)
+      storage.upload
+    end
+
+    uploading_object.delete_local_files
+  end
+
+  def self.delete_files(model)
+    options = model.class.fclay_options
+
+    if options[:primary].present?
+      storage = provider_for(options[:primary], model)
+      storage.delete_files
+
+      if options[:secondary].present?
+        storage = provider_for(options[:secondary], model)
+        storage.delete_files
+      end
+    else
+      storage = provider_for(Fclay.configuration.storage_policy, model)
+      storage.delete_files
+    end
+  end
+
+  def self.remote_file_url(obj, style = nil)
+    klass = get_provider_class(obj.file_location)
+    "#{klass.url}/#{obj.remote_file_path(style)}"
+  end
+
+end

data/lib/fclay/remote_storage/s3.rb

@@ -0,0 +1,48 @@
+require_relative './base'
+
+class Fclay::RemoteStorage::S3 < Fclay::RemoteStorage::Base
+
+  def initialize(uploading_object)
+    @name = 's3'
+    @uploading_object = uploading_object
+    @storage = Fclay.configuration.remote_storages['s3']
+    @options = @uploading_object.class.fclay_options
+    @bucket = Aws::S3::Resource.new.bucket(bucket_name)
+  end
+
+  def upload(options = {})
+    (@options[:styles].try(:keys) || [nil]).each do |style|
+       obj = bucket_object(style)
+       obj.put({
+         body: File.read(uploading_object.local_file_path(style)),
+         acl: "public-read",
+         content_type: content_type
+       })
+    end
+
+    super unless options[:without_update]
+  end
+
+  def delete_files
+    (@options[:styles].try(:keys) || [nil]).each do |style|
+      bucket_object(style).delete
+    end
+  end
+
+  def bucket_object(style = nil)
+    @bucket.object(uploading_object.remote_file_path(style))
+  end
+
+  def self.url
+    "https://#{Fclay.configuration.remote_storages['s3'][:bucket]}.s3.amazonaws.com"
+  end
+
+  def content_type
+    uploading_object.try(:content_type)
+  end
+
+  def bucket_name
+    Fclay.configuration.remote_storages['s3'][:bucket]
+  end
+
+end

data/lib/fclay/remote_storage/ssh.rb

@@ -0,0 +1,57 @@
+require_relative './base'
+
+class Fclay::RemoteStorage::SSH < Fclay::RemoteStorage::Base
+
+  def initialize(uploading_object)
+    @name = 'ssh'
+    @uploading_object = uploading_object
+    @storage = Fclay.configuration.remote_storages['ssh']
+    @options = @uploading_object.class.fclay_options
+  end
+
+  def upload(options = {})
+    (@options[:styles].try(:keys) || [nil]).each do |style|
+      command = "ssh #{hosting} 'mkdir -p #{remote_dir(style)}'"
+      system(command)
+      command = "scp -r #{local_file(style)} #{hosting}:#{remote_file(style)}"
+      system(command)
+    end
+
+    super unless options[:without_update]
+  end
+
+  def delete_files
+    (@options[:styles].try(:keys) || [nil]).each do |style|
+      command = "ssh #{hosting} 'rm #{remote_file(style)}'"
+      system(command)
+    end
+  end
+
+  def self.url
+    opts = Fclay.configuration.remote_storages['ssh']
+    "https://#{opts[:host]}"
+  end
+
+  def hosting
+    "#{storage[:user]}@#{storage[:host]}"
+  end
+
+  def hosting_path
+    "#{storage[:path]}/"
+  end
+
+  def local_file(style = nil)
+    @uploading_object.local_file_path(style)
+  end
+
+  def remote_dir(style = nil)
+    dir = "#{hosting_path}#{@uploading_object.class.name.tableize}/"
+    dir += "#{style}/" if style
+    dir
+  end
+
+  def remote_file(style = nil)
+    "#{hosting_path}#{@uploading_object.remote_file_path(style)}"
+  end
+
+end

data/lib/fclay/version.rb

@@ -1,3 +1,3 @@
 module Fclay
-  VERSION = "1.49.0"
+  VERSION = "1.50.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fclay
 version: !ruby/object:Gem::Version
-  version: 1.49.0
+  version: 1.50.0
 platform: ruby
 authors:
 - Rustam Galiev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-31 00:00:00.000000000 Z
+date: 2019-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,6 +74,10 @@ files:
 - lib/fclay/configuration.rb
 - lib/fclay/includer.rb
 - lib/fclay/remote_storage.rb
+- lib/fclay/remote_storage/base.rb
+- lib/fclay/remote_storage/provider.rb
+- lib/fclay/remote_storage/s3.rb
+- lib/fclay/remote_storage/ssh.rb
 - lib/fclay/upload_job.rb
 - lib/fclay/version.rb
 - lib/generators/fclay/config/config_generator.rb