jobmensa_assets 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33dc913cb03fb90f0b53631c53b6153cdd750d0b
-  data.tar.gz: c2098fe8f90400e7207235c769c01a841061717f
+  metadata.gz: 93b18143df81fae9f950c4e550cd024514292d42
+  data.tar.gz: 737d10c1b9f4fa88a04393ae729e3a1b1fd31e11
 SHA512:
-  metadata.gz: fe1cc74a34fc894d3ee510b9890c74d92d0a163d6527d93afe8cc7084adf72024f9a8e12d08373880d8226d02427c3f1457c9dcea4dbc98ba5e4e2952e521a6b
-  data.tar.gz: 44ea14bd68e59a26becba382e260218bfbc0ce771fcee564690bd534a1eef79402e7bc151a13661064c182541c8fe9957586a47a6c37ff748ba5c2e5f111a256
+  metadata.gz: 6f61418887011483fabd4b04f2d6b2b4d3a6024c11e95d2ece38e6e3a1cb5a00d9067ff0065cf1df8a10afb918520002d0b86962a1a550217453647f63e0e8b0
+  data.tar.gz: 20e588e58c635e7e51f0e5db1eeb96a025085d3aaa108cbb36e475f37b5e027bf33b665d2d212ddfbf263f1e5b4c58617fce1da28cce9970359ad85c2e695756

data/Gemfile

@@ -4,11 +4,10 @@ ruby '2.2.1'
 
 # Specify your gem's dependencies in jobmensa_assets.gemspec
 gemspec
-gem 'refile', git: 'https://github.com/refile/refile.git', ref: '6a25a2405964e6c8ad7eb1761a365ccdf7987961'
+gem 'refile'
 gem 'rake'
 gem 'rspec'
 gem 'newrelic_rpm', require: false
 gem 'unicorn', require: false
 gem 'rollbar', require: false
-gem 'sinatra-logentries', require: false
-gem 'logging', require: false
+gem 'le', require: false

data/Gemfile.lock

@@ -1,16 +1,7 @@
-GIT
-  remote: https://github.com/refile/refile.git
-  revision: 6a25a2405964e6c8ad7eb1761a365ccdf7987961
-  ref: 6a25a2405964e6c8ad7eb1761a365ccdf7987961
-  specs:
-    refile (0.5.3)
-      mime-types
-      sinatra (~> 1.4.5)
-
 PATH
   remote: .
   specs:
-    jobmensa_assets (0.1.0)
+    jobmensa_assets (0.3.0)
       aws-sdk (>= 1.55, < 2)
       degu
       mini_magick
@@ -48,16 +39,13 @@ GEM
     json (1.8.2)
     kgio (2.9.3)
     le (2.6.2)
-    little-plugger (1.1.3)
-    logging (2.0.0)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.10)
     mime-types (2.4.3)
-    mini_magick (4.2.1)
+    mini_magick (4.2.3)
     mini_portile (0.6.2)
     minitest (5.6.0)
     multi_json (1.11.0)
-    newrelic_rpm (3.10.0.279)
+    netrc (0.10.3)
+    newrelic_rpm (3.11.2.286)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     rack (1.6.0)
@@ -65,31 +53,37 @@ GEM
       rack
     raindrops (0.13.0)
     rake (10.4.2)
-    rollbar (1.5.0)
+    refile (0.5.4)
+      mime-types
+      rest-client (~> 1.7.2)
+      sinatra (~> 1.4.5)
+    rest-client (1.7.3)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rollbar (1.5.1)
       multi_json (~> 1.3)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.3)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
     sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
-    sinatra-logentries (0.0.2)
-      le (>= 2.1.6)
     thread_safe (0.3.5)
     tilt (2.0.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    unicorn (4.8.3)
+    unicorn (4.9.0)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
@@ -100,11 +94,10 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.7)
   jobmensa_assets!
-  logging
+  le
   newrelic_rpm
   rake
-  refile!
+  refile
   rollbar
   rspec
-  sinatra-logentries
   unicorn

data/config.ru

@@ -13,18 +13,13 @@ require 'jobmensa_assets'
 require 'jobmensa_assets/config'
 require 'refile/app'
 
-# init logger, not needed if inside of a rails app
-require 'logging'
-logger = Logging.logger['default_logger']
-logger.add_appenders \
-  Logging.appenders.rolling_file "log/#{settings.environment}.log", keep: 5, age: 'daily'
-if [:test, :development].include? settings.environment
-  logger.level = :debug
+if logentries_key = ENV['LOGENTRIES_TOKEN']
+  require 'le'
+  Refile.logger = Le.new(logentries_key, log_level: Logger::INFO)
 else
-  logger.level = :info
+  Refile.logger = Logger.new("log/#{settings.environment}.log")
+  Refile.logger.level = Logger::DEBUG
 end
-Refile.logger = logger
-
 
 # configure rollbar
 if rollbar_key = ENV['ROLLBAR_ACCESS_TOKEN']
@@ -34,12 +29,6 @@ if rollbar_key = ENV['ROLLBAR_ACCESS_TOKEN']
   end
 end
 
-# configure logentries
-if logentries_key = ENV['LOGENTRIES_TOKEN']
-  require 'sinatra-logentries'
-  Sinatra::Logentries.token = logentries_key
-end
-
 # configure newrelic
 configure :staging, :production do
   require 'newrelic_rpm'
@@ -49,7 +38,7 @@ jobmensa_assets_app = Rack::Builder.new do
   if (authorized_domain = ENV['BLITZ_AUTHORIZED_DOMAIN'])
     map "/#{authorized_domain}" do
       blitz_app = Sinatra.new { get('/') { '42' } }
-      blitz_app.run!
+      run blitz_app
     end
   end
   map '/attachments' do

data/lib/jobmensa_assets.rb

@@ -1,7 +1,6 @@
 require 'jobmensa_assets/version'
 require 'refile'
 require 'jobmensa_assets/xt/refile/type'
-require 'jobmensa_assets/xt/refile/attacher'
 require 'jobmensa_assets/xt/refile/backend/s3'
 require 'jobmensa_assets/image_processor'
 require 'jobmensa_assets/attachment_type'

data/lib/jobmensa_assets/version.rb

@@ -1,3 +1,3 @@
 module JobmensaAssets
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jobmensa_assets
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jobmensa dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -132,7 +132,6 @@ files:
 - config.ru
 - config/ey.yml
 - config/newrelic.yml
-- config/puma.rb
 - config/unicorn_local.rb
 - jobmensa_assets.gemspec
 - lib/jobmensa_assets.rb
@@ -141,7 +140,6 @@ files:
 - lib/jobmensa_assets/image_processor.rb
 - lib/jobmensa_assets/railtie.rb
 - lib/jobmensa_assets/version.rb
-- lib/jobmensa_assets/xt/refile/attacher.rb
 - lib/jobmensa_assets/xt/refile/backend/s3.rb
 - lib/jobmensa_assets/xt/refile/type.rb
 - log/.git-keep
@@ -174,4 +172,3 @@ summary: Our image resize and delivery app.
 test_files:
 - spec/jobmensa_assets_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/config/puma.rb

@@ -1,8 +0,0 @@
-workers Integer(ENV['WEB_CONCURRENCY'] || 2)
-threads 0, Integer(ENV['WORKER_CONCURRENCY'] || 4)
-
-rackup DefaultRackup
-port ENV['PORT'] || 3000
-environment ENV['RACK_ENV'] || 'development'
-
-preload_app!

data/lib/jobmensa_assets/xt/refile/attacher.rb

@@ -1,32 +0,0 @@
-require 'refile'
-require 'refile/attacher'
-
-# Migration Content-Type (JM1) fix
-module Refile
-  class Attacher
-    def download(url)
-      unless url.to_s.empty?
-        file = open(url)
-        content_type = file.meta["content-type"]
-        if content_type.blank?
-          content_type = MIME::Types.type_for(::File.extname(file.base_uri.path).gsub('.', '')).first.content_type
-        end
-        @metadata = {
-          size: file.meta["content-length"].to_i,
-          filename: ::File.basename(file.base_uri.path),
-          content_type: content_type
-        }
-        if valid?
-          @metadata[:id] = cache.upload(file).id
-          write_metadata
-        elsif @raise_errors
-          raise Refile::Invalid, @errors.join(", ")
-        end
-      end
-    rescue OpenURI::HTTPError, RuntimeError => error
-      raise if error.is_a?(RuntimeError) and error.message !~ /redirection loop/
-      @errors = [:download_failed]
-      raise if @raise_errors
-    end
-  end
-end