magickly 1.1.1 → 1.1.2

data/Gemfile

@@ -4,8 +4,7 @@ source 'http://rubygems.org'
 #   gem 'activesupport', '>= 2.3.5'
 
 gem 'sinatra', '~> 1.2.1', :require => 'sinatra/base'
-gem 'rack-cache', :require => 'rack/cache'
-gem 'dragonfly', '~> 0.8'
+gem 'dragonfly', '~> 0.9.1'
 gem 'addressable', '~> 2.2', :require => 'addressable/uri'
 
 gem 'haml', '~> 3.0.25'
@@ -27,3 +26,7 @@ group :development, :test do
   gem 'ruby-debug19', :platforms => :ruby_19
   gem 'ruby-debug', :platforms => :ruby_18
 end
+
+group :production do
+  gem 'newrelic_rpm', :require => false
+end

data/Gemfile.lock

@@ -7,7 +7,7 @@ GEM
     columnize (0.3.2)
     crack (0.1.8)
     diff-lcs (1.1.2)
-    dragonfly (0.9.0)
+    dragonfly (0.9.1)
       rack
       rack
     git (1.2.5)
@@ -22,9 +22,8 @@ GEM
     linecache (0.43)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
+    newrelic_rpm (2.14.1)
     rack (1.2.2)
-    rack-cache (1.0)
-      rack (>= 0.4)
     rack-test (0.5.7)
       rack (>= 1.0)
     rake (0.8.7)
@@ -66,12 +65,12 @@ PLATFORMS
 DEPENDENCIES
   activesupport (>= 2.0.0)
   addressable (~> 2.2)
-  dragonfly (~> 0.8)
+  dragonfly (~> 0.9.1)
   haml (~> 3.0.25)
   httparty (~> 0.7.3)
   imagesize (~> 0.1)
   jeweler (~> 1.5)
-  rack-cache
+  newrelic_rpm
   rack-test
   rcov
   rspec (~> 2.4)

data/HISTORY.md

@@ -1,3 +1,13 @@
+This gem respects [semantic versioning](http://semver.org/).
+
+# 1.1.2 (5/16/11)
+
+* 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
+* get job/processor commands from Dragonfly (new in v0.9.1)
+* enable tilt_shift shortcut (possible after `convert` argument order change in Dragonfly v0.9.0)
+
 # 1.1.1 (4/28/11)
 
 * cross-compatibility fix for Ruby 1.8/1.9 regarding the checking of available methods from the Processor

data/README.md

@@ -88,7 +88,7 @@ The app can be accessed at [http://localhost:4567](http://localhost:4567)
 As an example, to have magickly accessible at `/magickly` in a Rails app:
 
     # Gemfile
-    gem 'magickly', '~> 0.1'
+    gem 'magickly', '~> 1.1'
     
     # config/routes.rb
     match '/magickly', :to => Magickly::App, :anchor => false

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/magickly.rb

@@ -15,8 +15,6 @@ module Magickly
     c.log = Logger.new($stdout)
   end
   
-  DRAGONFLY_PROCESSOR_FUNCTIONS = @dragonfly.processor.functions.keys
-  
   class << self
     def dragonfly
       @dragonfly
@@ -32,13 +30,16 @@ module Magickly
     
     def process_image(image, options={})
       options.each do |method, val|
-        if !DRAGONFLY_PROCESSOR_FUNCTIONS.include?(method.to_sym)
-          # might be an app-defined dragonfly shortcut
+        method = method.to_sym
+        if Magickly.dragonfly.processor_methods.include?(method)
+          if val == 'true'
+            image = image.process method
+          else
+            image = image.process method, val
+          end
+        elsif Magickly.dragonfly.job_methods.include?(method)
+          # note: 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
       

data/lib/magickly/app.rb

@@ -6,6 +6,11 @@ module Magickly
     set :root, File.join(File.dirname(__FILE__), '..')
     set :homepage, "http://github.com/afeld/magickly"
     
+    configure :production do
+      require 'newrelic_rpm' if ENV['NEW_RELIC_ID']
+    end
+    
+    
     before do
       Magickly.dragonfly.datastore.configure do |d|
         # pass cookies to subsequent request
@@ -23,6 +28,8 @@ module Magickly
       src = params['src']
       
       if src
+        # process image
+        
         uri = Addressable::URI.parse(src)
         uri.site ||= Addressable::URI.parse(request.url).site
         
@@ -31,9 +38,8 @@ module Magickly
       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)
+        # get combined list of jobs and processor methods
+        @methods = ( Magickly.dragonfly.job_methods | Magickly.dragonfly.processor_methods )
         haml :index
       end
     end
@@ -43,8 +49,8 @@ module Magickly
   end
 end
 
+# <b>DEPRECATED:</b> Please use <tt>Magickly::App</tt> instead.
 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

data/lib/shortcuts.rb

@@ -3,15 +3,13 @@ Magickly.dragonfly.configure do |c|
     process :convert, "-filter Gaussian -resize #{size}"
   end
   
-  # Dragonfly currently chokes on this command - see pull request #73:
-  # https://github.com/markevans/dragonfly/pull/73
-  #
-  # 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
+  c.job :tilt_shift do |coefficients|
+    if coefficients == 'true'
+      # use default polynomial coefficients
+      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/magickly.gemspec

@@ -5,15 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{magickly}
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Aidan Feldman"]
-  s.date = %q{2011-04-28}
-  s.default_executable = %q{magickly}
+  s.authors = [%q{Aidan Feldman}]
+  s.date = %q{2011-05-16}
   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"
@@ -45,9 +44,9 @@ Gem::Specification.new do |s|
     "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.6.2}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.2}
   s.summary = %q{image manipulation as a (plugin-able) service}
   s.test_files = [
     "spec/requests/magickly_app_spec.rb",
@@ -61,8 +60,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       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"])
+      s.add_runtime_dependency(%q<dragonfly>, ["~> 0.9.1"])
       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"])
@@ -77,8 +75,7 @@ Gem::Specification.new do |s|
       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"])
+      s.add_dependency(%q<dragonfly>, ["~> 0.9.1"])
       s.add_dependency(%q<addressable>, ["~> 2.2"])
       s.add_dependency(%q<haml>, ["~> 3.0.25"])
       s.add_dependency(%q<httparty>, ["~> 0.7.3"])
@@ -94,8 +91,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<sinatra>, ["~> 1.2.1"])
-    s.add_dependency(%q<rack-cache>, [">= 0"])
-    s.add_dependency(%q<dragonfly>, ["~> 0.8"])
+    s.add_dependency(%q<dragonfly>, ["~> 0.9.1"])
     s.add_dependency(%q<addressable>, ["~> 2.2"])
     s.add_dependency(%q<haml>, ["~> 3.0.25"])
     s.add_dependency(%q<httparty>, ["~> 0.7.3"])

data/spec/requests/magickly_app_spec.rb

@@ -33,6 +33,18 @@ describe Magickly::App do
       compare_binary(last_response.body, IO.read(@image_path))
     end
     
+    it "should ignore unused params" do
+      setup_image
+      
+      get "/?src=#{@image_url}&bad_param=666"
+      
+      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
+      compare_binary(last_response.body, IO.read(@image_path))
+    end
+    
     it "retrieves an image at a relative URI" do
       setup_image "http://#{Rack::Test::DEFAULT_HOST}"
       

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: magickly
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
-  version: 1.1.1
+  segments: 
+  - 1
+  - 1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Aidan Feldman
@@ -10,174 +15,219 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 -04:00
-default_executable: magickly
+date: 2011-05-16 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: rack-cache
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: dragonfly
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.8"
+        hash: 57
+        segments: 
+        - 0
+        - 9
+        - 1
+        version: 0.9.1
   type: :runtime
+  requirement: *id002
   prerelease: false
-  version_requirements: *id003
+  name: dragonfly
 - !ruby/object:Gem::Dependency 
-  name: addressable
-  requirement: &id004 !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: *id004
+  name: addressable
 - !ruby/object:Gem::Dependency 
-  name: haml
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 53
+        segments: 
+        - 3
+        - 0
+        - 25
         version: 3.0.25
   type: :runtime
+  requirement: *id004
   prerelease: false
-  version_requirements: *id005
+  name: haml
 - !ruby/object:Gem::Dependency 
-  name: httparty
-  requirement: &id006 !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: *id006
+  name: httparty
 - !ruby/object:Gem::Dependency 
-  name: activesupport
-  requirement: &id007 !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: *id007
+  name: activesupport
 - !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id008 !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: :development
+  requirement: *id007
   prerelease: false
-  version_requirements: *id008
+  name: jeweler
 - !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
+  requirement: *id008
   prerelease: false
-  version_requirements: *id009
+  name: rcov
 - !ruby/object:Gem::Dependency 
-  name: rack-test
-  requirement: &id010 !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: *id010
+  name: rack-test
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 4
         version: "2.4"
   type: :development
+  requirement: *id010
   prerelease: false
-  version_requirements: *id011
+  name: rspec
 - !ruby/object:Gem::Dependency 
-  name: webmock
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 6
         version: "1.6"
   type: :development
+  requirement: *id011
   prerelease: false
-  version_requirements: *id012
+  name: webmock
 - !ruby/object:Gem::Dependency 
-  name: imagesize
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 1
         version: "0.1"
   type: :development
+  requirement: *id012
   prerelease: false
-  version_requirements: *id013
+  name: imagesize
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug19
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
+  requirement: *id013
   prerelease: false
-  version_requirements: *id014
+  name: ruby-debug19
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
+  requirement: *id014
   prerelease: false
-  version_requirements: *id015
+  name: ruby-debug
 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: 
@@ -212,7 +262,6 @@ files:
 - spec/support/imagemagick.png
 - spec/unit/magickly_spec.rb
 - spec/unit/remote_data_store_spec.rb
-has_rdoc: true
 homepage: http://github.com/afeld/magickly
 licenses: 
 - MIT
@@ -226,7 +275,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1672346397376944796
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -235,11 +284,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.2
 signing_key: 
 specification_version: 3
 summary: image manipulation as a (plugin-able) service