Merge branch 'master' into feature/1985#voting_token

app/models/direct_upload.rb

@@ -19,7 +19,9 @@ class DirectUpload
     if @resource_type.present? && @resource_relation.present? && (@attachment.present? || @cached_attachment.present?)
       @resource = @resource_type.constantize.find_or_initialize_by(id: @resource_id)
 
-      if @resource.respond_to?(:images)
+      #Refactor
+      if @resource.respond_to?(:images) &&
+        ((@attachment.present? && !@attachment.content_type.match(/pdf/)) || @cached_attachment.present?)
         @relation = @resource.images.send("build", relation_attributtes)
       elsif @resource.class.reflections[@resource_relation].macro == :has_one
         @relation = @resource.send("build_#{resource_relation}", relation_attributtes)

app/models/poll/question.rb

@@ -1,11 +1,6 @@
 class Poll::Question < ActiveRecord::Base
   include Measurable
   include Searchable
-  include Documentable
-  documentable max_documents_allowed: 1,
-               max_file_size: 3.megabytes,
-               accepted_content_types: [ "application/pdf" ]
-  accepts_nested_attributes_for :documents, allow_destroy: true
 
   acts_as_paranoid column: :hidden_at
   include ActsAsParanoidAliases

app/models/poll/question/answer.rb

@@ -1,7 +1,13 @@
 class Poll::Question::Answer < ActiveRecord::Base
 	include Galleryable
+  include Documentable
+  documentable max_documents_allowed: 3,
+               max_file_size: 3.megabytes,
+               accepted_content_types: [ "application/pdf" ]
+  accepts_nested_attributes_for :documents, allow_destroy: true
 
   belongs_to :question, class_name: 'Poll::Question', foreign_key: 'question_id'
+  has_many :videos, class_name: 'Poll::Question::Answer::Video'
 
   validates :title, presence: true
 

app/models/poll/question/answer/video.rb

@@ -0,0 +1,16 @@
+class Poll::Question::Answer::Video < ActiveRecord::Base
+  belongs_to :answer, class_name: 'Poll::Question::Answer', foreign_key: 'answer_id'
+
+  VIMEO_REGEX = /vimeo.*(staffpicks\/|channels\/|videos\/|video\/|\/)([^#\&\?]*).*/
+  YOUTUBE_REGEX = /youtu.*(be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/
+
+  validates :title, presence: true
+  validate :valid_url?
+
+  def valid_url?
+    return if url.blank?
+    return if url.match(VIMEO_REGEX)
+    return if url.match(YOUTUBE_REGEX)
+    errors.add(:url, :invalid)
+  end
+end