Merge branch 'develop' into feature/opt_out_notification_fix

ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.html.erb

@@ -74,7 +74,7 @@
       <td style="text-align:center">
         <span class="latency">
         <span class="latency-value"><%= (sess.latency / 2).round %> ms</span>
-        <% if sess.latency <= (APP_CONFIG.max_good_full_score) %>
+        <% if sess.latency <= (APP_CONFIG.max_good_full_score / 2) %>
           <%= image_tag("http://www.jamkazam.com/assets/content/icon_green_score.png", alt: 'good score icon') %>
         <% else %>
           <%= image_tag("http://www.jamkazam.com/assets/content/icon_yellow_score.png", alt: 'fair score icon') %>

ruby/lib/jam_ruby/models/artifact_update.rb

@@ -44,7 +44,7 @@ module JamRuby
         # this is basically a dev-time only path of code; we store real artifacts in s3
         url = APP_CONFIG.jam_admin_root_url + self.uri.url
       else
-        url = "http://#{APP_CONFIG.cloudfront_host}/#{self[:uri]}"
+        url = "http://#{APP_CONFIG.cloudfront_host}/#{self.uri.store_dir}/#{self[:uri]}"
         #url = self.uri.url.gsub(APP_CONFIG.aws_fullhost, APP_CONFIG.cloudfront_host)
       end
 

ruby/lib/jam_ruby/models/email_batch_scheduled_sessions.rb

@@ -217,7 +217,7 @@ SQL
     def _collect_scored_recipients
       ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS tmp_matches")
       if !self.snapshot? || 0 == (max_score = ENV[ENV_MAX_LATENCY].to_i)
-        max_score = APP_CONFIG.max_yellow_full_score * 2
+        max_score = APP_CONFIG.max_yellow_full_score
       end
       limit_sql = (self.snapshot? && 0 < ENV[ENV_QUERY_LIMIT].to_i) ? "LIMIT #{ENV[ENV_QUERY_LIMIT]}" : ''
       sql =<<SQL

web/config/application.rb

@@ -256,7 +256,7 @@ if defined?(Bundler)
     config.max_track_upload_failures = 10
     config.max_track_part_upload_failures = 3
 
-    # scoring thresholds for 'full score', which is 1/2 your gear + 1/2 their gear + and 1/2 ping time
+    # scoring thresholds for 'full score', which is your gear +  their gear + and ping time
     config.max_good_full_score = 40
     config.max_yellow_full_score = 70
     config.max_red_full_score = 100

web/spec/features/create_session_flow_spec.rb

@@ -140,7 +140,7 @@ describe "Create Session UI", :js => true, :type => :feature, :capybara_feature
           find('li[create-type="schedule-future"] ins').trigger(:click)
           find('.btn-next').trigger(:click)
 
-          jk_select("Rock", '#create-session-form select[name="genres"]')
+          jk_select("Alternative Rock", '#create-session-form select[name="genres"]')
           fill_in('session-name', :with => "Test Name")
           fill_in('session-description', :with => "Test Description")
           find('.btn-next').trigger(:click)
@@ -167,7 +167,7 @@ describe "Create Session UI", :js => true, :type => :feature, :capybara_feature
           find('li[create-type="schedule-future"] ins').trigger(:click)
           find('.btn-next').trigger(:click)
 
-          jk_select("Rock", '#create-session-form select[name="genres"]')
+          jk_select("Alternative Rock", '#create-session-form select[name="genres"]')
           fill_in('session-name', :with => "Test Name")
           fill_in('session-description', :with => "Test Description")
           find('.btn-next').trigger(:click)
@@ -204,7 +204,7 @@ describe "Create Session UI", :js => true, :type => :feature, :capybara_feature
           find('li[create-type="schedule-future"] ins').trigger(:click)
           find('.btn-next').trigger(:click)
 
-          jk_select("Rock", '#create-session-form select[name="genres"]')
+          jk_select("Alternative Rock", '#create-session-form select[name="genres"]')
           fill_in('session-name', :with => "Test Name")
           fill_in('session-description', :with => "Test Description")
           find('.btn-next').trigger(:click)
@@ -219,7 +219,7 @@ describe "Create Session UI", :js => true, :type => :feature, :capybara_feature
 
       it "initial status" do
         find('.session-step-title', text: 'Review & Confirm')
-        find('em#session-name-disp', text: 'Test Name (Rock)')
+        find('em#session-name-disp', text: 'Test Name (Alternative Rock)')
         find('div#session-description-disp', text: 'Test Description')
         find('div#session-language-disp', text: 'English')
         find('div#session-invited-disp', text: 'Any interested JamKazam musicians that I approve')

web/spec/support/utilities.rb

@@ -267,7 +267,7 @@ def create_session(options={})
   creator = options[:creator] || FactoryGirl.create(:user)
   unique_session_name = options[:name] || "create_join_session #{SecureRandom.urlsafe_base64}"
   unique_session_desc = options[:description] || "create_join_session #{SecureRandom.urlsafe_base64}"
-  genre = options[:genre] || 'Rock'
+  genre = options[:genre] || 'Alternative Rock'
   musician_access = options[:musician_access].nil? ? true : options[:musician_access]
   approval_required = options[:approval_required].nil? ? true : options[:approval_required]
   fan_access = options[:fan_access].nil? ? true : options[:fan_access]
@@ -332,7 +332,7 @@ def schedule_session(options = {})
   creator = options[:creator] || FactoryGirl.create(:user)
   unique_session_name = options[:name] || "schedule_session #{SecureRandom.urlsafe_base64}"
   unique_session_desc = options[:description] || "schedule_session #{SecureRandom.urlsafe_base64}"
-  genre = options[:genre] || 'Rock'
+  genre = options[:genre] || 'Alternative Rock'
   musician_access = options[:musician_access].nil? ? true : options[:musician_access]
   approval_required = options[:approval_required].nil? ? true : options[:approval_required]
   fan_access = options[:fan_access].nil? ? true : options[:fan_access]
@@ -535,7 +535,7 @@ def random_genre
    'R&B',
    'Reggae',
    'Religious',
-   'Rock',
+   'Alternative Rock',
    'Ska',
    'Other'].sample
 end