ruby-thumbor 1.0.0 → 1.1.0

data/README.rdoc

@@ -1,4 +1,4 @@
-= ruby-thumbor {<img src="https://secure.travis-ci.org/heynemann/ruby-thumbor.png?branch=master" alt="Build Status" />}[http://travis-ci.org/heynemann/ruby-thumbor]
+= ruby-thumbor {<img src="https://secure.travis-ci.org/heynemann/ruby-thumbor.png?branch=master" alt="Build Status" />}[http://travis-ci.org/heynemann/ruby-thumbor] {<img src="https://gemnasium.com/heynemann/ruby-thumbor.png" alt="Dependency Status" />}[https://gemnasium.com/heynemann/ruby-thumbor]
 
 * http://github.com/heynemann/ruby-thumbor
 
@@ -17,15 +17,32 @@ No dependencies required for regular usage.
 
 * thumbor (http://github.com/globocom/thumbor) for running ruby-thumbor tests.
 
+== INSTALL:
+
+    gem install ruby-thumbor
+
+    gem 'ruby-thumbor'
+
+
 == USAGE:
 
-    crypto = CryptoURL.new :key => 'my-security-key'
+    require 'ruby-thumbor'
+
+    crypto = Thumbor::CryptoURL.new :key => 'my-security-key'
 
     url = crypto.generate :width => 200, :height => 300, :image => 'my.server.com/path/to/image.jpg'
 
     # url will contain something like:
     # /2913921in321n3k2nj32hjhj3h22/my.server.com/path/to/image.jpg
 
+or
+
+    require 'ruby-thumbor'
+
+    Thumbor.key = 'my-security-key'
+    image = Thumbor::Cascade.new('my.server.com/path/to/image.jpg')
+    image.width(300).height(200).watermark_filter('http://my-server.com/image.png', 30).generate
+
 Available arguments to the generate method:
 
     :meta => bool - flag that indicates that thumbor should return only meta-data on the operations it would
@@ -51,10 +68,6 @@ Available arguments to the generate method:
 
 If you need more info on what each option does, check thumbor's documentation at https://github.com/globocom/thumbor/wiki.
 
-== INSTALL:
-
-* sudo gem install ruby-thumbor
-
 == CONTRIBUTIONS:
 
 * Hugo Lopes (hugobr) - Fixes in the usage readme part of the docs.

data/lib/ruby-thumbor.rb

@@ -1,146 +1,13 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
-require 'openssl'
-require 'base64'
-require 'digest/md5'
-require 'cgi'
+require 'thumbor/crypto_url'
+require 'thumbor/cascade'
 
 module Thumbor
-    VERSION = '1.0.0'
-
-    class CryptoURL
-        attr_accessor :key, :computed_key
-
-        def initialize(key)
-            @key = key
-            @computed_key = (key * 16)[0..15]
-        end
-
-        def pad(s)
-            s + ("{" * (16 - s.length % 16))
-        end
-
-        def calculate_width_and_height(url_parts, options)
-            width = options[:width]
-            height = options[:height]
-
-            if width and options[:flip]
-                width = width * -1
-            end
-            if height and options[:flop]
-                height = height * -1
-            end
-
-            if width or height
-                width = 0 if not width
-                height = 0 if not height
-            end
-
-            has_width = width
-            has_height = height
-            if options[:flip] and not has_width and not has_height
-                width = "-0"
-                height = '0' if not has_height and not options[:flop]
-            end
-            if options[:flop] and not has_width and not has_height
-                height = "-0"
-                width = '0' if not has_width and not options[:flip]
-            end
-
-            if width or height
-                width = width.to_s
-                height = height.to_s
-                url_parts.push(width << 'x' << height)
-            end
-        end
-
-        def url_for(options, include_hash = true)
-            if not options[:image]
-                raise 'image is a required argument.'
-            end
-
-            url_parts = Array.new
-
-            if options[:meta]
-                url_parts.push('meta')
-            end
-
-            crop = options[:crop]
-            if crop
-                crop_left = crop[0]
-                crop_top = crop[1]
-                crop_right = crop[2]
-                crop_bottom = crop[3]
-
-                if crop_left > 0 or crop_top > 0 or crop_bottom > 0 or crop_right > 0
-                    url_parts.push(crop_left.to_s << 'x' << crop_top.to_s << ':' << crop_right.to_s << 'x' << crop_bottom.to_s)
-                end
-            end
-
-            if options[:fit_in]
-                url_parts.push('fit-in')
-            end
-
-            calculate_width_and_height(url_parts, options)
-
-            if options[:halign] and options[:halign] != :center
-                url_parts.push(options[:halign])
-            end
-
-            if options[:valign] and options[:valign] != :middle
-                url_parts.push(options[:valign])
-            end
-
-            if options[:smart]
-                url_parts.push('smart')
-            end
-
-            if options[:filters] && !options[:filters].empty?
-              filter_parts = []
-              options[:filters].each do |filter|
-                filter_parts.push(filter)
-              end
-
-              url_parts.push("filters:#{ filter_parts.join(':') }")
-            end
-
-            if include_hash
-                image_hash = Digest::MD5.hexdigest(options[:image])
-                url_parts.push(image_hash)
-            end
-
-            return url_parts.join('/')
-        end
-
-        def url_safe_base64(str)
-            Base64.encode64(str).gsub('+', '-').gsub('/', '_').gsub!(/[\n]/, '')
-        end
-
-        def generate_old(options)
-            url = pad(url_for(options))
-            cipher = OpenSSL::Cipher::Cipher.new('aes-128-ecb').encrypt
-            cipher.key = @computed_key
-            encrypted = cipher.update(url)
-            based = url_safe_base64(encrypted)
-
-            "/#{based}/#{options[:image]}"
-        end
-
-        def generate_new(options)
-            url_options = url_for(options, false)
-            url = "#{url_options}/#{options[:image]}"
-
-            signature = OpenSSL::HMAC.digest('sha1', @key, url)
-            signature = url_safe_base64(signature)
-
-            "/#{signature}/#{url}"
-        end
-
-        def generate(options)
-            return generate_old(options) if options[:old]
-            generate_new(options)
-        end
-    end
+  def self.key=(key)
+    @@key = key
+  end
 
+  def self.key
+    @@key
+  end
 end
+

data/lib/thumbor/cascade.rb

@@ -0,0 +1,70 @@
+require 'forwardable'
+require 'openssl'
+require 'base64'
+require 'digest/md5'
+require 'cgi'
+
+module Thumbor
+  class Cascade
+    attr_accessor :image, :old_crypto, :options, :filters
+
+    @available_options = [:meta, :crop, :width, :height, :flip,:flop, :halign, :valign, :smart, :fit_in, :old, :trim]
+
+    extend Forwardable
+
+    def_delegators :@old_crypto, :computed_key
+
+    @available_options.each do |opt|
+      define_method(opt) do |*args|
+        args = [true] if args.empty?
+        @options[opt] = args
+        self
+      end
+    end
+
+    def initialize(image=nil)
+      @image = image
+      @options = {}
+      @filters = []
+      @old_crypto = Thumbor::CryptoURL.new Thumbor.key
+    end
+
+    def url_for
+      @old_crypto.url_for prepare_options(@options).merge({:image => @image, :filters => @filters})
+    end
+
+    def generate
+      @old_crypto.generate prepare_options(@options).merge({:image => @image, :filters => @filters})
+    end
+
+    def method_missing(m, *args)
+      if /^(.+)_filter$/.match(m.to_s)
+        @filters << "#{$1}(#{escape_args(args).join(',')})"
+        self
+      else
+        super
+      end
+    end
+
+    private
+
+    def escape_args(args)
+      args.map do |arg|
+        arg = CGI::escape(arg) if arg.is_a? String and arg.match(/^https?:\/\//)
+        arg
+      end
+    end
+
+    def prepare_options(options)
+      options.reduce({}) do |final_options, item|
+        value = if item[1].length == 1
+          item[1].first
+        else
+          item[1]
+        end
+        final_options[item[0]] = value
+        final_options
+      end
+    end
+  end
+end

data/lib/thumbor/crypto_url.rb

@@ -0,0 +1,146 @@
+require 'openssl'
+require 'base64'
+require 'digest/md5'
+require 'cgi'
+
+module Thumbor
+    class CryptoURL
+        attr_accessor :computed_key
+
+        def initialize(key)
+            Thumbor.key = key
+            @computed_key = (Thumbor.key * 16)[0..15]
+        end
+
+        def pad(s)
+            s + ("{" * (16 - s.length % 16))
+        end
+
+        def calculate_width_and_height(url_parts, options)
+            width = options[:width]
+            height = options[:height]
+
+            if width and options[:flip]
+                width = width * -1
+            end
+            if height and options[:flop]
+                height = height * -1
+            end
+
+            if width or height
+                width = 0 if not width
+                height = 0 if not height
+            end
+
+            has_width = width
+            has_height = height
+            if options[:flip] and not has_width and not has_height
+                width = "-0"
+                height = '0' if not has_height and not options[:flop]
+            end
+            if options[:flop] and not has_width and not has_height
+                height = "-0"
+                width = '0' if not has_width and not options[:flip]
+            end
+
+            if width or height
+                width = width.to_s
+                height = height.to_s
+                url_parts.push(width << 'x' << height)
+            end
+        end
+
+        def url_for(options, include_hash = true)
+            if not options[:image]
+                raise 'image is a required argument.'
+            end
+
+            url_parts = Array.new
+
+            if options[:meta]
+                url_parts.push('meta')
+            end
+
+            crop = options[:crop]
+            if crop
+                crop_left = crop[0]
+                crop_top = crop[1]
+                crop_right = crop[2]
+                crop_bottom = crop[3]
+
+                if crop_left > 0 or crop_top > 0 or crop_bottom > 0 or crop_right > 0
+                    url_parts.push(crop_left.to_s << 'x' << crop_top.to_s << ':' << crop_right.to_s << 'x' << crop_bottom.to_s)
+                end
+            end
+
+            if options[:fit_in]
+                url_parts.push('fit-in')
+            end
+
+            calculate_width_and_height(url_parts, options)
+
+            if options[:halign] and options[:halign] != :center
+                url_parts.push(options[:halign])
+            end
+
+            if options[:valign] and options[:valign] != :middle
+                url_parts.push(options[:valign])
+            end
+
+            if options[:smart]
+                url_parts.push('smart')
+            end
+
+            if options[:trim]
+                trim_options  = ['trim']
+                trim_options << options[:trim] unless options[:trim] == true or options[:trim][0] == true
+                url_parts.push(trim_options.join(':'))
+            end
+
+            if options[:filters] && !options[:filters].empty?
+              filter_parts = []
+              options[:filters].each do |filter|
+                filter_parts.push(filter)
+              end
+
+              url_parts.push("filters:#{ filter_parts.join(':') }")
+            end
+
+            if include_hash
+                image_hash = Digest::MD5.hexdigest(options[:image])
+                url_parts.push(image_hash)
+            end
+
+            return url_parts.join('/')
+        end
+
+        def url_safe_base64(str)
+            Base64.encode64(str).gsub('+', '-').gsub('/', '_').gsub!(/[\n]/, '')
+        end
+
+        def generate_old(options)
+            url = pad(url_for(options))
+            cipher = OpenSSL::Cipher::Cipher.new('aes-128-ecb').encrypt
+            cipher.key = @computed_key
+            encrypted = cipher.update(url)
+            based = url_safe_base64(encrypted)
+
+            "/#{based}/#{options[:image]}"
+        end
+
+        def generate_new(options)
+            url_options = url_for(options, false)
+            url = "#{url_options}/#{options[:image]}"
+
+            signature = OpenSSL::HMAC.digest('sha1', Thumbor.key, url)
+            signature = url_safe_base64(signature)
+
+            "/#{signature}/#{url}"
+        end
+
+        def generate(options)
+            return generate_old(options) if options[:old]
+            generate_new(options)
+        end
+    end
+end

data/lib/thumbor/version.rb

@@ -0,0 +1,3 @@
+module Thumbor
+  VERSION = '1.1.0'
+end

data/spec/spec_helper.rb

@@ -1,2 +1,15 @@
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-require 'ruby-thumbor'
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+
+if /^1\.9/ === RUBY_VERSION
+  require 'simplecov'
+
+  SimpleCov.start do
+    add_filter '/spec/'
+  end
+end
+
+RSpec.configure do |c| 
+  c.filter_run :focus => true
+  c.run_all_when_everything_filtered = true
+end