jobmensa_assets 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15057b5098dc275d50c8b3c9ecc24c520af11709
-  data.tar.gz: ffbf510953e3f0eeba3a15955c56c9e740eae67b
+  metadata.gz: 33dc913cb03fb90f0b53631c53b6153cdd750d0b
+  data.tar.gz: c2098fe8f90400e7207235c769c01a841061717f
 SHA512:
-  metadata.gz: 7db8acffb9dcc6d9ce53e044395b806fe3ee5a4a47493c34090296fc54ee6ad4c9655b95a84d608e5525b72898a0b67f4a802d8000836940b61cfa525be8c2b3
-  data.tar.gz: 5ed16fe81bd6297cb1552f526c434707b2f8eb6844556d7aab5ae383598c8ce262f1a20def639df83f4b63e6f2bfd17dc3a31ad562abb40c3607a92de08ad6ce
+  metadata.gz: fe1cc74a34fc894d3ee510b9890c74d92d0a163d6527d93afe8cc7084adf72024f9a8e12d08373880d8226d02427c3f1457c9dcea4dbc98ba5e4e2952e521a6b
+  data.tar.gz: 44ea14bd68e59a26becba382e260218bfbc0ce771fcee564690bd534a1eef79402e7bc151a13661064c182541c8fe9957586a47a6c37ff748ba5c2e5f111a256

data/Gemfile

@@ -8,6 +8,7 @@ gem 'refile', git: 'https://github.com/refile/refile.git', ref: '6a25a2405964e6c
 gem 'rake'
 gem 'rspec'
 gem 'newrelic_rpm', require: false
-gem 'puma', require: false
 gem 'unicorn', require: false
-gem 'rollbar', require: false
+gem 'rollbar', require: false
+gem 'sinatra-logentries', require: false
+gem 'logging', require: false

data/Gemfile.lock

@@ -47,22 +47,25 @@ GEM
     i18n (0.7.0)
     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_portile (0.6.2)
-    minitest (5.5.1)
+    minitest (5.6.0)
     multi_json (1.11.0)
     newrelic_rpm (3.10.0.279)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    puma (2.11.1)
-      rack (>= 1.1, < 2.0)
     rack (1.6.0)
     rack-protection (1.5.3)
       rack
     raindrops (0.13.0)
     rake (10.4.2)
-    rollbar (1.4.4)
+    rollbar (1.5.0)
       multi_json (~> 1.3)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
@@ -80,6 +83,8 @@ GEM
       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)
@@ -95,10 +100,11 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.7)
   jobmensa_assets!
+  logging
   newrelic_rpm
-  puma
   rake
   refile!
   rollbar
   rspec
+  sinatra-logentries
   unicorn

data/config/ey.yml

@@ -0,0 +1,178 @@
+# Engine Yard Cloud Deploy Options
+#
+####################################################################
+#                           IMPORTANT
+#            Commit this file into your git repository.
+#       These options are loaded on the server during deploy.
+####################################################################
+#
+# Valid locations:
+# * REPOSITORY_ROOT/config/ey.yml.
+# * REPOSITORY_ROOT/ey.yml
+#
+# Further information available here:
+# https://support.cloud.engineyard.com/entries/20996661-customize-your-deployment-on-engine-yard-cloud
+#
+# For advanced usage, see the source that loads this configuration:
+# https://github.com/engineyard/engineyard-serverside/blob/master/lib/engineyard-serverside/configuration.rb
+#
+defaults:
+  # Run migrations during deploy by default.
+  #
+  # When set to true, runs the migration_command (below) during deploy.
+  #
+  # This setting can be overridden for individual deployments using
+  # the command line options --migrate or --no-migrate.
+  #
+  migrate: false
+
+  # Default migration command to run when migrations are enabled.
+  #
+  #migration_command: rake db:migrate --trace
+
+  # Enables rails assets precompilation always and halts when the task fails.
+  #
+  # By default, assets are detected using app/assets and config/application.rb.
+  #
+  # If you use rails assets and you want Engine Yard to compile your assets
+  # during deploy, set this to true. If you want to compile assets locally
+  # before deploy, set this to false. Make sure you add `public/assets` to
+  # `.gitignore` if you want Engine Yard to precompile your assets.
+  #
+  # For more control over assets, set precompile_assets: false and
+  # run your precompile task in the deploy/before_compile_assets.rb deploy hook.
+  #
+  precompile_assets: false
+
+  # Override the assets:precompile rake task. This option will be used instead
+  # of assets:precompile in the `rake assets:precompile` command.
+  #
+  #precompile_assets_task: assets:precompile
+
+  # Asset strategies affect the way assets are stored on the server.
+  #
+  # * private
+  #   Store assets directly in public/assets for each deployment.
+  #   Previous assets are symlinked for continuity.
+  #   When assets are reused, they are copied using rsync.
+  #
+  # * shifting
+  #   Assets are kept in a shared directory on each server.
+  #   When new assets are compiled, old assets are shifted to a shared
+  #   last_assets directory. This has always been the default behavior.
+  #
+  # * shared
+  #   Assets are kept in a shared directory on each server.
+  #   When new assets are compiled, the same directory is used.
+  #   Assets will accumulate in this mode if a cleaning script is not run.
+  #   Use this strategy if you want to write your own asset cleaning script.
+  #
+  # * cleaning
+  #   Like shared, but a cleaning script is run before each new compile.
+  #   The script attempts to remove all files not mentioned by the old
+  #   manifest.yml, before it is replaced by the new manifest (leaving 2
+  #   deployments worth of assets in the directory)
+  #
+  # "private" is recommended because it is the least error prone.
+  # If you prefer faster compilation, "shared" can be quicker, but will require
+  # custom scripting and will cause problems when rollbacks are used.
+  # "shifting" is the default behavior.
+  #
+  #asset_strategy: private
+
+  # This list of repository relative paths is checked for changes during
+  # each deployment (when change detection is not disabled). If `git diff`
+  # detects changes since the last deployment, fresh assets will be compiled.
+  #
+  # This option overrides the default list, so include the following
+  # defaults if you need them.
+  #
+  #asset_dependencies:
+  #- app/assets            # default
+  #- lib/assets            # default
+  #- vendor/assets         # default
+  #- Gemfile.lock          # default
+  #- config/application.rb # default
+  #- config/routes.rb      # default
+  #- config/requirejs.yml  # example of a custom asset dependency
+
+  # When true, precompiles assets even if no changes would be detected by
+  # running git diff with the asset_dependencies above.
+  #
+  # Default is false (always check git diff before asset compilation)
+  #
+  #precompile_unchanged_assets: false
+
+  # Choose which servers should compile assets.
+  #
+  # Default behavior is to exclude util instances.
+  # Specify :all to compile on all servers including util servers.
+  #
+  #asset_roles: :all
+
+  # Bundle without different bundler groups:
+  # Ex: bundle install --without '[bundle_without]'
+  #
+  # Default is "".
+  # Leave blank to remove --without from the bundle install command.
+  #
+  #bundle_without: 
+
+  # Add extra options to the bundle install command line.
+  # Does not override bundle_without, if specified.
+  #
+  # If the application's gems are vendored in the
+  # repository, setting --local can speed up bundle.
+  #
+  #bundle_options: 
+
+  # Enable maintenance page during migrate action (default)
+  # Setting this to false, disables maintenance page during migrations.
+  #
+  # CAUTION! No-downtime migrations requires careful migration
+  # planning. Migrations must be non-destructive. The *previous*
+  # deployment might serve pages during a partially migrated state.
+  # For example, if you rename a column, all traffic served during
+  # that migration will be broken until the new code is deployed.
+  #
+  #maintenance_on_migrate: true
+
+  # Enable maintanence page during every deploy.
+  # Unicorn and Passenger support no-downtime deploys, so the default
+  # for these servers is false. Mongrel and some other servers default
+  # to true to avoid downtime during server restarting.
+  #
+  #maintenance_on_restart: 
+
+  # If true, always run deployments in verbose mode.
+  #
+  #verbose: false
+
+  # Hide the warning shown when the Gemfile does not contain a recognized
+  # database adapter (mongodb for example)
+  #
+  # This warning is here to help new customers that accidentally have no adapter.
+  # You may safely set this to true if you aren't using a common database.
+  #
+  #ignore_database_adapter_warning: false
+
+  # You can add custom keys that will be available in your deploy hooks.
+  # Custom keys will be available using config.key or config[:key]
+  #
+  #your_own_custom_key: custom info
+
+
+####################################################################
+# Environment specific options.
+#
+# The options you specify here will only apply to a single environment
+# that exactly matches the environment name key.
+#
+# Environment options will override the default options above.
+#
+environments:
+
+  # These options will only apply to the EXAMPLE_ENVIRONMENT environment.
+  #EXAMPLE_ENVIRONMENT:
+    #precompile_unchanged_assets: true
+

data/config.ru

@@ -14,34 +14,47 @@ require 'jobmensa_assets/config'
 require 'refile/app'
 
 # init logger, not needed if inside of a rails app
-require 'logger'
-Refile.logger = if [:test, :development].include? settings.environment
-  logger = Logger.new("log/#{settings.environment}.log")
-  logger.level = Logger::DEBUG
-  logger
+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
 else
-  logger = Logger.new(STDOUT)
-  logger.level = Logger::INFO
-  logger
+  logger.level = :info
 end
+Refile.logger = logger
+
 
 # configure rollbar
-require 'rollbar'
 if rollbar_key = ENV['ROLLBAR_ACCESS_TOKEN']
+  require 'rollbar'
   Rollbar.configure do |config|
     config.access_token = rollbar_key
   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'
 end
 
 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!
+    end
+  end
   map '/attachments' do
     run Refile::App
   end
 end
 
-run jobmensa_assets_app
+run jobmensa_assets_app

data/lib/jobmensa_assets/attachment_type.rb

@@ -3,9 +3,13 @@ require 'degu'
 module JobmensaAssets
   enum :AttachmentType do
     field :content_type
-
+    
+    # Path for image if no thumnail is available
+    field :default_thumbnail_path
+        
     Image(
-      content_type: ['image/jpeg', 'image/gif', 'image/png']
+      content_type: ['image/jpeg', 'image/gif', 'image/png'],
+      default_thumbnail_path: ''
     )
 
     Spreadsheet(
@@ -13,11 +17,13 @@ module JobmensaAssets
         'application/vnd.ms-excel', 'application/excel', # xls
         'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', # xlsx
         'application/vnd.oasis.opendocument.spreadsheet' # ods
-      ]
+      ],
+      default_thumbnail_path: 'jobmensa/attachment-tables.png'
     )
 
     PDF(
-      content_type: ['application/pdf']
+      content_type: ['application/pdf'],
+      default_thumbnail_path: 'jobmensa/attachment-pdf.png'
     )
 
     Document(
@@ -26,7 +32,8 @@ module JobmensaAssets
         'application/vnd.openxmlformats-officedocument.wordprocessingml.document', # docx
         'application/vnd.oasis.opendocument.text', # odt
         'application/rtf', 'application/x-rtf', 'text/rtf', 'text/x-rtf' # rtf
-      ]
+      ],
+      default_thumbnail_path: 'jobmensa/attachment-text.png'
     )
 
     def self.content_type(type)
@@ -43,7 +50,13 @@ module JobmensaAssets
         content_type.each_with_object([]) { |type, memo| memo << MIME::Types[type].flat_map(&:extensions) }.flatten.uniq
       end
     end
-
+    
+    def self.attachment_type_for(content_type)
+      all.select do |attachment_type|
+        attachment_type.content_type.include? content_type
+      end.first
+    end
+    
     def self.max_filesize(_type)
       Refile.cache.max_size
     end

data/lib/jobmensa_assets/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jobmensa_assets
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jobmensa dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -130,9 +130,10 @@ files:
 - README.md
 - Rakefile
 - config.ru
+- config/ey.yml
 - config/newrelic.yml
 - config/puma.rb
-- config/unicorn.rb
+- config/unicorn_local.rb
 - jobmensa_assets.gemspec
 - lib/jobmensa_assets.rb
 - lib/jobmensa_assets/attachment_type.rb
@@ -173,3 +174,4 @@ summary: Our image resize and delivery app.
 test_files:
 - spec/jobmensa_assets_spec.rb
 - spec/spec_helper.rb
+has_rdoc: