fclay 1.50.0 → 1.50.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cd4d68a9d0de6f8479283f6dd5abb91ef0322ed
-  data.tar.gz: b1f5fb353758cc9dd143421f670ae745492489fc
+  metadata.gz: 59e9bfa1ddeacd560f2cd9be91a320f39ceb6e1d
+  data.tar.gz: 86672e2d722d6ef0405f0446d7bfbdf67e9aa830
 SHA512:
-  metadata.gz: 527bae9df327302246fda7d59fd1c0c1fa0b3bde9e79d752acf06b811e48f93fd37ffc32644ae13d66993478038864ac679e553306d39b06166bbc14d1e8fe7a
-  data.tar.gz: 011fd5a2a2d059637686282f7e6d7cd2f7e800414d48d5a1a29fedded072458b0a642849bae89a0fc86144ec1eeb9d2909e2bd310a5013d3205eab2ee9616738
+  metadata.gz: c8c344aa70a596d22639e9f3dfeec54ead29eeaa7e171ca88b6a2743747d936ee9799031c6be3e200587c6bad672da609f30333a80331a56145041a10e905153
+  data.tar.gz: f9e7aa36e0182185db6a613e16867d345a6ce139e1cc04d5d8e985a7468ef90705062d1d51d8f4ef6452ef27369d8bbedd2970257314ad34ecb784385812ca95

data/lib/fclay/remote_storage/base.rb

@@ -2,6 +2,13 @@ class Fclay::RemoteStorage::Base
 
   attr_accessor :name, :uploading_object, :storage, :options
 
+  def initialize(name, uploading_object)
+    @name = name
+    @uploading_object = uploading_object
+    @storage = get_storage_by_name(name)
+    @options = @uploading_object.class.fclay_options
+  end
+
   def upload(options = {})
     uploading_object.update(file_status: 'idle', file_location: name)
     uploading_object.try(:log, "Sucessful uploaded! file_status: 'idle', file_location: #{name}")
@@ -11,7 +18,11 @@ class Fclay::RemoteStorage::Base
   def delete_files
   end
 
-  def self.url
+  def self.url(name = nil)
+  end
+
+  def get_storage_by_name(name)
+    Fclay.configuration.remote_storages[name]
   end
 
 end

data/lib/fclay/remote_storage/provider.rb

@@ -4,7 +4,7 @@ require_relative './s3'
 class Fclay::RemoteStorage::Provider
 
   def self.get_provider_class(storage)
-    case storage
+    case storage[:kind]
     when 'ssh'
       Fclay::RemoteStorage::SSH
     when 's3'
@@ -14,9 +14,9 @@ class Fclay::RemoteStorage::Provider
     end
   end
 
-  def self.provider_for(storage, uploading_object)
-    klass = get_provider_class(storage)
-    klass.new(uploading_object)
+  def self.provider_for(storage_name, uploading_object)
+    klass = get_provider_class(storages_list[storage_name])
+    klass.new(storage_name, uploading_object)
   end
 
 
@@ -32,7 +32,7 @@ class Fclay::RemoteStorage::Provider
         storage.upload(without_update: true)
       end
     else
-      storage = provider_for(Fclay.configuration.storage_policy, uploading_object)
+      storage = provider_for(storage_policy, uploading_object)
       storage.upload
     end
 
@@ -51,14 +51,22 @@ class Fclay::RemoteStorage::Provider
         storage.delete_files
       end
     else
-      storage = provider_for(Fclay.configuration.storage_policy, model)
+      storage = provider_for(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)}"
+    klass = get_provider_class(storages_list[obj.file_location])
+    "#{klass.url(obj.file_location)}/#{obj.remote_file_path(style)}"
+  end
+
+  def self.storages_list
+    Fclay.configuration.remote_storages
+  end
+
+  def self.storage_policy
+    Fclay.configuration.storage_policy
   end
 
 end

data/lib/fclay/remote_storage/s3.rb

@@ -2,11 +2,9 @@ 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
+  def initialize(name, uploading_object)
+    super
+
     @bucket = Aws::S3::Resource.new.bucket(bucket_name)
   end
 
@@ -33,8 +31,9 @@ class Fclay::RemoteStorage::S3 < Fclay::RemoteStorage::Base
     @bucket.object(uploading_object.remote_file_path(style))
   end
 
-  def self.url
-    "https://#{Fclay.configuration.remote_storages['s3'][:bucket]}.s3.amazonaws.com"
+  def self.url(name = nil)
+    return '' unless name
+    "https://#{Fclay.configuration.remote_storages[name][:bucket]}.s3.amazonaws.com"
   end
 
   def content_type
@@ -42,7 +41,7 @@ class Fclay::RemoteStorage::S3 < Fclay::RemoteStorage::Base
   end
 
   def bucket_name
-    Fclay.configuration.remote_storages['s3'][:bucket]
+    Fclay.configuration.remote_storages[name][:bucket]
   end
 
 end

data/lib/fclay/remote_storage/ssh.rb

@@ -2,11 +2,8 @@ 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
+  def initialize(name, uploading_object)
+    super
   end
 
   def upload(options = {})
@@ -27,8 +24,9 @@ class Fclay::RemoteStorage::SSH < Fclay::RemoteStorage::Base
     end
   end
 
-  def self.url
-    opts = Fclay.configuration.remote_storages['ssh']
+  def self.url(name = nil)
+    return '' unless name
+    opts = Fclay.configuration.remote_storages[name]
     "https://#{opts[:host]}"
   end
 

data/lib/fclay/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fclay
 version: !ruby/object:Gem::Version
-  version: 1.50.0
+  version: 1.50.2
 platform: ruby
 authors:
 - Rustam Galiev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-12 00:00:00.000000000 Z
+date: 2019-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler