snapimage 0.0.6 → 0.1.0

data/spec/snapimage/image/image_spec.rb

@@ -1,55 +1,55 @@
-require "spec_helper"
-
-describe SnapImage::Image do
-  before do
-    @image_path = File.join(RSpec.root, "support/assets/stub-300x200.png")
-  end
-
-  describe "#crop" do
-    before do
-      @image = SnapImage::Image.new
-      @image.set_image_from_path(@image_path)
-    end
-
-    it "correctly crops image" do
-      @image.crop(10, 30, 20, 30)
-      @image.width.should eq 20
-      @image.height.should eq 30
-    end
-  end
-
-  describe "#resize" do
-    before do
-      @image = SnapImage::Image.new
-      @image.set_image_from_path(@image_path)
-    end
-
-    it "raises an error when no height is specified and maintaining aspect ratio is false" do
-      expect { @image.resize(100, nil, false) }.should raise_error
-    end
-
-    it "resizes the image when the width is larger or equal to the height" do
-      @image.resize(330)
-      @image.width.should eq 330
-      @image.height.should eq 220
-    end
-
-    it "resizes the image when the width is less than the height" do
-      @image.resize(150)
-      @image.width.should eq 150
-      @image.height.should eq 100
-    end
-
-    it "resizes the image to fit within the width/height while maintaining aspect ratio" do
-      @image.resize(150, 200)
-      @image.width.should eq 150
-      @image.height.should eq 100
-    end
-
-    it "stretches image when not maintaining aspect ratio" do
-      @image.resize(100, 200, false)
-      @image.width.should eq 100
-      @image.height.should eq 200
-    end
-  end
-end
+#require "spec_helper"
+
+#describe SnapImage::Image do
+  #before do
+    #@image_path = File.join(RSpec.root, "support/assets/stub-300x200.png")
+  #end
+
+  #describe "#crop" do
+    #before do
+      #@image = SnapImage::Image.new
+      #@image.set_image_from_path(@image_path)
+    #end
+
+    #it "correctly crops image" do
+      #@image.crop(10, 30, 20, 30)
+      #@image.width.should eq 20
+      #@image.height.should eq 30
+    #end
+  #end
+
+  #describe "#resize" do
+    #before do
+      #@image = SnapImage::Image.new
+      #@image.set_image_from_path(@image_path)
+    #end
+
+    #it "raises an error when no height is specified and maintaining aspect ratio is false" do
+      #expect { @image.resize(100, nil, false) }.should raise_error
+    #end
+
+    #it "resizes the image when the width is larger or equal to the height" do
+      #@image.resize(330)
+      #@image.width.should eq 330
+      #@image.height.should eq 220
+    #end
+
+    #it "resizes the image when the width is less than the height" do
+      #@image.resize(150)
+      #@image.width.should eq 150
+      #@image.height.should eq 100
+    #end
+
+    #it "resizes the image to fit within the width/height while maintaining aspect ratio" do
+      #@image.resize(150, 200)
+      #@image.width.should eq 150
+      #@image.height.should eq 100
+    #end
+
+    #it "stretches image when not maintaining aspect ratio" do
+      #@image.resize(100, 200, false)
+      #@image.width.should eq 100
+      #@image.height.should eq 200
+    #end
+  #end
+#end

data/spec/snapimage/rack/request_file_spec.rb

@@ -1,15 +1,4 @@
 require "spec_helper"
 
 describe SnapImage::RequestFile do
-  describe "#type" do
-    it "returns the correct type" do
-      file = SnapImage::RequestFile.new({filename: "image.png"})
-      file.type.should eq "png"
-    end
-
-    it "returns jpg when the type is jpeg" do
-      file = SnapImage::RequestFile.new({filename: "image.jpeg"})
-      file.type.should eq "jpg"
-    end
-  end
 end

data/spec/snapimage/rack/request_spec.rb

@@ -7,46 +7,27 @@ describe SnapImage::Request do
 
   describe "#bad_request?" do
     it "returns true if the request is not a post" do
-      json = { action: "test", resource_identifier: "123" }.to_json
       @request.stub(:post?).and_return(false)
-      @request.stub(:POST).and_return({"json" => json})
+      @request.stub(:POST).and_return({ "file" => "abc", "directory" => "123" })
       @request.bad_request?.should be_true
     end
 
-    it "returns true if the request does not include json" do
+    it "returns true if the request does not include file" do
       @request.stub(:post?).and_return(true)
-      @request.stub(:POST).and_return({})
+      @request.stub(:POST).and_return({ "directory" => "123" })
       @request.bad_request?.should be_true
     end
 
-    it "returns true if the request does not include an action" do
-      json = { resource_identifier: "123" }.to_json
+    it "returns true if the request does not include directory" do
       @request.stub(:post?).and_return(true)
-      @request.stub(:POST).and_return({"json" => json})
-      @request.bad_request?.should be_true
-    end
-
-    it "returns true if the request does not include a resource_identifier" do
-      json = { action: "test" }.to_json
-      @request.stub(:post?).and_return(true)
-      @request.stub(:POST).and_return({"json" => json})
+      @request.stub(:POST).and_return({ "file" => "abc" })
       @request.bad_request?.should be_true
     end
 
     it "returns false if the request is valid" do
-      json = { action: "test", resource_identifier: "123" }.to_json
       @request.stub(:post?).and_return(true)
-      @request.stub(:POST).and_return({"json" => json})
+      @request.stub(:POST).and_return({ "file" => "abc", "directory" => "123" })
       @request.bad_request?.should be_false
     end
   end
-
-  describe "#json" do
-    it "returns the json object" do
-      @request.stub(:bad_request?).and_return(false)
-      @request.stub(:POST).and_return({"json" => '{"data":"value"}'})
-      json = @request.json
-      json["data"].should eq "value"
-    end
-  end
 end

data/spec/snapimage/server_actions/server_actions.authorize_spec.rb

@@ -1,67 +1,67 @@
-require "spec_helper"
+#require "spec_helper"
 
-describe SnapImage::ServerActions::Authorize do
-  before do
-    class TestServerActions
-      include SnapImage::ServerActions::Authorize
+#describe SnapImage::ServerActions::Authorize do
+  #before do
+    #class TestServerActions
+      #include SnapImage::ServerActions::Authorize
 
-      attr_accessor :config
+      #attr_accessor :config
 
-      def initialize(request)
-        @request = request
-        @config = {"security_salt" => "abc123"}
-      end
-    end
+      #def initialize(request)
+        #@request = request
+        #@config = {"security_salt" => "abc123"}
+      #end
+    #end
 
-    @request = double("request")
-    @actions = TestServerActions.new(@request)
-  end
+    #@request = double("request")
+    #@actions = TestServerActions.new(@request)
+  #end
 
-  describe "#token_available?" do
-    before do
-      @request.stub(:json).and_return({"client_security_token" => "abc123"})
-    end
-    it "returns true when role's token is set" do
-      @actions.token_available?(:client).should be_true
-    end
+  #describe "#token_available?" do
+    #before do
+      #@request.stub(:json).and_return({"client_security_token" => "abc123"})
+    #end
+    #it "returns true when role's token is set" do
+      #@actions.token_available?(:client).should be_true
+    #end
 
-    it "returns false when role's token is not set" do
-      @actions.token_available?(:server).should be_false
-    end
-  end
+    #it "returns false when role's token is not set" do
+      #@actions.token_available?(:server).should be_false
+    #end
+  #end
 
-  describe "#generate_tokens" do
-    before do
-      @request.stub(:json).and_return({"resource_identifier" => "123"})
-    end
+  #describe "#generate_tokens" do
+    #before do
+      #@request.stub(:json).and_return({"resource_identifier" => "123"})
+    #end
 
-    it "generates three token" do
-      now = Time.now
-      yesterday = (now - 24*60*60).strftime("%Y-%m-%d")
-      today = now.strftime("%Y-%m-%d")
-      tomorrow = (now + 24*60*60).strftime("%Y-%m-%d")
-      yesterday_token = Digest::SHA1.hexdigest("client:#{yesterday}:abc123:123")
-      today_token = Digest::SHA1.hexdigest("client:#{today}:abc123:123")
-      tomorrow_token = Digest::SHA1.hexdigest("client:#{tomorrow}:abc123:123")
-      @actions.generate_tokens(:client).should eq [yesterday_token, today_token, tomorrow_token]
-    end
-  end
+    #it "generates three token" do
+      #now = Time.now
+      #yesterday = (now - 24*60*60).strftime("%Y-%m-%d")
+      #today = now.strftime("%Y-%m-%d")
+      #tomorrow = (now + 24*60*60).strftime("%Y-%m-%d")
+      #yesterday_token = Digest::SHA1.hexdigest("client:#{yesterday}:abc123:123")
+      #today_token = Digest::SHA1.hexdigest("client:#{today}:abc123:123")
+      #tomorrow_token = Digest::SHA1.hexdigest("client:#{tomorrow}:abc123:123")
+      #@actions.generate_tokens(:client).should eq [yesterday_token, today_token, tomorrow_token]
+    #end
+  #end
 
-  describe "#authorize" do
-    it "returns true when the security_salt is not set" do
-      @actions.config = {}
-      @actions.authorize(:client).should be_true
-    end
+  #describe "#authorize" do
+    #it "returns true when the security_salt is not set" do
+      #@actions.config = {}
+      #@actions.authorize(:client).should be_true
+    #end
 
-    it "raises an error when the token is not available" do
-      @actions.stub(:token_available?).and_return(false)
-      expect { @actions.authorize(:client) }.should raise_error SnapImage::AuthorizationRequired
-    end
+    #it "raises an error when the token is not available" do
+      #@actions.stub(:token_available?).and_return(false)
+      #expect { @actions.authorize(:client) }.should raise_error SnapImage::AuthorizationRequired
+    #end
 
-    it "raises an error when the token does not match" do
-      @request.stub(:json).and_return({"client_security_token" => "abc123", "resource_identifier" => "123"})
-      @actions.stub(:token_available?).and_return(true)
-      expect { @actions.authorize(:client) }.should raise_error SnapImage::AuthorizationFailed
-    end
-  end
-end
+    #it "raises an error when the token does not match" do
+      #@request.stub(:json).and_return({"client_security_token" => "abc123", "resource_identifier" => "123"})
+      #@actions.stub(:token_available?).and_return(true)
+      #expect { @actions.authorize(:client) }.should raise_error SnapImage::AuthorizationFailed
+    #end
+  #end
+#end

data/spec/snapimage/server_actions/server_actions.generate_image_spec.rb

@@ -1,146 +1,146 @@
-require "spec_helper"
-
-describe SnapImage::ServerActions::GenerateImage do
-  before do
-    @image_path = File.join(RSpec.root, "support/assets/stub-300x200.png")
-    @storage = double("storage")
-    @config = { "max_width" => 1024, "max_height" => 2048 }
-    @config.stub(:storage).and_return(@storage)
-    @request = double("request")
-    @response = double("response")
-    @generate_image = SnapImage::ServerActions::GenerateImage.new(@config, @request, @response)
-  end
-
-  describe "#source_image_defined?" do
-    it "returns false if file and url are not defined" do
-      @request.stub(:file).and_return(nil)
-      @request.stub(:json).and_return({})
-      @generate_image.send(:source_image_defined?).should be_false
-    end
-
-    it "returns true when file is defined" do
-      @request.stub(:file).and_return("file")
-      @request.stub(:json).and_return({})
-      @generate_image.send(:source_image_defined?).should be_true
-    end
-
-    it "returns true when url is defined" do
-      @request.stub(:file).and_return(nil)
-      @request.stub(:json).and_return({"url" => "something"})
-      @generate_image.send(:source_image_defined?).should be_true
-    end
-  end
-
-  describe "#get_max_width?" do
-    it "returns the server max width when JSON 'max_width' is not defined" do
-      @request.stub(:json).and_return({})
-      @generate_image.send(:get_max_width).should eq 1024
-    end
-
-    it "returns the server max width when JSON 'max_width' is larger" do
-      @request.stub(:json).and_return({"max_width" => "4096"})
-      @generate_image.send(:get_max_width).should eq 1024
-    end
-
-    it "returns the JSON 'max_width' when server max width is larger" do
-      @request.stub(:json).and_return({"max_width" => "640"})
-      @generate_image.send(:get_max_width).should eq 640
-    end
-  end
-
-  describe "#get_max_height?" do
-    it "returns the server max height when JSON 'max_height' is not defined" do
-      @request.stub(:json).and_return({})
-      @generate_image.send(:get_max_height).should eq 2048
-    end
-
-    it "returns the server max height when JSON 'max_height' is larger" do
-      @request.stub(:json).and_return({"max_height" => "4096"})
-      @generate_image.send(:get_max_height).should eq 2048
-    end
-
-    it "returns the JSON 'max_height' when server max height is larger" do
-      @request.stub(:json).and_return({"max_height" => "640"})
-      @generate_image.send(:get_max_height).should eq 640
-    end
-  end
-
-  describe "#get_image_for_modification" do
-    context "upload" do
-      before do
-        @generate_image.stub(:upload?).and_return(true)
-      end
-
-      it "uploads the image and returns it when a file is specified" do
-        @request.stub(:file).and_return("file")
-        @request.stub(:json).and_return({"resource_identifier" => "abc123"})
-        @storage.should_receive(:add_upload).with("file", "abc123").once.and_return("image")
-        @generate_image.send(:get_image_for_modification).should eq "image"
-      end
-
-      it "downloads the image and returns it when a local url is specified" do
-        @request.stub(:file).and_return(nil)
-        @request.stub(:json).and_return({"url" => "http://example.com/12345678-1024x768.png", "resource_identifier" => "abc123"})
-        @storage.should_receive(:add_url).with("http://example.com/12345678-1024x768.png", "abc123").once.and_return("image")
-        @generate_image.send(:get_image_for_modification).should eq "image"
-      end
-    end
-
-    context "modify" do
-      before do
-        @generate_image.stub(:upload?).and_return(false)
-      end
-
-      it "gets the base image" do
-        @request.stub(:json).and_return("url" => "http://example.com/fi3k2od0-1027x768-1x2x640x480-300x200-1.png")
-        @storage.should_receive(:get).with("http://example.com/fi3k2od0-1027x768.png").once.and_return("image")
-        @generate_image.send(:get_image_for_modification).should eq "image"
-      end
-    end
-  end
-
-  describe "#modify_image" do
-    before do
-      @image = SnapImage::Image.from_path(@image_path, "http://example.com/12345678-300x200.png")
-    end
-
-    it "does nothing when there are no modifications" do
-      @request.stub(:json).and_return({})
-      result = @generate_image.send(:modify_image, @image)
-      result[:image].should be @image
-      result[:name].should eq "12345678-300x200.png"
-    end
-
-    it "crops" do
-      @request.stub(:json).and_return({"crop_x" => 10, "crop_y" => 20, "crop_width" => 50, "crop_height" => 100})
-      result = @generate_image.send(:modify_image, @image)
-      result[:image].width.should eq 50
-      result[:image].height.should eq 100
-      result[:name].should eq "12345678-300x200-10x20x50x100-50x100-0.png"
-    end
-
-    it "resizes" do
-      @request.stub(:json).and_return({"width" => 400, "height" => 50})
-      result = @generate_image.send(:modify_image, @image)
-      result[:image].width.should eq 400
-      result[:image].height.should eq 50
-      result[:name].should eq "12345678-300x200-0x0x300x200-400x50-0.png"
-    end
-
-    it "resizes to fit" do
-      @request.stub(:json).and_return({"width" => 2048, "height" => 100})
-      result = @generate_image.send(:modify_image, @image)
-      result[:image].width.should eq 1024
-      result[:image].height.should eq 50
-      result[:name].should eq "12345678-300x200-0x0x300x200-1024x50-0.png"
-    end
-
-    it "sharpens" do
-      @request.stub(:json).and_return({"sharpen" => true})
-      result = @generate_image.send(:modify_image, @image)
-      result[:image].width.should eq 300
-      result[:image].height.should eq 200
-      result[:name].should eq "12345678-300x200-0x0x300x200-300x200-1.png"
-    end
-  end
-end
+#require "spec_helper"
+
+#describe SnapImage::ServerActions::GenerateImage do
+  #before do
+    #@image_path = File.join(RSpec.root, "support/assets/stub-300x200.png")
+    #@storage = double("storage")
+    #@config = { "max_width" => 1024, "max_height" => 2048 }
+    #@config.stub(:storage).and_return(@storage)
+    #@request = double("request")
+    #@response = double("response")
+    #@generate_image = SnapImage::ServerActions::GenerateImage.new(@config, @request, @response)
+  #end
+
+  #describe "#source_image_defined?" do
+    #it "returns false if file and url are not defined" do
+      #@request.stub(:file).and_return(nil)
+      #@request.stub(:json).and_return({})
+      #@generate_image.send(:source_image_defined?).should be_false
+    #end
+
+    #it "returns true when file is defined" do
+      #@request.stub(:file).and_return("file")
+      #@request.stub(:json).and_return({})
+      #@generate_image.send(:source_image_defined?).should be_true
+    #end
+
+    #it "returns true when url is defined" do
+      #@request.stub(:file).and_return(nil)
+      #@request.stub(:json).and_return({"url" => "something"})
+      #@generate_image.send(:source_image_defined?).should be_true
+    #end
+  #end
+
+  #describe "#get_max_width?" do
+    #it "returns the server max width when JSON 'max_width' is not defined" do
+      #@request.stub(:json).and_return({})
+      #@generate_image.send(:get_max_width).should eq 1024
+    #end
+
+    #it "returns the server max width when JSON 'max_width' is larger" do
+      #@request.stub(:json).and_return({"max_width" => "4096"})
+      #@generate_image.send(:get_max_width).should eq 1024
+    #end
+
+    #it "returns the JSON 'max_width' when server max width is larger" do
+      #@request.stub(:json).and_return({"max_width" => "640"})
+      #@generate_image.send(:get_max_width).should eq 640
+    #end
+  #end
+
+  #describe "#get_max_height?" do
+    #it "returns the server max height when JSON 'max_height' is not defined" do
+      #@request.stub(:json).and_return({})
+      #@generate_image.send(:get_max_height).should eq 2048
+    #end
+
+    #it "returns the server max height when JSON 'max_height' is larger" do
+      #@request.stub(:json).and_return({"max_height" => "4096"})
+      #@generate_image.send(:get_max_height).should eq 2048
+    #end
+
+    #it "returns the JSON 'max_height' when server max height is larger" do
+      #@request.stub(:json).and_return({"max_height" => "640"})
+      #@generate_image.send(:get_max_height).should eq 640
+    #end
+  #end
+
+  #describe "#get_image_for_modification" do
+    #context "upload" do
+      #before do
+        #@generate_image.stub(:upload?).and_return(true)
+      #end
+
+      #it "uploads the image and returns it when a file is specified" do
+        #@request.stub(:file).and_return("file")
+        #@request.stub(:json).and_return({"resource_identifier" => "abc123"})
+        #@storage.should_receive(:add_upload).with("file", "abc123").once.and_return("image")
+        #@generate_image.send(:get_image_for_modification).should eq "image"
+      #end
+
+      #it "downloads the image and returns it when a local url is specified" do
+        #@request.stub(:file).and_return(nil)
+        #@request.stub(:json).and_return({"url" => "http://example.com/12345678-1024x768.png", "resource_identifier" => "abc123"})
+        #@storage.should_receive(:add_url).with("http://example.com/12345678-1024x768.png", "abc123").once.and_return("image")
+        #@generate_image.send(:get_image_for_modification).should eq "image"
+      #end
+    #end
+
+    #context "modify" do
+      #before do
+        #@generate_image.stub(:upload?).and_return(false)
+      #end
+
+      #it "gets the base image" do
+        #@request.stub(:json).and_return("url" => "http://example.com/fi3k2od0-1027x768-1x2x640x480-300x200-1.png")
+        #@storage.should_receive(:get).with("http://example.com/fi3k2od0-1027x768.png").once.and_return("image")
+        #@generate_image.send(:get_image_for_modification).should eq "image"
+      #end
+    #end
+  #end
+
+  #describe "#modify_image" do
+    #before do
+      #@image = SnapImage::Image.from_path(@image_path, "http://example.com/12345678-300x200.png")
+    #end
+
+    #it "does nothing when there are no modifications" do
+      #@request.stub(:json).and_return({})
+      #result = @generate_image.send(:modify_image, @image)
+      #result[:image].should be @image
+      #result[:name].should eq "12345678-300x200.png"
+    #end
+
+    #it "crops" do
+      #@request.stub(:json).and_return({"crop_x" => 10, "crop_y" => 20, "crop_width" => 50, "crop_height" => 100})
+      #result = @generate_image.send(:modify_image, @image)
+      #result[:image].width.should eq 50
+      #result[:image].height.should eq 100
+      #result[:name].should eq "12345678-300x200-10x20x50x100-50x100-0.png"
+    #end
+
+    #it "resizes" do
+      #@request.stub(:json).and_return({"width" => 400, "height" => 50})
+      #result = @generate_image.send(:modify_image, @image)
+      #result[:image].width.should eq 400
+      #result[:image].height.should eq 50
+      #result[:name].should eq "12345678-300x200-0x0x300x200-400x50-0.png"
+    #end
+
+    #it "resizes to fit" do
+      #@request.stub(:json).and_return({"width" => 2048, "height" => 100})
+      #result = @generate_image.send(:modify_image, @image)
+      #result[:image].width.should eq 1024
+      #result[:image].height.should eq 50
+      #result[:name].should eq "12345678-300x200-0x0x300x200-1024x50-0.png"
+    #end
+
+    #it "sharpens" do
+      #@request.stub(:json).and_return({"sharpen" => true})
+      #result = @generate_image.send(:modify_image, @image)
+      #result[:image].width.should eq 300
+      #result[:image].height.should eq 200
+      #result[:name].should eq "12345678-300x200-0x0x300x200-300x200-1.png"
+    #end
+  #end
+#end