merge v04

[pettanr/pettanr.git] / app / controllers / original_pictures_controller.rb

diff --git a/app/controllers/original_pictures_controller.rb b/app/controllers/original_pictures_controller.rb
index 437f5ff..31b3ca1 100644 (file)
--- a/app/controllers/original_pictures_controller.rb
+++ b/app/controllers/original_pictures_controller.rb
@@ -5,30 +5,12 @@ class OriginalPicturesController < ApplicationController
   
   private
   
-  def set_image(prm)
-    img = nil
-    if (f = prm[:original_picture][:file]).respond_to?(:read)
-      if f.size > 1000000
-        @original_picture.width = 0
-        @original_picture.height = 0
-        @original_picture.ext = 'none'
-        @original_picture.filesize = 1.megabytes
-      else
-        img = Magick::Image.from_blob(f.read).shift
-        @original_picture.width = img.columns
-        @original_picture.height = img.rows
-        @original_picture.ext = img.format.downcase
-        @original_picture.filesize = f.size
-      end
+  def set_image(file)
+    if file.respond_to?(:read)
+      file.read
     else
-      dat = Base64.decode64(prm[:original_picture][:file].to_s.gsub(' ', '+')) #rubyのバグ？+でデコードされるべきキャラがスペースになる
-      img = Magick::Image.from_blob(dat).shift
-      @original_picture.width = img.columns
-      @original_picture.height = img.rows
-      @original_picture.ext = img.format.downcase
-      @original_picture.filesize = 1000
+      Base64.decode64(file.to_s.gsub(' ', '+')) #rubyのバグ？+でデコードされるべきキャラがスペースになる
     end
-    img
   end
   
   def authenticate_artist
@@ -64,11 +46,7 @@ class OriginalPicturesController < ApplicationController
   # GET /original_pictures/1
   # GET /original_pictures/1.json
   def show
-    @original_picture = OriginalPicture.show(params[:id], @author)
-#    if params[:subdir] == 'refresh'
-#      refresh 
-#      return
-#    end
+    @original_picture = OriginalPicture.show(params[:id], @artist)
 
     respond_to do |format|
       opt = {:type => @original_picture.mime_type, :disposition=>"inline"}
@@ -76,7 +54,7 @@ class OriginalPicturesController < ApplicationController
       format.gif { send_data(@original_picture.restore, opt ) }
       format.jpeg { send_data(@original_picture.restore, opt ) }
       format.html # show.html.erb
-      format.json { render json: @original_picture}
+      format.json { render json: @original_picture.to_json(OriginalPicture.show_json_include_opt)}
     end
   end
 
@@ -132,25 +110,17 @@ class OriginalPicturesController < ApplicationController
   # POST /original_pictures
   # POST /original_pictures.json
   def create
+    @picture_data = set_image params[:original_picture][:file]
     @original_picture = OriginalPicture.new
-    img = set_image params
-    @original_picture.artist_id = @author.artist.id
-    @original_picture.license_id = @author.artist.default_license_id
+    @original_picture.supply_default @artist
 
     respond_to do |format|
-      OriginalPicture.transaction do
-        if @original_picture.save
-          if @original_picture.store(img)
-            format.html { redirect_to @original_picture, notice: 'Original picture was successfully created.' }
-            format.json { render json: @original_picture, status: :created, location: @original_picture }
-          else
-            format.html { redirect_to @original_picture, notice: 'Failed! Original picture was NOT created.' }
-            format.json { render json: @original_picture.errors, status: :unprocessable_entity }
-          end
-        else
-          format.html { render action: "new" }
-          format.json { render json: @original_picture.errors, status: :unprocessable_entity }
-        end
+      if @original_picture.store(@picture_data, @artist, params[:original_picture][:license_id])
+        format.html { redirect_to @original_picture, notice: 'Original picture was successfully created.' }
+        format.json { render json: @original_picture, status: :created, location: @original_picture }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @original_picture.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -158,23 +128,17 @@ class OriginalPicturesController < ApplicationController
   # PUT /original_pictures/1
   # PUT /original_pictures/1.json
   def update
+    @picture_data = set_image params[:original_picture][:file]
     @original_picture = OriginalPicture.show(params[:id], @author)
-    img = set_image params
+    @original_picture.supply_default @artist
 
     respond_to do |format|
-      OriginalPicture.transaction do
-        if @original_picture.save
-          if @original_picture.store(img)
-            format.html { redirect_to @original_picture, notice: 'Original picture was successfully updated.' }
-            format.json { head :ok }
-          else
-            format.html { redirect_to @original_picture, notice: 'Failed! Original picture was NOT created.' }
-            format.json { render json: @original_picture.errors, status: :unprocessable_entity }
-          end
-        else
-          format.html { render action: "edit" }
-          format.json { render json: @original_picture.errors, status: :unprocessable_entity }
-        end
+      if @original_picture.store(@picture_data, @artist, params[:original_picture][:license_id])
+        format.html { redirect_to @original_picture, notice: 'Original picture was successfully created.' }
+        format.json { render json: @original_picture, status: :created, location: @original_picture }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @original_picture.errors, status: :unprocessable_entity }
       end
     end
   end