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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b20b216b7b8291b648744c3f156a7e71454f4b2
-  data.tar.gz: 16aece948baf6128256e3b9eb55d7772b880a853
+  metadata.gz: 6060c6b53af5a9c9c3de6fb7a2b5fc10c7cf1b4e
+  data.tar.gz: 3e55f1d9fc338b48de3d8362f33403c7f89cdb91
 SHA512:
-  metadata.gz: 5334ff18ac42f6c684fd0d7bbe39818d2a47d3d574d59ed34221a4e644310337ebad7aa281f469ce3e27d55c99d0369c0faab42da8abb317dc635c78c01c8dff
-  data.tar.gz: b0001414e93868aea9ec272b583ecefca2fec4623d86da425e6332fe0ccb445a3838d0ec0bc220da43c85c981c64b432f61023c95d708c9c27bf1ae740fa1460
+  metadata.gz: 333e9cc5316f5eccc5aea857823bf8cfae09b213b559c28ce71d55dba1e6be192c523b32172c727fbca0c5b1ffa5d8c3987243f48c538de1224ae1dac8b08807
+  data.tar.gz: 2508a55160619c01b96a254280596be715a63aae2ae7a94c1734e3af8c6e2b762f2ecee6392b43d62d168a9502439d4d29621a23a2624b8216a264d865f13285

data/lib/lalala/uploaders/file.rb

@@ -9,10 +9,15 @@ class Lalala::Uploaders::File < CarrierWave::Uploader::Base
   end
 
   def url(*)
+    super_url = super
     if Rails.env.production? or Rails.env.staging?
-      File.join("/storage/assets", super)
+      if super_url
+        File.join("/storage/assets", super_url)
+      else
+        super_url
+      end
     else
-      super
+      super_url
     end
   end
 

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.0.0"
-  BUILD   = "125"
+  BUILD   = "126"
 
   if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
     BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.0.0.dev.125
+  version: 4.0.0.dev.126
 platform: ruby
 authors:
 - Simon Menke
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave