dragonfly 0.9.12 → 0.9.13

data/lib/dragonfly/active_model_extensions/class_methods.rb

@@ -6,34 +6,34 @@ module Dragonfly
 
       def register_dragonfly_app(macro_name, app)
         (class << self; self; end).class_eval do
-    
+
           # Defines e.g. 'image_accessor' for any activemodel class body
           define_method macro_name do |attribute, &config_block|
 
             # Add callbacks
             before_save :save_dragonfly_attachments
             before_destroy :destroy_dragonfly_attachments
-      
+
             # Register the new attribute
             dragonfly_attachment_classes << new_dragonfly_attachment_class(attribute, app, config_block)
-            
+
             # Define the setter for the attribute
             define_method "#{attribute}=" do |value|
               dragonfly_attachments[attribute].assign(value)
             end
-      
+
             # Define the getter for the attribute
             define_method attribute do
               dragonfly_attachments[attribute].to_value
             end
-      
+
             # Define the URL setter
             define_method "#{attribute}_url=" do |url|
               unless url.blank?
                 dragonfly_attachments[attribute].assign(app.fetch_url(url))
               end
             end
-      
+
             # Define the URL getter
             define_method "#{attribute}_url" do
               nil
@@ -54,28 +54,28 @@ module Dragonfly
             define_method "retained_#{attribute}=" do |string|
               unless string.blank?
                 begin
-                  dragonfly_attachments[attribute].retained_attrs = Serializer.marshal_decode(string)
+                  dragonfly_attachments[attribute].retained_attrs = Serializer.json_decode(string, :symbolize_keys => true)
                 rescue Serializer::BadString => e
-                  app.log.warn("*** WARNING ***: couldn't update attachment with serialized retained_#{attribute} string #{string.inspect}")              
+                  app.log.warn("*** WARNING ***: couldn't update attachment with serialized retained_#{attribute} string #{string.inspect}")
                 end
               end
               dragonfly_attachments[attribute].should_retain = true
               dragonfly_attachments[attribute].retain!
               string
             end
-            
+
             # Define the retained getter
             define_method "retained_#{attribute}" do
               attrs = dragonfly_attachments[attribute].retained_attrs
-              Serializer.marshal_encode(attrs) if attrs
+              Serializer.json_encode(attrs) if attrs
             end
-            
+
           end
-    
+
         end
         app
       end
-      
+
       def dragonfly_attachment_classes
         @dragonfly_attachment_classes ||= begin
           parent_class = ancestors.select{|a| a.is_a?(Class) }[1]
@@ -88,11 +88,11 @@ module Dragonfly
           end
         end
       end
-      
+
       def new_dragonfly_attachment_class(attribute, app, config_block)
         Class.new(Attachment).init(self, attribute, app, config_block)
       end
-      
+
     end
   end
 end

data/lib/dragonfly/image_magick/generator.rb

@@ -40,6 +40,8 @@ module Dragonfly
       include Utils
 
       def plain(width, height, colour, opts={})
+        opts = Dragonfly::Utils.symbolize_keys(opts)
+
         format = opts[:format] || 'png'
         [
           convert(nil, "-size #{width}x#{height} xc:#{colour}", format),

data/lib/dragonfly/image_magick/processor.rb

@@ -13,25 +13,27 @@ module Dragonfly
         's'  => 'South',
         'se' => 'SouthEast'
       }
-      
+
       # Geometry string patterns
       RESIZE_GEOMETRY         = /^\d*x\d*[><%^!]?$|^\d+@$/ # e.g. '300x200!'
       CROPPED_RESIZE_GEOMETRY = /^(\d+)x(\d+)#(\w{1,2})?$/ # e.g. '20x50#ne'
       CROP_GEOMETRY           = /^(\d+)x(\d+)([+-]\d+)?([+-]\d+)?(\w{1,2})?$/ # e.g. '30x30+10+10'
       THUMB_GEOMETRY = Regexp.union RESIZE_GEOMETRY, CROPPED_RESIZE_GEOMETRY, CROP_GEOMETRY
-      
+
       include Configurable
       include Utils
-      
+
       def resize(temp_object, geometry)
         convert(temp_object, "-resize #{geometry}")
       end
-      
+
       def auto_orient(temp_object)
         convert(temp_object, "-auto-orient")
       end
 
       def crop(temp_object, opts={})
+        opts = Dragonfly::Utils.symbolize_keys(opts)
+
         width   = opts[:width]
         height  = opts[:height]
         gravity = GRAVITIES[opts[:gravity]]
@@ -41,24 +43,26 @@ module Dragonfly
         y = '+' + y unless y[/^[+-]/]
         repage  = opts[:repage] == false ? '' : '+repage'
         resize  = opts[:resize]
-    
+
         convert(temp_object, "#{"-resize #{resize} " if resize}#{"-gravity #{gravity} " if gravity}-crop #{width}x#{height}#{x}#{y} #{repage}")
       end
-      
+
       def flip(temp_object)
         convert(temp_object, "-flip")
       end
-      
+
       def flop(temp_object)
         convert(temp_object, "-flop")
       end
-      
+
       def greyscale(temp_object)
         convert(temp_object, "-colorspace Gray")
       end
       alias grayscale greyscale
-      
+
       def resize_and_crop(temp_object, opts={})
+        opts = Dragonfly::Utils.symbolize_keys(opts)
+
         if !opts[:width] && !opts[:height]
           return temp_object
         elsif !opts[:width] || !opts[:height]
@@ -72,37 +76,39 @@ module Dragonfly
         opts[:resize]  = "#{opts[:width]}x#{opts[:height]}^^"
         crop(temp_object, opts)
       end
-      
+
       def rotate(temp_object, amount, opts={})
+        opts = Dragonfly::Utils.symbolize_keys(opts)
+
         convert(temp_object, "-rotate #{amount}#{opts[:qualifier]}")
       end
 
       def strip(temp_object)
         convert(temp_object, "-strip")
-      end   
-      
+      end
+
       def thumb(temp_object, geometry)
         case geometry
         when RESIZE_GEOMETRY
           resize(temp_object, geometry)
         when CROPPED_RESIZE_GEOMETRY
-          resize_and_crop(temp_object, :width => $1, :height => $2, :gravity => $3)
+          resize_and_crop(temp_object, 'width' => $1, 'height' => $2, 'gravity' => $3)
         when CROP_GEOMETRY
           crop(temp_object,
-            :width => $1,
-            :height => $2,
-            :x => $3,
-            :y => $4,
-            :gravity => $5
+            'width' => $1,
+            'height' => $2,
+            'x' => $3,
+            'y' => $4,
+            'gravity' => $5
           )
         else raise ArgumentError, "Didn't recognise the geometry string #{geometry}"
         end
       end
-      
+
       def convert(temp_object, args='', format=nil)
         format ? [super, {:format => format.to_sym}] : super
       end
-      
+
     end
   end
 end

data/lib/dragonfly/job.rb

@@ -35,9 +35,9 @@ module Dragonfly
         def step_name
           @step_name ||= basename.gsub(/[A-Z]/){ "_#{$&.downcase}" }.sub('_','').to_sym
         end
-        # Dragonfly::Job::Fetch -> :f
+        # Dragonfly::Job::Fetch -> 'f'
         def abbreviation
-          @abbreviation ||= basename.scan(/[A-Z]/).join.downcase.to_sym
+          @abbreviation ||= basename.scan(/[A-Z]/).join.downcase
         end
       end
 
@@ -69,7 +69,7 @@ module Dragonfly
 
     class Process < Step
       def name
-        args.first
+        args.first.to_sym
       end
       def arguments
         args[1..-1]
@@ -86,7 +86,7 @@ module Dragonfly
         job.url_attrs[:format] = format
       end
       def format
-        args.first
+        args.first.to_sym
       end
       def arguments
         args[1..-1]
@@ -99,8 +99,14 @@ module Dragonfly
     end
 
     class Generate < Step
+      def name
+        args.first.to_sym
+      end
+      def arguments
+        args[1..-1]
+      end
       def apply
-        content, meta = job.app.generator.generate(*args)
+        content, meta = job.app.generator.generate(name, *arguments)
         job.update(content, meta)
       end
     end
@@ -166,7 +172,7 @@ module Dragonfly
       end
 
       def deserialize(string, app)
-        from_a(Serializer.marshal_decode(string), app)
+        from_a(Serializer.json_decode(string), app)
       end
 
       def step_abbreviations
@@ -187,20 +193,20 @@ module Dragonfly
     # If we had traits/classboxes in ruby maybe this wouldn't be needed
     # Think of it as like a normal instance method but with a css-like !important after it
     module OverrideInstanceMethods
-      
+
       def format
         apply
         meta[:format] || (ext.to_sym if ext && app.trust_file_extensions) || analyse(:format)
       end
-      
+
       def mime_type
         app.mime_type_for(format) || analyse(:mime_type) || app.fallback_mime_type
       end
-      
+
       def to_s
         super.sub(/#<Class:\w+>/, 'Extended Dragonfly::Job')
       end
-      
+
     end
 
     def initialize(app, content=nil, meta={}, url_attrs={})
@@ -280,7 +286,7 @@ module Dragonfly
     end
 
     def serialize
-      Serializer.marshal_encode(to_a)
+      Serializer.json_encode(to_a)
     end
 
     def unique_signature
@@ -311,7 +317,7 @@ module Dragonfly
     def url_attrs=(hash)
       @url_attrs = UrlAttributes[hash]
     end
-    
+
     attr_reader :url_attrs
 
     def b64_data
@@ -380,7 +386,7 @@ module Dragonfly
     def inspect
       "<Dragonfly::Job app=#{app.name.inspect}, steps=#{steps.inspect}, temp_object=#{temp_object.inspect}, steps applied:#{applied_steps.length}/#{steps.length} >"
     end
-    
+
     def update(content, new_meta)
       if new_meta
         new_meta.merge!(new_meta.delete(:meta)) if new_meta[:meta] # legacy data etc. may have nested meta hash - deprecate gracefully here
@@ -388,12 +394,12 @@ module Dragonfly
       old_meta = temp_object ? temp_object.meta : {}
       self.temp_object = TempObject.new(content, old_meta.merge(new_meta || {}))
     end
-    
+
     def close
       previous_temp_objects.each{|temp_object| temp_object.close }
       temp_object.close if temp_object
     end
-    
+
     protected
 
     attr_writer :steps
@@ -405,20 +411,20 @@ module Dragonfly
       apply
       temp_object || raise(NoContent, "Job has not been initialized with content. Need to fetch first?")
     end
-    
+
     def attributes_for_url
       attrs = url_attrs.slice(*server.params_in_url)
       attrs[:format] = (attrs[:format] || (url_attrs.ext if app.trust_file_extensions)).to_s if server.params_in_url.include?('format')
       attrs.delete_if{|k, v| v.blank? }
       attrs
     end
-    
+
     attr_reader :previous_temp_objects
 
     def last_step_of_type(type)
       steps.select{|s| s.is_a?(type) }.last
     end
-    
+
     def opts_for_store
       {:mime_type => mime_type}
     end

data/lib/dragonfly/routed_endpoint.rb

@@ -9,7 +9,7 @@ module Dragonfly
     end
 
     def call(env)
-      params = symbolize_keys_of Rack::Request.new(env).params
+      params = Utils.symbolize_keys Rack::Request.new(env).params
       job = @block.call(params.merge(routing_params(env)), @app)
       Response.new(job, env).to_response
     rescue Job::NoSHAGiven => e
@@ -33,12 +33,5 @@ module Dragonfly
         raise(NoRoutingParams, "couldn't find any routing parameters in env #{env.inspect}")
     end
 
-    def symbolize_keys_of(hash)
-      hash.inject({}) do |h, (key, value)|
-        h[(key.to_sym rescue key) || key] = value
-        h
-      end
-    end
-
   end
 end

data/lib/dragonfly/serializer.rb

@@ -1,32 +1,43 @@
 # encoding: utf-8
 require 'base64'
+require 'multi_json'
 
 module Dragonfly
   module Serializer
-    
+
     # Exceptions
     class BadString < RuntimeError; end
-    
+
     extend self # So we can do Serializer.b64_encode, etc.
-    
+
     def b64_encode(string)
-      Base64.encode64(string).tr("\n=",'').tr('/','~')
+      Base64.encode64(string).tr("\n=",'')
     end
-    
+
     def b64_decode(string)
       padding_length = string.length % 4
-      Base64.decode64(string.tr('~','/') + '=' * padding_length)
+      Base64.decode64(string + '=' * padding_length)
     end
-    
+
     def marshal_encode(object)
       b64_encode(Marshal.dump(object))
     end
-    
+
     def marshal_decode(string)
       Marshal.load(b64_decode(string))
     rescue TypeError, ArgumentError => e
       raise BadString, "couldn't decode #{string} - got #{e}"
     end
-    
+
+    def json_encode(object)
+      b64_encode(MultiJson.encode(object))
+    end
+
+    def json_decode(string, opts={})
+      MultiJson.decode(b64_decode(string), :symbolize_keys => opts[:symbolize_keys])
+    rescue MultiJson::DecodeError => e
+      raise BadString, "couldn't decode #{string} - got #{e}"
+    end
+
   end
 end

data/lib/dragonfly/server.rb

@@ -6,7 +6,7 @@ module Dragonfly
 
     include Loggable
     include Configurable
-    
+
     configurable_attr :allow_fetch_file, false
     configurable_attr :allow_fetch_url, false
     configurable_attr :dragonfly_url, '/dragonfly'
@@ -16,18 +16,18 @@ module Dragonfly
 
     extend Forwardable
     def_delegator :url_mapper, :params_in_url
-    
+
     def initialize(app)
       @app = app
       use_same_log_as(app)
       use_as_fallback_config(app)
     end
-    
+
     def before_serve(&block)
       self.before_serve_callback = block
     end
     configuration_method :before_serve
-    
+
     def call(env)
       if dragonfly_url == env["PATH_INFO"]
         dragonfly_response
@@ -68,13 +68,12 @@ module Dragonfly
     end
 
     private
-    
+
     attr_reader :app
     attr_accessor :before_serve_callback
 
     def url_mapper
       @url_mapper ||= UrlMapper.new(url_format,
-        :job => '[\w+~]',
         :basename => '[^\/]',
         :name => '[^\/]',
         :format => '[^\.]'