Removing pre-1.9 hashrockets

Author: augustf

Gemfile.lock

@@ -1,27 +1,27 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.7)
-      actionpack (= 4.1.7)
-      actionview (= 4.1.7)
+    actionmailer (4.1.9)
+      actionpack (= 4.1.9)
+      actionview (= 4.1.9)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.7)
-      actionview (= 4.1.7)
-      activesupport (= 4.1.7)
+    actionpack (4.1.9)
+      actionview (= 4.1.9)
+      activesupport (= 4.1.9)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.7)
-      activesupport (= 4.1.7)
+    actionview (4.1.9)
+      activesupport (= 4.1.9)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.7)
-      activesupport (= 4.1.7)
+    activemodel (4.1.9)
+      activesupport (= 4.1.9)
       builder (~> 3.1)
-    activerecord (4.1.7)
-      activemodel (= 4.1.7)
-      activesupport (= 4.1.7)
+    activerecord (4.1.9)
+      activemodel (= 4.1.9)
+      activesupport (= 4.1.9)
       arel (~> 5.0.0)
-    activesupport (4.1.7)
+    activesupport (4.1.9)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -37,20 +37,20 @@ GEM
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
       multi_json (>= 1.0.0)
-    bcrypt (3.1.7)
+    bcrypt (3.1.9)
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
-    bootstrap-datepicker-rails (1.3.0.2)
+    bootstrap-datepicker-rails (1.3.1.1)
       railties (>= 3.0)
     builder (3.2.2)
     bundler-audit (0.3.1)
       bundler (~> 1.2)
       thor (~> 0.18)
-    cancancan (1.9.2)
-    clockwork (1.0.0)
+    cancancan (1.10.1)
+    clockwork (1.1.0)
       activesupport
       tzinfo
-    coffee-rails (4.0.1)
+    coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
     coffee-script (2.3.0)
@@ -74,50 +74,47 @@ GEM
     concerto_weather (0.0.8)
       rails
     connection_pool (1.2.0)
-    delayed_job (4.0.4)
-      activesupport (>= 3.0, < 4.2)
-    delayed_job_active_record (4.0.2)
-      activerecord (>= 3.0, < 4.2)
+    delayed_job (4.0.6)
+      activesupport (>= 3.0, < 5.0)
+    delayed_job_active_record (4.0.3)
+      activerecord (>= 3.0, < 5.0)
       delayed_job (>= 3.0, < 4.1)
     devise (3.0.4)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
       warden (~> 1.2.3)
     docile (1.1.5)
-    dotenv (0.11.1)
-      dotenv-deployment (~> 0.0.2)
-    dotenv-deployment (0.0.2)
+    dotenv (1.0.2)
     easy_translate (0.5.0)
       json
       thread
       thread_safe
     erubis (2.7.0)
     execjs (2.2.2)
     extlib (0.9.16)
-    faraday (0.9.0)
+    faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
-    foreman (0.75.0)
-      dotenv (~> 0.11.1)
+    foreman (0.77.0)
+      dotenv (~> 1.0.2)
       thor (~> 0.19.1)
     girl_friday (0.11.2)
       connection_pool (~> 1.0)
       rubinius-actor
     google-analytics-turbolinks (0.0.4)
-    google-api-client (0.7.1)
-      addressable (>= 2.3.2)
-      autoparse (>= 0.3.3)
-      extlib (>= 0.9.15)
-      faraday (>= 0.9.0)
-      jwt (>= 0.1.5)
-      launchy (>= 2.1.1)
-      multi_json (>= 1.0.0)
-      retriable (>= 1.4)
-      signet (>= 0.5.0)
-      uuidtools (>= 2.1.0)
+    google-api-client (0.8.2)
+      activesupport (>= 3.2)
+      addressable (~> 2.3)
+      autoparse (~> 0.3)
+      extlib (~> 0.9)
+      faraday (~> 0.9)
+      launchy (~> 2.4)
+      multi_json (~> 1.10)
+      retriable (~> 1.4)
+      signet (~> 0.6)
     highline (1.6.21)
     hike (1.2.3)
-    i18n (0.6.11)
+    i18n (0.7.0)
     i18n-js (3.0.0.rc8)
       i18n (~> 0.6)
     i18n-tasks (0.7.10)
@@ -129,73 +126,74 @@ GEM
       slop (>= 3.5.0)
       term-ansicolor
       terminal-table
-    icalendar (2.2.0)
+    icalendar (2.2.2)
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     jquery-timepicker-rails (1.4.3)
       railties (>= 3.1.0)
-    json (1.8.1)
-    jwt (1.0.0)
+    json (1.8.2)
+    jwt (1.2.0)
     kaminari (0.16.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    launchy (2.4.2)
+    launchy (2.4.3)
       addressable (~> 2.3)
     libv8 (3.16.14.7)
-    mail (2.6.1)
+    mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mime-types (2.4.3)
-    minitest (5.4.2)
+    minitest (5.5.1)
     multi_json (1.10.1)
     multipart-post (2.0.0)
-    mysql2 (0.3.16)
-    nprogress-rails (0.1.6.3)
+    nprogress-rails (0.1.6.5)
     orm_adapter (0.5.0)
     public_activity (1.4.2)
       actionpack (>= 3.0.0)
       activerecord (>= 3.0)
       i18n (>= 0.5.0)
       railties (>= 3.0.0)
     rack (1.5.2)
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.7)
-      actionmailer (= 4.1.7)
-      actionpack (= 4.1.7)
-      actionview (= 4.1.7)
-      activemodel (= 4.1.7)
-      activerecord (= 4.1.7)
-      activesupport (= 4.1.7)
+    rails (4.1.9)
+      actionmailer (= 4.1.9)
+      actionpack (= 4.1.9)
+      actionview (= 4.1.9)
+      activemodel (= 4.1.9)
+      activerecord (= 4.1.9)
+      activesupport (= 4.1.9)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.7)
+      railties (= 4.1.9)
       sprockets-rails (~> 2.0)
-    railties (4.1.7)
-      actionpack (= 4.1.7)
-      activesupport (= 4.1.7)
+    railties (4.1.9)
+      actionpack (= 4.1.9)
+      activesupport (= 4.1.9)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
-    redcarpet (3.2.0)
+    rake (10.4.2)
+    redcarpet (3.2.2)
     ref (1.0.5)
     retriable (1.4.1)
-    rmagick (2.13.3)
+    rmagick (2.13.4)
     rubinius-actor (0.0.2)
       rubinius-core-api
     rubinius-core-api (0.0.1)
     ruby-xslt (0.9.9)
     rubyzip (1.1.6)
-    sass (3.2.19)
-    sass-rails (4.0.4)
+    sass (3.4.9)
+    sass-rails (5.0.1)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.2)
-      sprockets (~> 2.8, < 2.12)
-      sprockets-rails (~> 2.0)
-    signet (0.5.1)
-      addressable (>= 2.2.3)
-      faraday (>= 0.9.0.rc5)
-      jwt (>= 0.1.5)
-      multi_json (>= 1.0.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (~> 1.1)
+    signet (0.6.0)
+      addressable (~> 2.3)
+      extlib (~> 0.9)
+      faraday (~> 0.9)
+      jwt (~> 1.0)
+      multi_json (~> 1.10)
     simplecov (0.9.1)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
@@ -207,11 +205,11 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.0)
+    sprockets-rails (2.2.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.9)
+    sqlite3 (1.3.10)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     terminal-table (1.4.5)
@@ -223,15 +221,14 @@ GEM
     thread_safe (0.3.4)
     tilt (1.4.1)
     tins (1.3.3)
-    turbolinks (2.4.0)
+    turbolinks (2.5.3)
       coffee-rails
-    twitter-bootstrap-rails-confirm (1.0.3)
+    twitter-bootstrap-rails-confirm (1.0.4)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.5.3)
+    uglifier (2.7.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    uuidtools (2.1.5)
     warden (1.2.3)
       rack (>= 1.0)
 

app/controllers/application_controller.rb

@@ -212,10 +212,10 @@ def process_notification(ar_instance, pa_params, options = {})
       #make an effort to catch all mail-related exceptions after sending the mail - IOError will catch anything for sendmail, SMTP for the rest
       rescue IOError, Net::SMTPAuthenticationError, Net::SMTPServerBusy, Net::SMTPSyntaxError, Net::SMTPFatalError, Net::SMTPUnknownError => e
         Rails.logger.debug "Mail delivery failed at #{Time.now.to_s} for #{options[:recipient]}: #{e.message}"
-        ConcertoConfig.first.create_activity :action => :system_notification, :params => {:message => t(:smtp_send_error)}
+        ConcertoConfig.first.create_activity action: :system_notification, params: {message: t(:smtp_send_error)}
       rescue OpenSSL::SSL::SSLError => e
         Rails.logger.debug "Mail delivery failed at #{Time.now.to_s} for #{options[:recipient]}: #{e.message} -- might need to disable SSL Verification in settings"
-        ConcertoConfig.first.create_activity :action => :system_notification, :params => {:message => t(:smtp_send_error_ssl)}
+        ConcertoConfig.first.create_activity action: :system_notification, params: {message: t(:smtp_send_error_ssl)}
       end
     end
 
@@ -261,10 +261,10 @@ def check_for_initial_install
   #Don't break for CanCan exceptions; send the user to the front page with a Flash error message
   rescue_from CanCan::AccessDenied do |exception|
     respond_to do |format|
-      format.json { render :json => {:error=>true, :status=>403, :message => exception.message}, :status => :forbidden }
-      format.xml{ render :xml => {:error=>true, :status=>403, :message => exception.message}, :status => :forbidden }
+      format.json { render json: {error:true, status:403, message: exception.message}, status: :forbidden }
+      format.xml{ render xml: {error:true, status:403, message: exception.message}, status: :forbidden }
       format.any {
-        redirect_to main_app.root_url, :flash => { :notice => exception.message }
+        redirect_to main_app.root_url, flash: { notice: exception.message }
       }
     end
   end
@@ -381,7 +381,7 @@ def extract_pagination_from_relation(relation)
      # applied before auth.
      relation.limit_value = nil
      relation.offset_value = [0,offset-(page-1)*per].max
-     return {:page => page, :per => per}
+     return {page: page, per: per}
     else
      # Not paginated, we don't need to do anything.
      return nil
@@ -426,7 +426,7 @@ def after_sign_in_path_for(resource)
   def process_notification_options(options = {})
     opts = {}
     opts[:params] = {
-      :owner_name => current_user.name
+      owner_name: current_user.name
     }
     opts[:owner] = current_user
     opts[:action] = action_name

app/controllers/concerto_config_controller.rb

@@ -8,7 +8,7 @@ def show
 
   def initiate_restart
     restart_webserver()
-    redirect_to :action => :show
+    redirect_to action: :show
   end
 
   def config_check
@@ -29,22 +29,22 @@ def config_check
   def update
     authorize! :update, ConcertoConfig
     params[:concerto_config].each  do |k,v|
-      config = ConcertoConfig.where(:key => k).first
+      config = ConcertoConfig.where(key: k).first
       # since all they can change is the value, only create/update if it changed
       if config.nil? || config.value != v
         if config.nil?
-          config = ConcertoConfig.new(:key => k, :value => v)
+          config = ConcertoConfig.new(key: k, value: v)
           config.save
         else
           config.update_column(:value, v)
         end
-        process_notification(config, {}, process_notification_options({:params => {:concerto_config_key => config.key}}))
+        process_notification(config, {}, process_notification_options({params: {concerto_config_key: config.key}}))
       end
     end
 
     ConcertoConfig.cache_expire
     flash[:notice] = t(:settings_saved)
-    redirect_to :action => :show
+    redirect_to action: :show
   end
 
 end