magickly 1.4.0 → 2.0.0

data/lib/dragonfly/data_storage/remote_data_store.rb

@@ -1,4 +1,5 @@
 require 'httparty'
+require 'uri'
 
 module Dragonfly
   module DataStorage
@@ -6,13 +7,14 @@ module Dragonfly
     
     class RemoteDataStore
       include Configurable
-      
+      configurable_attr :url_host
+
       def store(temp_object, opts={})
         raise "Sorry friend, this datastore is read-only."
       end
 
       def retrieve(uid)
-        response = HTTParty.get uid, :timeout => 3
+        response = HTTParty.get URI::join(url_host.to_s, uid).to_s, :timeout => 3
         unless response.ok?
           #raise Forbidden if response.code == 403
           raise DataNotFound

data/lib/magickly/app.rb

@@ -6,6 +6,7 @@ module Magickly
     enable :logging
     set :root, File.join(File.dirname(__FILE__), '..')
     set :homepage, "http://github.com/afeld/magickly"
+    set :protection, :except => :path_traversal
     
     configure :production do
       require 'newrelic_rpm' if ENV['NEW_RELIC_ID']
@@ -31,25 +32,16 @@ module Magickly
       process_src_or_display_demo params[:src], @options
     end
 
-    get '/q/*' do 
-      src = nil
-      opts = ActiveSupport::OrderedHash.new
-      splat = request.path_info.sub /^\/q\//, ''
-      
-      splat.split('/').each_slice(2) do |k, v|
-        if RESERVED_PARAMS.include? k
-          if k == 'src'
-            src = URI.unescape(v)
-            # slashes come in double-escaped by Apache so we
-            # need to unescape again
-            src = URI.unescape(src) if src =~ /%2F/
-          end
-        else
-          opts[k] = URI.unescape(v)
-        end
-      end
+    get '/q/*' do
+      process_path request.path_info.sub /^\/q\//, ''
+    end
 
-      process_src_or_display_demo src, opts
+    get '/qe/*' do
+      # TODO use Base64.urlsafe_decode64
+      decoded = request.path_info.sub /^\/qe\//, ''
+      decoded = decoded.tr("-_", "+/").unpack("m0").first
+
+      process_path decoded
     end
     
     get '/analyze' do
@@ -78,6 +70,26 @@ module Magickly
       end
     end
 
+    def process_path splat
+      src = nil
+      opts = []
+      
+      splat.split('/').each_slice(2) do |k, v|
+        if RESERVED_PARAMS.include? k
+          if k == 'src'
+            src = URI.unescape(v)
+            # slashes come in double-escaped by Apache so we
+            # need to unescape again
+            src = URI.unescape(src) if src =~ /%2F/
+          end
+        else
+          opts << [k, URI.unescape(v)]
+        end
+      end
+
+      process_src_or_display_demo src, opts
+    end
+
     def process_src_or_display_demo src, options
       if src
         # process image

data/lib/magickly/version.rb

@@ -0,0 +1,3 @@
+module Magickly
+  VERSION = '2.0.0'
+end

data/spec/requests/magickly_app_spec.rb

@@ -3,11 +3,11 @@ require 'uri'
 
 describe Magickly::App do
   include Rack::Test::Methods
-  
+
   def app
     Magickly::App
   end
-  
+
   def setup_image(host='http://www.foo.com')
     @image_filename = 'imagemagick.png'
     @image_url = "#{host}/#{@image_filename}"
@@ -15,61 +15,70 @@ describe Magickly::App do
     @image_path = File.join(File.dirname(__FILE__), '..', 'support', @image_filename)
     stub_request(:get, @image_url).to_return(:body => File.new(@image_path))
   end
-  
+
+  def get_image(uri)
+    get(uri)
+    file = Tempfile.new('testimage')
+    file.write(last_response.body)
+    file.rewind
+
+    file
+  end
+
   describe "GET /" do
     it "should display the demo page for no params" do
       get '/'
-      last_response.should be_ok
+      last_response.status.should eq(200)
       # 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
-      
+      last_response.status.should eq(200)
+
       # check that the returned file is identical to the original
       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
-      
+      last_response.status.should eq(200)
+
       # 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}"
-      
+
       get "/?src=/#{@image_filename}"
-      
+
       a_request(:get, @image_url).should have_been_made.once
-      last_response.should be_ok
-      
+      last_response.status.should eq(200)
+
       # check that the returned file is identical to the original
       compare_binary(last_response.body, IO.read(@image_path))
     end
-    
+
     it "resizes an image" do
       setup_image
       width = 100
-      
-      get "/?src=#{@image_url}&resize=#{width}x"
-      
+
+      file = get_image "/?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
+      last_response.status.should eq(200)
+      FastImage.size(file)[0].should eq(width)
     end
-    
+
     it "should use my Dragonfly shortcut with no arguments" do
       setup_image
       width = 100
@@ -79,13 +88,13 @@ describe Magickly::App 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
+
+      file = get_image "/?src=#{@image_url}&#{shortcut}=true"
+
+      last_response.status.should eq(200)
+      FastImage.size(file)[0].should eq width
     end
-    
+
     it "should use my Dragonfly shortcut with one argument" do
       setup_image
       width = 100
@@ -96,10 +105,10 @@ describe Magickly::App do
         end
       end
 
-      get "/?src=#{@image_url}&#{shortcut}=#{width}x"
-      
-      last_response.should be_ok
-      ImageSize.new(last_response.body).get_width.should eq width
+      file = get_image "/?src=#{@image_url}&#{shortcut}=#{width}x"
+
+      last_response.status.should eq(200)
+      FastImage.size(file)[0].should eq width
     end
   end
 
@@ -109,47 +118,69 @@ describe Magickly::App do
       setup_image
       width = 100
 
-      get "/q/src/#{@escaped_image_url}/resize/#{width}x"
-      
+      file = get_image "/q/src/#{@escaped_image_url}/resize/#{width}x"
+
+      a_request(:get, @image_url).should have_been_made.once
+      last_response.status.should eq(200)
+      FastImage.size(file)[0].should eq width
+    end
+
+  end
+
+  describe "GET /qe" do
+
+    it "resized an image" do
+      setup_image
+      width = 100
+
+      # This is just Base64.urlsafe_encode64 which is not available in ruby 1.8.7
+      encoded = ["src/#{@escaped_image_url}/resize/#{width}x"].pack("m0").tr("+/", "-_")
+
+      # Strip the newlines from the encoding since m0 should mean no newlines
+      # but doesn't seem to be doing that in ruby 1.8.7
+      encoded = encoded.tr("\n", "")
+
+      file = get_image "/qe/#{encoded}"
+
       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
+      last_response.status.should eq(200)
+      FastImage.size(file)[0].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.status.should eq(200)
       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.status.should eq(200)
       last_response.body.should_not be_empty
       json = ActiveSupport::JSON.decode(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.status.should eq(200)
       last_response.body.should =~ /false/
     end
   end
@@ -157,18 +188,18 @@ 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
+      last_response.status.should eq(200)
       # TODO test that it renders the view
     end
-    
+
   end
 end

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ require 'magickly'
 require 'rack/test'
 require 'sinatra'
 require 'webmock/rspec'
-require 'image_size'
+require 'fastimage'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
@@ -17,12 +17,10 @@ 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
+  # Ruby 1.9
+  unless one.encoding == two.encoding
+    one = one.force_encoding("UTF-8")
+    two = two.force_encoding("UTF-8")
   end
   
   one.should eq two

data/spec/unit/remote_data_store_spec.rb

@@ -20,6 +20,21 @@ describe Dragonfly::DataStorage::RemoteDataStore do
       image,extra = datastore.retrieve(url)
       image.should eq IO.read(image_path)
     end
+
+    it "should fetch the image based on the url_host variable" do
+      path = "foo/bar/iamgemagick.png"
+      url_host = "http://www.foo.com/"
+      url = url_host + path
+      stub_request(:get, url)
+
+      datastore = Dragonfly::DataStorage::RemoteDataStore.new
+      datastore.configure do |c|
+        c.url_host = url_host
+      end
+
+      datastore.retrieve path
+      a_request(:get, url).should have_been_made.once
+    end
   end
 end
 

metadata

@@ -1,126 +1,91 @@
 --- !ruby/object:Gem::Specification
 name: magickly
 version: !ruby/object:Gem::Version
-  version: 1.4.0
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Aidan Feldman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70099405673020 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70099405673020
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: dragonfly
-  requirement: &70099405672440 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.9.14
   type: :runtime
   prerelease: false
-  version_requirements: *70099405672440
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.14
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70099405671720 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70099405671720
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: &70099405670520 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *70099405670520
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &70099405669280 !ruby/object:Gem::Requirement
-    none: false
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0.13'
   type: :runtime
   prerelease: false
-  version_requirements: *70099405669280
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &70099405668340 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: *70099405668340
+        version: '0.13'
 - !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: &70099405667520 !ruby/object:Gem::Requirement
-    none: false
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70099405667520
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70099405666620 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
+        version: 2.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
+        version: '5'
+  type: :runtime
   prerelease: false
-  version_requirements: *70099405666620
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: &70099405666020 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: *70099405666020
-- !ruby/object:Gem::Dependency
-  name: imagesize
-  requirement: &70099405681480 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
+        version: 2.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :development
-  prerelease: false
-  version_requirements: *70099405681480
+        version: '5'
 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
@@ -130,63 +95,46 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .document
-- .gemtest
-- .rspec
-- .travis.yml
+- CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
-- HISTORY.md
 - LICENSE.txt
+- Procfile
 - README.md
 - Rakefile
-- VERSION
-- config.ru
 - 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/public/images/logo.jpg
-- lib/public/jquery-ui.smoothness.css
-- lib/public/magickly_demo.js
-- lib/public/style.css
+- lib/magickly/version.rb
 - lib/shortcuts.rb
-- lib/views/analyzers.erb
-- lib/views/index.erb
-- 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/shortcut_spec.rb
-homepage: http://github.com/afeld/magickly
+homepage: http://magickly.afeld.me
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 596109342780870765
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: image manipulation as a (plugin-able) service
 test_files: []