From 42840bd6610c1bfa83985103e1186bc5d66cf107 Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Thu, 3 Jul 2014 23:21:39 +0200 Subject: [PATCH] add attachment model and add paperclip --- Gemfile.lock | 197 +++++++++++++++++++++------------------ app/models/attachment.rb | 1 - 2 files changed, 105 insertions(+), 93 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 680805b4..c204fac3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,183 +2,195 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.2.9) - aasm (3.4.0) - actionmailer (4.1.11) - actionpack (= 4.1.11) - actionview (= 4.1.11) + aasm (4.2.0) + actionmailer (4.1.12) + actionpack (= 4.1.12) + actionview (= 4.1.12) mail (~> 2.5, >= 2.5.4) - actionpack (4.1.11) - actionview (= 4.1.11) - activesupport (= 4.1.11) + actionpack (4.1.12) + actionview (= 4.1.12) + activesupport (= 4.1.12) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionpack-xml_parser (1.0.1) - actionpack (>= 4.0.0.rc1) - actionview (4.1.11) - activesupport (= 4.1.11) + actionpack-xml_parser (1.0.2) + actionpack (>= 4.0.0, < 5) + actionview (4.1.12) + activesupport (= 4.1.12) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.11) - activesupport (= 4.1.11) + activemodel (4.1.12) + activesupport (= 4.1.12) builder (~> 3.1) - activerecord (4.1.11) - activemodel (= 4.1.11) - activesupport (= 4.1.11) + activerecord (4.1.12) + activemodel (= 4.1.12) + activesupport (= 4.1.12) arel (~> 5.0.0) - activerecord-deprecated_finders (1.0.3) - activesupport (4.1.11) + activerecord-deprecated_finders (1.0.4) + activesupport (4.1.12) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) - acts_as_list (0.5.0) + acts_as_list (0.7.2) activerecord (>= 3.0) arel (5.0.1.20140414130214) - aruba (0.6.1) - childprocess (>= 0.3.6) - cucumber (>= 1.1.1) - rspec-expectations (>= 2.7.0) - bcrypt (3.1.9) + aruba (0.8.1) + childprocess (~> 0.5.6) + contracts (~> 0.9) + cucumber (>= 1.3.19) + rspec-expectations (>= 2.99) + bcrypt (3.1.10) builder (3.2.2) - bullet (4.14.0) + bullet (4.14.7) activesupport (>= 3.0.0) - uniform_notifier (>= 1.6.0) + uniform_notifier (~> 1.9.0) + cache_digests (0.3.1) + actionpack (>= 3.2) + thread_safe capybara (2.4.4) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - childprocess (0.5.5) + childprocess (0.5.6) ffi (~> 1.0, >= 1.0.11) - codeclimate-test-reporter (0.4.1) + climate_control (0.0.3) + activesupport (>= 3.0) + cocaine (0.5.7) + climate_control (>= 0.0.3, < 1.0) + codeclimate-test-reporter (0.4.7) simplecov (>= 0.7.1, < 1.0.0) coffee-rails (4.1.0) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) - coffee-script (2.3.0) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.8.0) - crass (0.2.1) - cucumber (1.3.18) + coffee-script-source (1.9.1.1) + contracts (0.11.0) + crass (1.0.2) + cucumber (2.0.2) builder (>= 2.1.2) + cucumber-core (~> 1.2.0) diff-lcs (>= 1.1.3) gherkin (~> 2.12) multi_json (>= 1.7.5, < 2.0) - multi_test (>= 0.1.1) - cucumber-rails (1.4.2) - capybara (>= 1.1.2, < 3) - cucumber (>= 1.3.8, < 2) - mime-types (>= 1.16, < 3) - nokogiri (~> 1.5) - rails (>= 3, < 5) - daemons (1.1.9) - database_cleaner (1.3.0) + multi_test (>= 0.1.2) + cucumber-core (1.2.0) + gherkin (~> 2.12.0) + cucumber-rails (1.4.0) + capybara (>= 1.1.2) + cucumber (>= 1.2.0) + nokogiri (>= 1.5.0) + rails (>= 3.0.0) + daemons (1.2.3) + database_cleaner (1.4.1) diff-lcs (1.2.5) docile (1.1.5) erubis (2.7.0) eventmachine (1.0.7) - execjs (2.2.2) + execjs (2.5.2) factory_girl (4.5.0) activesupport (>= 3.0.0) factory_girl_rails (4.5.0) factory_girl (~> 4.5.0) railties (>= 3.0.0) - ffi (1.9.6) + ffi (1.9.10) gherkin (2.12.2) multi_json (~> 1.3) hike (1.2.3) - htmlentities (4.3.3) + htmlentities (4.3.4) i18n (0.7.0) jquery-rails (3.1.3) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.3) - libv8 (3.16.14.7) + libv8 (3.16.14.11) mail (2.6.3) mime-types (>= 1.16, < 3) metaclass (0.0.4) mime-types (2.6.1) - mini_portile (0.6.1) + mimemagic (0.3.0) + mini_portile (0.6.2) minitest (5.7.0) mocha (1.1.0) metaclass (~> 0.0.1) - multi_json (1.11.1) - multi_test (0.1.1) - mysql2 (0.3.16) - nokogiri (1.6.4) + multi_json (1.11.2) + multi_test (0.1.2) + mysql2 (0.3.19) + nokogiri (1.6.6.2) mini_portile (~> 0.6.0) - nokogumbo (1.1.12) + nokogumbo (1.4.1) nokogiri - rack (1.5.5) - rack-dev-mark (0.7.3) - paperclip (4.1.1) - activemodel (>= 3.0.0) - activesupport (>= 3.0.0) - cocaine (~> 0.5.3) + paperclip (4.3.0) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + cocaine (~> 0.5.5) mime-types - polyglot (0.3.5) + mimemagic (= 0.3.0) + rack (1.5.5) + rack-dev-mark (0.7.4) rack (>= 1.1) - rack-mini-profiler (0.9.2) + rack-mini-profiler (0.9.7) rack (>= 1.1.3) rack-test (0.6.3) rack (>= 1.0) - rails (4.1.11) - actionmailer (= 4.1.11) - actionpack (= 4.1.11) - actionview (= 4.1.11) - activemodel (= 4.1.11) - activerecord (= 4.1.11) - activesupport (= 4.1.11) + rails (4.1.12) + actionmailer (= 4.1.12) + actionpack (= 4.1.12) + actionview (= 4.1.12) + activemodel (= 4.1.12) + activerecord (= 4.1.12) + activesupport (= 4.1.12) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.11) + railties (= 4.1.12) sprockets-rails (~> 2.0) rails_autolink (1.1.6) rails (> 3.1) - railties (4.1.11) - actionpack (= 4.1.11) - activesupport (= 4.1.11) + railties (4.1.12) + actionpack (= 4.1.12) + activesupport (= 4.1.12) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.4.2) - ref (1.0.5) - rspec-expectations (3.1.2) + ref (2.0.0) + rspec-expectations (3.3.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.1.0) - rspec-support (3.1.2) - rubyzip (1.1.6) + rspec-support (~> 3.3.0) + rspec-support (3.3.0) + rubyzip (1.1.7) safe_yaml (1.0.4) - sanitize (3.0.3) - crass (~> 0.2.0) + sanitize (4.0.0) + crass (~> 1.0.2) nokogiri (>= 1.4.4) - nokogumbo (= 1.1.12) + nokogumbo (= 1.4.1) sass (3.2.19) - sass-rails (4.0.4) + sass-rails (4.0.5) railties (>= 4.0.0, < 5.0) sass (~> 3.2.2) - sprockets (~> 2.8, < 2.12) + sprockets (~> 2.8, < 3.0) sprockets-rails (~> 2.0) - selenium-webdriver (2.45.0) + selenium-webdriver (2.47.1) childprocess (~> 0.5) multi_json (~> 1.0) rubyzip (~> 1.0) websocket (~> 1.0) - simplecov (0.9.1) + simplecov (0.10.0) docile (~> 1.1.0) - multi_json (~> 1.0) - simplecov-html (~> 0.8.0) - simplecov-html (0.8.0) - spring (1.1.3) + json (~> 1.8) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) + spring (1.3.6) spring-commands-cucumber (1.0.1) spring (>= 0.9.1) - sprockets (2.11.3) + sprockets (2.12.4) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.3.1) + sprockets-rails (2.3.2) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) @@ -186,7 +198,7 @@ GEM swf_fu (2.0.4) coffee-script rails (>= 3.1) - therubyracer (0.12.1) + therubyracer (0.12.2) libv8 (~> 3.16.14.0) ref thin (1.6.3) @@ -202,11 +214,11 @@ GEM will_paginate tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.5.3) + uglifier (2.7.1) execjs (>= 0.3.0) json (>= 1.8.0) - uniform_notifier (1.6.2) - websocket (1.2.1) + uniform_notifier (1.9.0) + websocket (1.2.2) will_paginate (3.0.7) xpath (2.0.0) nokogiri (~> 1.3) @@ -224,6 +236,7 @@ DEPENDENCIES aruba (>= 0.5.4) bcrypt (~> 3.1.7) bullet + cache_digests capybara codeclimate-test-reporter coffee-rails (~> 4.0) diff --git a/app/models/attachment.rb b/app/models/attachment.rb index d1ea3d4d..d42be866 100644 --- a/app/models/attachment.rb +++ b/app/models/attachment.rb @@ -20,5 +20,4 @@ class Attachment < ActiveRecord::Base file = nil save! end - end