snapimage 0.1.1 → 0.2.0

data/spec/snapimage/adapters/local/storage_spec.rb

@@ -0,0 +1,44 @@
+require "spec_helper"
+
+describe SnapImage::Local::Storage do
+  before do
+    @config = { "directory" => "/directory", "public_url" => "http://snapimage.com/public" }
+    @storage = SnapImage::Local::Storage.new(@config)
+  end
+
+  describe "#store" do
+    before do
+      @file = double("file")
+      FileUtils.stub(:mkdir_p)
+    end
+
+    it "stores the file" do
+      File.should_receive(:open).with("/directory/abc/123/file.png", "wb").once
+      @storage.store("file.png", @file, directory: "abc/123")
+    end
+
+    it "returns the public URL" do
+      File.stub(:open)
+      @storage.store("file.png", @file, directory: "abc/123").should eq "http://snapimage.com/public/abc/123/file.png"
+    end
+  end
+
+  describe "#get_file_path" do
+    it "returns a simple file path when the file doesn't exist" do
+      File.stub(:exists?).and_return(false)
+      @storage.send(:get_file_path, "abc/123", "pic.png").should eq "abc/123/pic.png"
+    end
+
+    it "returns the file path appended with (1) when only the file exists" do
+      File.stub(:exists?).and_return(true)
+      Dir.stub(:glob).and_return([])
+      @storage.send(:get_file_path, "abc/123", "pic.png").should eq "abc/123/pic(1).png"
+    end
+
+    it "returns the file path appended with the next number when multiple files exist" do
+      File.stub(:exists?).and_return(true)
+      Dir.stub(:glob).and_return(["abc/123/pic(10).png", "abc/123/pic(2).png"])
+      @storage.send(:get_file_path, "abc/123", "pic.png").should eq "abc/123/pic(11).png"
+    end
+  end
+end

data/spec/snapimage/middleware_spec.rb

@@ -9,6 +9,7 @@ describe SnapImage::Middleware do
   describe "#call" do
     it "passes the call through to the rack app when the path does not match" do
       @app.should_receive(:call).with(@env).and_return("app")
+      SnapImage::Storage.stub(:new)
       middleware = SnapImage::Middleware.new(@app, config: {})
       middleware.call(@env).should eq "app"
     end
@@ -16,6 +17,7 @@ describe SnapImage::Middleware do
     it "passes the call through to the SnapImage Server" do
       server = double("server")
       server.should_receive(:call).and_return("server")
+      SnapImage::Storage.stub(:new)
       SnapImage::Server.stub(:new).and_return(server)
 
       @app.should_not_receive(:call)

data/spec/snapimage/rack/request_spec.rb

@@ -8,25 +8,19 @@ describe SnapImage::Request do
   describe "#bad_request?" do
     it "returns true if the request is not a post" do
       @request.stub(:post?).and_return(false)
-      @request.stub(:POST).and_return({ "file" => "abc", "directory" => "123" })
+      @request.stub(:POST).and_return({ "file" => "abc" })
       @request.bad_request?.should be_true
     end
 
     it "returns true if the request does not include file" do
       @request.stub(:post?).and_return(true)
-      @request.stub(:POST).and_return({ "directory" => "123" })
-      @request.bad_request?.should be_true
-    end
-
-    it "returns true if the request does not include directory" do
-      @request.stub(:post?).and_return(true)
-      @request.stub(:POST).and_return({ "file" => "abc" })
+      @request.stub(:POST).and_return({})
       @request.bad_request?.should be_true
     end
 
     it "returns false if the request is valid" do
       @request.stub(:post?).and_return(true)
-      @request.stub(:POST).and_return({ "file" => "abc", "directory" => "123" })
+      @request.stub(:POST).and_return({ "file" => "abc" })
       @request.bad_request?.should be_false
     end
   end

data/spec/snapimage/server_spec.rb

@@ -3,8 +3,10 @@ require "spec_helper"
 describe SnapImage::Server do
   before do
     @request = double("request")
-    @config = { "directory" => "/directory", "max_file_size" => 100 }
-    @server = SnapImage::Server.new(@request, @config)
+    @request.stub(:xhr?).and_return(true)
+    @config = { "directory" => "/directory", "public_url" => "http://snapimage.com/public", "max_file_size" => 100 }
+    @storage = double("storage")
+    @server = SnapImage::Server.new(@request, @config, @storage)
   end
 
   describe "#call" do
@@ -54,7 +56,7 @@ describe SnapImage::Server do
       response[2].body.should eq ['{"status_code":405,"message":"File Too Large"}']
     end
 
-    it "returns success when the file already exists" do
+    it "returns success when the file is saved" do
       @request.stub(:bad_request?).and_return(false)
       tempfile = double("tempfile")
       tempfile.stub(:size).and_return(50)
@@ -63,15 +65,15 @@ describe SnapImage::Server do
       file.stub(:tempfile).and_return(tempfile)
       @request.stub(:file).and_return(file)
       @request.stub(:[]).with("directory").and_return("abc/123")
-      File.stub(:exists?).and_return(true)
-      FileUtils.stub(:mkdir_p)
+      @storage.should_receive(:store).with("abc123.png", tempfile, directory: "abc/123").and_return("http://snapimage.com/public/abc/123/abc123.png")
       response = @server.call
       response[0].should eq 200
       response[1]["Content-Type"].should eq "text/json"
-      response[2].body.should eq ['{"status_code":200,"message":"Success"}']
+      response[2].body.should eq ['{"status_code":200,"url":"http://snapimage.com/public/abc/123/abc123.png","message":"Success"}']
     end
 
-    it "returns success when the file is saved" do
+    it "returns content type of text/html when non-XHR" do
+      @request.stub(:xhr?).and_return(false)
       @request.stub(:bad_request?).and_return(false)
       tempfile = double("tempfile")
       tempfile.stub(:size).and_return(50)
@@ -80,13 +82,27 @@ describe SnapImage::Server do
       file.stub(:tempfile).and_return(tempfile)
       @request.stub(:file).and_return(file)
       @request.stub(:[]).with("directory").and_return("abc/123")
-      File.stub(:exists?).and_return(false)
-      FileUtils.stub(:mkdir_p)
-      File.should_receive(:open).with("/directory/abc/123/abc123.png", "wb").once
+      @storage.should_receive(:store).with("abc123.png", tempfile, directory: "abc/123").and_return("http://snapimage.com/public/abc/123/abc123.png")
+      response = @server.call
+      response[0].should eq 200
+      response[1]["Content-Type"].should eq "text/html"
+      response[2].body.should eq ['{"status_code":200,"url":"http://snapimage.com/public/abc/123/abc123.png","message":"Success"}']
+    end
+
+    it "uses the default directory when none is given" do
+      @request.stub(:bad_request?).and_return(false)
+      tempfile = double("tempfile")
+      tempfile.stub(:size).and_return(50)
+      file = double("file")
+      file.stub(:filename).and_return("abc123.png")
+      file.stub(:tempfile).and_return(tempfile)
+      @request.stub(:file).and_return(file)
+      @request.stub(:[]).with("directory").and_return(nil)
+      @storage.should_receive(:store).with("abc123.png", tempfile, directory: "uncategorized").and_return("http://snapimage.com/public/uncategorized/abc123.png")
       response = @server.call
       response[0].should eq 200
       response[1]["Content-Type"].should eq "text/json"
-      response[2].body.should eq ['{"status_code":200,"message":"Success"}']
+      response[2].body.should eq ['{"status_code":200,"url":"http://snapimage.com/public/uncategorized/abc123.png","message":"Success"}']
     end
   end
 end

data/spec/support/assets/config.json

@@ -1,4 +1,6 @@
 {
+  "adapter": "local",
   "directory": "/path/to/directory",
+  "public_url": "http://snapimage.com/public/url",
   "max_file_size": 100
 }

data/spec/support/assets/config.yml

@@ -1,2 +1,4 @@
+adapter: "local"
 directory: "/path/to/directory"
+public_url: "http://snapimage.com/public/url"
 max_file_size: 100

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snapimage
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2013-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -27,22 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rmagick
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -158,23 +142,18 @@ files:
 - bin/snapimage_generate_config
 - bin/snapimage_server
 - lib/snapimage.rb
+- lib/snapimage/adapters/cloudinary/config.rb
+- lib/snapimage/adapters/cloudinary/storage.rb
+- lib/snapimage/adapters/local/config.rb
+- lib/snapimage/adapters/local/storage.rb
 - lib/snapimage/config.rb
 - lib/snapimage/exceptions.rb
-- lib/snapimage/image/image.rb
-- lib/snapimage/image/image_name_utils.rb
 - lib/snapimage/middleware.rb
 - lib/snapimage/rack/request.rb
 - lib/snapimage/rack/request_file.rb
 - lib/snapimage/rack/response.rb
 - lib/snapimage/server.rb
-- lib/snapimage/server_actions/server_actions.authorize.rb
-- lib/snapimage/server_actions/server_actions.delete_resource_images.rb
-- lib/snapimage/server_actions/server_actions.generate_image.rb
-- lib/snapimage/server_actions/server_actions.list_resource_images.rb
-- lib/snapimage/server_actions/server_actions.sync_resource.rb
-- lib/snapimage/storage/storage.rb
-- lib/snapimage/storage/storage_server.local.rb
-- lib/snapimage/storage/storage_server.rb
+- lib/snapimage/storage.rb
 - lib/snapimage/version.rb
 - snapimage.gemspec
 - spec/acceptance/delete_resource_images_spec.rb
@@ -182,6 +161,7 @@ files:
 - spec/acceptance/modify_spec.rb
 - spec/acceptance/sync_spec.rb
 - spec/acceptance/upload_spec.rb
+- spec/snapimage/adapters/local/storage_spec.rb
 - spec/snapimage/config_spec.rb
 - spec/snapimage/image/image_name_utils_spec.rb
 - spec/snapimage/image/image_spec.rb
@@ -220,18 +200,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2769920436023059955
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2769920436023059955
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -244,6 +218,7 @@ test_files:
 - spec/acceptance/modify_spec.rb
 - spec/acceptance/sync_spec.rb
 - spec/acceptance/upload_spec.rb
+- spec/snapimage/adapters/local/storage_spec.rb
 - spec/snapimage/config_spec.rb
 - spec/snapimage/image/image_name_utils_spec.rb
 - spec/snapimage/image/image_spec.rb

data/lib/snapimage/image/image.rb

@@ -1,103 +0,0 @@
-module SnapImage
-  class Image
-    def self.from_path(path, public_url)
-      image = SnapImage::Image.new(public_url)
-      image.set_image_from_path(path)
-      image
-    end
-
-    def self.from_blob(blob)
-      image = SnapImage::Image.new
-      image.set_image_from_blob(blob)
-      image
-    end
-
-    def self.from_image(img)
-      image = SnapImage::Image.new
-      image.set_image_from_image(img)
-      image
-    end
-
-    attr_accessor :public_url
-
-    # Arguments:
-    # * public_url:: Public URL associated with the image
-    def initialize(public_url = nil)
-      @public_url = public_url
-    end
-
-    # Arguments:
-    # * path:: Local path or URL
-    def set_image_from_path(path)
-      destroy!
-      @image = Magick::ImageList.new(path)
-    end
-
-    # Arguments:
-    # * blob:: Image blob
-    def set_image_from_blob(blob)
-      destroy!
-      @image = Magick::ImageList.new
-      @image.from_blob(blob)
-    end
-
-    # Arguments:
-    # * image:: RMagick Image
-    def set_image_from_image(image)
-      destroy!
-      @image = image
-    end
-
-    def width
-      @image.columns
-    end
-
-    def height
-      @image.rows
-    end
-
-    def blob
-      @image.to_blob
-    end
-
-    def destroy!
-      @image.destroy! if @image && !@image.destroyed?
-    end
-
-    # Crops the image with the given parameters.
-    #
-    # Arguments:
-    # * x:: x coordinate of the top left corner
-    # * y:: y coordinate of the top left corner
-    # * width:: width of the crop rectangle
-    # * height:: height of the crop rectangle
-    def crop(x, y, width, height)
-      @image.crop!(x, y, width, height)
-    end
-
-    # Resizes the image with the given paramaters.
-    #
-    # Arguments:
-    # * width:: Width to resize to
-    # * height:: Height to resize to (optional)
-    # * maintain_aspect_ratio:: If true, the image will be resized to fit within the width/height specified while maintaining the aspect ratio. If false, the image is allowed to be stretched.
-    def resize(width, height = nil, maintain_aspect_ratio = true)
-      raise "Height must be specified when not maintaining aspect ratio." if !maintain_aspect_ratio && !height
-      # If no height is given, make sure it does not interfere with the
-      # resizing.
-      height ||= [width, @image.rows].max
-      if maintain_aspect_ratio
-        @image.resize_to_fit!(width, height)
-      else
-        @image.resize!(width, height)
-      end
-    end
-
-    # Sharpens the image.
-    def sharpen
-      image = @image.sharpen
-      destroy!
-      @image = image
-    end
-  end
-end

data/lib/snapimage/image/image_name_utils.rb

@@ -1,131 +0,0 @@
-module SnapImage
-  class ImageNameUtils
-    # Base Image Format:
-    # {basename}-{original dimensions}.{extname}
-    #
-    # Modified Image Format:
-    # {basename}-{original dimensions}-{crop}-{dimensions}-{sharpen}.{extname}
-    #
-    # Notes
-    # * crop:: {x}x{y}x{width}x{height}
-    # * dimensions:: {width}x{height}
-    # * sharpen:: 0 or 1
-    IMAGE_PATH_REGEXP = /^(.*\/|)(([a-z0-9]{8})-(\d+)x(\d+)(-(\d+)x(\d+)x(\d+)x(\d+)-(\d+)x(\d+)-([01])|).(png|jpg|gif))$/
-
-    class << self
-      # Returns true if the path is for a base image. False otherwise.
-      #
-      # The path points to a base image if the dimensions are the same as the
-      # original dimensions, there is no cropping, and there is no sharpening.
-      def base_image?(path)
-        get_image_name_parts(path)[:is_base]
-      end
-
-      # Returns the extension name of the path. Normalizes jpeg to jpg.
-      def get_image_type(path)
-        type =  File.extname(path).sub(/^\./, "")
-        type = "jpg" if type == "jpeg"
-        type
-      end
-
-      # Returns true if the name is valid. False otherwise.
-      def valid?(path)
-        get_image_name_parts(path)
-        return true
-      rescue
-        return false
-      end
-
-      # Parses the following format:
-      # {basename}-{original dimensions}-{crop}-{dimensions}-{sharpen}.{extname}
-      # Notes about the format:
-      # * crop:: {x}x{y}x{width}x{height}
-      # * dimensions:: {width}x{height}
-      # * sharpen:: 0 or 1
-      #
-      # Returns the information in a hash.
-      def get_image_name_parts(path)
-        matches = path.match(SnapImage::ImageNameUtils::IMAGE_PATH_REGEXP)
-        raise SnapImage::InvalidImageIdentifier, "The image identifier is invalid: #{path}" unless matches
-        parts = {
-          is_base: matches[6].size == 0,
-          full: matches[0],
-          path: matches[1].sub(/\/$/, ""),
-          filename: matches[2],
-          basename: matches[3],
-          original_dimensions: [matches[4].to_i, matches[5].to_i],
-          extname: matches[14]
-        }
-        unless parts[:is_base]
-          parts.merge!({
-            crop: {
-              x: matches[7].to_i,
-              y: matches[8].to_i,
-              width: matches[9].to_i,
-              height: matches[10].to_i
-            },
-            dimensions: [matches[11].to_i, matches[12].to_i],
-            sharpen: !!matches[13]
-          })
-        end
-        parts
-      end
-
-      # Returns the base image name from the path.
-      def get_base_image_path(path)
-        parts = get_image_name_parts(path)
-        "#{parts[:path]}/#{parts[:basename]}-#{parts[:original_dimensions][0]}x#{parts[:original_dimensions][1]}.#{parts[:extname]}"
-      end
-
-      # Returns the name with the new width and height.
-      def get_resized_image_name(name, width, height)
-        parts = SnapImage::ImageNameUtils.get_image_name_parts(name)
-        if parts[:is_base]
-          resized_name = SnapImage::ImageNameUtils.generate_image_name(width, height, parts[:extname], basename: parts[:basename])
-        else
-          options = {
-            basename: parts[:basename],
-            crop: parts[:crop],
-            width: width,
-            height: height,
-            sharpen: parts[:sharpend]
-          }
-          resized_name = SnapImage::ImageNameUtils.generate_image_name(parts[:original_dimensions][0], parts[:original_dimensions][1], parts[:extname], options)
-        end
-        resized_name
-      end
-
-      # Generates a random alphanumeric string of 8 characters.
-      def generate_basename
-        (0...8).map { rand(36).to_s(36) }.join
-      end
-
-      # When no options besides :basename are given, generates a base image
-      # name in the format:
-      # {basename}-{original dimensions}.{extname}
-      #
-      # Otherwise, generates a modified image name in the format:
-      # {basename}-{original dimensions}-{crop}-{dimensions}-{sharpen}.{extname}
-      #
-      # Notes about the format:
-      # * crop:: {x}x{y}x{width}x{height}
-      # * dimensions:: {width}x{height}
-      # * sharpen:: 0 or 1
-      #
-      # Options:
-      # * basename:: Defaults to a randomly generated basename of 8 characters
-      # * crop:: Crop values {x: <int>, y: <int>, width: <int>, height: <int>}
-      # * width:: New width
-      # * height:: New height
-      # * sharpen:: True or false
-      def generate_image_name(original_width, original_height, extname, options = {})
-        basename = options.delete(:basename) || self.generate_basename
-        if options.empty?
-          "#{basename}-#{original_width}x#{original_height}.#{extname}"
-        else
-        "#{basename}-#{original_width}x#{original_height}-#{options[:crop][:x]}x#{options[:crop][:y]}x#{options[:crop][:width]}x#{options[:crop][:height]}-#{options[:width]}x#{options[:height]}-#{options[:sharpen] ? 1 : 0}.#{extname}"
-        end
-      end
-    end
-  end
-end