dragonfly 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4447e48d0b8ae55e37417b745ad6b41874460e3
-  data.tar.gz: eec72c3113796cfb2350b92d2f423f74c09c08a8
+  metadata.gz: f6a1155a49050b3a3077261fae1e4171180f96df
+  data.tar.gz: c45adb992820172d12aa9a2dc2e6da9d283a93a3
 SHA512:
-  metadata.gz: 8b603153fca561242e794bf14dbbc2f5aa189d89d1bb61a680cc8592147f5f42742057dbc2a3817e1015b864876d9282a3b2407bd7525a779e44217b74ab17fd
-  data.tar.gz: e963b8c1b8791262b823d1b2af24f862cd799567da45cdd2676797c4822caa8c0ab5949596743032b95ac7486cc240698f88c982101f45d8570549d635406dbc
+  metadata.gz: 8510a94d6b279c349b99db139015bd36fa098b0badebfad02245e14d21a7d1a29a180b8a17790b49b5082f9c6833843bf77027b3cf72d522e69e2bc99e92332a
+  data.tar.gz: f087a85e74a5c47955caaae28e1fff406cdfad07fbbc6babc55b2eba6771158ffb1921e9a3fad95484146ca605660deee583955d213eb45bf84de26a8da79abc

data/Gemfile

@@ -1,6 +1,12 @@
 source 'https://rubygems.org'
+
 gemspec
-gem 'pry', :group => :development
+
+group :development do
+  gem 'pry'
+  gem 'rake'
+end
+
 if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx' && RUBY_VERSION >= '2.0'
   gem "rubysl", "~> 2.0", :group => :development
 end

data/History.md

@@ -1,3 +1,15 @@
+1.0.6 (2014-08-22)
+===================
+Features
+--------
+- env can be accessed by routed endpoint blocks
+
+Fixes
+-----
+- analyser cache doesn't get stored in meta for a given piece of meta - can mess with stringifying analyser return values
+- removed default secret, forcing user to specify one explicitly
+- deal with "[" character problems in urls https://github.com/markevans/dragonfly/pull/337
+
 1.0.5 (2014-05-15)
 ===================
 Fixes

data/README.md

@@ -54,7 +54,7 @@ Installation
 
 or in your Gemfile
 ```ruby
-gem 'dragonfly', '~> 1.0.5'
+gem 'dragonfly', '~> 1.0.6'
 ```
 
 Require with

data/dev/irbrc.rb

@@ -2,7 +2,7 @@ require "rubygems"
 require "bundler/setup"
 $:.unshift(File.expand_path('../../lib', __FILE__))
 require 'dragonfly'
-include Dragonfly::Serializer
+require 'pry'
 
 APP = Dragonfly.app.configure do
   plugin :imagemagick
@@ -16,6 +16,18 @@ class Model
   dragonfly_accessor :small_image
 end
 
+def reload
+  self.class.send(:remove_const, :APP)
+  Dragonfly.constants.each do |const|
+    Dragonfly.send(:remove_const, const)
+  end
+  $LOADED_FEATURES.grep(/dragonfly/).each do |path|
+    load path
+  end
+  nil
+end
+alias reload! reload
+
 puts "Loaded stuff from dragonfly irbrc"
 puts "\nAvailable sample images:\n"
 puts Dir['samples/*']

data/dragonfly.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency("rack", [">= 0"])
   spec.add_runtime_dependency("multi_json", ["~> 1.0"])
+  spec.add_runtime_dependency("addressable", ["~> 2.3"])
 
   spec.add_development_dependency("rspec", ["~> 2.5"])
   spec.add_development_dependency("webmock")

data/lib/dragonfly/app.rb

@@ -233,7 +233,7 @@ module Dragonfly
 
     def remote_url_for(uid, opts={})
       datastore.url_for(uid, opts)
-    rescue NoMethodError => e
+    rescue NoMethodError
       raise NotImplementedError, "The datastore doesn't support serving content directly - #{datastore.inspect}"
     end
 
@@ -258,12 +258,7 @@ module Dragonfly
       'application/octet-stream'
     end
 
-    def secret
-      @secret ||= 'secret yo'
-    end
-    attr_writer :secret
-
-    attr_accessor :allow_legacy_urls
+    attr_accessor :allow_legacy_urls, :secret
 
     def define_macro(klass, name)
       raise NoMethodError, "define_macro is deprecated - instead of defining #{name}, just extend #{klass.name} with Dragonfly::Model and use dragonfly_accessor"

data/lib/dragonfly/content.rb

@@ -115,7 +115,7 @@ module Dragonfly
       self.temp_object = TempObject.new(obj)
       original_filename = temp_object.original_filename
       self.meta['name'] ||= original_filename if original_filename
-      self.meta.delete("analyser_cache")
+      clear_analyser_cache
       add_meta(obj.meta) if obj.respond_to?(:meta)
       add_meta(meta) if meta
       self
@@ -205,7 +205,11 @@ module Dragonfly
     end
 
     def analyser_cache
-      meta["analyser_cache"] ||= {}
+      @analyser_cache ||= {}
+    end
+
+    def clear_analyser_cache
+      analyser_cache.clear
     end
 
     def run(command, opts)

data/lib/dragonfly/core_ext/tempfile.rb

@@ -0,0 +1,19 @@
+# Tempfile#size reports size of 0 after the tempfile has been
+# closed (without unlinking).  This happens because internal
+# @tmpfile is set to nil when the Tempfile is closed.
+# Alternatively @tmpname is set to nil when file is unlinked.
+
+if RUBY_VERSION < '1.9'
+  class Tempfile
+    def size
+      if @tmpfile
+        @tmpfile.flush
+        @tmpfile.stat.size
+      elsif @tmpname
+        File.size(@tmpname)
+      else
+        0
+      end
+    end
+  end
+end

data/lib/dragonfly/job.rb

@@ -15,6 +15,7 @@ module Dragonfly
     class InvalidArray < StandardError; end
     class NoSHAGiven < StandardError; end
     class IncorrectSHA < StandardError; end
+    class CannotGenerateSha < StandardError; end
 
     extend Forwardable
     def_delegators :result,
@@ -150,6 +151,10 @@ module Dragonfly
     end
 
     def sha
+      unless app.secret
+        raise CannotGenerateSha, "A secret is required to sign and verify Dragonfly job requests. "\
+                                 "Use `secret '...'` or disable `protect_from_dos_attacks` in your config."
+      end
       Digest::SHA1.hexdigest("#{to_unique_s}#{app.secret}")[0...8]
     end
 

data/lib/dragonfly/job/fetch_url.rb

@@ -2,6 +2,7 @@ require 'uri'
 require 'net/http'
 require 'base64'
 require 'dragonfly/job/step'
+require 'addressable/uri'
 
 module Dragonfly
   class Job
@@ -84,7 +85,10 @@ module Dragonfly
         URI.parse(url)
       rescue URI::InvalidURIError
         begin
-          URI.parse(URI.escape(url))
+          encoded_uri = Addressable::URI.parse(url).normalize.to_s
+          URI.parse(encoded_uri)
+        rescue Addressable::URI::InvalidURIError => e
+          raise BadURI, e.message
         rescue URI::InvalidURIError => e
           raise BadURI, e.message
         end

data/lib/dragonfly/routed_endpoint.rb

@@ -14,7 +14,7 @@ module Dragonfly
 
     def call(env)
       params = Utils.symbolize_keys Rack::Request.new(env).params
-      value = @block.call(params.merge(routing_params(env)), @app)
+      value = @block.call(params.merge(routing_params(env)), @app, env)
       case value
       when nil then plain_response(404, "Not Found")
       when Job, Model::Attachment

data/lib/dragonfly/temp_object.rb

@@ -2,6 +2,7 @@ require 'stringio'
 require 'tempfile'
 require 'pathname'
 require 'fileutils'
+require 'dragonfly/core_ext/tempfile'
 
 module Dragonfly
 
@@ -98,7 +99,9 @@ module Dragonfly
     end
 
     def size
-      @data ? @data.bytesize : File.size(path)
+      @tempfile && @tempfile.size ||
+      @data && @data.bytesize ||
+      File.size(path)
     end
 
     def each(&block)

data/lib/dragonfly/version.rb

@@ -1,3 +1,3 @@
 module Dragonfly
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 end

data/spec/dragonfly/content_spec.rb

@@ -108,19 +108,10 @@ describe Dragonfly::Content do
       content.analyse(:len).should == 7
     end
 
-    it "caches it in the meta" do
-      content.meta["analyser_cache"].should be_nil
+    it "updates when updated (i.e. clears cache)" do
       content.analyse(:len).should == 7
-      content.meta["analyser_cache"].should == {"len" => 7}
-    end
-
-    it "empties the cache if updated" do
-      content.analyse(:len).should == 7
-      content.meta["analyser_cache"].should == {"len" => 7}
       content.update("something else")
-      content.meta["analyser_cache"].should be_nil
       content.analyse(:len).should == 14
-      content.meta["analyser_cache"].should == {"len" => 14}
     end
   end
 

data/spec/dragonfly/job/fetch_url_spec.rb

@@ -96,15 +96,15 @@ describe Dragonfly::Job::FetchUrl do
 
   describe "escaping" do
     before do
-      stub_request(:get, "escapedurl.com/escaped%20url.jpg").to_return(:body => "OK!")
+      stub_request(:get, "escapedurl.com/escaped%20url%5B1%5D.jpg").to_return(:body => "OK!")
     end
 
     it "works with escaped urls" do
-      job.fetch_url('escapedurl.com/escaped%20url.jpg').data.should == 'OK!'
+      job.fetch_url('escapedurl.com/escaped%20url%5B1%5D.jpg').data.should == 'OK!'
     end
 
     it "tries to escape unescaped urls" do
-      job.fetch_url('escapedurl.com/escaped url.jpg').data.should == 'OK!'
+      job.fetch_url('escapedurl.com/escaped url[1].jpg').data.should == 'OK!'
     end
 
     it "still blows up with bad urls" do

data/spec/dragonfly/job_spec.rb

@@ -415,6 +415,11 @@ describe Dragonfly::Job do
     it "should be different for different jobs" do
       @app.fetch('figs').sha.should_not == @job.sha
     end
+
+    it "should raise error when secret is unspecified" do
+      @app.secret = nil
+      expect{ @app.fetch('figs').sha }.to raise_error(Dragonfly::Job::CannotGenerateSha)
+    end
   end
 
   describe "validate_sha!" do

data/spec/dragonfly/routed_endpoint_spec.rb

@@ -11,6 +11,7 @@ describe Dragonfly::RoutedEndpoint do
   end
 
   let (:app) { test_app }
+  let (:uid) { app.store('wassup') }
 
   describe "endpoint returning a job" do
     let (:endpoint) {
@@ -19,10 +20,6 @@ describe Dragonfly::RoutedEndpoint do
       }
     }
 
-    before(:each) do
-      @uid = app.store('wassup')
-    end
-
     it "should raise an error when there are no routing parameters" do
       lambda{
         endpoint.call(env_for('/blah'))
@@ -37,14 +34,14 @@ describe Dragonfly::RoutedEndpoint do
     }.each do |name, key|
 
       it "should work with #{name} routing args" do
-        response = response_for endpoint.call(env_for('/blah', key => {:uid => @uid}))
+        response = response_for endpoint.call(env_for('/blah', key => {:uid => uid}))
         response.body.should == 'wassup'
       end
 
     end
 
     it "should merge with query parameters" do
-      env = Rack::MockRequest.env_for("/big/buns?uid=#{@uid}", 'dragonfly.params' => {:something => 'else'})
+      env = Rack::MockRequest.env_for("/big/buns?uid=#{uid}", 'dragonfly.params' => {:something => 'else'})
       response = response_for endpoint.call(env)
       response.body.should == 'wassup'
     end
@@ -54,6 +51,19 @@ describe Dragonfly::RoutedEndpoint do
      end
   end
 
+  describe "env argument" do
+    let (:endpoint) {
+      Dragonfly::RoutedEndpoint.new(app) {|params, app, env|
+        app.fetch(env['THE_UID'])
+      }
+    }
+
+    it "adds the env to the arguments" do
+      response = response_for endpoint.call(env_for('/blah', {"THE_UID" => uid, 'dragonfly.params' => {}}))
+      response.body.should == 'wassup'
+    end
+  end
+
   describe "endpoint returning other things" do
     let (:model_class) {
       Class.new do

data/spec/spec_helper.rb

@@ -9,7 +9,7 @@ require 'dragonfly'
 require 'fileutils'
 require 'tempfile'
 require 'webmock/rspec'
-require 'pry'
+require 'pry' if RUBY_VERSION >= '1.9'
 
 # Requires supporting files with custom matchers and macros, etc,
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
@@ -38,6 +38,7 @@ end
 def test_app(name=nil)
   app = Dragonfly::App.instance(name)
   app.datastore = Dragonfly::MemoryDataStore.new
+  app.secret = "test secret"
   app
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Mark Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -112,6 +126,7 @@ files:
 - lib/dragonfly/core_ext/array.rb
 - lib/dragonfly/core_ext/hash.rb
 - lib/dragonfly/core_ext/object.rb
+- lib/dragonfly/core_ext/tempfile.rb
 - lib/dragonfly/file_data_store.rb
 - lib/dragonfly/has_filename.rb
 - lib/dragonfly/hash_with_css_style_keys.rb
@@ -250,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ideal gem for handling attachments in Rails, Sinatra and Rack applications.