Move to cloudinary

Author: jfontan

server/main.rb

@@ -16,9 +16,6 @@
     set :public_folder, 'server/assets'
 
     GALLERY=ERB.new(File.read('server/assets/gallery.html'))
-    IMAGE_PREFIX=ENV['IMAGE_PREFIX']||''
-    uri=URI.parse(ENV['CLOUDINARY_URL'])
-    CLOUDINARY_PROJECT=uri.host
 
     $glsl=GlslDatabase.new
 

server/model.rb

@@ -34,8 +34,11 @@ def next_page
     end
 
     def image(effect)
-        "http://res.cloudinary.com/#{CLOUDINARY_PROJECT}/image/upload/"<<
-            "#{IMAGE_PREFIX}#{effect['_id']}.png"
+        if effect["image_url"]
+            effect["image_url"]
+        else
+            effect["image"]
+        end
     end
 end
 
@@ -63,20 +66,23 @@ def save_version(code_id, code)
             :code => code_data['code']
         }
 
+        res=Cloudinary::Uploader.upload(
+            code_data['image'],
+            :public_id => code_id.to_s)
+
+        image_url=res['url']
+
         @code.find_and_modify({
             :query => { :_id => code_id },
             :update => {
                 '$set' => {
-                    :modified_at => time
+                    :modified_at    => time,
+                    :image_url      => image_url
                 },
                 '$push' => { :versions => data }
             }
         })
 
-        Cloudinary::Uploader.upload(
-            code_data['image'],
-            :public_id => IMAGE_PREFIX+code_id.to_s)
-
         code=$glsl.get_code(code_id)
 
         version=code['versions'].length-1