lalala 4.0.0.dev.125 → 4.0.0.dev.126

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: 2b20b216b7b8291b648744c3f156a7e71454f4b2
4
- data.tar.gz: 16aece948baf6128256e3b9eb55d7772b880a853
3
+ metadata.gz: 6060c6b53af5a9c9c3de6fb7a2b5fc10c7cf1b4e
4
+ data.tar.gz: 3e55f1d9fc338b48de3d8362f33403c7f89cdb91
5
5
  SHA512:
6
- metadata.gz: 5334ff18ac42f6c684fd0d7bbe39818d2a47d3d574d59ed34221a4e644310337ebad7aa281f469ce3e27d55c99d0369c0faab42da8abb317dc635c78c01c8dff
7
- data.tar.gz: b0001414e93868aea9ec272b583ecefca2fec4623d86da425e6332fe0ccb445a3838d0ec0bc220da43c85c981c64b432f61023c95d708c9c27bf1ae740fa1460
6
+ metadata.gz: 333e9cc5316f5eccc5aea857823bf8cfae09b213b559c28ce71d55dba1e6be192c523b32172c727fbca0c5b1ffa5d8c3987243f48c538de1224ae1dac8b08807
7
+ data.tar.gz: 2508a55160619c01b96a254280596be715a63aae2ae7a94c1734e3af8c6e2b762f2ecee6392b43d62d168a9502439d4d29621a23a2624b8216a264d865f13285
@@ -9,10 +9,15 @@ class Lalala::Uploaders::File < CarrierWave::Uploader::Base
9
9
  end
10
10
 
11
11
  def url(*)
12
+ super_url = super
12
13
  if Rails.env.production? or Rails.env.staging?
13
- File.join("/storage/assets", super)
14
+ if super_url
15
+ File.join("/storage/assets", super_url)
16
+ else
17
+ super_url
18
+ end
14
19
  else
15
- super
20
+ super_url
16
21
  end
17
22
  end
18
23
 
@@ -1,6 +1,6 @@
1
1
  module Lalala
2
2
  VERSION = "4.0.0"
3
- BUILD = "125"
3
+ BUILD = "126"
4
4
 
5
5
  if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
6
6
  BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: lalala
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.0.0.dev.125
4
+ version: 4.0.0.dev.126
5
5
  platform: ruby
6
6
  authors:
7
7
  - Simon Menke
@@ -13,7 +13,7 @@ authors:
13
13
  autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
- date: 2013-05-13 00:00:00.000000000 Z
16
+ date: 2013-05-14 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: carrierwave