dragonfly 1.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e67b985fbe6f3f97fc92af0803738713e5dcabae
-  data.tar.gz: 2f2587a40ef4dd9a431e20760cf8ec94530836d0
+  metadata.gz: f679f5471b494a363b6ad8b63abe134ab56169e0
+  data.tar.gz: 16e5bddb9fabf32fe9f494025aa1d9ec052f9421
 SHA512:
-  metadata.gz: ada62ec2fad0a91f4a8131d8b3ea53ee38631f5bde95f02e3eb30a094895ed744d4e8a861e40a1ea9fa31a9d3cbd7f7ed4ba0e87c9ed68c407363f391cb7cb65
-  data.tar.gz: 90753f8280e3f8e29e4c6de826b5f5d0dc20d2f71df6a239bb05e6e75ac00f23dfeb6c4985140ef319bfba4913a7975292dc65a1910b481b64de03b61dc05650
+  metadata.gz: ce1fb089fa71ad9f0ac5ba3a2841de04510c1a9241a99a404be6886a62a1574a594c3fb07efe629e66528d8fdb92b973e67f1f6db4328506cebd6fbec108ba8b
+  data.tar.gz: e53fb3a2d1da7c4cd64ab58ca10f4fa39f3167da1a10c7273f36e8ba65e3b142c2df8e29095d06cef1d54d4de2e95be83e9f6f86d52ad1dd5ebbc91e274b85ba

data/.gitignore

@@ -7,3 +7,4 @@ Gemfile.lock
 .s3_spec.yml
 ***.rbc
 dragonfly.log
+_site

data/.travis.yml

@@ -4,8 +4,5 @@ rvm:
   - "1.9.2"
   - "1.9.3"
   - "2.0.0"
-  - jruby-18mode # JRuby in 1.8 mode
-  - jruby-19mode # JRuby in 1.9 mode
-  - rbx-18mode
-  - rbx-19mode
+  - "jruby"
 script: bundle exec rspec spec

data/History.md

@@ -1,3 +1,20 @@
+1.0.1 (2013-11-28)
+===================
+Changes
+-------
+- FileDataStore doesn't use hours_minutes_seconds in its path - it uses a random string instead (12_15_59_saf4fs_file.png -> sdf4c2G_file.png)
+
+Features
+--------
+- model attribute `xxx_changed?` method (useful e.g. in validations)
+
+Fixes
+-----
+- proper support for Ruby 1.8.7 and JRuby (version 1.7.8)
+- routed endpoints can deal with returned `Attachment` objects (rather than returned `Job` objects) and return 404 if the endpoint proc returns nil
+- default Content-Disposition header doesn't url-encode filename unless the request is from IE
+- `fetch_url` deals with urls that redirect to https (previously was blowing up)
+
 1.0.0 (2013-11-24)
 ===================
 Changes

data/README.md

@@ -55,8 +55,12 @@ Require with
 require 'dragonfly'
 ```
 
-Plugins and Add-ons
-===================
+Ruby Versions
+=============
+Dragonfly has been tested with ruby versions 1.8.7, 1.9.2, 1.9.3, 2.0.0 and jruby 1.7.8.
+
+Plugins / add-ons
+=================
 See [the Add-ons wiki](http://github.com/markevans/dragonfly/wiki/Dragonfly-add-ons).
 
 Please feel free to contribute!!

data/Rakefile

@@ -0,0 +1 @@
+require "bundler/gem_tasks"

data/dragonfly.gemspec

@@ -24,10 +24,26 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency("rack", [">= 0"])
   spec.add_runtime_dependency("multi_json", ["~> 1.0"])
 
-  spec.add_development_dependency("activemodel")
   spec.add_development_dependency("rspec", ["~> 2.5"])
   spec.add_development_dependency("webmock")
+  if RUBY_VERSION < '1.9.3'
+    spec.add_development_dependency("activemodel", '~> 3.2')
+  else
+    spec.add_development_dependency("activemodel")
+  end
   if RUBY_PLATFORM == "java"
     spec.add_development_dependency("jruby-openssl")
   end
+  spec.post_install_message =<<-POST_INSTALL_MESSAGE
+================================================================================
+
+Please check the documentation at <http://markevans.github.io/dragonfly/>.
+
+--------------------------------------------------------------------------------
+
+DEPRECATED: dragonfly/rails/images is now deprecated.
+Please refer to <http://markevans.github.io/dragonfly/rails/> for instructions to setup
+with Rails
+--------------------------------------------------------------------------------
+POST_INSTALL_MESSAGE
 end

data/lib/dragonfly/app.rb

@@ -207,7 +207,7 @@ module Dragonfly
 
     def ext_for(mime_type)
       return 'txt' if mime_type == 'text/plain'
-      ext = mime_types.key(mime_type)
+      ext = key_for(mime_types, mime_type)
       ext.tr('.', '') if ext
     end
 
@@ -279,5 +279,14 @@ module Dragonfly
       '.' + format.to_s.downcase.sub(/^.*\./,'')
     end
 
+    def key_for(hash, value)
+      if hash.respond_to?(:key)
+        hash.key(value)
+      else
+        hash.each {|k, v| return k if v == value }
+        nil
+      end
+    end
+
   end
 end

data/lib/dragonfly/file_data_store.rb

@@ -177,7 +177,7 @@ module Dragonfly
 
     def relative_path_for(filename)
       time = Time.now
-      "#{time.strftime '%Y/%m/%d/%H_%M_%S'}_#{time.usec.to_s(36)}_#{filename.gsub(/[^\w.]+/,'_')}"
+      "#{time.strftime '%Y/%m/%d/'}#{rand(1e15).to_s(36)}_#{filename.gsub(/[^\w.]+/,'_')}"
     end
 
     def purge_empty_directories(path)

data/lib/dragonfly/image_magick/plugin.rb

@@ -69,9 +69,10 @@ module Dragonfly
         end
 
         # Extra methods
-        app.define :identify do |args=""|
+        app.define :identify do |*args|
+          cli_args = args.first # because ruby 1.8.7 can't deal with default args in blocks
           shell_eval do |path|
-            "#{app.env[:identify_command]} #{args} #{path}"
+            "#{app.env[:identify_command]} #{cli_args} #{path}"
           end
         end
 

data/lib/dragonfly/job.rb

@@ -1,9 +1,5 @@
 require 'forwardable'
 require 'digest/sha1'
-require 'uri'
-require 'open-uri'
-require 'pathname'
-require 'base64'
 require 'dragonfly/serializer'
 require 'dragonfly/content'
 require 'dragonfly/url_attributes'
@@ -27,180 +23,11 @@ module Dragonfly
                    :analyse, :shell_eval, :store,
                    :b64_data
 
-    class Step
-
-      class << self
-        # Dragonfly::Job::Fetch -> 'Fetch'
-        def basename
-          @basename ||= name.split('::').last
-        end
-        # Dragonfly::Job::Fetch -> :fetch
-        def step_name
-          @step_name ||= basename.gsub(/[A-Z]/){ "_#{$&.downcase}" }.sub('_','').to_sym
-        end
-        # Dragonfly::Job::Fetch -> 'f'
-        def abbreviation
-          @abbreviation ||= basename.scan(/[A-Z]/).join.downcase
-        end
-      end
-
-      def initialize(job, *args)
-        @job, @args = job, args
-        init
-      end
-
-      def init # To be overridden
-      end
-
-      attr_reader :job, :args
-
-      def app
-        job.app
-      end
-
-      def to_a
-        [self.class.abbreviation, *args]
-      end
-
-      def inspect
-        "#{self.class.step_name}(#{args.map{|a| a.inspect }.join(', ')})"
-      end
-
-    end
-
-    class Fetch < Step
-      class NotFound < RuntimeError; end
-
-      def uid
-        args.first
-      end
-
-      def apply
-        content, meta = app.datastore.read(uid)
-        raise NotFound, "uid #{uid} not found" if content.nil?
-        job.content.update(content, meta)
-      end
-    end
-
-    class Process < Step
-      def init
-        processor.update_url(job.url_attributes, *arguments) if processor.respond_to?(:update_url)
-      end
-
-      def name
-        args.first.to_sym
-      end
-
-      def arguments
-        args[1..-1]
-      end
-
-      def processor
-        @processor ||= app.get_processor(name)
-      end
-
-      def apply
-        processor.call(job.content, *arguments)
-      end
-    end
-
-    class Generate < Step
-      def init
-        generator.update_url(job.url_attributes, *arguments) if generator.respond_to?(:update_url)
-      end
-
-      def name
-        args.first
-      end
-
-      def generator
-        @generator ||= app.get_generator(name)
-      end
-
-      def arguments
-        args[1..-1]
-      end
-
-      def apply
-        generator.call(job.content, *arguments)
-      end
-    end
-
-    class FetchFile < Step
-      def initialize(job, path)
-        super(job, path.to_s)
-      end
-      def init
-        job.url_attributes.name = filename
-      end
-
-      def path
-        @path ||= File.expand_path(args.first)
-      end
-
-      def filename
-        @filename ||= File.basename(path)
-      end
-
-      def apply
-        job.content.update(Pathname.new(path), 'name' => filename)
-      end
-    end
-
-    class FetchUrl < Step
-      class ErrorResponse < RuntimeError
-        def initialize(status, body)
-          @status, @body = status, body
-        end
-        attr_reader :status, :body
-      end
-      class CannotHandle < RuntimeError; end
-
-      def init
-        job.url_attributes.name = filename
-      end
-
-      def uri
-        args.first
-      end
-
-      def url
-        @url ||= uri =~ /^\w+:/ ? uri : "http://#{uri}"
-      end
-
-      def filename
-        return if data_uri?
-        @filename ||= URI.parse(url).path[/[^\/]+$/]
-      end
-
-      def data_uri?
-        uri =~ /^data:/
-      end
-
-      def apply
-        if data_uri?
-          update_from_data_uri
-        else
-          open(URI.escape(url)) do |f|
-            job.content.update(f.read, 'name' => filename)
-          end
-        end
-      rescue OpenURI::HTTPError => e
-        status, message = e.io.status
-        raise ErrorResponse.new(status.to_i, e.io.read)
-      end
-
-      def update_from_data_uri
-        mime_type, b64_data = uri.scan(/^data:([^;]+);base64,(.*)$/)[0]
-        if mime_type && b64_data
-          data = Base64.decode64(b64_data)
-          ext = app.ext_for(mime_type)
-          job.content.update(data, 'name' => "file.#{ext}")
-        else
-          raise CannotHandle, "fetch_url can only deal with base64-encoded data uris with specified content type"
-        end
-      end
-    end
+    require 'dragonfly/job/fetch'
+    require 'dragonfly/job/fetch_file'
+    require 'dragonfly/job/fetch_url'
+    require 'dragonfly/job/generate'
+    require 'dragonfly/job/process'
 
     STEPS = [
       Fetch,

data/lib/dragonfly/job/fetch.rb

@@ -0,0 +1,19 @@
+require 'dragonfly/job/step'
+
+module Dragonfly
+  class Job
+    class Fetch < Step
+      class NotFound < RuntimeError; end
+
+      def uid
+        args.first
+      end
+
+      def apply
+        content, meta = app.datastore.read(uid)
+        raise NotFound, "uid #{uid} not found" if content.nil?
+        job.content.update(content, meta)
+      end
+    end
+  end
+end

data/lib/dragonfly/job/fetch_file.rb

@@ -0,0 +1,27 @@
+require 'pathname'
+require 'dragonfly/job/step'
+
+module Dragonfly
+  class Job
+    class FetchFile < Step
+      def initialize(job, path)
+        super(job, path.to_s)
+      end
+      def init
+        job.url_attributes.name = filename
+      end
+
+      def path
+        @path ||= File.expand_path(args.first)
+      end
+
+      def filename
+        @filename ||= File.basename(path)
+      end
+
+      def apply
+        job.content.update(Pathname.new(path), 'name' => filename)
+      end
+    end
+  end
+end

data/lib/dragonfly/job/fetch_url.rb

@@ -0,0 +1,75 @@
+require 'uri'
+require 'net/http'
+require 'base64'
+require 'dragonfly/job/step'
+
+module Dragonfly
+  class Job
+    class FetchUrl < Step
+
+      class ErrorResponse < RuntimeError
+        def initialize(status, body)
+          @status, @body = status, body
+        end
+        attr_reader :status, :body
+      end
+      class CannotHandle < RuntimeError; end
+      class TooManyRedirects < RuntimeError; end
+
+      def init
+        job.url_attributes.name = filename
+      end
+
+      def uri
+        args.first
+      end
+
+      def url
+        @url ||= uri =~ /^\w+:/ ? uri : "http://#{uri}"
+      end
+
+      def filename
+        return if data_uri?
+        @filename ||= URI.parse(url).path[/[^\/]+$/]
+      end
+
+      def data_uri?
+        uri =~ /^data:/
+      end
+
+      def apply
+        if data_uri?
+          update_from_data_uri
+        else
+          data = get(URI.escape(url))
+          job.content.update(data, 'name' => filename)
+        end
+      end
+
+      def get(url, redirect_limit=10)
+        raise TooManyRedirects, "url #{url} redirected too many times" if redirect_limit == 0
+        response = Net::HTTP.get_response(URI.parse(url))
+        case response
+        when Net::HTTPSuccess then response.body || ""
+        when Net::HTTPRedirection then get(response['location'], redirect_limit-1)
+        else
+          response.error!
+        end
+      rescue Net::HTTPExceptions => e
+        raise ErrorResponse.new(e.response.code.to_i, e.response.body)
+      end
+
+      def update_from_data_uri
+        mime_type, b64_data = uri.scan(/^data:([^;]+);base64,(.*)$/)[0]
+        if mime_type && b64_data
+          data = Base64.decode64(b64_data)
+          ext = app.ext_for(mime_type)
+          job.content.update(data, 'name' => "file.#{ext}")
+        else
+          raise CannotHandle, "fetch_url can only deal with base64-encoded data uris with specified content type"
+        end
+      end
+
+    end
+  end
+end