<%= @claimed_recording.recording.play_count %>
@@ -101,7 +113,45 @@
$(function () {
var showRecording = new JK.ShowRecording(JK.app);
showRecording.initialize("<%= @claimed_recording.id %>", "<%= @claimed_recording.recording_id %>");
- })
+
+ // remainder of this code is related to playing/pausing the recording
+ var htmlAudio = $(".recording-controls").find('audio').get(0);
+ var durationInitialized = false;
+
+ function formatTime(time) {
+ var minutes = Math.floor(time / 60);
+ var seconds = Math.floor(time % 60);
+ return minutes.toString() + ":" + (seconds > 9 ? seconds.toString() : '0' + seconds.toString());
+ }
+
+ // this calculates the original
+ $(htmlAudio).on('timeupdate', function() {
+ if (!durationInitialized) {
+ $("#recordingDuration").html(formatTime(htmlAudio.duration));
+ durationInitialized = true;
+ }
+ var percentComplete = (htmlAudio.currentTime / htmlAudio.duration) * 100;
+ $(".recording-slider").css({'left': percentComplete + '%'});
+ $(".recording-current").html(formatTime(htmlAudio.currentTime));
+
+ // reset icon to play and slider to far left when done
+ if (percentComplete === 100) {
+ $("#imgPlayPause").attr('src', '/assets/content/icon_playbutton.png');
+ $(".recording-slider").css({'left': 0 + '%'});
+ }
+ });
+
+ $("#btnPlayPause").click(function() {
+ if (htmlAudio.paused) {
+ htmlAudio.play();
+ $("#imgPlayPause").attr('src', '/assets/content/icon_pausebutton.png');
+ }
+ else {
+ htmlAudio.pause();
+ $("#imgPlayPause").attr('src', '/assets/content/icon_playbutton.png');
+ }
+ });
+ });
<% end %>
diff --git a/web/app/views/shared/_landing_sidebar.html.erb b/web/app/views/shared/_landing_sidebar.html.erb
index ab14d09fc..673acebf7 100644
--- a/web/app/views/shared/_landing_sidebar.html.erb
+++ b/web/app/views/shared/_landing_sidebar.html.erb
@@ -4,14 +4,15 @@
<% recent_history.each do |history_record| %>
- <% if history_record.instance_of? ClaimedRecording %>
+ <% if history_record.instance_of? Recording %>
<%= history_record.created_at.strftime("%b #{history_record.created_at.day.ordinalize}") %>:
+
<%= history_record.claimed_recordings.first.description %>
<% elsif history_record.instance_of? MusicSessionHistory %>
@@ -31,9 +32,9 @@
Session Ended. Unavailable.
<% end %>
+
<%= history_record.description %>
<% end %>
-
<%= history_record.description %>
<% if history_record != recent_history.last %>
<% end %>
diff --git a/web/app/views/users/_buzz_item.html.erb b/web/app/views/users/_buzz_item.html.erb
index 1fccfc34f..78820dea6 100644
--- a/web/app/views/users/_buzz_item.html.erb
+++ b/web/app/views/users/_buzz_item.html.erb
@@ -1,7 +1,7 @@
<%= content_tag(:div, :class => "buzz-item small", :data => { :buzz_item => buzz_item.id}) do %>
- <%= content_tag(:div, image_tag(buzz_item.image), :class => "avatar_large mr20") %>
+ <%= content_tag(:div, image_tag(buzz_item.image_url, :size => '54x54'), :class => "avatar_large mr20") %>
<%= content_tag(:div, buzz_item.text_long, :class => "buzz-item-text") %>
<%= content_tag(:div, "--#{buzz_item.text_short}", :class => "right", :style => "margin-top:6px;") %>
<%= content_tag(:div, nil, :class => "clearall") %>
diff --git a/web/app/views/users/_feed_item.html.erb b/web/app/views/users/_feed_item.html.erb
index a75e92783..b2051a56d 100644
--- a/web/app/views/users/_feed_item.html.erb
+++ b/web/app/views/users/_feed_item.html.erb
@@ -2,7 +2,7 @@
<%= content_tag(:div, :class => "feed-entry") do %>
- <%= content_tag(:div, image_tag(src="images/content/avatar_band1.jpg")) %>
+ <%= content_tag(:div, image_tag(src="content/avatar_band1.jpg")) %>
diff --git a/web/app/views/users/welcome.html.erb b/web/app/views/users/welcome.html.erb
index 209d57544..72777710f 100644
--- a/web/app/views/users/welcome.html.erb
+++ b/web/app/views/users/welcome.html.erb
@@ -26,7 +26,7 @@
<%= content_tag(:div, :class => "home-questions") do -%>
Have questions about how JamKazam works?
-
Here are some answers.
+
Here are some answers.
<% end %>
<% end %>
<% end %>
diff --git a/web/build b/web/build
index d529624da..e0d0ae888 100755
--- a/web/build
+++ b/web/build
@@ -57,7 +57,17 @@ if [ -z $SKIP_TESTS ]; then
bundle exec rspec
if [ "$?" = "0" ]; then
echo "success: ran rspec tests"
- else
+ elif [ "$?" = "20" ]; then
+ echo "retrying once more"
+ bundle exec rspec
+
+ if [ "$?" = "0" ]; then
+ echo "success: ran rspec tests"
+ else
+ echo "running rspec tests for the second time failed."
+ exit 1
+ fi
+ else
echo "running rspec tests failed."
exit 1
fi
diff --git a/web/config/initializers/jam_ruby/promotional.rb b/web/config/initializers/jam_ruby/promotional.rb
new file mode 100644
index 000000000..7d58bf09d
--- /dev/null
+++ b/web/config/initializers/jam_ruby/promotional.rb
@@ -0,0 +1,3 @@
+class JamRuby::PromoBuzz < JamRuby::Promotional
+ mount_uploader :image, ImageUploader
+end
diff --git a/web/config/routes.rb b/web/config/routes.rb
index 89dc54cb3..54cd40d12 100644
--- a/web/config/routes.rb
+++ b/web/config/routes.rb
@@ -347,9 +347,14 @@ SampleApp::Application.routes.draw do
match '/feeds' => 'api_feeds#index', :via => :get
# scoring
+ # todo scoring should pick the clientid up from the current logged in user
match '/scoring/work/:clientid' => 'api_scoring#work', :via => :get
match '/scoring/worklist/:clientid' => 'api_scoring#worklist', :via => :get
match '/scoring/record' => 'api_scoring#record', :via => :post
+
+ # favorites
+ match '/favorites' => 'api_favorites#index', :via => :get
+ match '/favorites/:id' => 'api_favorites#update', :via => :post
end
end
diff --git a/web/lib/music_session_manager.rb b/web/lib/music_session_manager.rb
index b9d69fae7..3efc2cb90 100644
--- a/web/lib/music_session_manager.rb
+++ b/web/lib/music_session_manager.rb
@@ -43,9 +43,6 @@ MusicSessionManager < BaseManager
# save session parameters for next session
User.save_session_settings(user, music_session)
- # save session history
- MusicSessionHistory.save(music_session)
-
# auto-join this user into the newly created session
as_musician = true
connection = ConnectionManager.new.join_music_session(user, client_id, music_session, as_musician, tracks)
@@ -96,12 +93,9 @@ MusicSessionManager < BaseManager
update[:genres] = genre_array
end
- if music_session.update_attributes(update)
- # save session history (only thing that could change is description)
- MusicSessionHistory.save(music_session)
- end
+ music_session.update_attributes(update)
- return music_session
+ music_session
end
def participant_create(user, music_session_id, client_id, as_musician, tracks)
diff --git a/web/lib/tasks/sample_data.rake b/web/lib/tasks/sample_data.rake
index 622173630..facaf1b4b 100644
--- a/web/lib/tasks/sample_data.rake
+++ b/web/lib/tasks/sample_data.rake
@@ -32,6 +32,7 @@ namespace :db do
end
task populate: :environment do
+ make_users(10) if 14 > User.count
make_friends
make_bands
make_band_members
diff --git a/web/spec/controllers/api_favorites_controller_spec.rb b/web/spec/controllers/api_favorites_controller_spec.rb
new file mode 100644
index 000000000..21226e154
--- /dev/null
+++ b/web/spec/controllers/api_favorites_controller_spec.rb
@@ -0,0 +1,87 @@
+require 'spec_helper'
+
+describe ApiFavoritesController do
+ render_views
+
+ let(:user) { FactoryGirl.create(:user) }
+ let(:user2) { FactoryGirl.create(:user) }
+ let(:band) { FactoryGirl.create(:band) }
+ let(:music_session) { FactoryGirl.create(:music_session, creator: user) }
+ let(:claimed_recording) { FactoryGirl.create(:claimed_recording) }
+
+ before(:each) do
+ RecordingLiker.delete_all
+ ClaimedRecording.delete_all
+ controller.current_user = nil
+ end
+
+ describe "index" do
+ it "insists on login" do
+ get :index
+ response.status.should == 403
+ end
+
+ it "requires user param" do
+ controller.current_user = user
+ expect { get :index }.to raise_error "user must be specified"
+ end
+
+ it "can return nothing" do
+ controller.current_user = user
+ get :index, { user: user}
+
+ json = JSON.parse(response.body, :symbolize_names => true)
+ json[:entries].length.should == 0
+ json[:since].should be_nil
+ end
+
+ it "returns one thing" do
+ claimed_recording.touch
+ like = FactoryGirl.create(:recording_like, user: user, claimed_recording: claimed_recording, recording: claimed_recording.recording, favorite: true)
+
+ controller.current_user = user
+ get :index, { user: user}
+
+ json = JSON.parse(response.body, :symbolize_names => true)
+ json[:entries].length.should == 1
+ json[:since].should be_nil
+ end
+ end
+
+
+ describe "update" do
+
+ it "insists on login" do
+ post :update, {id: '1'}
+ response.status.should == 403
+ end
+
+ it "404 if no like for record" do
+ controller.current_user = user
+ post :update, {id: claimed_recording.id}
+ response.status.should == 404
+ end
+
+ it "no favorite specified leaves record alone" do
+ controller.current_user = user
+ like = FactoryGirl.create(:recording_like, user: user, claimed_recording: claimed_recording, recording: claimed_recording.recording, favorite: true)
+ post :update, {:format => 'json', id: claimed_recording.id}
+ response.status.should == 200
+
+ like.reload
+ like.favorite.should be_true
+ end
+
+ it "can set favorite to false" do
+ controller.current_user = user
+ like = FactoryGirl.create(:recording_like, user: user, claimed_recording: claimed_recording, recording: claimed_recording.recording, favorite: true)
+ post :update, {:format => 'json', id: claimed_recording.id, favorite:false}
+ response.status.should == 200
+
+ like.reload
+ like.favorite.should be_false
+ end
+
+ end
+
+end
diff --git a/web/spec/controllers/api_feeds_controller_spec.rb b/web/spec/controllers/api_feeds_controller_spec.rb
index bc581e267..e3c906744 100644
--- a/web/spec/controllers/api_feeds_controller_spec.rb
+++ b/web/spec/controllers/api_feeds_controller_spec.rb
@@ -4,11 +4,14 @@ describe ApiFeedsController do
render_views
let(:user) { FactoryGirl.create(:user) }
+ let(:user2) { FactoryGirl.create(:user) }
+ let(:band) { FactoryGirl.create(:band) }
let(:music_session) {FactoryGirl.create(:music_session, creator: user) }
let(:claimed_recording) {FactoryGirl.create(:claimed_recording) }
before(:each) do
MusicSession.delete_all
+ MusicSessionUserHistory.delete_all
MusicSessionHistory.delete_all
Recording.delete_all
end
@@ -23,6 +26,7 @@ describe ApiFeedsController do
it "returns a recording" do
claimed_recording.touch
# artifact of factory of :claimed_recording that this gets created
+ MusicSessionUserHistory.delete_all
MusicSessionHistory.delete_all
get :index
@@ -109,4 +113,65 @@ describe ApiFeedsController do
_next.should be_nil
end
end
+
+ describe "user targetting" do
+
+ it "user viewing own profile" do
+ music_session.fan_access = false
+ music_session.save!
+ controller.current_user = music_session.creator
+
+ get :index, { user: music_session.creator.id }
+ json = JSON.parse(response.body, :symbolize_names => true)
+ json[:entries].length.should == 1
+ end
+
+ it "user viewing someone else's profile" do
+ music_session.fan_access = false
+ music_session.save!
+ controller.current_user = user2
+ music_session.music_session_history.reload
+ music_session.music_session_history.fan_access.should be_false
+
+ get :index, { user: music_session.creator.id }
+ json = JSON.parse(response.body, :symbolize_names => true)
+ json[:entries].length.should == 0
+ end
+ end
+
+ describe "band targetting" do
+
+ it "user viewing own band" do
+ user.bands << band
+ user.save!
+ claimed_recording1 = FactoryGirl.create(:claimed_recording, user: user)
+ claimed_recording1.is_public = false
+ claimed_recording1.recording.band = band
+ claimed_recording1.recording.save!
+ claimed_recording1.save!
+
+ controller.current_user = user
+
+ get :index, { band: band.id }
+ json = JSON.parse(response.body, :symbolize_names => true)
+ json[:entries].length.should == 1
+ end
+
+ it "user viewing someone else's band" do
+ user.bands << band
+ user.save!
+
+ claimed_recording1 = FactoryGirl.create(:claimed_recording, user: user)
+ claimed_recording1.is_public = false
+ claimed_recording1.recording.band = band
+ claimed_recording1.recording.save!
+ claimed_recording1.save!
+
+ controller.current_user = user2
+
+ get :index, { band: band.id }
+ json = JSON.parse(response.body, :symbolize_names => true)
+ json[:entries].length.should == 0
+ end
+ end
end
diff --git a/web/spec/factories.rb b/web/spec/factories.rb
index 71b608c6a..d805af4a7 100644
--- a/web/spec/factories.rb
+++ b/web/spec/factories.rb
@@ -52,12 +52,20 @@ FactoryGirl.define do
association :creator, :factory => :user
after(:create) { |session|
- MusicSessionHistory.save(session)
+ FactoryGirl.create(:music_session_user_history, :history => session.music_session_history, :user => session.creator)
}
end
factory :music_session_user_history, :class => JamRuby::MusicSessionUserHistory do
+ ignore do
+ history nil
+ user nil
+ end
+
+ music_session_id { history.music_session_id }
+ user_id { user.id }
+ sequence(:client_id) { |n| "Connection #{n}" }
end
@@ -344,4 +352,20 @@ FactoryGirl.define do
sequence(:token) { |n| "token-#{n}"}
token_expires_at Time.now
end
+
+ factory :recording_play, :class => JamRuby::RecordingPlay do
+
+ end
+
+ factory :music_session_play, :class => JamRuby::MusicSessionPlay do
+
+ end
+
+ factory :recording_like, :class => JamRuby::RecordingLiker do
+
+ end
+
+ factory :music_session_like, :class => JamRuby::MusicSessionLiker do
+
+ end
end
diff --git a/web/spec/features/social_meta_spec.rb b/web/spec/features/social_meta_spec.rb
index f1648d586..a3846cf70 100644
--- a/web/spec/features/social_meta_spec.rb
+++ b/web/spec/features/social_meta_spec.rb
@@ -8,8 +8,6 @@ describe "social metadata" do
subject { page }
-
-
share_examples_for :has_default_metadata do
it "should have default metadata" do
page.find('meta[property="fb:app_id"]', :visible => false)['content'].should == Rails.application.config.facebook_app_id
@@ -22,7 +20,6 @@ describe "social metadata" do
end
end
-
describe "default layout metadata" do
let(:user) {FactoryGirl.create(:user) }
diff --git a/web/spec/spec_helper.rb b/web/spec/spec_helper.rb
index ab3f7597c..298ff151a 100644
--- a/web/spec/spec_helper.rb
+++ b/web/spec/spec_helper.rb
@@ -24,14 +24,21 @@ require 'jam_ruby'
# uncomment this to see active record logs
# ActiveRecord::Base.logger = Logger.new(STDOUT) if defined?(ActiveRecord::Base)
-
include JamRuby
-
# put ActionMailer into test mode
ActionMailer::Base.delivery_method = :test
-
RecordedTrack.observers.disable :all # only a few tests want this observer active
+# a way to kill tests if they aren't running. capybara is hanging intermittently, I think
+tests_started = false
+
+Thread.new {
+ sleep 30
+ unless tests_started
+ puts "tests are hung. exiting..."
+ exit! 20
+ end
+}
Spork.prefork do
# Loading more in this block will cause your tests to run faster. However,
@@ -67,11 +74,6 @@ Spork.prefork do
config.visible_text_only = true
end
- Capybara.server do |app, port|
- require 'rack/handler/puma'
- Rack::Handler::Puma.run(app, :Port => port)
- end
-
# Requires supporting ruby files with custom matchers and macros, etc,
# in spec/support/ and its subdirectories.
Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
@@ -110,11 +112,10 @@ Spork.prefork do
config.include Requests::FeatureHelpers, type: :feature
config.before(:suite) do
-
+ tests_started = true
end
config.before(:all) do
-
end
config.before(:each) do
@@ -141,8 +142,8 @@ Spork.prefork do
# dump response.body if an example fails
if example.metadata[:type] == :controller && example.exception
- puts "'#{determine_test_name(example.metadata)}' controller test failed."
- puts "response.status = #{response.status}, response.body = " + response.body
+ puts "'#{determine_test_name(example.metadata)}' controller test failed."
+ puts "response.status = #{response.status}, response.body = " + response.body
end
end
diff --git a/web/spec/support/utilities.rb b/web/spec/support/utilities.rb
index a38b77ce7..7d44a27ea 100644
--- a/web/spec/support/utilities.rb
+++ b/web/spec/support/utilities.rb
@@ -56,8 +56,8 @@ end
def sign_in_poltergeist(user)
visit signin_path
- fill_in "Email Address:", with: user.email
- fill_in "Password:", with: user.password
+ fill_in "session_email", with: user.email
+ fill_in "session_password", with: user.password
click_button "SIGN IN"
if Capybara.javascript_driver == :poltergeist
