zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-25 09:42:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

Update rmagick (and add io/extra for geoip)

Browse source
This commit is contained in:
Kyle Drake 2015-04-29 13:37:21 -07:00
parent 44e3d276f4
commit 434deee366
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -27,6 +27,7 @@ gem 'scrypt'
gem 'rack-cache' gem 'rack-cache'
gem 'rest-client' gem 'rest-client'
gem 'geoip' gem 'geoip'
gem 'io-extra', require: 'io/extra'
platform :mri, :rbx do platform :mri, :rbx do
gem 'magic' # sudo apt-get install file, For OSX: brew install libmagic gem 'magic' # sudo apt-get install file, For OSX: brew install libmagic

4
Gemfile.lock
View file

@ -79,6 +79,7 @@ GEM
http-cookie (1.0.2) http-cookie (1.0.2)
domain_name (~> 0.5) domain_name (~> 0.5)
i18n (0.6.9) i18n (0.6.9)
io-extra (1.2.8)
jimson-temp (0.9.5) jimson-temp (0.9.5)
blankslate (>= 3.1.2) blankslate (>= 3.1.2)
multi_json (~> 1.0) multi_json (~> 1.0)
@ -158,7 +159,7 @@ GEM
mime-types (>= 1.16, < 3.0) mime-types (>= 1.16, < 3.0)
netrc (~> 0.7) netrc (~> 0.7)
retriable (1.4.1) retriable (1.4.1)
rmagick (2.13.3) rmagick (2.15.0)
safe_yaml (1.0.4) safe_yaml (1.0.4)
sass (3.3.8) sass (3.3.8)
screencap (0.1.1) screencap (0.1.1)
@ -246,6 +247,7 @@ DEPENDENCIES
geoip geoip
google-api-client google-api-client
hiredis hiredis
io-extra
jdbc-postgres jdbc-postgres
jruby-openssl jruby-openssl
json json

2
workers/screenshot_worker.rb
View file

@ -1,4 +1,4 @@
require 'RMagick' require 'rmagick'
require 'timeout' require 'timeout'
require 'securerandom' require 'securerandom'
require 'thread' require 'thread'

2
workers/thumbnail_worker.rb
View file

@ -1,4 +1,4 @@
require 'RMagick' require 'rmagick'
class ThumbnailWorker class ThumbnailWorker
THUMBNAILS_PATH = Site::THUMBNAILS_ROOT THUMBNAILS_PATH = Site::THUMBNAILS_ROOT