thumbs 0.0.5 → 0.0.6

data/Gemfile

@@ -4,6 +4,7 @@ source "http://rubygems.org"
 gem "rack"
 gem "rack-contrib"
 gem "mini_magick"
+gem "lumberjack"
 
 group :development do
   gem "rspec"

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/thumbs/image.rb

@@ -3,7 +3,7 @@ module Thumbs
 
   class Image
 
-    attr_accessor :server, :path, :size
+    attr_accessor :server, :path, :size, :url
 
     def initialize(params)
       @size          = params[:size] if params[:size] =~ /^\d+x\d+$/

data/lib/thumbs/middleware/config.rb

@@ -18,6 +18,7 @@ module Thumbs
         image = Image.new(params.merge(:thumbs_folder => env['thumbs.thumbs_folder']))
 
         env['thumbs.remote_url']      = image.remote_url
+        env['thumbs.url']             = image.url
         env['thumbs.resized_path']    = image.resized_path
         env['thumbs.original_path']   = image.original_path
         env['thumbs.size']            = image.size

data/lib/thumbs/middleware/logger.rb

@@ -1,24 +1,24 @@
-require 'logger'
+require 'lumberjack'
 require 'benchmark'
 
 module Thumbs
   class Logger
     def initialize(app, logfile_path)
-      @logger = ::Logger.new(logfile_path, 0)
-      @logger.datetime_format = "%Y-%m-%d %H:%M:%S"
+      @logger = Lumberjack::Logger.new(logfile_path, :time_format => "%Y-%m-%d %H:%M:%S", :roll => :daily, :flush_seconds => 5)
       @app = app
     end
     
     def call(env)
       env['thumbs.logger'] = []
-      env['thumbs.logger'] << "#{env['thumbs.remote_url']}@#{env['thumbs.size']}"
+      env['thumbs.logger'] << env['thumbs.url']
+      env['thumbs.logger'] << env['thumbs.size']
       response = []
       realtime = Benchmark.realtime do
         response = @app.call(env)
       end
       status, headers, body = response
       env['thumbs.logger'] << sprintf('%.4f', realtime)
-      @logger.info env['thumbs.logger'].join(" : ")
+      @logger.info env['thumbs.logger'].join("\t")
       return [status, headers, body]
     end
   end

data/lib/thumbs.rb

@@ -26,11 +26,11 @@ module Thumbs
         :ttl           => 86400,
         :last_modified => true
       },
-      :server_name     => "Thumbs/0.0.3",
+      :server_name     => "Thumbs/0.0.6",
       :url_map         => "/:size/:original_url",
       :image_not_found => File.join(File.dirname(__FILE__), "thumbs", "images", "image_not_found.jpg"),
       :runtime         => false,
-      :logfile         => "log/thumbs.log"
+      :logfile         => false
     }.merge!(args)
     
     Rack::Builder.new do
@@ -45,7 +45,7 @@ module Thumbs
 
       use Thumbs::Config, options[:url_map]
       
-      use Thumbs::Logger, options[:logfile]
+      use Thumbs::Logger, options[:logfile] if options[:logfile]
 
       use Thumbs::ServerName, options[:server_name] if options[:server_name]
       use Thumbs::CacheControl, options[:cache_control] if options[:cache_control]

data/thumbs.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{thumbs}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcin Ciunelis"]
-  s.date = %q{2011-01-23}
+  s.date = %q{2011-02-26}
   s.description = %q{}
   s.email = %q{marcin.ciunelis@gmail.com}
   s.extra_rdoc_files = [
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/martinciu/thumbs}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.1}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{Image server proxy that can resize images on the fly. Built in ruby as a Rack application.}
   s.test_files = [
     "spec/spec_helper.rb",
@@ -57,6 +57,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rack>, [">= 0"])
       s.add_runtime_dependency(%q<rack-contrib>, [">= 0"])
       s.add_runtime_dependency(%q<mini_magick>, [">= 0"])
+      s.add_runtime_dependency(%q<lumberjack>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -64,6 +65,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rack>, [">= 0"])
       s.add_dependency(%q<rack-contrib>, [">= 0"])
       s.add_dependency(%q<mini_magick>, [">= 0"])
+      s.add_dependency(%q<lumberjack>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -72,6 +74,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rack>, [">= 0"])
     s.add_dependency(%q<rack-contrib>, [">= 0"])
     s.add_dependency(%q<mini_magick>, [">= 0"])
+    s.add_dependency(%q<lumberjack>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thumbs
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Marcin Ciunelis
@@ -15,10 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-23 00:00:00 +01:00
+date: 2011-02-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: rack
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -28,11 +29,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
   prerelease: false
-  name: rack
   type: :runtime
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
+  name: rack-contrib
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -42,11 +43,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
   prerelease: false
-  name: rack-contrib
   type: :runtime
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
+  name: mini_magick
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -56,11 +57,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
   prerelease: false
-  name: mini_magick
   type: :runtime
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
+  name: lumberjack
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -70,11 +71,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
   prerelease: false
-  name: rspec
-  type: :development
+  type: :runtime
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
+  name: rspec
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -84,12 +85,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
   prerelease: false
-  name: bundler
   type: :development
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
+  name: bundler
   version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -100,10 +115,9 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  requirement: *id006
   prerelease: false
-  name: jeweler
   type: :development
+  requirement: *id007
 description: ""
 email: marcin.ciunelis@gmail.com
 executables: []
@@ -166,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Image server proxy that can resize images on the fly. Built in ruby as a Rack application.