fclay 0.1.2 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d10bc34257d53b487c6d8761fdf7abae71dd2b13
-  data.tar.gz: 261755f3588f9bc1e690f1df4bfa848734d2d2c7
+  metadata.gz: 2b7b92b7a729df3df56c94be63fa55bffa4d04ff
+  data.tar.gz: 48978989481aaebe63b662e03c78cb6dcd0662c1
 SHA512:
-  metadata.gz: 1ea4d99a01dcfb4c1fbc3433236cc2daf7a6840b94943bac2a2f28b4a4d286c0ed34e4a8065f621ce35f465e2963fdde35697399a4a5b61a593e6ed450b65ba8
-  data.tar.gz: 703f9e5f14ed0b250f6f212c9112b51a8f82999c1deb65510f0b70b2c7665edc65cf2630403599fe67f96414600555f8715ee99fa670bf2e043b989c0611a5af
+  metadata.gz: f055070746fab691bf25a8012b912e5152c656ab9e06cae5885a0c2be2033b01de1ca682a0e5e1023e475b231a55340427a361574b07f85c52e47f9671d8a66e
+  data.tar.gz: e44df41175bdad7956c76e045a2b468a0096240caaa483e5780b18ecf02a99d48a4736d59dc876984b119eb6585f38f73414c84e5bc221f2c18e884bca929f9e

data/lib/fclay/attachment.rb

@@ -1,5 +1,3 @@
-require 'base64'
-
 module Fclay  
   module Attachment
 
@@ -29,7 +27,7 @@ module Fclay
     
     def delete_files
       
-      case self.file_location 
+      case file_location 
         when 's3'
           delete_remote_files
         when 'local'
@@ -52,10 +50,9 @@ module Fclay
     
     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
+       type = type.constantize
+       uploading_object = type.find(id)
+       return unless uploading_object.need_upload
        content_type  = uploading_object.try(:content_type)
        bucket = Fclay.remote_storage.bucket_object
        
@@ -85,13 +82,15 @@ module Fclay
     end
 
     def file_url(style=nil)
-      case self.file_location
+      case file_location
         when "external_link"
           self.file_name
         when "local"
           local_file_url(style)
-        else
+        when "s3"
           remote_file_url(style)
+        else 
+          ""
         end
     end
 
@@ -161,9 +160,7 @@ module Fclay
         create_dirs
         fetch_file_name
 
-          
         FileUtils.mv(path,local_file_path)
-        
         `chmod 0755 #{local_file_path}`
 
         delete_tmp_file
@@ -176,7 +173,7 @@ module Fclay
     def fetch_file_name
       
       ext = self.class.fclay_options[:extension]
-      if ext && ext != false && @file.try(:original_filename)
+      if ext != false || (ext == nil && @file.original_filename)
         filename_part = @file.original_filename.split(".")
         ext = filename_part.last if filename_part.size > 1
       end

data/lib/fclay/version.rb

@@ -1,3 +1,3 @@
 module Fclay
-  VERSION = "0.1.2"
+  VERSION = "0.1.13"
 end

data/lib/generators/fclay/config/config_generator.rb

@@ -5,7 +5,7 @@ class Fclay::ConfigGenerator < Rails::Generators::Base
   def create_initializer_file
     create_file "config/initializers/fclay.rb" do 
 "Fclay.configure do |config|
-  #config.local_storage_host = 'http://mysite.com'
+  #config.local_storage_assets_host = 'http://mysite.com'
   #config.storage_policy = :s3
   #config.storages do |storages|
   #  storages[:s3] = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fclay
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.13
 platform: ruby
 authors:
 - Rustam Galiev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler