magickly 1.1.3 → 1.2.0

data/Gemfile

@@ -1,7 +1,4 @@
 source 'http://rubygems.org'
-# Add dependencies required to use your gem here.
-# Example:
-#   gem 'activesupport', '>= 2.3.5'
 
 gem 'sinatra', '~> 1.2.1', :require => 'sinatra/base'
 gem 'dragonfly', '~> 0.9.1'
@@ -10,9 +7,8 @@ gem 'addressable', '~> 2.2', :require => 'addressable/uri'
 gem 'haml', '~> 3.0'
 gem 'httparty', '~> 0.7.3'
 gem 'activesupport', '>= 2.0.0', :require => false
+gem 'json', '~> 1.5'
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
 group :development do
   gem 'jeweler', '~> 1.5'
   gem 'rcov', '>= 0'

data/Gemfile.lock

@@ -1,39 +1,40 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.7)
+    activesupport (3.0.9)
     addressable (2.2.6)
     crack (0.1.8)
     diff-lcs (1.1.2)
-    dragonfly (0.9.2)
+    dragonfly (0.9.4)
       rack
     git (1.2.5)
-    haml (3.1.1)
-    httparty (0.7.7)
+    haml (3.1.2)
+    httparty (0.7.8)
       crack (= 0.1.8)
     imagesize (0.1.1)
-    jeweler (1.6.0)
-      bundler (~> 1.0.0)
+    jeweler (1.6.2)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    newrelic_rpm (3.0.1)
+    json (1.5.3)
+    newrelic_rpm (3.1.0)
     rack (1.3.0)
     rack-test (0.6.0)
       rack (>= 1.0)
-    rake (0.9.0)
+    rake (0.9.2)
     rcov (0.9.9)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
       rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.3)
+    rspec-core (2.6.4)
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
     sinatra (1.2.6)
       rack (~> 1.1)
       tilt (< 2.0, >= 1.2.2)
-    tilt (1.3.1)
+    tilt (1.3.2)
     webmock (1.6.4)
       addressable (> 2.2.5, ~> 2.2)
       crack (>= 0.1.7)
@@ -49,6 +50,7 @@ DEPENDENCIES
   httparty (~> 0.7.3)
   imagesize (~> 0.1)
   jeweler (~> 1.5)
+  json (~> 1.5)
   newrelic_rpm
   rack-test
   rcov

data/HISTORY.md

@@ -1,12 +1,32 @@
 This gem respects [semantic versioning](http://semver.org/).
 
+# 1.2.0 (6/28/11)
+
+[commits](https://github.com/afeld/magickly/compare/v1.1.3...v1.2.0)
+
+* add /analyze and /analyze/:analyzer endpoints
+* fix for negative values for brightness_contrast
+* validation & specs for existing shortcuts
+* added shortcuts:
+    * color_palette (analyzer)
+    * cross_process
+    * glow
+    * halftone
+    * lomo
+    * saturation
+    * two_color
+
 # 1.1.3 (5/26/11)
 
+[commits](https://github.com/afeld/magickly/compare/v1.1.2...v1.1.3)
+
 * make tilt-shift faster
 * add brightness_contrast shortcut
 
 # 1.1.2 (5/16/11)
 
+[commits](https://github.com/afeld/magickly/compare/v1.1.1...v1.1.2)
+
 * remove rack-cache - this is not the responsibility of the gem
 * use NewRelic, if configured
 * ignore params that do not correspond to jobs or processor methods
@@ -15,11 +35,15 @@ This gem respects [semantic versioning](http://semver.org/).
 
 # 1.1.1 (4/28/11)
 
+[commits](https://github.com/afeld/magickly/compare/v1.1.0...v1.1.1)
+
 * cross-compatibility fix for Ruby 1.8/1.9 regarding the checking of available methods from the Processor
 * Addressable now required properly when included as a gem
 
 # 1.1.0 (4/26/11)
 
+[commits](https://github.com/afeld/magickly/compare/v1.0.0...v1.1.0)
+
 * make underlying Dragonfly application accessible for external configuration
 * added some example Dragonfly shortcuts
 * major refactoring: namespacing inside of Magickly module (should be entirely backwards compatible)

data/README.md

@@ -1,4 +1,4 @@
-# magickly
+# magickly [![Build Status](http://travis-ci.org/afeld/magickly.png)](http://travis-ci.org/afeld/magickly)
 
 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.
 
@@ -8,7 +8,35 @@ If no query params are provided, a simple sandbox page is displayed.  Try it her
 
 [magickly.heroku.com](http://magickly.heroku.com)
 
-## Parameters
+## Installation
+
+Requires Imagemagick >= v6.2.4.
+
+    $ gem install magickly
+
+## Running the App
+
+A few options:
+
+### A. Run the app directly
+
+    $ magickly
+
+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 `/magickly` in a Rails app:
+
+    # Gemfile
+    gem 'magickly', '~> 1.1'
+    
+    # config/routes.rb
+    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/).
+
+## Processing Parameters
 
 *See the [Dragonfly documentation](http://markevans.github.com/dragonfly/file.ImageMagick.html) for more details about the permitted* `geometry` *values.*
 
@@ -18,7 +46,7 @@ The URL of the original image.
 
 ### brightness_contrast=*brightness* x *contrast*
 
-*brightness* and *contrast* are percentage change, between -100 and 100.  For example, to increase contrast by 20% but leave brightness the same, use `brightness_contrast=0x20`.
+*brightness* and *contrast* are percentage change, between -100 and 100.  For example, to increase contrast by 20% but leave brightness unchanged, use `brightness_contrast=0x20`.
 
 ![tanned imagemagick logo](http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&brightness_contrast=-10x50)
 
@@ -36,12 +64,28 @@ The URL of the original image.
 
 [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)
 
+### glow=*amount*,*softness*
+
+where `amount` is a float >= 1.0, and `softness` is an int >= 0.
+
+![glowing imagemagick logo](http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&glow=1.2,20)
+
+[http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&glow=1.2,20](http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&glow=1.2,20)
+
 ### greyscale=true
 
 ![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)
 
 [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)
 
+### halftone=*threshold*
+
+where *threshold* is a value between 0 and 100.
+
+![halftone imagemagick logo](http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&halftone=60)
+
+[http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&halftone=60](http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&halftone=60)
+
 ### 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)
@@ -54,6 +98,14 @@ The URL of the original image.
 
 [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)
 
+### saturation=*percentage*
+
+*percentage* is the percentage of variation: a positive integer.  100 means no change.  For example, to increase saturation by 50%, use `saturation=150`.
+
+![saturated imagemagick logo](http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&saturation=150)
+
+[http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&saturation=150](http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&saturation=150)
+
 ### tilt_shift=true
 
 ![tilt-shifted imagemagick logo](http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&tilt_shift=true)
@@ -68,9 +120,23 @@ The URL of the original image.
 
 (note: the `%23` in the geometry string above is an encoded '`#`', which tells Dragonfly to fill the dimensions and crop)
 
+### two_color=true
+
+![two color imagemagick logo](http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&two_color=true)
+
+[http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&two_color=true](http://magickly.heroku.com/?src=http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Imagemagick-logo.png/200px-Imagemagick-logo.png&two_color=true)
+
+## Analyzers
+
+Magickly v1.2.0 introduces the ability to retrieve image properties via a REST API.  For example, to retrieve the number of colors in the photo, visit:
+
+[magickly.heroku.com/analyze/number_of_colors?src=http://upload.wikimedia.org/wikipedia/commons/0/0d/Imagemagick-logo.png](http://magickly.heroku.com/analyze/number_of_colors?src=http://upload.wikimedia.org/wikipedia/commons/0/0d/Imagemagick-logo.png)
+
+To get the list of available analyzers, visit [magickly.heroku.com/analyze](http://magickly.heroku.com/analyze)
+
 ## 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`:
+In addition to the available parameters 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|
@@ -83,32 +149,6 @@ which can then be used with the query string `?src=...&resize_with_blur=200x`.
 
 See the [Dragonfly documentation](http://markevans.github.com/dragonfly/file.GeneralUsage.html#Shortcuts) for more info on "shortcuts", and the [shortcuts.rb](https://github.com/afeld/magickly/blob/master/lib/shortcuts.rb) file for examples.
 
-## Installation
-
-    $ gem install magickly
-
-## Running the App
-
-A few options:
-
-### A. Run the app directly
-
-    $ magickly
-
-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 `/magickly` in a Rails app:
-
-    # Gemfile
-    gem 'magickly', '~> 1.1'
-    
-    # config/routes.rb
-    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/).
-
 ## Contributing to magickly
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.2.0

data/lib/dragonfly/app.rb

@@ -0,0 +1,8 @@
+module Dragonfly
+  class App
+    # there is a pending pull request to add this method - see https://github.com/markevans/dragonfly/pull/100
+    def analyser_methods
+      analyser.functions.keys
+    end
+  end
+end

data/lib/dragonfly/data_storage/remote_data_store.rb

@@ -14,7 +14,7 @@ module Dragonfly
       end
 
       def retrieve(uid)
-        response = HTTParty.get uid, :headers => {'cookie' => cookie_str || ''}
+        response = HTTParty.get uid, :headers => {'cookie' => cookie_str || ''}, :timeout => 3
         unless response.ok?
           #raise Forbidden if response.code == 403
           raise DataNotFound

data/lib/magickly.rb

@@ -4,15 +4,18 @@ require 'active_support/ordered_hash'
 require 'sinatra/base'
 require 'addressable/uri'
 require 'dragonfly'
-require File.expand_path(File.join(File.dirname(__FILE__), 'dragonfly', 'data_storage', 'remote_data_store'))
+Dir["#{File.dirname(__FILE__)}/dragonfly/**/*.rb"].each {|file| require file }
 Dir["#{File.dirname(__FILE__)}/magickly/*.rb"].each {|file| require file }
 
 
 module Magickly
-  @dragonfly = Dragonfly[:images].configure_with(:imagemagick)
+  DEFAULT_PALETTE_COLOR_COUNT = 5
+  
+  @dragonfly = Dragonfly[:magickly].configure_with(:imagemagick)
   @dragonfly.configure do |c|
     c.datastore = Dragonfly::DataStorage::RemoteDataStore.new
     c.log = Logger.new($stdout)
+    c.log_commands = true
   end
   
   class << self

data/lib/magickly/app.rb

@@ -1,6 +1,7 @@
 module Magickly
   class App < Sinatra::Base
     RESERVED_PARAMS = ['src']
+    DEMO_IMAGE = 'http://upload.wikimedia.org/wikipedia/commons/0/0d/Imagemagick-logo.png'
     
     enable :logging
     set :root, File.join(File.dirname(__FILE__), '..')
@@ -29,21 +30,52 @@ module Magickly
       
       if src
         # process image
-        
-        uri = Addressable::URI.parse(src)
-        uri.site ||= Addressable::URI.parse(request.url).site
-        
-        image = Magickly.process_src(uri.to_s, @options)
+        url = uri_to_url(src)
+        image = Magickly.process_src(url, @options)
         image.to_response(env)
       else
         # display demo page
         
         # get combined list of jobs and processor methods
         @methods = ( Magickly.dragonfly.job_methods | Magickly.dragonfly.processor_methods )
+        @methods.sort!{|m1, m2| m1.to_s <=> m2.to_s }
         haml :index
       end
     end
     
+    get '/analyze' do
+      @analyzers = Magickly.dragonfly.analyser_methods
+      @analyzers.sort!{|m1, m2| m1.to_s <=> m2.to_s }
+      haml :analyzers
+    end
+    
+    get '/analyze/:name' do |method|
+      src = params[:src]
+      if src
+        url = uri_to_url(src)
+        image = Magickly.process_src(url, @options)
+        
+        begin
+          output = image.send(method.to_sym)
+        rescue NoMethodError
+          method = method.to_s + '?'
+          output = image.send(method.to_sym)
+        end
+        
+        output.is_a?(String) ? output : output.to_json
+      else
+        status 400
+        "Please provide an image URL with the src parameter."
+      end
+    end
+    
+    
+    def uri_to_url(uri)
+      url = Addressable::URI.parse(uri)
+      url.site ||= Addressable::URI.parse(request.url).site
+      url.to_s
+    end
+    
     # start the server if ruby file executed directly
     run! if __FILE__ == $0
   end

data/lib/shortcuts.rb

@@ -1,20 +1,91 @@
 Magickly.dragonfly.configure do |c|
   c.job :brightness_contrast do |val|
+    raise ArgumentError, "argument must be of the format '<int>[%]x<int>[%]'" unless val =~ /^-?\d+%?(x-?\d+%?)?$/
     process :convert, "-brightness-contrast #{val}"
   end
   
+  c.job :saturation do |percentage|
+    raise ArgumentError, "percentage must be a positive integer" unless percentage =~ /^\d+$/
+    process :convert, "-modulate 100,#{percentage}"
+  end
+  
   c.job :resize_with_blur do |size|
     process :convert, "-filter Gaussian -resize #{size}"
   end
   
   c.job :tilt_shift do |coefficients|
-    if coefficients == 'true'
-      # use default polynomial coefficients
-      coefficients = '4,-4,1'
-    end
+    coefficients = '4,-4,1' if coefficients == 'true'
+    raise ArgumentError, "coefficients must be of the format '<decimal>,<decimal>,<decimal>'" unless coefficients =~ /^(-?\d+(\.\d+)?,){2}-?\d+(\.\d+)?$/
     
     # note: can be made faster by decreasing sigma passed to option:compose:args
     action = "\\( +clone -sparse-color Barycentric '0,0 black 0,%h white' -function polynomial #{coefficients} \\) -compose Blur -set option:compose:args 8 -composite"
     process :convert, action
   end
+  
+  # thanks to http://www.melissaevans.com/tutorials/pop-art-inspired-by-lichtenstein
+  c.job :halftone do |threshold|
+    threshold = 50 if threshold == 'true'
+    process :convert, "-white-threshold #{threshold.to_i}% -gaussian-blur 2 -ordered-dither 8x1"
+  end
+  
+  # thanks to http://www.photoshopsupport.com/tutorials/or/cross-processing.html
+  c.job :cross_process do
+    process :convert, "-channel Red -sigmoidal-contrast 6,50% -channel Blue -level 25%\\! -channel Green -sigmoidal-contrast 5,45% \\( +clone +matte -fill yellow -colorize 4% \\) -compose overlay -composite"
+  end
+  
+  ## thanks to https://github.com/soveran/lomo
+  c.job :lomo do |modulate_params|
+    if modulate_params == 'true'
+      modulate_params = '100,150'
+    elsif modulate_params =~ /^\d+,\d+$/
+      # valid params
+    else
+      raise ArgumentError, "modulate_params must be of the format '<int>,<int>'"
+    end
+    
+    lomo_mask = File.join(File.dirname(__FILE__), 'images', 'lomo_mask.png')
+    process :convert, "\\( +clone -unsharp 1 -contrast -contrast -modulate #{modulate_params} \\( #{lomo_mask} -resize #{@job.width}x#{@job.height}\\! \\) -compose overlay -composite \\) -compose multiply -composite"
+  end
+  
+  
+  ## thanks to Fred Weinhaus (http://www.fmwconcepts.com/imagemagick) for the following: ##
+  
+  c.job :glow do |args|
+    if args == 'true'
+      amount = 1.2
+      softening = 20
+    elsif args =~ /^(\d+\.\d+?),(\d+)$/ && $1.to_f >= 1.0 && $2.to_i >= 0
+      amount = $1
+      softening = $2
+    else
+      raise ArgumentError, "args must be of the form <amount(float)>,<softening(int)>"
+    end
+    
+    process :convert, "\\( +clone -evaluate multiply #{amount} -blur 0x#{softening} \\) -compose plus -composite"
+  end
+  
+  c.job :two_color do
+    process :convert, "-background black -flatten +matte +dither -colors 2 -colorspace gray -contrast-stretch 0"
+  end
+  
+  #########################################################################################
+  
+  
+  c.job :color_palette_swatch do |count|
+    count = Magickly::DEFAULT_PALETTE_COLOR_COUNT if count == 'true'
+    
+    process :convert, "-resize 600x600 -colors #{count} -unique-colors -scale 10000%"
+    encode :gif
+  end
+  
+  c.analyser.add :color_palette do |temp_object, num_colors|
+    num_colors = num_colors.blank? ? Magickly::DEFAULT_PALETTE_COLOR_COUNT : num_colors.to_i
+    output = `convert #{temp_object.path} -resize 600x600 -colors #{num_colors} -format %c -depth 8 histogram:info:-`
+    
+    palette = []
+    output.scan(/\s+(\d+):[^\n]+#([0-9A-Fa-f]{6})/) do |count, hex|
+      palette << { :count => count.to_i, :hex => hex }
+    end
+    palette
+  end
 end

data/lib/views/analyzers.haml

@@ -0,0 +1,3 @@
+- @analyzers.each do |analyzer|
+  %a{:href => "/analyze/#{analyzer.to_s.chomp('?')}?src=#{Magickly::App::DEMO_IMAGE}"}= analyzer
+  %br

data/lib/views/index.haml

@@ -40,7 +40,7 @@
     %br
     %br
     %label Image URL:
-    %input#src-img{:size => 80, :value => "http://upload.wikimedia.org/wikipedia/commons/0/0d/Imagemagick-logo.png"}
+    %input#src-img{:size => 80, :value => Magickly::App::DEMO_IMAGE}
     %br
     %label Params:
     %input#params{:size => 80, :value => "resize=200x"}

data/magickly.gemspec

@@ -5,15 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{magickly}
-  s.version = "1.1.3"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Aidan Feldman"]
-  s.date = %q{2011-05-26}
-  s.default_executable = %q{magickly}
+  s.authors = [%q{Aidan Feldman}]
+  s.date = %q{2011-06-29}
   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.executables = [%q{magickly}]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -31,23 +30,27 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/magickly",
     "config.ru",
+    "lib/dragonfly/app.rb",
     "lib/dragonfly/data_storage/remote_data_store.rb",
+    "lib/images/lomo_mask.png",
     "lib/magickly.rb",
     "lib/magickly/app.rb",
     "lib/public/imagemagick.png",
     "lib/shortcuts.rb",
+    "lib/views/analyzers.haml",
     "lib/views/index.haml",
     "magickly.gemspec",
     "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"
+    "spec/unit/remote_data_store_spec.rb",
+    "spec/unit/shortcut_spec.rb"
   ]
   s.homepage = %q{http://github.com/afeld/magickly}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.5}
   s.summary = %q{image manipulation as a (plugin-able) service}
 
   if s.respond_to? :specification_version then
@@ -60,6 +63,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<haml>, ["~> 3.0"])
       s.add_runtime_dependency(%q<httparty>, ["~> 0.7.3"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.0.0"])
+      s.add_runtime_dependency(%q<json>, ["~> 1.5"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<rack-test>, [">= 0"])
@@ -73,6 +77,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<haml>, ["~> 3.0"])
       s.add_dependency(%q<httparty>, ["~> 0.7.3"])
       s.add_dependency(%q<activesupport>, [">= 2.0.0"])
+      s.add_dependency(%q<json>, ["~> 1.5"])
       s.add_dependency(%q<jeweler>, ["~> 1.5"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<rack-test>, [">= 0"])
@@ -87,6 +92,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<haml>, ["~> 3.0"])
     s.add_dependency(%q<httparty>, ["~> 0.7.3"])
     s.add_dependency(%q<activesupport>, [">= 2.0.0"])
+    s.add_dependency(%q<json>, ["~> 1.5"])
     s.add_dependency(%q<jeweler>, ["~> 1.5"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<rack-test>, [">= 0"])

data/spec/requests/magickly_app_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
+require 'json'
 
 describe Magickly::App do
   include Rack::Test::Methods
@@ -7,14 +8,14 @@ describe Magickly::App do
     Magickly::App
   end
   
+  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
+  
   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
@@ -100,6 +101,42 @@ describe Magickly::App do
       ImageSize.new(last_response.body).get_width.should eq width
     end
   end
+  
+  describe "GET /analyze" do
+    it "retrieves the mime_type of an image" do
+      setup_image
+      
+      get "/analyze/mime_type?src=#{@image_url}"
+      
+      a_request(:get, @image_url).should have_been_made.once
+      last_response.should be_ok
+      last_response.body.should eq 'image/png'
+    end
+    
+    it "retrieves the color palette of an image" do
+      setup_image
+      
+      get "/analyze/color_palette?src=#{@image_url}"
+      
+      a_request(:get, @image_url).should have_been_made.once
+      last_response.should be_ok
+      last_response.body.should_not be_empty
+      json = JSON.parse(last_response.body)
+      json.should be_an Array
+      json.size.should eq 5
+    end
+    
+    it "should handle analyzer methods where the question mark is missing" do
+      Magickly.dragonfly.analyser_methods.map{|m| m.to_s }.should include 'landscape?'
+      setup_image
+      
+      get "/analyze/landscape?src=#{@image_url}"
+      
+      a_request(:get, @image_url).should have_been_made.once
+      last_response.should be_ok
+      last_response.body.should =~ /false/
+    end
+  end
 end
 
 describe MagicklyApp do

data/spec/spec_helper.rb

@@ -8,7 +8,7 @@ require 'image_size'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+# Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 set :environment, :test
 

data/spec/unit/shortcut_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+describe "Dragonfly shortcuts" do
+  before do
+    @image_path = File.join(File.dirname(__FILE__), '..', 'support', 'imagemagick.png')
+    @image = Magickly.dragonfly.fetch_file(@image_path)
+  end
+  
+  describe :brightness_contrast do
+    it "should throw an error for no arguments" do
+      expect { @image.brightness_contrast }.to raise_error
+    end
+    
+    it "should throw an error for a empty string" do
+      expect { @image.brightness_contrast('') }.to raise_error(ArgumentError)
+    end
+    
+    it "should succeed for a valid argument" do
+      @image.brightness_contrast('10x10')
+    end
+    
+    it "should succeed for negative values" do
+      @image.brightness_contrast('-80x-80')
+    end
+  end
+  
+  describe :color_palette do
+    it "should return an array" do
+      palette = @image.color_palette
+      palette.should be_an Array
+    end
+    
+    it "should have the default number of colors" do
+      palette = @image.color_palette
+      palette.length.should eq Magickly::DEFAULT_PALETTE_COLOR_COUNT
+    end
+    
+    it "should have the specified number of colors" do
+      num_colors = 4
+      num_colors.should_not eq Magickly::DEFAULT_PALETTE_COLOR_COUNT
+      
+      palette = @image.color_palette(num_colors)
+      palette.length.should eq num_colors
+    end
+  end
+  
+  describe :tilt_shift do
+    it "should throw an error for no coefficient" do
+      expect { @image.tilt_shift }.to raise_error
+    end
+    
+    it "should throw an error for a empty string" do
+      expect { @image.tilt_shift('') }.to raise_error(ArgumentError)
+    end
+    
+    it "should succeed for a valid coefficient" do
+      @image.tilt_shift('2,-1,0.5')
+    end
+  end
+end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: magickly
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: 
-  version: 1.1.3
+  segments: 
+  - 1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Aidan Feldman
@@ -10,141 +15,205 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 -04:00
-default_executable: magickly
+date: 2011-06-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: sinatra
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 2
+        - 1
         version: 1.2.1
   type: :runtime
+  requirement: *id001
   prerelease: false
-  version_requirements: *id001
+  name: sinatra
 - !ruby/object:Gem::Dependency 
-  name: dragonfly
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 57
+        segments: 
+        - 0
+        - 9
+        - 1
         version: 0.9.1
   type: :runtime
+  requirement: *id002
   prerelease: false
-  version_requirements: *id002
+  name: dragonfly
 - !ruby/object:Gem::Dependency 
-  name: addressable
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 2
         version: "2.2"
   type: :runtime
+  requirement: *id003
   prerelease: false
-  version_requirements: *id003
+  name: addressable
 - !ruby/object:Gem::Dependency 
-  name: haml
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
         version: "3.0"
   type: :runtime
+  requirement: *id004
   prerelease: false
-  version_requirements: *id004
+  name: haml
 - !ruby/object:Gem::Dependency 
-  name: httparty
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 7
+        - 3
         version: 0.7.3
   type: :runtime
+  requirement: *id005
   prerelease: false
-  version_requirements: *id005
+  name: httparty
 - !ruby/object:Gem::Dependency 
-  name: activesupport
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
   type: :runtime
+  requirement: *id006
   prerelease: false
-  version_requirements: *id006
+  name: activesupport
 - !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 5
+        version: "1.5"
+  type: :runtime
+  requirement: *id007
+  prerelease: false
+  name: json
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 5
         version: "1.5"
   type: :development
+  requirement: *id008
   prerelease: false
-  version_requirements: *id007
+  name: jeweler
 - !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
+  requirement: *id009
   prerelease: false
-  version_requirements: *id008
+  name: rcov
 - !ruby/object:Gem::Dependency 
-  name: rack-test
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
+  requirement: *id010
   prerelease: false
-  version_requirements: *id009
+  name: rack-test
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 4
         version: "2.4"
   type: :development
+  requirement: *id011
   prerelease: false
-  version_requirements: *id010
+  name: rspec
 - !ruby/object:Gem::Dependency 
-  name: webmock
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 6
         version: "1.6"
   type: :development
+  requirement: *id012
   prerelease: false
-  version_requirements: *id011
+  name: webmock
 - !ruby/object:Gem::Dependency 
-  name: imagesize
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 1
         version: "0.1"
   type: :development
+  requirement: *id013
   prerelease: false
-  version_requirements: *id012
+  name: imagesize
 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: 
@@ -167,11 +236,14 @@ files:
 - VERSION
 - bin/magickly
 - config.ru
+- lib/dragonfly/app.rb
 - lib/dragonfly/data_storage/remote_data_store.rb
+- lib/images/lomo_mask.png
 - lib/magickly.rb
 - lib/magickly/app.rb
 - lib/public/imagemagick.png
 - lib/shortcuts.rb
+- lib/views/analyzers.haml
 - lib/views/index.haml
 - magickly.gemspec
 - spec/requests/magickly_app_spec.rb
@@ -179,7 +251,7 @@ files:
 - spec/support/imagemagick.png
 - spec/unit/magickly_spec.rb
 - spec/unit/remote_data_store_spec.rb
-has_rdoc: true
+- spec/unit/shortcut_spec.rb
 homepage: http://github.com/afeld/magickly
 licenses: 
 - MIT
@@ -193,7 +265,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3187711069815381468
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -202,11 +274,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: image manipulation as a (plugin-able) service