fclay 0.1.40 → 0.1.41

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8038a99d51d64574380ca41f6e9c74a100003bfc
4
- data.tar.gz: 74cfdf7f487891494556ee90b190d39eed908636
3
+ metadata.gz: a462ff335c261ad700166a30236c32ac0f6b2bcd
4
+ data.tar.gz: 8c23a96725c2afcaf24e4e9de94e3e96e82a1108
5
5
  SHA512:
6
- metadata.gz: 5ff45a48f0c142ac4047ad02b761c3558d1c72972bfecef31223de2fd0fbf2413bbce3019215b6d2894b1a6c5f2528fe064a931567874fc9e5c16a6b61d83a8c
7
- data.tar.gz: 6f6d88fd933e2de83960a2dd81fa043f829247e79a1641fdd5943a93998b4c95eec2ebbc82010056fdd61abb5dbaf909382dbc32845ffc59d14c8bf1b6bdd1fa
6
+ metadata.gz: f0ed4ccb1efaa286c2c8fd480ab27e35a66310dbde675b3addf7840c8e29e5cbaaf03cbe7f548831217f711505de4182e2272bde3bc20c0ac84fcb36174aa343
7
+ data.tar.gz: 95e606160eacc5e58009ac1aec160dfeb9f535745067723723556d8533ce078d1188ed2a6a3a4ec2972a02f6e9ed9452862e03391224fbc0ab3963379011d464
@@ -104,6 +104,15 @@ module Fclay
104
104
  remote_file_url(style)
105
105
  end
106
106
  end
107
+
108
+ def final_file_url(style=nil)
109
+ return self.file_name if self.file_location == "external_link"
110
+ if need_upload
111
+ remote_file_url(style)
112
+ else
113
+ local_file_url(style)
114
+ end
115
+ end
107
116
 
108
117
  def remote_file_url(style=nil)
109
118
  "http://#{Fclay.remote_storage.bucket_name}.s3.amazonaws.com/#{remote_file_path(style)}"
@@ -9,6 +9,7 @@ module Fclay
9
9
  end
10
10
 
11
11
  def s3?
12
+ return false unless @data
12
13
  @data[:kind] == "s3"
13
14
  end
14
15
 
@@ -1,3 +1,3 @@
1
1
  module Fclay
2
- VERSION = "0.1.40"
2
+ VERSION = "0.1.41"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fclay
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.40
4
+ version: 0.1.41
5
5
  platform: ruby
6
6
  authors:
7
7
  - Rustam Galiev
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-05-10 00:00:00.000000000 Z
11
+ date: 2017-09-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler