Merge branch 'develop'

Author: ElliottAYoung

app/models/media.rb

@@ -34,7 +34,8 @@ class Media < ActiveRecord::Base
                     },
                     :processors => [:thumbnail, :paperclip_optimizer],
                     :preserve_files => 'true',
-                    :path => ':class/:attachment/:style-:id.:extension'
+                    # :path => ':class/:attachment/:style-:id.:extension'
+                    :path => ':class/:attachment/careerbuilder-:style-:id.:extension'
 
   validates_attachment :attachment,
                        :presence => true,

bower.json

@@ -1,3 +1,4 @@
+
 {
   "name": "cortex",
   "authors": [
@@ -47,3 +48,4 @@
     "angular": "1.2.29"
   }
 }
+

lib/tasks/cortex.rake

@@ -85,6 +85,7 @@ namespace :cortex do
         next
       end
 
+
       # Replace text in Snippets and in Posts
       puts "Searching for Snippets with the text '#{find}' in tenant #{tenant}"
       matching_snippets = Snippet.find_by_tenant_id(tenant).find_by_body_text(find)
@@ -232,11 +233,16 @@ namespace :cortex do
   namespace :media do
     desc 'Manage Cortex media'
     task :update_url => :environment do
+
+      old_url = ENV['OLD_PATH']
+      unless old_url
+        puts 'OLD_PATH must be set'
+      end
+
+
       Media.find_each do |media|
         unless media.attachment_file_name.blank?
-          object_id = "%05d" % media.id
-          object_key = "media/attachments/00#{object_id.first}/00#{object_id[1]}/#{object_id[2..4]}/original/#{media.attachment_file_name}"
-          puts object_key
+          object_key = media.attachment.arbitrary_url_for old_url
 
           s3 = Aws::S3::Client.new
 

semaphore_ci/threads/javascript.sh

@@ -0,0 +1 @@
+bundle exec rake spec:javascript