dimension 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cf302e4bb1fc448c02a78c5c8301b16f3f3b3e8
-  data.tar.gz: c6f093638b2ac08b6cf18f23b37ca6c8bdceaf3b
+  metadata.gz: 06041accf96d75786ffb67e1f1688035b5748954
+  data.tar.gz: 3c1be7b7ea191d66b614653bf4100aa0cbe77a77
 SHA512:
-  metadata.gz: 88bae316d7293757aa1699835e5d685c564315ca513ccafa9ffabb1384605b0f34807f06cfca5758ba7363eba75bc4c425205ecde4be738bcca6766652e5f25a
-  data.tar.gz: e511c93b2e6e4cc5dce4e8858498508eb6d8f82be4acd278f92996e0dad154e009d6520c5cbc42466c65b5323b3c75dbdc1805d253386f77f5c21eefcb25ed45
+  metadata.gz: 2bc01c771714e7efb0303213d75f296450d1a8763026092c3f4742fcc1664076a2f097c490e23722f087530eed07cda1356f1ac2fe40a0772a32e6a093cb6b80
+  data.tar.gz: a9fbf7942b35dc01fa4f94af05306b13e35042c7d858554304523a60a6733e70a214b7df79158cefb3432bb35013f43e327133e87b1bc38a12709263623550d8

data/dimension.gemspec

@@ -18,4 +18,6 @@ Gem::Specification.new do |s|
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
   s.require_path = 'lib'
   # s.bindir       = 'bin'
+
+  s.add_runtime_dependency 'rack-throttle', '~> 0.3'
 end

data/examples/middleware.rb

@@ -9,9 +9,12 @@ require ROOT + '/../lib/dimension/middleware'
 
 app = Rack::Builder.new do
 
-  root = File.join(ROOT, 'assets')
+  # root = File.join(ROOT, 'assets')
+  root = ROOT
 
-  use Dimension::Middleware, { :root => root }
+  use Rack::CommonLogger
+
+  use Dimension::Middleware, { :root => root, :throttle => 1, :save => false }
 
   use Rack::Static,
     :urls => ['/'],
@@ -21,6 +24,6 @@ app = Rack::Builder.new do
     [ 200, { 'Content-Type'  => 'text/html'}, ['Not Found.'] ]
   }
 
-end.to_app
+end
 
-Thin::Server.start('0.0.0.0', 4567, app)
+Thin::Server.start('0.0.0.0', 4567, app.to_app)

data/lib/dimension/image.rb

@@ -104,7 +104,7 @@ class Image
   end
 
   def to_response(env = nil)
-    [200, {'Content-Type' => "image/#{format}"}, image_data]
+    [200, {'Content-Type' => "image/#{format}"}, [image_data]]
   end
 
   def log(msg)

data/lib/dimension/middleware.rb

@@ -1,26 +1,42 @@
+require 'rack/throttle'
+
 module Dimension
 
   class Middleware
   
-    FORMATS = ['.jpg', '.png', '.gif', '.jpeg']
+    EXCEEDED = [403, {'Content-Type' => 'text/plain'}, ['Limit Exceeded.']]
   
     def initialize(app, opts = {})
       @app  = app
       @root = File.expand_path(opts[:root] || Dir.pwd())
+      @save = opts[:save]
+      
+      if opts[:throttle]
+        @throttle = Rack::Throttle::Interval.new(self, :min => opts[:throttle])
+      end
     end
   
     def call(env)
       url      = env['PATH_INFO']
-      query    = env['QUERY_STRING']
-      geometry = query && query[/geometry=([^\&|$]+)/, 1]
+      geometry = url[/-([0-9x:-]+)\.(png|gif|jpe?g)/, 1]
+      
+      return @app.call(env) unless geometry
+
+      resized  = File.join(@root, url)
+      original = resized.sub("-#{geometry}", '')
     
-      if geometry and ext = File.extname(url) and ext != '' and FORMATS.include?(ext.downcase)
-        file = File.join(@root, url)
+      if !File.exist?(resized) and File.exist?(original)
+        
+        if @throttle
+          req = Rack::Request.new(env)
+          return EXCEEDED unless @throttle.allowed?(req)
+        end
+        
         # puts 'Processing image: ' + file
-      
-        image = Dimension.open(file)
+        image = Dimension.open(original)
         image.generate(geometry) do
-          image.to_response
+          image.save_as(resized) if @save
+          return image.to_response
         end
       end
 

data/lib/dimension/version.rb

@@ -1,7 +1,7 @@
 module Dimension
   MAJOR = 0
   MINOR = 0
-  PATCH = 4
+  PATCH = 5
 
   VERSION = [MAJOR, MINOR, PATCH].join('.')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dimension
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Tomás Pollak
@@ -9,7 +9,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2014-04-10 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack-throttle
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: Yes, there are other graphic libraries besides ImageMagick.
 email:
 - tomas@forkhq.com