magickly 1.2.0 → 1.2.1

data/Gemfile

@@ -1,11 +1,11 @@
 source 'http://rubygems.org'
 
-gem 'sinatra', '~> 1.2.1', :require => 'sinatra/base'
-gem 'dragonfly', '~> 0.9.1'
+gem 'sinatra', '~> 1.2', :require => 'sinatra/base'
+gem 'dragonfly', '~> 0.9.5'
 gem 'addressable', '~> 2.2', :require => 'addressable/uri'
 
 gem 'haml', '~> 3.0'
-gem 'httparty', '~> 0.7.3'
+gem 'httparty', '~> 0.8.1'
 gem 'activesupport', '>= 2.0.0', :require => false
 gem 'json', '~> 1.5'
 

data/Gemfile.lock

@@ -1,42 +1,49 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.9)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
     addressable (2.2.6)
-    crack (0.1.8)
-    diff-lcs (1.1.2)
-    dragonfly (0.9.4)
+    crack (0.3.1)
+    diff-lcs (1.1.3)
+    dragonfly (0.9.8)
       rack
     git (1.2.5)
-    haml (3.1.2)
-    httparty (0.7.8)
-      crack (= 0.1.8)
+    haml (3.1.4)
+    httparty (0.8.1)
+      multi_json
+      multi_xml
     imagesize (0.1.1)
-    jeweler (1.6.2)
+    jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.5.3)
-    newrelic_rpm (3.1.0)
-    rack (1.3.0)
-    rack-test (0.6.0)
+    json (1.6.3)
+    multi_json (1.0.4)
+    multi_xml (0.4.1)
+    newrelic_rpm (3.3.1)
+    rack (1.3.5)
+    rack-protection (1.1.4)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.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.4)
-    rspec-expectations (2.6.0)
+    rake (0.9.2.2)
+    rcov (0.9.11)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.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.2)
-    webmock (1.6.4)
-      addressable (> 2.2.5, ~> 2.2)
+    rspec-mocks (2.7.0)
+    sinatra (1.3.1)
+      rack (~> 1.3, >= 1.3.4)
+      rack-protection (~> 1.1, >= 1.1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    tilt (1.3.3)
+    webmock (1.7.8)
+      addressable (~> 2.2, > 2.2.5)
       crack (>= 0.1.7)
 
 PLATFORMS
@@ -45,9 +52,9 @@ PLATFORMS
 DEPENDENCIES
   activesupport (>= 2.0.0)
   addressable (~> 2.2)
-  dragonfly (~> 0.9.1)
+  dragonfly (~> 0.9.5)
   haml (~> 3.0)
-  httparty (~> 0.7.3)
+  httparty (~> 0.8.1)
   imagesize (~> 0.1)
   jeweler (~> 1.5)
   json (~> 1.5)
@@ -55,5 +62,5 @@ DEPENDENCIES
   rack-test
   rcov
   rspec (~> 2.4)
-  sinatra (~> 1.2.1)
+  sinatra (~> 1.2)
   webmock (~> 1.6)

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/lib/magickly.rb

@@ -15,7 +15,7 @@ module Magickly
   @dragonfly.configure do |c|
     c.datastore = Dragonfly::DataStorage::RemoteDataStore.new
     c.log = Logger.new($stdout)
-    c.log_commands = true
+    # c.log_commands = true
   end
   
   class << self

data/magickly.gemspec

@@ -4,15 +4,15 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{magickly}
-  s.version = "1.2.0"
+  s.name = "magickly"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  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 = [%q{magickly}]
+  s.authors = ["Aidan Feldman"]
+  s.date = "2011-12-21"
+  s.description = "A service for image manipulation - built as an extensible wrapper of Imagemagick which handles caching, c/o the Dragonfly gem."
+  s.email = "aidan.feldman@gmail.com"
+  s.executables = ["magickly"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -30,7 +30,6 @@ 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",
@@ -47,21 +46,21 @@ Gem::Specification.new do |s|
     "spec/unit/remote_data_store_spec.rb",
     "spec/unit/shortcut_spec.rb"
   ]
-  s.homepage = %q{http://github.com/afeld/magickly}
-  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}
+  s.homepage = "http://github.com/afeld/magickly"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.12"
+  s.summary = "image manipulation as a (plugin-able) service"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     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<dragonfly>, ["~> 0.9.1"])
+      s.add_runtime_dependency(%q<sinatra>, ["~> 1.2"])
+      s.add_runtime_dependency(%q<dragonfly>, ["~> 0.9.5"])
       s.add_runtime_dependency(%q<addressable>, ["~> 2.2"])
       s.add_runtime_dependency(%q<haml>, ["~> 3.0"])
-      s.add_runtime_dependency(%q<httparty>, ["~> 0.7.3"])
+      s.add_runtime_dependency(%q<httparty>, ["~> 0.8.1"])
       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"])
@@ -71,11 +70,11 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<webmock>, ["~> 1.6"])
       s.add_development_dependency(%q<imagesize>, ["~> 0.1"])
     else
-      s.add_dependency(%q<sinatra>, ["~> 1.2.1"])
-      s.add_dependency(%q<dragonfly>, ["~> 0.9.1"])
+      s.add_dependency(%q<sinatra>, ["~> 1.2"])
+      s.add_dependency(%q<dragonfly>, ["~> 0.9.5"])
       s.add_dependency(%q<addressable>, ["~> 2.2"])
       s.add_dependency(%q<haml>, ["~> 3.0"])
-      s.add_dependency(%q<httparty>, ["~> 0.7.3"])
+      s.add_dependency(%q<httparty>, ["~> 0.8.1"])
       s.add_dependency(%q<activesupport>, [">= 2.0.0"])
       s.add_dependency(%q<json>, ["~> 1.5"])
       s.add_dependency(%q<jeweler>, ["~> 1.5"])
@@ -86,11 +85,11 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<imagesize>, ["~> 0.1"])
     end
   else
-    s.add_dependency(%q<sinatra>, ["~> 1.2.1"])
-    s.add_dependency(%q<dragonfly>, ["~> 0.9.1"])
+    s.add_dependency(%q<sinatra>, ["~> 1.2"])
+    s.add_dependency(%q<dragonfly>, ["~> 0.9.5"])
     s.add_dependency(%q<addressable>, ["~> 2.2"])
     s.add_dependency(%q<haml>, ["~> 3.0"])
-    s.add_dependency(%q<httparty>, ["~> 0.7.3"])
+    s.add_dependency(%q<httparty>, ["~> 0.8.1"])
     s.add_dependency(%q<activesupport>, [">= 2.0.0"])
     s.add_dependency(%q<json>, ["~> 1.5"])
     s.add_dependency(%q<jeweler>, ["~> 1.5"])

metadata

@@ -1,229 +1,169 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: magickly
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 1.2.1
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 0
-  version: 1.2.0
 platform: ruby
-authors: 
+authors:
 - Aidan Feldman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-29 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  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
+date: 2011-12-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70169062032180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 0
-        - 9
-        - 1
-        version: 0.9.1
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :runtime
-  requirement: *id002
   prerelease: false
+  version_requirements: *70169062032180
+- !ruby/object:Gem::Dependency
   name: dragonfly
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70169062047380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        version: "2.2"
+      - !ruby/object:Gem::Version
+        version: 0.9.5
   type: :runtime
-  requirement: *id003
   prerelease: false
+  version_requirements: *70169062047380
+- !ruby/object:Gem::Dependency
   name: addressable
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70169062042260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '2.2'
   type: :runtime
-  requirement: *id004
   prerelease: false
+  version_requirements: *70169062042260
+- !ruby/object:Gem::Dependency
   name: haml
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70169062039960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        - 3
-        version: 0.7.3
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  requirement: *id005
   prerelease: false
+  version_requirements: *70169062039960
+- !ruby/object:Gem::Dependency
   name: httparty
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70169062054320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.1
   type: :runtime
-  requirement: *id006
   prerelease: false
+  version_requirements: *70169062054320
+- !ruby/object:Gem::Dependency
   name: activesupport
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &70169062051960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        version: "1.5"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
-  requirement: *id007
   prerelease: false
+  version_requirements: *70169062051960
+- !ruby/object:Gem::Dependency
   name: json
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &70169062048680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        version: "1.5"
-  type: :development
-  requirement: *id008
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
   prerelease: false
+  version_requirements: *70169062048680
+- !ruby/object:Gem::Dependency
   name: jeweler
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &70169062080560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :development
-  requirement: *id009
   prerelease: false
+  version_requirements: *70169062080560
+- !ruby/object:Gem::Dependency
   name: rcov
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: &70169062095520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id010
   prerelease: false
+  version_requirements: *70169062095520
+- !ruby/object:Gem::Dependency
   name: rack-test
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: &70169062090640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 4
-        version: "2.4"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id011
   prerelease: false
+  version_requirements: *70169062090640
+- !ruby/object:Gem::Dependency
   name: rspec
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  requirement: &70169062110280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 6
-        version: "1.6"
+      - !ruby/object:Gem::Version
+        version: '2.4'
   type: :development
-  requirement: *id012
   prerelease: false
+  version_requirements: *70169062110280
+- !ruby/object:Gem::Dependency
   name: webmock
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  requirement: &70169062106480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 1
-        version: "0.1"
+      - !ruby/object:Gem::Version
+        version: '1.6'
   type: :development
-  requirement: *id013
   prerelease: false
+  version_requirements: *70169062106480
+- !ruby/object:Gem::Dependency
   name: imagesize
-description: A service for image manipulation - built as an extensible wrapper of Imagemagick which handles caching, c/o the Dragonfly gem.
+  requirement: &70169062102960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: *70169062102960
+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: 
+executables:
 - magickly
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - .document
 - .gemtest
 - .rspec
@@ -236,7 +176,6 @@ 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
@@ -253,37 +192,31 @@ files:
 - spec/unit/remote_data_store_spec.rb
 - spec/unit/shortcut_spec.rb
 homepage: http://github.com/afeld/magickly
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2669035562758074524
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: image manipulation as a (plugin-able) service
 test_files: []
-

data/lib/dragonfly/app.rb

@@ -1,8 +0,0 @@
-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