magickly 1.0.0 → 1.1.0

data/Gemfile

@@ -6,6 +6,7 @@ source 'http://rubygems.org'
 gem 'sinatra', '~> 1.2.1', :require => 'sinatra/base'
 gem 'rack-cache', :require => 'rack/cache'
 gem 'dragonfly', '~> 0.8.2'
+gem 'addressable', '~> 2.2', :require => 'addressable/uri'
 
 gem 'haml', '~> 3.0.25'
 gem 'httparty', '~> 0.7.3'
@@ -23,6 +24,6 @@ group :development, :test do
   gem 'rspec', '~> 2.4'
   gem 'webmock', '~> 1.6'
   gem 'imagesize', '~> 0.1'
-  #gem 'ruby-debug19', :platforms => :ruby_19
-  #gem 'ruby-debug', :platforms => :ruby_18
+  gem 'ruby-debug19', :platforms => :ruby_19
+  gem 'ruby-debug', :platforms => :ruby_18
 end

data/Gemfile.lock

@@ -3,6 +3,8 @@ GEM
   specs:
     activesupport (3.0.5)
     addressable (2.2.4)
+    archive-tar-minitar (0.5.2)
+    columnize (0.3.2)
     crack (0.1.8)
     diff-lcs (1.1.2)
     dragonfly (0.8.2)
@@ -16,6 +18,9 @@ GEM
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    linecache (0.43)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
     rack (1.2.2)
     rack-cache (1.0)
       rack (>= 0.4)
@@ -31,6 +36,21 @@ GEM
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
     sinatra (1.2.1)
       rack (~> 1.1)
       tilt (< 2.0, >= 1.2.2)
@@ -44,6 +64,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (>= 2.0.0)
+  addressable (~> 2.2)
   dragonfly (~> 0.8.2)
   haml (~> 3.0.25)
   httparty (~> 0.7.3)
@@ -53,5 +74,7 @@ DEPENDENCIES
   rack-test
   rcov
   rspec (~> 2.4)
+  ruby-debug
+  ruby-debug19
   sinatra (~> 1.2.1)
   webmock (~> 1.6)

data/HISTORY.md

@@ -0,0 +1,8 @@
+# 1.1.0
+
+* make underlying Dragonfly application accessible for external configuration
+* major refactoring: namespacing inside of Magickly module (should be entirely backwards compatible)
+
+# 1.0.0
+
+* initial release

data/README.md

@@ -2,34 +2,68 @@
 
 A service for image manipulation - built as a simple wrapper of Imagemagick which handles caching, c/o the [Dragonfly](http://markevans.github.com/dragonfly/) gem.
 
-## Usage
+Say the base URL is the hosted version of this app, [magickly.heroku.com](http://magickly.heroku.com).  The image URL is appended to the query string as a `src=`, followed by any of the supported operations below.  Multiple operations can be combined, and will be applied in order.
 
-Say the base URL is the hosted version of this app, [magickly.heroku.com](http://magickly.heroku.com).  The image URL is appended to the query string as a `src=`, followed by any of the supported imagemagick operations.  For example, you could get a 100x100 thumbnail of [the imagemagick logo](http://upload.wikimedia.org/wikipedia/commons/0/0d/Imagemagick-logo.png) like so:
+## Parameters
 
-[http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/0/0d/Imagemagick-logo.png&resize=100x100](http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/0/0d/Imagemagick-logo.png&resize=100x100)
+*See the [Dragonfly documentation](http://markevans.github.com/dragonfly/file.Processing.html#ImageMagickProcessor) for more details about the permitted* `geometry` *values.*
 
-### Parameters (required)
+### src=*url* (required)
 
-**src** - the URL of the original image
+The URL of the original image.
 
-### Parameters (optional):
+### flip=true
 
-See the [imagemagick command line params documentation](http://www.imagemagick.org/script/command-line-options.php) for details about allowed values.
+![flipped imagemagick logo](http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&flip=true)
 
-**crop**
+[http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&flip=true](http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&flip=true)
 
-**flip**
+### flop=true
 
-**flop**
+![flopped imagemagick logo](http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&flop=true)
 
-**greyscale**
+[http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&flop=true](http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&flop=true)
 
-**resize**
+### greyscale=true
 
-**rotate**
+![flopped imagemagick logo](http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&greyscale=true)
 
-**thumb**
+[http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&greyscale=true](http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&greyscale=true)
 
+### resize=*geometry*
+
+![resized imagemagick logo](http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&resize=100x100)
+
+[http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&resize=100x100](http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&resize=100x100)
+
+### rotate=*degrees*
+
+![rotated imagemagick logo](http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&rotate=45)
+
+[http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&rotate=45](http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&rotate=45)
+
+### thumb=*geometry*
+
+![thumbnail of imagemagick logo](http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&thumb=200x100%23)
+
+[http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&thumb=200x100%23](http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&thumb=200x100%23)
+
+(note: the `%23` in the geometry string above is an encoded '`#`', which tells Dragonfly to fill the dimensions and crop)
+
+## Customization
+
+In addition to the available listed above, custom "shortcuts" can be created to perform arbitrary imagemagick operations.  For example, to create a shortcut called `resize_with_blur`:
+
+    # somewhere in your app configuration, i.e. config/initializers/magickly.rb for a Rails 3 app
+    Magickly.dragonfly.configure do |c|
+      c.job :resize_with_blur do |size|
+        process :convert, "-filter Gaussian -resize #{size}"
+      end
+    end
+
+which can then be used with the query string `?src=...&resize_with_blur=200x`.  Note that magickly will pass the value of the query param to the block as a single string.
+
+See the [Dragonfly documentation](http://markevans.github.com/dragonfly/file.GeneralUsage.html#Shortcuts) for more info on "shortcuts".
 
 ## Installation
 
@@ -47,13 +81,13 @@ The app can be accessed at [http://localhost:4567](http://localhost:4567)
 
 ### B. Use as an endpoint in another Rack app
 
-As an example, to have magickly accessible at `/images` in a Rails app:
+As an example, to have magickly accessible at `/magickly` in a Rails app:
 
     # Gemfile
     gem 'magickly', '~> 0.1'
     
     # config/routes.rb
-    match '/magickly', :to => MagicklyApp, :anchor => false
+    match '/magickly', :to => Magickly::App, :anchor => false
 
 For more info, see [Rails Routing from the Outside In](http://guides.rubyonrails.org/routing.html#routing-to-rack-applications) or Michael Raidel's [Mount Rails apps in Rails 3](http://inductor.induktiv.at/blog/2010/05/23/mount-rack-apps-in-rails-3/).
 
@@ -67,7 +101,7 @@ For more info, see [Rails Routing from the Outside In](http://guides.rubyonrails
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
-## Copyright
+## Credits
+
+Created by [Aidan Feldman](http://www.aidanfeldman.com) at [Jux.com](http://www.jux.com).  Thanks to [Mark Evans](https://github.com/markevans) for all his hard work on [Dragonfly](http://markevans.github.com/dragonfly/).
 
-Copyright (c) 2011 Aidan Feldman. See LICENSE.txt for
-further details.

data/Rakefile

@@ -15,8 +15,8 @@ Jeweler::Tasks.new do |gem|
   gem.name = "magickly"
   gem.homepage = "http://github.com/afeld/magickly"
   gem.license = "MIT"
-  gem.summary = %Q{Imagemagick as a service}
-  gem.description = %Q{A simple wrapper of Imagemagick which handles caching, c/o the Dragonfly gem.}
+  gem.summary = %Q{image manipulation as a (plugin-able) service}
+  gem.description = %Q{A service for image manipulation - built as an extensible wrapper of Imagemagick which handles caching, c/o the Dragonfly gem.}
   gem.email = "aidan.feldman@gmail.com"
   gem.authors = ["Aidan Feldman"]
   gem.executables = ['magickly']

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/bin/magickly

@@ -9,4 +9,4 @@ rescue LoadError => e
   require 'magickly'
 end
 
-MagicklyApp.run!
+Magickly::App.run!

data/config.ru

@@ -3,4 +3,4 @@ require 'bundler'
 Bundler.require
 
 require File.join(File.dirname(__FILE__), 'lib', 'magickly')
-run MagicklyApp
+run Magickly::App

data/lib/dragonfly/data_storage/remote_data_store.rb

@@ -2,7 +2,6 @@ require 'httparty'
 
 module Dragonfly
   module DataStorage
-    
     #class Forbidden < StandardError; end
     
     class RemoteDataStore

data/lib/magickly.rb

@@ -4,66 +4,51 @@ require 'active_support/ordered_hash'
 require 'sinatra/base'
 require 'dragonfly'
 require File.expand_path(File.join(File.dirname(__FILE__), 'dragonfly', 'data_storage', 'remote_data_store'))
+Dir["#{File.dirname(__FILE__)}/magickly/*.rb"].each {|file| require file }
 
 
-class MagicklyApp < Sinatra::Base
-  RESERVED_PARAMS = ['src']
+module Magickly
+  # fallback for Dragonfly v0.8.2 and below
+  dragonfly_processor = Dragonfly::ImageMagick::Processor rescue Dragonfly::Processing::ImageMagickProcessor
+  @dragonfly_processor_methods = dragonfly_processor.instance_methods(false)
   
-  enable :logging
-  set :root, File.dirname(__FILE__)
-  set :homepage, "http://github.com/afeld/magickly"
-  
-  dragonfly = Dragonfly[:images].configure_with(:imagemagick)
-  dragonfly.configure do |c|
+  @dragonfly = Dragonfly[:images].configure_with(:imagemagick)
+  @dragonfly.configure do |c|
     c.datastore = Dragonfly::DataStorage::RemoteDataStore.new
     c.log = Logger.new($stdout)
   end
-  set :dragonfly, dragonfly
-  
-  def magickify(src, options={})
-    raise ArgumentError.new("src needed") if src.blank?
-    escaped_src = URI.escape(src)
-    image = settings.dragonfly.fetch(escaped_src)
-    
-    options.each do |method, val|
-      if val == 'true'
-        image = image.process method
-      else
-        image = image.process method, val
-      end
-    end
-    
-    image
-  end
   
-  before do
-    dragonfly.datastore.configure do |d|
-      # pass cookies to subsequent request
-      d.cookie_str = request.env["rack.request.cookie_string"]
+  class << self
+    def dragonfly
+      @dragonfly
     end
     
-    @options = ActiveSupport::OrderedHash.new
-    request.query_string.split('&').each do |e|
-      k,v = e.split('=')
-      @options[k] = v unless RESERVED_PARAMS.include?(k)
+    def process_src(src, options={})
+      raise ArgumentError.new("src needed") if src.blank?
+      escaped_src = URI.escape(src)
+      image = Magickly.dragonfly.fetch(escaped_src)
+      
+      process_image(image, options)
     end
-  end
-  
-  get '/' do
-    src = params['src']
     
-    if src
-      image = magickify(src, @options)
-      image.to_response(env)
-    else
-      # fallback for Dragonfly v0.8.2 and below
-      klass = Dragonfly::ImageMagick::Processor rescue Dragonfly::Processing::ImageMagickProcessor
-      @methods = klass.instance_methods(false)
-      haml :index
+    def process_image(image, options={})
+      options.each do |method, val|
+        if !@dragonfly_processor_methods.include?(method)
+          # might be an app-defined dragonfly shortcut
+          image = image.send(method, val)
+        elsif val == 'true'
+          image = image.process method
+        else
+          image = image.process method, val
+        end
+      end
+      
+      image
     end
   end
-  
-  # start the server if ruby file executed directly
-  run! if __FILE__ == $0
 end
 
+require File.expand_path(File.join(File.dirname(__FILE__), 'shortcuts'))
+
+# start the server if ruby file executed directly
+Magickly::App.run! if __FILE__ == $0

data/lib/magickly/app.rb

@@ -0,0 +1,52 @@
+module Magickly
+  class App < Sinatra::Base
+    RESERVED_PARAMS = ['src']
+    
+    enable :logging
+    set :root, File.join(File.dirname(__FILE__), '..')
+    set :homepage, "http://github.com/afeld/magickly"
+    
+    before do
+      Magickly.dragonfly.datastore.configure do |d|
+        # pass cookies to subsequent request
+        d.cookie_str = request.env["rack.request.cookie_string"]
+      end
+      
+      @options = ActiveSupport::OrderedHash.new
+      request.query_string.split('&').each do |e|
+        k,v = e.split('=')
+        @options[k] = URI.unescape(v) unless RESERVED_PARAMS.include?(k)
+      end
+    end
+    
+    get '/' do
+      src = params['src']
+      
+      if src
+        uri = Addressable::URI.parse(src)
+        uri.site ||= Addressable::URI.parse(request.url).site
+        
+        image = Magickly.process_src(uri.to_s, @options)
+        image.to_response(env)
+      else
+        # display demo page
+        
+        # fallback for Dragonfly v0.8.2 and below
+        klass = Dragonfly::ImageMagick::Processor rescue Dragonfly::Processing::ImageMagickProcessor
+        @methods = klass.instance_methods(false)
+        haml :index
+      end
+    end
+    
+    # start the server if ruby file executed directly
+    run! if __FILE__ == $0
+  end
+end
+
+class MagicklyApp < Magickly::App
+  # <b>DEPRECATED:</b> Please use <tt>Magickly::App</tt> instead.
+  def self.run
+    warn "This has been deprecated - please use Magickly::App.run"
+    super
+  end
+end

data/lib/shortcuts.rb

@@ -0,0 +1,14 @@
+Magickly.dragonfly.configure do |c|
+  c.job :resize_with_blur do |size|
+    process :convert, "-filter Gaussian -resize #{size}"
+  end
+  
+  # c.job :tilt_shift do |coefficients|
+  #   if coefficients == 'true'
+  #     coefficients = "2,-2,0.5"
+  #   end
+  #   
+  #   action = "\\( +clone -sparse-color Barycentric '0,0 black 0,%[fx:h-1] white' -function polynomial #{coefficients} \\) -compose Blur -set option:compose:args 15 -composite"
+  #   process :convert, action
+  # end
+end

data/lib/views/index.haml

@@ -22,6 +22,16 @@
         $('#src-img').change(updateResult);
         $('#params').change(updateResult);
       });
+      
+      var _gaq = _gaq || [];
+      _gaq.push(['_setAccount', 'UA-22837777-1']);
+      _gaq.push(['_trackPageview']);
+      
+      (function() {
+        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+      })();
 
   %body
     %h1 Welcome to Magickly

data/magickly.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{magickly}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aidan Feldman"]
-  s.date = %q{2011-04-19}
-  s.description = %q{A simple wrapper of Imagemagick which handles caching, c/o the Dragonfly gem.}
+  s.date = %q{2011-04-26}
+  s.description = %q{A service for image manipulation - built as an extensible wrapper of Imagemagick which handles caching, c/o the Dragonfly gem.}
   s.email = %q{aidan.feldman@gmail.com}
   s.executables = ["magickly"]
   s.extra_rdoc_files = [
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
     ".rspec",
     "Gemfile",
     "Gemfile.lock",
+    "HISTORY.md",
     "LICENSE.txt",
     "README.md",
     "Rakefile",
@@ -31,20 +32,27 @@ Gem::Specification.new do |s|
     "config.ru",
     "lib/dragonfly/data_storage/remote_data_store.rb",
     "lib/magickly.rb",
+    "lib/magickly/app.rb",
+    "lib/public/imagemagick.png",
+    "lib/shortcuts.rb",
     "lib/views/index.haml",
     "magickly.gemspec",
-    "spec/requests/magickly_spec.rb",
+    "spec/requests/magickly_app_spec.rb",
     "spec/spec_helper.rb",
-    "spec/support/imagemagick.png"
+    "spec/support/imagemagick.png",
+    "spec/unit/magickly_spec.rb",
+    "spec/unit/remote_data_store_spec.rb"
   ]
   s.homepage = %q{http://github.com/afeld/magickly}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.7.2}
-  s.summary = %q{Imagemagick as a service}
+  s.summary = %q{image manipulation as a (plugin-able) service}
   s.test_files = [
-    "spec/requests/magickly_spec.rb",
-    "spec/spec_helper.rb"
+    "spec/requests/magickly_app_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/unit/magickly_spec.rb",
+    "spec/unit/remote_data_store_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -54,6 +62,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<sinatra>, ["~> 1.2.1"])
       s.add_runtime_dependency(%q<rack-cache>, [">= 0"])
       s.add_runtime_dependency(%q<dragonfly>, ["~> 0.8.2"])
+      s.add_runtime_dependency(%q<addressable>, ["~> 2.2"])
       s.add_runtime_dependency(%q<haml>, ["~> 3.0.25"])
       s.add_runtime_dependency(%q<httparty>, ["~> 0.7.3"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.0.0"])
@@ -63,10 +72,13 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, ["~> 2.4"])
       s.add_development_dependency(%q<webmock>, ["~> 1.6"])
       s.add_development_dependency(%q<imagesize>, ["~> 0.1"])
+      s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
     else
       s.add_dependency(%q<sinatra>, ["~> 1.2.1"])
       s.add_dependency(%q<rack-cache>, [">= 0"])
       s.add_dependency(%q<dragonfly>, ["~> 0.8.2"])
+      s.add_dependency(%q<addressable>, ["~> 2.2"])
       s.add_dependency(%q<haml>, ["~> 3.0.25"])
       s.add_dependency(%q<httparty>, ["~> 0.7.3"])
       s.add_dependency(%q<activesupport>, [">= 2.0.0"])
@@ -76,11 +88,14 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, ["~> 2.4"])
       s.add_dependency(%q<webmock>, ["~> 1.6"])
       s.add_dependency(%q<imagesize>, ["~> 0.1"])
+      s.add_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_dependency(%q<ruby-debug>, [">= 0"])
     end
   else
     s.add_dependency(%q<sinatra>, ["~> 1.2.1"])
     s.add_dependency(%q<rack-cache>, [">= 0"])
     s.add_dependency(%q<dragonfly>, ["~> 0.8.2"])
+    s.add_dependency(%q<addressable>, ["~> 2.2"])
     s.add_dependency(%q<haml>, ["~> 3.0.25"])
     s.add_dependency(%q<httparty>, ["~> 0.7.3"])
     s.add_dependency(%q<activesupport>, [">= 2.0.0"])
@@ -90,6 +105,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, ["~> 2.4"])
     s.add_dependency(%q<webmock>, ["~> 1.6"])
     s.add_dependency(%q<imagesize>, ["~> 0.1"])
+    s.add_dependency(%q<ruby-debug19>, [">= 0"])
+    s.add_dependency(%q<ruby-debug>, [">= 0"])
   end
 end
 

data/spec/requests/magickly_app_spec.rb

@@ -0,0 +1,109 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Magickly::App do
+  include Rack::Test::Methods
+  
+  def app
+    Magickly::App
+  end
+  
+  describe "GET /" do
+    def setup_image(host='http://www.foo.com')
+      @image_filename = 'imagemagick.png'
+      @image_url = "#{host}/#{@image_filename}"
+      @image_path = File.join(File.dirname(__FILE__), '..', 'support', @image_filename)
+      stub_request(:get, @image_url).to_return(:body => File.new(@image_path))
+    end
+    
+    it "should display the demo page for no params" do
+      get '/'
+      last_response.should be_ok
+      # TODO test that it renders the view
+    end
+    
+    it "retrieves an image with no options" do
+      setup_image
+      
+      get "/?src=#{@image_url}"
+      
+      a_request(:get, @image_url).should have_been_made.once
+      last_response.should be_ok
+      
+      # check that the returned file is identical to the original
+      last_response.body.should eq IO.read(@image_path)
+    end
+    
+    it "retrieves an image at a relative URI" do
+      setup_image "http://#{Rack::Test::DEFAULT_HOST}"
+      
+      get "/?src=/#{@image_filename}"
+      
+      a_request(:get, @image_url).should have_been_made.once
+      last_response.should be_ok
+      
+      # check that the returned file is identical to the original
+      last_response.body.should eq IO.read(@image_path)
+    end
+    
+    it "resizes an image" do
+      setup_image
+      width = 100
+      
+      get "/?src=#{@image_url}&resize=#{width}x"
+      
+      a_request(:get, @image_url).should have_been_made.once
+      last_response.should be_ok
+      ImageSize.new(last_response.body).get_width.should eq width
+    end
+    
+    it "should use my Dragonfly shortcut with no arguments" do
+      setup_image
+      width = 100
+      shortcut = :filter_with_no_arguments
+      Magickly.dragonfly.configure do |c|
+        c.job shortcut do
+          process :convert, "-filter Gaussian -resize #{width}x"
+        end
+      end
+      
+      get "/?src=#{@image_url}&#{shortcut}=true"
+      
+      last_response.should be_ok
+      ImageSize.new(last_response.body).get_width.should eq width
+    end
+    
+    it "should use my Dragonfly shortcut with one argument" do
+      setup_image
+      width = 100
+      shortcut = :filter_with_one_argument
+      Magickly.dragonfly.configure do |c|
+        c.job shortcut do |size|
+          process :thumb, size
+        end
+      end
+      
+      get "/?src=#{@image_url}&#{shortcut}=#{width}x"
+      
+      last_response.should be_ok
+      ImageSize.new(last_response.body).get_width.should eq width
+    end
+  end
+end
+
+describe MagicklyApp do
+  include Rack::Test::Methods
+  
+  def app
+    MagicklyApp
+  end
+  
+  describe "backward compatibility test" do
+    
+    it "should display the demo page for no params" do
+      get '/'
+      last_response.should be_ok
+      # TODO test that it renders the view
+    end
+    
+  end
+end

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ require 'rack/test'
 require 'sinatra'
 require 'webmock/rspec'
 require 'image_size'
-#require 'ruby-debug'
+require 'ruby-debug'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
@@ -16,3 +16,4 @@ set :environment, :test
 RSpec.configure do |config|
   
 end
+

data/spec/unit/magickly_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Magickly do
+  describe ".process_src" do
+    it "retrieves an image with no options" do
+      image_url = "http://www.foo.com/imagemagick.png"
+      image_path = File.join(File.dirname(__FILE__), '..', 'support', 'imagemagick.png')
+      stub_request(:get, image_url).to_return(:body => File.new(image_path))
+      
+      returned_image = Magickly.process_src(image_url)
+      
+      returned_image.should_not be_nil
+      
+      # check that the returned file is identical to the original
+      IO.read(returned_image.file.path).should eq IO.read(image_path)
+    end
+  end
+  
+  describe ".process_image" do
+    it "doesn't modify the image if given no options"
+  end
+end

data/spec/unit/remote_data_store_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Dragonfly::DataStorage::RemoteDataStore do
+  describe '#retrieve' do
+    it "should successfully make requests" do
+      url = "http://www.foo.com/iamgemagick.png"
+      stub_request(:get, url)
+      datastore = Dragonfly::DataStorage::RemoteDataStore.new
+      
+      datastore.retrieve url
+      a_request(:get, url).should have_been_made.once
+    end
+    
+    it "should return the image" do
+      url = "http://www.foo.com/imagemagick.png"
+      image_path = File.join(File.dirname(__FILE__), '..', 'support', 'imagemagick.png')
+      stub_request(:get, url).to_return(:body => File.new(image_path))
+      datastore = Dragonfly::DataStorage::RemoteDataStore.new
+      
+      image,extra = datastore.retrieve(url)
+      image.should eq IO.read(image_path)
+    end
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: magickly
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Aidan Feldman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 Z
+date: 2011-04-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -65,6 +65,21 @@ dependencies:
   type: :runtime
 - !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 2
+        version: "2.2"
+  version_requirements: *id004
+  name: addressable
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -75,12 +90,12 @@ dependencies:
         - 0
         - 25
         version: 3.0.25
-  version_requirements: *id004
+  version_requirements: *id005
   name: haml
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -91,12 +106,12 @@ dependencies:
         - 7
         - 3
         version: 0.7.3
-  version_requirements: *id005
+  version_requirements: *id006
   name: httparty
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -107,12 +122,12 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  version_requirements: *id006
+  version_requirements: *id007
   name: activesupport
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -122,12 +137,12 @@ dependencies:
         - 1
         - 5
         version: "1.5"
-  version_requirements: *id007
+  version_requirements: *id008
   name: jeweler
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -136,12 +151,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id008
+  version_requirements: *id009
   name: rcov
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -150,12 +165,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id009
+  version_requirements: *id010
   name: rack-test
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -165,12 +180,12 @@ dependencies:
         - 2
         - 4
         version: "2.4"
-  version_requirements: *id010
+  version_requirements: *id011
   name: rspec
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -180,12 +195,12 @@ dependencies:
         - 1
         - 6
         version: "1.6"
-  version_requirements: *id011
+  version_requirements: *id012
   name: webmock
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -195,11 +210,39 @@ dependencies:
         - 0
         - 1
         version: "0.1"
-  version_requirements: *id012
+  version_requirements: *id013
   name: imagesize
   prerelease: false
   type: :development
-description: A simple wrapper of Imagemagick which handles caching, c/o the Dragonfly gem.
+- !ruby/object:Gem::Dependency 
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id014
+  name: ruby-debug19
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id015
+  name: ruby-debug
+  prerelease: false
+  type: :development
+description: A service for image manipulation - built as an extensible wrapper of Imagemagick which handles caching, c/o the Dragonfly gem.
 email: aidan.feldman@gmail.com
 executables: 
 - magickly
@@ -214,6 +257,7 @@ files:
 - .rspec
 - Gemfile
 - Gemfile.lock
+- HISTORY.md
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -222,11 +266,16 @@ files:
 - config.ru
 - lib/dragonfly/data_storage/remote_data_store.rb
 - lib/magickly.rb
+- lib/magickly/app.rb
+- lib/public/imagemagick.png
+- lib/shortcuts.rb
 - lib/views/index.haml
 - magickly.gemspec
-- spec/requests/magickly_spec.rb
+- spec/requests/magickly_app_spec.rb
 - spec/spec_helper.rb
 - spec/support/imagemagick.png
+- spec/unit/magickly_spec.rb
+- spec/unit/remote_data_store_spec.rb
 homepage: http://github.com/afeld/magickly
 licenses: 
 - MIT
@@ -259,7 +308,9 @@ rubyforge_project:
 rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
-summary: Imagemagick as a service
+summary: image manipulation as a (plugin-able) service
 test_files: 
-- spec/requests/magickly_spec.rb
+- spec/requests/magickly_app_spec.rb
 - spec/spec_helper.rb
+- spec/unit/magickly_spec.rb
+- spec/unit/remote_data_store_spec.rb

data/spec/requests/magickly_spec.rb

@@ -1,42 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-describe MagicklyApp do
-  include Rack::Test::Methods
-  
-  def app
-    MagicklyApp
-  end
-  
-  it "says hello" do
-    get '/'
-    last_response.should be_ok
-  end
-  
-  it "retrieves an image with no options" do
-    image_url = "http://www.foo.com/imagemagick.png"
-    image_path = File.join(File.dirname(__FILE__), '..', 'support', 'imagemagick.png')
-    stub_request(:get, image_url).to_return(:body => File.new(image_path))
-    
-    get "/?src=#{image_url}"
-    
-    a_request(:get, image_url).should have_been_made.once
-    last_response.should be_ok
-    
-    # check that the returned file is identical to the original
-    last_response.body.should eq IO.read(image_path)
-  end
-  
-  it "resizes an image" do
-    image_url = "http://www.foo.com/imagemagick.png"
-    image_path = File.join(File.dirname(__FILE__), '..', 'support', 'imagemagick.png')
-    stub_request(:get, image_url).to_return(:body => File.new(image_path))
-    width = 100
-    
-    get "/?src=#{image_url}&resize=#{width}x"
-    
-    a_request(:get, image_url).should have_been_made.once
-    last_response.should be_ok
-    
-    ImageSize.new(last_response.body).get_width.should eq width
-  end
-end