nouvelles images et refactor

.gitignore

@@ -33,3 +33,5 @@ pickle-email-*.html
 # Ignore personnal configfiles
 config/database.yml
 .env
+
+add

app/controllers/missions_controller.rb

@@ -72,30 +72,29 @@ def mission_params
       p = params.require(:mission).permit(:title, :description, :small_description, :source_code, :youtube)
       if not params[:source_code].eql?("")
         mission = Mission.find_by(:id=>(params[:source_code]).to_i)
-        template = ""
-        File.open("#{Rails.root}/public#{mission.source_code.url.split('/')[0..-2].join('/')}/#{mission.source_code_file_name}", "r") do |infile|
-          while(line = infile.gets) do
-            template << line.gsub(mission.title, p[:title])
-          end
-        end
-        name = [p[:title],".xml"]
-        file = Tempfile.new(name, "#{Rails.root}/tmp")
-        file.write(template)
-        file.rewind
-        p[:source_code] = file
+        template = create_template_from(mission.title, 
+                                        File.open("#{Rails.root}/public#{mission.source_code.url.split('/')[0..-2].join('/')}/#{mission.source_code_file_name}", "r"),
+                                        p)
       else
-        template = ""
-        File.open("#{Rails.root}/public/default_mission.xml", "r") do |infile|
-          while(line = infile.gets) do
-            template << line.gsub("Untitled", p[:title])
-          end
-        end
-        name = [p[:title],".xml"]
-        file = Tempfile.new(name, "#{Rails.root}/tmp")
-        file.write(template)
-        file.rewind
-        p[:source_code] = file
+        template = create_template_from("Untitled", 
+                                        File.open("#{Rails.root}/public/default_mission.xml", "r"),
+                                        p)
       end
+      name = [p[:title],".xml"]
+      file = Tempfile.new(name, "#{Rails.root}/tmp")
+      file.write(template)
+      file.rewind
+      p[:source_code] = file
       p
     end
+
+    def create_template_from(title, file_from, p)
+      template = ""
+      line = file_from.gets
+      while(line) do
+        template << line.gsub(title, p[:title])
+        line = file_from.gets
+      end
+      template
+    end
 end

app/controllers/projects_controller.rb

@@ -40,12 +40,9 @@ def edit
   def create
     @project = Project.new(project_params)
     authorize_action_for @project
-    puts "\n\n\nproject tezfre#{@project}\n\n\n"
     if @project.save
-      puts "\n\n\nproject save#{@project}\n\n\n"
       respond_to do |format|
         format.json do
-          puts "\n\n\nproject #{@project}\n\n\n"
           render :show
         end
       end

config/environments/production.rb

@@ -1,105 +1,35 @@
 Rsnap::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
-  # Code is not reloaded between requests.
-  config.cache_classes = true
+  # In the development environment your application's code is reloaded on
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
+  config.cache_classes = false
 
-  # Eager load code on boot. This eager loads most of Rails and
-  # your application in memory, allowing both thread web servers
-  # and those relying on copy on write to perform better.
-  # Rake tasks automatically ignore this option for performance.
-  config.eager_load = true
+  # Do not eager load code on boot.
+  config.eager_load = false
 
-  # Full error reports are disabled and caching is turned on.
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = false
-  config.action_controller.perform_caching = true
+  config.action_controller.perform_caching = false
 
-  # Enable Rack::Cache to put a simple HTTP cache in front of your application
-  # Add `rack-cache` to your Gemfile before enabling this.
-  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
-  # config.action_dispatch.rack_cache = true
+  # Don't care if the mailer can't send.
+  config.action_mailer.raise_delivery_errors = false
 
-  # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  # Print deprecation notices to the Rails logger.
+  config.active_support.deprecation = :log
 
-  # Compress JavaScripts and CSS.
-  config.assets.js_compressor = :uglifier
-  # config.assets.css_compressor = :sass
+  # Raise an error on page load if there are pending migrations
+  config.active_record.migration_error = :page_load
 
-  # Do not fallback to assets pipeline if a precompiled asset is missed.
-  config.assets.compile = false
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
 
-  # Generate digests for assets URLs.
-  config.assets.digest = true
+  config.action_mailer.default_url_options = { :host => 'localhost' }
 
-  # Version of your assets, change this if you want to expire all your assets.
-  config.assets.version = '1.0'
-
-  # Specifies the header that your server uses for sending files.
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
-
-  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  # config.force_ssl = true
-
-  # Set to :debug to see everything in the log.
-  config.log_level = :info
-
-  # Prepend all log lines with the following tags.
-  # config.log_tags = [ :subdomain, :uuid ]
-
-  # Use a different logger for distributed setups.
-  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
-
-  # Use a different cache store in production.
-  # config.cache_store = :mem_cache_store
-
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  # config.action_controller.asset_host = "http://assets.example.com"
-
-  # Precompile additional assets.
-  # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-  config.assets.precompile += ["snap_application.js"]
-  config.assets.precompile += ["snap-byob/lang-ca.js", "snap-byob/lang-cs.js", "snap-byob/lang-de.js", "snap-byob/lang-dk.js", "snap-byob/lang-el.js", "snap-byob/lang-eo.js", "snap-byob/lang-es.js", "snap-byob/lang-fr.js", "snap-byob/lang-it.js", "snap-byob/lang-ja_HIRA.js", "snap-byob/lang-ja.js", "snap-byob/lang-ko.js", "snap-byob/lang-nl.js", "snap-byob/lang-no.js", "snap-byob/lang-pl.js", "snap-byob/lang-pt.js", "snap-byob/lang-ru.js", "snap-byob/lang-si.js", "snap-byob/lang-tw.js", "snap-byob/lang-zh.js"]
-  config.assets.precompile += ["*.png", "*.gif", "*.jpg", "*.xml", "*.mp3", "*.wav"]
-
-  # Ignore bad email addresses and do not raise email delivery errors.
-  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
-  # config.action_mailer.raise_delivery_errors = false
-
-  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found).
-  config.i18n.fallbacks = true
-
-  # Send deprecation notices to registered listeners.
-  config.active_support.deprecation = :notify
-
-  # Disable automatic flushing of the log to improve performance.
-  # config.autoflush_log = false
-
-  # Use default logging formatter so that PID and timestamp are not suppressed.
-  config.log_formatter = ::Logger::Formatter.new
-
-  config.action_mailer.default_url_options = { :host => 'rsnap.herokuapp.com' }
-
-  # Amazon AWS storage
-  config.paperclip_defaults = {
-    :storage => :s3,
-    :s3_credentials => {
-      :bucket => ENV['S3_BUCKET_NAME'],
-      :access_key_id => ENV['AWS_ACCESS_KEY_ID'],
-      :secret_access_key => ENV['AWS_SECRET_ACCESS_KEY']
-    },
-    :s3_protocol => :https
-  }
-
-  config.action_mailer.delivery_method = :smtp
-  config.action_mailer.smtp_settings = {
-    address:              'smtp.gmail.com',
-    port:                 587,
-    domain:               'rsnap.herokuapp.com',
-    user_name:            'snap.school',
-    password:             'aqwnjklp',
-    authentication:       'plain',
-    enable_starttls_auto: true  }
+  Paperclip.options[:command_path] = "/usr/bin/"
+  # Local storage
+  config.paperclip_defaults = {}
 end

config/unicorn.rb

@@ -4,7 +4,6 @@
 
 before_fork do |server, worker|
   Signal.trap 'TERM' do
-    puts 'Unicorn master intercepting TERM and sending myself QUIT instead'
     Process.kill 'QUIT', Process.pid
   end
 
@@ -13,9 +12,6 @@
 end
 
 after_fork do |server, worker|
-  Signal.trap 'TERM' do
-    puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to send QUIT'
-  end
 
   defined?(ActiveRecord::Base) and
     ActiveRecord::Base.establish_connection