magickly 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48bca736420533c04731a949b5034b8deb9b1f12
-  data.tar.gz: 8a5e765053acac5f2ff53344e21efb0c9e5d3410
+  metadata.gz: 868fc5c7b36e6d2d18b1119d57ecc20f775c8530
+  data.tar.gz: 018b0809e1b4572af9b0d82b4afc46be95d52263
 SHA512:
-  metadata.gz: 265eabe3f052b86708a3c0b6157b5f6f5994c57f5095f7c192d23be58be7ca52a6ce593dd09937d5ef2110bb11216810199feac3bd8ecea50cbc50afab12fca2
-  data.tar.gz: 3efc895a81cc9ccb0573ec5d7096cd832f1059834ded8116f379ce13e77cd56473cbce4755f54a14276f41962ab9ee524b895742e28667d16783f56ff377b969
+  metadata.gz: 191dc04dc5709ed6daace9bded938054021e48979d028321904a42f98d2e83dc11e33681d445f4c8ea0405cc1e3868da0951b41479bbe13f78e93a07aedad187
+  data.tar.gz: 2f19233c16fb77f8c866c8cbe5e19cf81ade4b6882aadb8a35404618d81b23ca3c758eade3924cc1f835a77a18ebbc67c6d7bb17b3a3c04d1e6247b091052d02

data/CONTRIBUTING.md

@@ -3,6 +3,6 @@ Add tests for any new feature, and ensure that they pass.
 ## To run specs
 
 ```bash
-bundle install
-rspec spec
+bundle
+bundle exec rake
 ```

data/Gemfile

@@ -1,9 +1,10 @@
 source 'https://rubygems.org'
 
-ruby '2.1.0' unless ENV['CI']
-
 gemspec
 
+gem 'dotenv'
+
+gem 'rake'
 gem 'rack-cache', :require => 'rack/cache'
 
 group :development, :test do
@@ -13,6 +14,6 @@ group :development, :test do
   gem 'fastimage'
 end
 
-group :production do
+group :production, :staging do
   gem 'newrelic_rpm', :require => false
 end

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    magickly (1.4.0)
-      activesupport (>= 2.0.0)
+    magickly (2.0.2)
+      activesupport (>= 2.0.0, < 5)
       addressable (~> 2.2)
       dragonfly (~> 0.9.14)
       httparty (~> 0.13)
@@ -11,67 +11,74 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.0.3)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    activesupport (4.1.8)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    addressable (2.3.5)
-    atomic (1.1.14)
+      tzinfo (~> 1.1)
+    addressable (2.3.6)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
+    dotenv (1.0.2)
     dragonfly (0.9.15)
       multi_json (~> 1.0)
       rack
-    fastimage (1.6.0)
+    fastimage (1.6.6)
       addressable (~> 2.3, >= 2.3.5)
-    httparty (0.13.0)
+    httparty (0.13.3)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
-    i18n (0.6.9)
+    i18n (0.6.11)
     json (1.8.1)
-    minitest (4.7.5)
-    multi_json (1.8.4)
+    minitest (5.4.3)
+    multi_json (1.10.1)
     multi_xml (0.5.5)
-    newrelic_rpm (3.7.2.195)
+    newrelic_rpm (3.9.8.273)
     rack (1.5.2)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-protection (1.5.2)
+    rack-protection (1.5.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.5)
-    safe_yaml (1.0.1)
-    sinatra (1.4.4)
+    rake (10.4.2)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    safe_yaml (1.0.4)
+    sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    thread_safe (0.1.3)
-      atomic
+    thread_safe (0.3.4)
     tilt (1.4.1)
-    tzinfo (0.3.38)
-    webmock (1.17.3)
-      addressable (>= 2.2.7)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    webmock (1.20.4)
+      addressable (>= 2.3.6)
       crack (>= 0.3.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  dotenv
   fastimage
   magickly!
   newrelic_rpm
   rack-cache
   rack-test
+  rake
   rspec
   webmock

data/README.md

@@ -8,9 +8,10 @@ If no query params are provided, a simple sandbox page is displayed.  Try it her
 
 [magickly.afeld.me](http://magickly.afeld.me)
 
-Blog post about how it's used at <a href="https://jux.com">Jux</a>:
+More insights:
 
-[aidan.jux.com/nerdery/310516](https://aidan.jux.com/nerdery/310516)
+* [Blog post](https://aidan.jux.com/nerdery/310516) about how it's used at <a href="https://jux.com">Jux</a>
+* [Talk](http://www.hakkalabs.co/articles/anatomy-ruby-gem-magickly) at [Anatomy of a Ruby Gem](http://www.meetup.com/Anatomy-of-a-Ruby-Gem/events/163904202/) ([slides](https://docs.google.com/presentation/d/1vuXqmMOssslx3nRxqWh1e3SgGN7_euYdVMIWm94DDPA/edit?usp=sharing))
 
 ## Installation
 
@@ -195,7 +196,6 @@ See the [Dragonfly documentation](http://markevans.github.com/dragonfly/file.Gen
 
 The hosted version of the app ([magickly.afeld.me](http://magickly.afeld.me)) is a single app instance intended for demonstration purposes - if you are going to be making a large number of API calls to it or would like to use it in production, please let us know :-)
 
-## Credits
-
-Created by [Aidan Feldman](http://www.aidanfeldman.com) at [Jux.com](http://www.jux.com).  Thanks to [Mark Evans](https://github.com/markevans) for all his hard work on [Dragonfly](http://markevans.github.com/dragonfly/).
+## See Also
 
+* [Thumbor](http://thumbor.org/)

data/Rakefile

@@ -1,9 +1,16 @@
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+desc "Runs tests"
+task default: :spec
+
 desc "Runs a performance test of different sigma values to tilt_shift"
 task :blur_test do
   file = File.join(File.dirname(__FILE__), 'spec', 'support', 'imagemagick.png')
   dir = File.join(File.dirname(__FILE__), 'test_output')
-  Dir.mkdir(dir)
-  
+  FileUtils.mkdir_p(dir)
+
   (5..10).each do |sigma|
     print "sigma: #{sigma}   "
     out_file = File.join(dir, "blur_test-#{sigma}.png")
@@ -16,7 +23,7 @@ task :blur_test do
   end
 
   # RESULTS:
-  # 
+  #
   # radius: 5   time: 2.090919
   # radius: 6   time: 2.855877
   # radius: 7   time: 3.800624

data/lib/magickly/app.rb

@@ -2,16 +2,16 @@ module Magickly
   class App < Sinatra::Base
     RESERVED_PARAMS = ['src']
     DEMO_IMAGE = 'http://farm4.static.flickr.com/3351/3450592233_c29fde01ef_z.jpg'
-    
+
     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']
+      require 'newrelic_rpm' if ENV['NEW_RELIC_LICENSE_KEY']
     end
-    
+
     before do
       # redirect to MAGICKLY_APP_DOMAIN, if specified
       app_host = ENV['MAGICKLY_APP_DOMAIN']
@@ -19,17 +19,10 @@ module Magickly
         request_host_with_port = request.env['HTTP_HOST']
         redirect request.url.sub(request_host_with_port, app_host), 301
       end
-      
-      # parse query params so they are ordered
-      @options = ActiveSupport::OrderedHash.new
-      request.query_string.split('&').each do |e|
-        k,v = e.split('=')
-        @options[k] = URI.unescape(v) unless RESERVED_PARAMS.include?(k)
-      end
     end
-    
+
     get '/' do
-      process_src_or_display_demo params[:src], @options
+      process_src_or_display_demo params[:src], ordered_options
     end
 
     get '/q/*' do
@@ -43,26 +36,26 @@ module Magickly
 
       process_path decoded
     end
-    
+
     get '/analyze' do
       @analyzers = Magickly.dragonfly.analyser_methods
       @analyzers.sort!{|m1, m2| m1.to_s <=> m2.to_s }
       erb :analyzers
     end
-    
+
     get '/analyze/:name' do |method|
       src = params[:src]
       if src
         url = uri_to_url(src)
-        image = Magickly.process_src(url, @options)
-        
+        image = Magickly.process_src(url, ordered_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
@@ -73,7 +66,7 @@ module Magickly
     def process_path splat
       src = nil
       opts = []
-      
+
       splat.split('/').each_slice(2) do |k, v|
         if RESERVED_PARAMS.include? k
           if k == 'src'
@@ -98,20 +91,29 @@ module Magickly
         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 }
         erb :index
       end
     end
-    
+
+    def ordered_options
+      options = ActiveSupport::OrderedHash.new
+      request.query_string.split('&').each do |e|
+        k,v = e.split('=')
+        options[k] = URI.unescape(v) unless RESERVED_PARAMS.include?(k)
+      end
+      options
+    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/magickly/version.rb

@@ -1,3 +1,3 @@
 module Magickly
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

data/lib/shortcuts.rb

@@ -94,4 +94,8 @@ Magickly.dragonfly.configure do |c|
     end
     palette
   end
+
+  c.job :output do |val|
+    encode val.to_sym
+  end
 end

data/spec/requests/magickly_app_spec.rb

@@ -28,7 +28,7 @@ describe Magickly::App do
   describe "GET /" do
     it "should display the demo page for no params" do
       get '/'
-      last_response.status.should eq(200)
+      expect(last_response.status).to eq(200)
       # TODO test that it renders the view
     end
 
@@ -37,8 +37,8 @@ describe Magickly::App do
 
       get "/?src=#{@image_url}"
 
-      a_request(:get, @image_url).should have_been_made.once
-      last_response.status.should eq(200)
+      expect(a_request(:get, @image_url)).to have_been_made.once
+      expect(last_response.status).to eq(200)
 
       # check that the returned file is identical to the original
       compare_binary(last_response.body, IO.read(@image_path))
@@ -49,8 +49,8 @@ describe Magickly::App do
 
       get "/?src=#{@image_url}&bad_param=666"
 
-      a_request(:get, @image_url).should have_been_made.once
-      last_response.status.should eq(200)
+      expect(a_request(:get, @image_url)).to have_been_made.once
+      expect(last_response.status).to eq(200)
 
       # check that the returned file is identical to the original
       compare_binary(last_response.body, IO.read(@image_path))
@@ -61,8 +61,8 @@ describe Magickly::App do
 
       get "/?src=/#{@image_filename}"
 
-      a_request(:get, @image_url).should have_been_made.once
-      last_response.status.should eq(200)
+      expect(a_request(:get, @image_url)).to have_been_made.once
+      expect(last_response.status).to eq(200)
 
       # check that the returned file is identical to the original
       compare_binary(last_response.body, IO.read(@image_path))
@@ -74,9 +74,18 @@ describe Magickly::App do
 
       file = get_image "/?src=#{@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)
+      expect(a_request(:get, @image_url)).to have_been_made.once
+      expect(last_response.status).to eq(200)
+      expect(FastImage.size(file)[0]).to eq(width)
+    end
+
+    it "outputs an image in a new format" do
+      setup_image
+
+      file = get_image "/?src=#{@image_url}&output=gif"
+
+      expect(a_request(:get, @image_url)).to have_been_made.once
+      expect(FastImage.type(file)).to eq(:gif)
     end
 
     it "should use my Dragonfly shortcut with no arguments" do
@@ -91,8 +100,8 @@ describe Magickly::App do
 
       file = get_image "/?src=#{@image_url}&#{shortcut}=true"
 
-      last_response.status.should eq(200)
-      FastImage.size(file)[0].should eq width
+      expect(last_response.status).to eq(200)
+      expect(FastImage.size(file)[0]).to eq width
     end
 
     it "should use my Dragonfly shortcut with one argument" do
@@ -107,8 +116,8 @@ describe Magickly::App do
 
       file = get_image "/?src=#{@image_url}&#{shortcut}=#{width}x"
 
-      last_response.status.should eq(200)
-      FastImage.size(file)[0].should eq width
+      expect(last_response.status).to eq(200)
+      expect(FastImage.size(file)[0]).to eq width
     end
   end
 
@@ -120,9 +129,9 @@ describe Magickly::App do
 
       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
+      expect(a_request(:get, @image_url)).to have_been_made.once
+      expect(last_response.status).to eq(200)
+      expect(FastImage.size(file)[0]).to eq width
     end
 
   end
@@ -142,9 +151,9 @@ describe Magickly::App do
 
       file = get_image "/qe/#{encoded}"
 
-      a_request(:get, @image_url).should have_been_made.once
-      last_response.status.should eq(200)
-      FastImage.size(file)[0].should eq width
+      expect(a_request(:get, @image_url)).to have_been_made.once
+      expect(last_response.status).to eq(200)
+      expect(FastImage.size(file)[0]).to eq width
     end
 
   end
@@ -155,9 +164,9 @@ describe Magickly::App do
 
       get "/analyze/mime_type?src=#{@image_url}"
 
-      a_request(:get, @image_url).should have_been_made.once
-      last_response.status.should eq(200)
-      last_response.body.should eq 'image/png'
+      expect(a_request(:get, @image_url)).to have_been_made.once
+      expect(last_response.status).to eq(200)
+      expect(last_response.body).to eq 'image/png'
     end
 
     it "retrieves the color palette of an image" do
@@ -165,23 +174,23 @@ describe Magickly::App do
 
       get "/analyze/color_palette?src=#{@image_url}"
 
-      a_request(:get, @image_url).should have_been_made.once
-      last_response.status.should eq(200)
-      last_response.body.should_not be_empty
+      expect(a_request(:get, @image_url)).to have_been_made.once
+      expect(last_response.status).to eq(200)
+      expect(last_response.body).to_not be_empty
       json = ActiveSupport::JSON.decode(last_response.body)
-      json.should be_an Array
-      json.size.should eq 5
+      expect(json).to be_an Array
+      expect(json.size).to 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?'
+      expect(Magickly.dragonfly.analyser_methods.map{|m| m.to_s }).to include 'landscape?'
       setup_image
 
       get "/analyze/landscape?src=#{@image_url}"
 
-      a_request(:get, @image_url).should have_been_made.once
-      last_response.status.should eq(200)
-      last_response.body.should =~ /false/
+      expect(a_request(:get, @image_url)).to have_been_made.once
+      expect(last_response.status).to eq(200)
+      expect(last_response.body).to include('false')
     end
   end
 end
@@ -197,7 +206,7 @@ describe MagicklyApp do
 
     it "should display the demo page for no params" do
       get '/'
-      last_response.status.should eq(200)
+      expect(last_response.status).to eq(200)
       # TODO test that it renders the view
     end
 

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@ require 'fastimage'
 set :environment, :test
 
 RSpec.configure do |config|
-  
+  config.raise_errors_for_deprecations!
 end
 
 def compare_binary(one, two)
@@ -22,6 +22,6 @@ def compare_binary(one, two)
     one = one.force_encoding("UTF-8")
     two = two.force_encoding("UTF-8")
   end
-  
-  one.should eq two
+
+  expect(one).to eq two
 end

data/spec/unit/magickly_spec.rb

@@ -9,10 +9,10 @@ describe Magickly do
       
       returned_image = Magickly.process_src(image_url)
       
-      returned_image.should_not be_nil
+      expect(returned_image).to_not be_nil
       
       # check that the returned file is identical to the original
-      IO.read(returned_image.file.path).should eq IO.read(image_path)
+      expect(IO.read(returned_image.file.path)).to eq IO.read(image_path)
     end
   end
   

data/spec/unit/remote_data_store_spec.rb

@@ -8,7 +8,7 @@ describe Dragonfly::DataStorage::RemoteDataStore do
       datastore = Dragonfly::DataStorage::RemoteDataStore.new
       
       datastore.retrieve url
-      a_request(:get, url).should have_been_made.once
+      expect(a_request(:get, url)).to have_been_made.once
     end
     
     it "should return the image" do
@@ -18,7 +18,7 @@ describe Dragonfly::DataStorage::RemoteDataStore do
       datastore = Dragonfly::DataStorage::RemoteDataStore.new
       
       image,extra = datastore.retrieve(url)
-      image.should eq IO.read(image_path)
+      expect(image).to eq IO.read(image_path)
     end
 
     it "should fetch the image based on the url_host variable" do
@@ -33,7 +33,7 @@ describe Dragonfly::DataStorage::RemoteDataStore do
       end
 
       datastore.retrieve path
-      a_request(:get, url).should have_been_made.once
+      expect(a_request(:get, url)).to have_been_made.once
     end
   end
 end

data/spec/unit/shortcut_spec.rb

@@ -27,20 +27,20 @@ describe "Dragonfly shortcuts" do
   describe :color_palette do
     it "should return an array" do
       palette = @image.color_palette
-      palette.should be_an Array
+      expect(palette).to 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
+      expect(palette.length).to 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
+      expect(num_colors).to_not eq Magickly::DEFAULT_PALETTE_COLOR_COUNT
       
       palette = @image.color_palette(num_colors)
-      palette.length.should eq num_colors
+      expect(palette.length).to eq num_colors
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magickly
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Aidan Feldman
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: image manipulation as a (plugin-able) service