クリップ詳細: 画像が表示できない場合のデザイン崩れを修正

app/helpers/application_helper.rb

@@ -93,7 +93,7 @@ def avatar_url(user, options={})
   end
 
   def image_tag_by_clip(clip, options={})
-    style = clip.thumb_size_for_style_sheet(options)
+    style = clip.size_for_stylesheet(options)
     image_tag image_path(clip.image.thumb_url), alt: clip.title, style: style
   end
 

app/models/clip.rb

@@ -91,7 +91,7 @@ def url
     self.image.try(:url) || @url
   end
 
-  delegate :thumb_size_for_style_sheet, to: :image
+  delegate :size_for_stylesheet, to: :image
 
   def create_html_only_images
     images = [ @url ] if @url

app/models/image.rb

@@ -56,8 +56,7 @@ def thumb_height(crop_size=nil)
     end
   end
 
-  def thumb_size_for_style_sheet(options={})
-    return "width: #{self.thumb_width}px;" if self.thumb_height.zero? # for 下位互換
+  def size_for_stylesheet(options={})
     case options[:mode]
     when :crop
       crop_size = options[:size]
@@ -66,8 +65,10 @@ def thumb_size_for_style_sheet(options={})
       width_offset = width - crop_size
       height_offset = height - crop_size
       "width: #{width}px; height: #{height}px; margin-left: -#{width_offset / 2}px; margin-top: -#{height_offset / 2}px;"
-    else
+    when :thumbnail
       "width: #{self.thumb_width}px; height: #{self.thumb_height}px;"
+    else
+      "width: #{self.width}px; height: #{self.height}px;"
     end
   end
 end

app/views/base/_wall.html.slim

@@ -9,7 +9,7 @@
     - @clips.each do |clip|
       li.box id="clip_#{clip.id}"
         .image_box
-          = link_to image_tag_by_clip(clip), clip, remote: true
+          = link_to image_tag_by_clip(clip, mode: :thumbnail), clip, remote: true
           .status
             p.tag
               - if clip.tags.any?

app/views/clips/show.html.slim

@@ -16,7 +16,7 @@
 
   .info id="clip_#{@clip.id}"
     .image_box
-      = link_to image_tag(image_path(@clip.image)), @clip.url
+      = link_to image_tag_by_clip(@clip), @clip.url
 
     - if @clip.title.present?
       h2.title = @clip.title