magickly 1.1.0 → 1.1.1

data/Gemfile

@@ -5,7 +5,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 'dragonfly', '~> 0.8'
 gem 'addressable', '~> 2.2', :require => 'addressable/uri'
 
 gem 'haml', '~> 3.0.25'

data/Gemfile.lock

@@ -7,7 +7,8 @@ GEM
     columnize (0.3.2)
     crack (0.1.8)
     diff-lcs (1.1.2)
-    dragonfly (0.8.2)
+    dragonfly (0.9.0)
+      rack
       rack
     git (1.2.5)
     haml (3.0.25)
@@ -65,7 +66,7 @@ PLATFORMS
 DEPENDENCIES
   activesupport (>= 2.0.0)
   addressable (~> 2.2)
-  dragonfly (~> 0.8.2)
+  dragonfly (~> 0.8)
   haml (~> 3.0.25)
   httparty (~> 0.7.3)
   imagesize (~> 0.1)

data/HISTORY.md

@@ -1,8 +1,14 @@
-# 1.1.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
+* Addressable now required properly when included as a gem
+
+# 1.1.0 (4/26/11)
 
 * 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)
 
-# 1.0.0
+# 1.0.0 (4/19/11)
 
 * initial release

data/README.md

@@ -4,6 +4,10 @@ A service for image manipulation - built as a simple wrapper of Imagemagick whic
 
 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.
 
+If no query params are provided, a simple sandbox page is displayed.  Try it here:
+
+[magickly.heroku.com](http://magickly.heroku.com)
+
 ## Parameters
 
 *See the [Dragonfly documentation](http://markevans.github.com/dragonfly/file.Processing.html#ImageMagickProcessor) for more details about the permitted* `geometry` *values.*

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/magickly.rb

@@ -2,22 +2,21 @@ require 'active_support/core_ext/object/blank'
 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__)}/magickly/*.rb"].each {|file| require file }
 
 
 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)
-  
   @dragonfly = Dragonfly[:images].configure_with(:imagemagick)
   @dragonfly.configure do |c|
     c.datastore = Dragonfly::DataStorage::RemoteDataStore.new
     c.log = Logger.new($stdout)
   end
   
+  DRAGONFLY_PROCESSOR_FUNCTIONS = @dragonfly.processor.functions.keys
+  
   class << self
     def dragonfly
       @dragonfly
@@ -33,7 +32,7 @@ module Magickly
     
     def process_image(image, options={})
       options.each do |method, val|
-        if !@dragonfly_processor_methods.include?(method)
+        if !DRAGONFLY_PROCESSOR_FUNCTIONS.include?(method.to_sym)
           # might be an app-defined dragonfly shortcut
           image = image.send(method, val)
         elsif val == 'true'

data/lib/shortcuts.rb

@@ -3,6 +3,9 @@ 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"

data/magickly.gemspec

@@ -5,11 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{magickly}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aidan Feldman"]
-  s.date = %q{2011-04-26}
+  s.date = %q{2011-04-28}
+  s.default_executable = %q{magickly}
   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"]
@@ -46,7 +47,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/afeld/magickly}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{image manipulation as a (plugin-able) service}
   s.test_files = [
     "spec/requests/magickly_app_spec.rb",
@@ -61,7 +62,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.2"])
+      s.add_runtime_dependency(%q<dragonfly>, ["~> 0.8"])
       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,7 +78,7 @@ Gem::Specification.new do |s|
     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<dragonfly>, ["~> 0.8"])
       s.add_dependency(%q<addressable>, ["~> 2.2"])
       s.add_dependency(%q<haml>, ["~> 3.0.25"])
       s.add_dependency(%q<httparty>, ["~> 0.7.3"])
@@ -94,7 +95,7 @@ Gem::Specification.new do |s|
   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<dragonfly>, ["~> 0.8"])
     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

@@ -30,7 +30,7 @@ describe Magickly::App do
       last_response.should be_ok
       
       # check that the returned file is identical to the original
-      last_response.body.should eq IO.read(@image_path)
+      compare_binary(last_response.body, IO.read(@image_path))
     end
     
     it "retrieves an image at a relative URI" do
@@ -42,7 +42,7 @@ describe Magickly::App do
       last_response.should be_ok
       
       # check that the returned file is identical to the original
-      last_response.body.should eq IO.read(@image_path)
+      compare_binary(last_response.body, IO.read(@image_path))
     end
     
     it "resizes an image" do

data/spec/spec_helper.rb

@@ -17,3 +17,14 @@ RSpec.configure do |config|
   
 end
 
+def compare_binary(one, two)
+  if String.instance_methods.include?(:encoding)
+    # Ruby 1.9
+    unless one.encoding == two.encoding
+      one = one.force_encoding("UTF-8")
+      two = two.force_encoding("UTF-8")
+    end
+  end
+  
+  one.should eq two
+end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: magickly
 version: !ruby/object:Gem::Version 
-  hash: 19
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Aidan Feldman
@@ -15,233 +10,174 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 Z
+date: 2011-04-28 00:00:00 -04:00
+default_executable: magickly
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: sinatra
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 2
-        - 1
         version: 1.2.1
-  version_requirements: *id001
-  name: sinatra
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: rack-cache
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  version_requirements: *id002
-  name: rack-cache
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: dragonfly
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 8
-        - 2
-        version: 0.8.2
-  version_requirements: *id003
-  name: dragonfly
-  prerelease: false
+        version: "0.8"
   type: :runtime
+  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  name: addressable
   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
+  prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  name: haml
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 53
-        segments: 
-        - 3
-        - 0
-        - 25
         version: 3.0.25
-  version_requirements: *id005
-  name: haml
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  name: httparty
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        - 3
         version: 0.7.3
-  version_requirements: *id006
-  name: httparty
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
+  name: activesupport
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
         version: 2.0.0
-  version_requirements: *id007
-  name: activesupport
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
+  name: jeweler
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
         version: "1.5"
-  version_requirements: *id008
-  name: jeweler
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
+  name: rcov
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  version_requirements: *id009
-  name: rcov
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
+  name: rack-test
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  version_requirements: *id010
-  name: rack-test
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
+  name: rspec
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 4
         version: "2.4"
-  version_requirements: *id011
-  name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
+  name: webmock
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 6
         version: "1.6"
-  version_requirements: *id012
-  name: webmock
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
+  name: imagesize
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 1
         version: "0.1"
-  version_requirements: *id013
-  name: imagesize
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
+  name: ruby-debug19
   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
+  prerelease: false
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
+  name: ruby-debug
   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
+  prerelease: false
+  version_requirements: *id015
 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: 
@@ -276,6 +212,7 @@ 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
@@ -289,7 +226,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -1672346397376944796
       segments: 
       - 0
       version: "0"
@@ -298,14 +235,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: image manipulation as a (plugin-able) service