snapimage 0.0.6 → 0.1.0

data/.gitignore

@@ -17,3 +17,5 @@ test/tmp
 test/version_tmp
 tmp
 /vendor/bundle
+/storage
+snapimage_config.yml

data/bin/snapimage_generate_config

@@ -4,15 +4,15 @@ require "optparse"
 
 options = {
   file: "snapimage_config.yml",
+  size: 10485760,
   force: false
 }
 
 optparse = OptionParser.new do |opts|
-  opts.banner = "Usage: snapimage_generate_config local_root public_url [options]"
+  opts.banner = "Usage: snapimage_generate_config local_root [options]"
 
   opts.separator ""
   opts.separator "local_root\tPath to the directory where the images will be stored"
-  opts.separator "public_url\tURL at which the images will accessible from"
 
   opts.separator ""
   opts.separator "Options:"
@@ -21,6 +21,10 @@ optparse = OptionParser.new do |opts|
     options[:file] = file
   end
 
+  opts.on("-s", "--size SIZE", "Max file size in bytes (Default: 10485760)") do |size|
+    options[:size] = size.to_i
+  end
+
   opts.on("--force", "Overwrites the file if it exists") do
     options[:force] = true
   end
@@ -32,13 +36,12 @@ optparse = OptionParser.new do |opts|
 end
 optparse.parse!
 
-unless ARGV.length == 2
+unless ARGV.length == 1
   puts optparse.help
   exit
 end
 
 local_root = ARGV[0]
-public_url = ARGV[1]
 
 if !options[:force] && File.exists?(options[:file])
   puts "File '#{options[:file]}' already exists. Use --force if you want to overwrite."
@@ -50,13 +53,8 @@ end
 
 File.open(options[:file], "w") do |f|
   f.write(<<-EOF
-primary_storage_server: "local"
-storage_servers:
-  -
-    name: "local"
-    type: "LOCAL"
-    local_root: "#{local_root}"
-    public_url: "#{public_url}"
+directory: "#{local_root}"
+max_file_size: #{options[:size]}
 EOF
   )
 end

data/bin/snapimage_server

@@ -10,7 +10,7 @@ optparse = OptionParser.new do |opts|
   opts.banner = "Usage: snapimage_server config [options]"
 
   opts.on("-p", "--port PORT", "Set the port (Default: 54321)") do |port|
-    options[:port] = port
+    options[:port] = port.to_i
   end
 
   opts.on("--path PATH", "Set the URL path of the SnapImage API Server (Default: /snapimage_api)") do |path|

data/lib/snapimage.rb

@@ -3,23 +3,23 @@ require "yaml"
 require "json"
 require "fileutils"
 require "digest/sha1"
-require "open-uri"
-require "RMagick"
+#require "open-uri"
+#require "RMagick"
 require "snapimage/version"
 require "snapimage/exceptions"
 require "snapimage/rack/request_file"
 require "snapimage/rack/request"
 require "snapimage/rack/response"
-require "snapimage/image/image"
-require "snapimage/image/image_name_utils"
-require "snapimage/storage/storage_server"
-require "snapimage/storage/storage_server.local"
-require "snapimage/storage/storage"
+#require "snapimage/image/image"
+#require "snapimage/image/image_name_utils"
+#require "snapimage/storage/storage_server"
+#require "snapimage/storage/storage_server.local"
+#require "snapimage/storage/storage"
 require "snapimage/config"
-require "snapimage/server_actions/server_actions.authorize"
-require "snapimage/server_actions/server_actions.generate_image"
-require "snapimage/server_actions/server_actions.sync_resource"
-require "snapimage/server_actions/server_actions.delete_resource_images"
-require "snapimage/server_actions/server_actions.list_resource_images"
+#require "snapimage/server_actions/server_actions.authorize"
+#require "snapimage/server_actions/server_actions.generate_image"
+#require "snapimage/server_actions/server_actions.sync_resource"
+#require "snapimage/server_actions/server_actions.delete_resource_images"
+#require "snapimage/server_actions/server_actions.list_resource_images"
 require "snapimage/server"
 require "snapimage/middleware"

data/lib/snapimage/config.rb

@@ -9,14 +9,11 @@ module SnapImage
     end
 
     def validate_config
-      raise SnapImage::InvalidConfig, 'Missing "primary_storage_server"' unless @config["primary_storage_server"]
-      raise SnapImage::InvalidConfig, 'Missing "storage_servers"' unless @config["storage_servers"]
-      raise SnapImage::InvalidConfig, '"storage_servers" must be an array' unless @config["storage_servers"].is_a? Array
+      raise SnapImage::InvalidConfig, 'Missing "directory"' unless @config["directory"]
     end
 
     def set_config_defaults
-      @config["max_width"] ||= 1024
-      @config["max_height"] ||= 2048
+      @config["max_file_size"] ||= 10485760 # 10MB
     end
 
     def get_config
@@ -43,9 +40,5 @@ module SnapImage
     def [](key)
       get_config[key]
     end
-
-    def storage
-      @storage ||= SnapImage::Storage.new(get_config["storage_servers"], get_config["primary_storage_server"], get_config["max_width"], get_config["max_height"])
-    end
   end
 end

data/lib/snapimage/exceptions.rb

@@ -1,25 +1,22 @@
 module SnapImage
   # Configuration.
   class InvalidConfig < StandardError; end
-  class InvalidStorageConfig < StandardError; end
   class UnknownConfigType < StandardError; end
   class MissingConfig < StandardError; end
 
   # Authorization.
-  class AuthorizationRequired < StandardError; end
-  class AuthorizationFailed < StandardError; end
+  #class AuthorizationRequired < StandardError; end
+  #class AuthorizationFailed < StandardError; end
 
   # Request.
   class BadRequest < StandardError; end
-  class ActionNotImplemented < StandardError; end
+  #class ActionNotImplemented < StandardError; end
+  class InvalidFilename < StandardError; end
+  class InvalidDirectory < StandardError; end
+  class FileTooLarge < StandardError; end
 
   # Files.
   class UnknownFileType < StandardError; end
-  class FileDoesNotExist < StandardError; end
+  #class FileDoesNotExist < StandardError; end
 
-  # Images.
-  class InvalidImageIdentifier < StandardError; end
-
-  # Resources.
-  class InvalidResourceIdentifier < StandardError; end
 end

data/lib/snapimage/rack/request.rb

@@ -1,12 +1,7 @@
 module SnapImage
   class Request < Rack::Request
     def bad_request?
-      !(self.post? && self.POST["json"] && self.json["action"] && self.json["resource_identifier"])
-    end
-
-    # NOTE: Call bad_request? first to make sure there is json to parse.
-    def json
-      @json ||= JSON.parse(self.POST["json"])
+      !(self.post? && self.POST["file"] && self.POST["directory"])
     end
 
     # Returns a SnapImage::RequestFile which encapsulates the file that Rack

data/lib/snapimage/rack/request_file.rb

@@ -12,15 +12,12 @@ module SnapImage
       @file = file
     end
 
-    def file
+    def tempfile
       @file[:tempfile]
     end
 
-    def type
-      return @type if @type
-      @type = File.extname(@file[:filename])[1..-1]
-      @type = "jpg" if type == "jpeg"
-      @type
+    def filename
+      @file[:filename]
     end
   end
 end

data/lib/snapimage/rack/response.rb

@@ -18,30 +18,30 @@ module SnapImage
       @json = { status_code: 400, message: "Bad Request" }
     end
 
-    def set_authorization_required
-      @json = { status_code: 401, message: "Authorization Required" }
-    end
+    #def set_authorization_required
+      #@json = { status_code: 401, message: "Authorization Required" }
+    #end
+
+    #def set_authorization_failed
+      #@json = { status_code: 402, message: "Authorization Failed" }
+    #end
 
-    def set_authorization_failed
-      @json = { status_code: 402, message: "Authorization Failed" }
+    def set_invalid_filename
+      @json = { status_code: 403, message: "Invalid Filename" }
     end
 
-    def set_invalid_image_identifier
-      @json = { status_code: 403, message: "Invalid Image Identifier" }
+    def set_invalid_directory
+      @json = { status_code: 404, message: "Invalid Directory" }
     end
 
-    def set_invalid_resource_identifier
-      @json = { status_code: 404, message: "Invalid Resource Identifier" }
+    def set_file_too_large
+      @json = { status_code: 405, message: "File Too Large" }
     end
 
     def set_internal_server_error
       @json = { status_code: 500, message: "Internal Server Error" }
     end
 
-    def set_not_implemented
-      @json = { status_code: 501, message: "Not Implemented" }
-    end
-
     def finish
       self.body = [@template.gsub(/{{json}}/, @json.to_json)]
       self["Content-Type"] = @content_type

data/lib/snapimage/server.rb

@@ -1,14 +1,13 @@
 module SnapImage
   class Server
-    ACTIONS = ["generate_image", "sync_resource", "delete_resource_images", "list_resource_images"]
-    RESOURCE_ID_REGEXP = /^[a-z0-9_-]+(\/[a-z0-9_-]+)*$/
+    DIRECTORY_REGEXP = /^[a-z0-9_-]+(\/[a-z0-9_-]+)*$/
+    FILENAME_REGEXP = /^[a-z0-9_-]+[.](gif|jpg|jpeg|png)$/
 
     # Arguments:
     # * request:: Rack::Request
     def initialize(request, config)
       @request = request
       @config = config
-      @storage = @config.storage
     end
 
     # Handles the request and returns a Rack::Response.
@@ -16,35 +15,32 @@ module SnapImage
       @response = SnapImage::Response.new
       begin
         raise SnapImage::BadRequest if @request.bad_request?
-        raise SnapImage::InvalidResourceIdentifier unless !!@request.json["resource_identifier"].match(SnapImage::Server::RESOURCE_ID_REGEXP)
-        @response.content_type = @request.json["response_content_type"] if @request.json["response_content_type"]
-        @response.template = @request.json["response_template"] if @request.json["response_template"]
-        action = @request.json["action"]
-        raise SnapImage::ActionNotImplemented unless ACTIONS.include?(action)
-        @response = get_action_class(action).new(@config, @request, @response).call
+        raise SnapImage::InvalidFilename unless @request.file.filename =~ SnapImage::Server::FILENAME_REGEXP
+        raise SnapImage::InvalidDirectory unless @request["directory"] =~ SnapImage::Server::DIRECTORY_REGEXP
+        raise SnapImage::FileTooLarge if @request.file.tempfile.size > @config["max_file_size"]
+        directory = File.join(@config["directory"], @request["directory"])
+        file_path = File.join(directory, @request.file.filename)
+        # Make sure the directory exists.
+        FileUtils.mkdir_p(directory)
+        # Save the file.
+        File.open(file_path, "wb") { |f| f.write(@request.file.tempfile.read) } unless File.exists?(file_path)
+        @response.set_success
       rescue SnapImage::BadRequest
         @response.set_bad_request
-      rescue SnapImage::ActionNotImplemented
-        @response.set_not_implemented
-      rescue SnapImage::AuthorizationRequired
-        @response.set_authorization_required
-      rescue SnapImage::AuthorizationFailed
-        @response.set_authorization_failed
-      rescue SnapImage::InvalidImageIdentifier
-        @response.set_invalid_image_identifier
-      rescue SnapImage::InvalidResourceIdentifier
-        @response.set_invalid_resource_identifier
-      #rescue
-        #@response.set_internal_server_error
+      #rescue SnapImage::AuthorizationRequired
+        #@response.set_authorization_required
+      #rescue SnapImage::AuthorizationFailed
+        #@response.set_authorization_failed
+      rescue SnapImage::InvalidFilename
+        @response.set_invalid_filename
+      rescue SnapImage::InvalidDirectory
+        @response.set_invalid_directory
+      rescue SnapImage::FileTooLarge
+        @response.set_file_too_large
+      rescue
+        @response.set_internal_server_error
       end
       @response.finish
     end
-
-    private
-
-    def get_action_class(action)
-      klassname = action.split("_").map { |t| t.capitalize }.join("")
-      SnapImage::ServerActions.const_get(klassname)
-    end
   end
 end

data/lib/snapimage/version.rb

@@ -1,3 +1,3 @@
 module SnapImage
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

data/spec/acceptance/delete_resource_images_spec.rb

@@ -1,166 +1,166 @@
-require "spec_helper"
-require "rack/test"
-
-describe "Delete Resource Images" do
-  include Rack::Test::Methods
-
-  before do
-    @local_root = File.join(RSpec.root, "storage")
-    @image_path = File.join(RSpec.root, "support/assets/stub-300x200.png")
-    @resource_id_1 = "abc/123"
-    @resource_id_2 = "abc/456"
-  end
-
-  after do
-    FileUtils.rm_rf(@local_root)
-  end
-
-  context "without security tokens" do
-    def app
-      app = Proc.new do |env|
-        [200, {}, ""]
-      end
-      SnapImage::Middleware.new(
-        app,
-        path: "/snapimage_api",
-        config: {
-          "primary_storage_server" => "local",
-          "storage_servers" => [
-            {
-              "name" => "local",
-              "type" => "LOCAL",
-              "local_root" => File.join(RSpec.root, "storage"),
-              "public_url" => "//example.com/images"
-            }
-          ]
-        }
-      )
-    end
-
-    before do
-      # Store some images.
-      json = { action: "generate_image", resource_identifier: @resource_id_1 }.to_json
-      post "/snapimage_api", "file" => Rack::Test::UploadedFile.new(@image_path, "image/png"), "json" => json
-      @url_1 = JSON.parse(last_response.body)["image_url"]
-      post "/snapimage_api", "file" => Rack::Test::UploadedFile.new(@image_path, "image/png"), "json" => json
-      @url_2 = JSON.parse(last_response.body)["image_url"]
-
-      json = { action: "generate_image", resource_identifier: @resource_id_2 }.to_json
-      post "/snapimage_api", "file" => Rack::Test::UploadedFile.new(@image_path, "image/png"), "json" => json
-      @url_3 = JSON.parse(last_response.body)["image_url"]
-      post "/snapimage_api", "file" => Rack::Test::UploadedFile.new(@image_path, "image/png"), "json" => json
-      @url_4 = JSON.parse(last_response.body)["image_url"]
-
-      json = {
-        action: "delete_resource_images",
-        resource_identifier: @resource_id_1
-      }.to_json
-      post "/snapimage_api", "json" => json
-    end
-
-    it "is successful" do
-      last_response.should be_successful
-      last_response["Content-Type"].should eq "text/json"
-      json = JSON.parse(last_response.body)
-      json["status_code"].should eq 200
-      json["message"].should eq "Delete Resource Images Successful"
-      json["deleted_image_urls"].size.should eq 2
-      json["deleted_image_urls"].include?(@url_1).should be_true
-      json["deleted_image_urls"].include?(@url_2).should be_true
-    end
-
-    it "deletes the resource" do
-      File.exists?(File.join(@local_root, @resource_id_1)).should be_false
-    end
-
-    it "does not delete other resources" do
-      File.exists?(File.join(@local_root, @resource_id_2)).should be_true
-    end
-  end
-
-  context "with security tokens" do
-    def app
-      app = Proc.new do |env|
-        [200, {}, ""]
-      end
-      SnapImage::Middleware.new(
-        app,
-        path: "/snapimage_api",
-        config: {
-          "security_salt" => "123456789",
-          "primary_storage_server" => "local",
-          "storage_servers" => [
-            {
-              "name" => "local",
-              "type" => "LOCAL",
-              "local_root" => File.join(RSpec.root, "storage"),
-              "public_url" => "//example.com/images"
-            }
-          ]
-        }
-      )
-    end
-
-    before do
-      @client_security_token_1 = Digest::SHA1.hexdigest("client:#{Time.now.strftime("%Y-%m-%d")}:123456789:#{@resource_id_1}")
-      @client_security_token_2 = Digest::SHA2.hexdigest("client:#{Time.now.strftime("%Y-%m-%d")}:223456789:#{@resource_id_2}")
-      @server_security_token = Digest::SHA1.hexdigest("server:#{Time.now.strftime("%Y-%m-%d")}:123456789:#{@resource_id_1}")
-
-      # Store some images.
-      json = {
-        action: "generate_image",
-        resource_identifier: @resource_id_1,
-        client_security_token: @client_security_token_1
-      }.to_json
-      post "/snapimage_api", "file" => Rack::Test::UploadedFile.new(@image_path, "image/png"), "json" => json
-      @url_1 = JSON.parse(last_response.body)["image_url"]
-      post "/snapimage_api", "file" => Rack::Test::UploadedFile.new(@image_path, "image/png"), "json" => json
-      @url_2 = JSON.parse(last_response.body)["image_url"]
-
-      json = {
-        action: "generate_image",
-        resource_identifier: @resource_id_2,
-        client_security_token: @client_security_token_2
-      }.to_json
-      post "/snapimage_api", "file" => Rack::Test::UploadedFile.new(@image_path, "image/png"), "json" => json
-      @url_3 = JSON.parse(last_response.body)["image_url"]
-      post "/snapimage_api", "file" => Rack::Test::UploadedFile.new(@image_path, "image/png"), "json" => json
-      @url_4 = JSON.parse(last_response.body)["image_url"]
-
-      @options = { action: "delete_resource_images", resource_identifier: @resource_id_1 }
-    end
-
-    it "requires authorization when no security token is provided" do
-      request_json = @options.to_json
-      post "/snapimage_api", "json" => request_json
-      last_response.should be_successful
-      last_response["content-type"].should eq "text/json"
-      json = JSON.parse(last_response.body)
-      json["status_code"].should eq 401
-      json["message"].should eq "Authorization Required"
-    end
-
-    it "fails authorization when the security token is invalid" do
-      request_json = @options.merge!({"server_security_token" => "abc"}).to_json
-      post "/snapimage_api", "json" => request_json
-      last_response.should be_successful
-      last_response["content-type"].should eq "text/json"
-      json = JSON.parse(last_response.body)
-      json["status_code"].should eq 402
-      json["message"].should eq "Authorization Failed"
-    end
-
-    it "deletes successfully" do
-      request_json = @options.merge!({"server_security_token" => @server_security_token}).to_json
-      post "/snapimage_api", "json" => request_json
-      last_response.should be_successful
-      last_response["Content-Type"].should eq "text/json"
-      json = JSON.parse(last_response.body)
-      json["status_code"].should eq 200
-      json["message"].should eq "Delete Resource Images Successful"
-      json["deleted_image_urls"].size.should eq 2
-      json["deleted_image_urls"].include?(@url_1).should be_true
-      json["deleted_image_urls"].include?(@url_2).should be_true
-    end
-  end
-end
+#require "spec_helper"
+#require "rack/test"
+
+#describe "Delete Resource Images" do
+  #include Rack::Test::Methods
+
+  #before do
+    #@local_root = File.join(RSpec.root, "storage")
+    #@image_path = File.join(RSpec.root, "support/assets/stub-300x200.png")
+    #@resource_id_1 = "abc/123"
+    #@resource_id_2 = "abc/456"
+  #end
+
+  #after do
+    #FileUtils.rm_rf(@local_root)
+  #end
+
+  #context "without security tokens" do
+    #def app
+      #app = Proc.new do |env|
+        #[200, {}, ""]
+      #end
+      #SnapImage::Middleware.new(
+        #app,
+        #path: "/snapimage_api",
+        #config: {
+          #"primary_storage_server" => "local",
+          #"storage_servers" => [
+            #{
+              #"name" => "local",
+              #"type" => "LOCAL",
+              #"local_root" => File.join(RSpec.root, "storage"),
+              #"public_url" => "//example.com/images"
+            #}
+          #]
+        #}
+      #)
+    #end
+
+    #before do
+      ## Store some images.
+      #json = { action: "generate_image", resource_identifier: @resource_id_1 }.to_json
+      #post "/snapimage_api", "file" => Rack::Test::UploadedFile.new(@image_path, "image/png"), "json" => json
+      #@url_1 = JSON.parse(last_response.body)["image_url"]
+      #post "/snapimage_api", "file" => Rack::Test::UploadedFile.new(@image_path, "image/png"), "json" => json
+      #@url_2 = JSON.parse(last_response.body)["image_url"]
+
+      #json = { action: "generate_image", resource_identifier: @resource_id_2 }.to_json
+      #post "/snapimage_api", "file" => Rack::Test::UploadedFile.new(@image_path, "image/png"), "json" => json
+      #@url_3 = JSON.parse(last_response.body)["image_url"]
+      #post "/snapimage_api", "file" => Rack::Test::UploadedFile.new(@image_path, "image/png"), "json" => json
+      #@url_4 = JSON.parse(last_response.body)["image_url"]
+
+      #json = {
+        #action: "delete_resource_images",
+        #resource_identifier: @resource_id_1
+      #}.to_json
+      #post "/snapimage_api", "json" => json
+    #end
+
+    #it "is successful" do
+      #last_response.should be_successful
+      #last_response["Content-Type"].should eq "text/json"
+      #json = JSON.parse(last_response.body)
+      #json["status_code"].should eq 200
+      #json["message"].should eq "Delete Resource Images Successful"
+      #json["deleted_image_urls"].size.should eq 2
+      #json["deleted_image_urls"].include?(@url_1).should be_true
+      #json["deleted_image_urls"].include?(@url_2).should be_true
+    #end
+
+    #it "deletes the resource" do
+      #File.exists?(File.join(@local_root, @resource_id_1)).should be_false
+    #end
+
+    #it "does not delete other resources" do
+      #File.exists?(File.join(@local_root, @resource_id_2)).should be_true
+    #end
+  #end
+
+  #context "with security tokens" do
+    #def app
+      #app = Proc.new do |env|
+        #[200, {}, ""]
+      #end
+      #SnapImage::Middleware.new(
+        #app,
+        #path: "/snapimage_api",
+        #config: {
+          #"security_salt" => "123456789",
+          #"primary_storage_server" => "local",
+          #"storage_servers" => [
+            #{
+              #"name" => "local",
+              #"type" => "LOCAL",
+              #"local_root" => File.join(RSpec.root, "storage"),
+              #"public_url" => "//example.com/images"
+            #}
+          #]
+        #}
+      #)
+    #end
+
+    #before do
+      #@client_security_token_1 = Digest::SHA1.hexdigest("client:#{Time.now.strftime("%Y-%m-%d")}:123456789:#{@resource_id_1}")
+      #@client_security_token_2 = Digest::SHA2.hexdigest("client:#{Time.now.strftime("%Y-%m-%d")}:223456789:#{@resource_id_2}")
+      #@server_security_token = Digest::SHA1.hexdigest("server:#{Time.now.strftime("%Y-%m-%d")}:123456789:#{@resource_id_1}")
+
+      ## Store some images.
+      #json = {
+        #action: "generate_image",
+        #resource_identifier: @resource_id_1,
+        #client_security_token: @client_security_token_1
+      #}.to_json
+      #post "/snapimage_api", "file" => Rack::Test::UploadedFile.new(@image_path, "image/png"), "json" => json
+      #@url_1 = JSON.parse(last_response.body)["image_url"]
+      #post "/snapimage_api", "file" => Rack::Test::UploadedFile.new(@image_path, "image/png"), "json" => json
+      #@url_2 = JSON.parse(last_response.body)["image_url"]
+
+      #json = {
+        #action: "generate_image",
+        #resource_identifier: @resource_id_2,
+        #client_security_token: @client_security_token_2
+      #}.to_json
+      #post "/snapimage_api", "file" => Rack::Test::UploadedFile.new(@image_path, "image/png"), "json" => json
+      #@url_3 = JSON.parse(last_response.body)["image_url"]
+      #post "/snapimage_api", "file" => Rack::Test::UploadedFile.new(@image_path, "image/png"), "json" => json
+      #@url_4 = JSON.parse(last_response.body)["image_url"]
+
+      #@options = { action: "delete_resource_images", resource_identifier: @resource_id_1 }
+    #end
+
+    #it "requires authorization when no security token is provided" do
+      #request_json = @options.to_json
+      #post "/snapimage_api", "json" => request_json
+      #last_response.should be_successful
+      #last_response["content-type"].should eq "text/json"
+      #json = JSON.parse(last_response.body)
+      #json["status_code"].should eq 401
+      #json["message"].should eq "Authorization Required"
+    #end
+
+    #it "fails authorization when the security token is invalid" do
+      #request_json = @options.merge!({"server_security_token" => "abc"}).to_json
+      #post "/snapimage_api", "json" => request_json
+      #last_response.should be_successful
+      #last_response["content-type"].should eq "text/json"
+      #json = JSON.parse(last_response.body)
+      #json["status_code"].should eq 402
+      #json["message"].should eq "Authorization Failed"
+    #end
+
+    #it "deletes successfully" do
+      #request_json = @options.merge!({"server_security_token" => @server_security_token}).to_json
+      #post "/snapimage_api", "json" => request_json
+      #last_response.should be_successful
+      #last_response["Content-Type"].should eq "text/json"
+      #json = JSON.parse(last_response.body)
+      #json["status_code"].should eq 200
+      #json["message"].should eq "Delete Resource Images Successful"
+      #json["deleted_image_urls"].size.should eq 2
+      #json["deleted_image_urls"].include?(@url_1).should be_true
+      #json["deleted_image_urls"].include?(@url_2).should be_true
+    #end
+  #end
+#end