seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

* updating Rails to 3.2.22 to allow compat with ruby 2.2.2

This commit is contained in:
Seth Call 2015-07-16 10:58:03 -05:00
parent db3ffafd38
commit efe3dea8e3
9 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/Gemfile
View File

@ -14,7 +14,7 @@ else
ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true"
end
gem 'rails', '~> 3.2.11'
gem 'rails', '~> 3.2.22'
gem 'bootstrap-sass', '2.0.4'
gem 'bcrypt-ruby', '3.0.1'
@ -77,7 +77,7 @@ gem 'influxdb-rails', '0.1.10'
gem 'recurly'
group :libv8 do
gem 'libv8', "~> 3.11.8"
gem 'libv8', "~> 4.5.95"
end
@ -101,15 +101,16 @@ end
group :development, :test do
gem 'capybara'
gem 'rspec-rails', '2.14.2'
gem 'guard-rspec', '0.5.5'
gem 'guard-rspec'
gem 'jasmine', '1.3.1'
gem 'execjs', '1.4.0'
gem 'therubyracer' #, '0.11.0beta8'
#gem 'therubyracer' #, '0.11.0beta8'
gem 'factory_girl_rails', '4.1.0'
gem 'database_cleaner', '0.7.0'
gem 'launchy'
gem 'faker', '1.3.0'
gem 'puma'
gem 'test-unit'
end
group :test do

2
db/Gemfile
View File

@ -3,4 +3,4 @@ source 'http://rubygems.org'
# Assumes you have already cloned pg_migrate_ruby in your workspace
# $ cd [workspace]
# $ git clone https://github.com/sethcall/pg_migrate_ruby
gem 'pg_migrate', '0.1.13'
gem 'pg_migrate', '0.1.13', :source => 'http://rubygems.org/'

4
db/Gemfile.lock
View File

@ -15,7 +15,7 @@ PLATFORMS
ruby
DEPENDENCIES
pg_migrate (= 0.1.13)
pg_migrate (= 0.1.13)!
BUNDLED WITH
1.10.3
1.10.5

4
ruby/Gemfile
View File

@ -18,7 +18,7 @@ end
gem 'pg', '0.17.1', :platform => [:mri, :mswin, :mingw]
gem 'jdbc_postgres', :platform => [:jruby]
gem 'activerecord', '3.2.13'
gem 'activerecord', '3.2.22'
gem "activerecord-import", "~> 0.4.1"
gem 'uuidtools', '2.1.2'
gem 'bcrypt-ruby', '3.0.1'
@ -26,7 +26,7 @@ gem 'ruby-protocol-buffers', '1.2.2'
gem 'eventmachine', '1.0.4'
gem 'amqp', '1.0.2'
gem 'will_paginate'
gem 'actionmailer', '3.2.13'
gem 'actionmailer', '3.2.22'
gem 'sendgrid', '1.2.0'
gem 'aws-sdk', '~> 1'
gem 'carrierwave', '0.9.0'

2
ruby/jt_metadata.json
View File

@ -1 +1 @@
{"container_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150715-36419-8j9xo3/jam-track-90.jkz", "version": "0", "coverart": null, "rsa_priv_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150715-36419-8j9xo3/skey.pem", "tracks": [{"name": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150715-36419-8j9xo3/623cd29a-51fc-4185-89ed-99a88f3c7fb0.ogg", "trackName": "track_00"}], "rsa_pub_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150715-36419-8j9xo3/pkey.pem", "jamktrack_info": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/tmpbM4F2I"}
{"container_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150716-51872-twucnn/jam-track-75.jkz", "version": "0", "coverart": null, "rsa_priv_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150716-51872-twucnn/skey.pem", "tracks": [{"name": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150716-51872-twucnn/a3ecd76f-6176-4595-8bee-ddc9896685fe.ogg", "trackName": "track_00"}], "rsa_pub_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150716-51872-twucnn/pkey.pem", "jamktrack_info": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/tmpmYAmj7"}

4
ruby/lib/jam_ruby/models/band.rb
View File

@ -49,10 +49,10 @@ module JamRuby
has_many :recordings, :class_name => "JamRuby::Recording", :foreign_key => "band_id", dependent: :destroy
# self.id = likable_id in likes table
has_many :likers, :as => :likable, :class_name => "JamRuby::Like", :dependent => :destroy, dependent: :destroy
has_many :likers, :as => :likable, :class_name => "JamRuby::Like", :dependent => :destroy
# self.id = followable_id in follows table
has_many :followers, :as => :followable, :class_name => "JamRuby::Follow", :dependent => :destroy, dependent: :destroy
has_many :followers, :as => :followable, :class_name => "JamRuby::Follow", :dependent => :destroy
# invitations
has_many :invitations, :inverse_of => :band, :class_name => "JamRuby::BandInvitation", :foreign_key => "band_id", dependent: :destroy

6
ruby/lib/jam_ruby/models/music_session.rb
View File

@ -44,10 +44,10 @@ module JamRuby
has_one :share_token, :class_name => "JamRuby::ShareToken", :inverse_of => :shareable, :foreign_key => 'shareable_id'
has_one :feed, :class_name => "JamRuby::Feed", :inverse_of => :music_session, :foreign_key => 'music_session_id', :dependent => :destroy
belongs_to :genre, :class_name => "JamRuby::Genre", :inverse_of => :music_sessions, :foreign_key => 'genre_id'
has_many :join_requests, :foreign_key => "music_session_id", :inverse_of => :music_session, :class_name => "JamRuby::JoinRequest", :foreign_key => "music_session_id"
has_many :invitations, :foreign_key => "music_session_id", :inverse_of => :music_session, :class_name => "JamRuby::Invitation", :foreign_key => "music_session_id"
has_many :join_requests, :foreign_key => "music_session_id", :inverse_of => :music_session, :class_name => "JamRuby::JoinRequest"
has_many :invitations, :foreign_key => "music_session_id", :inverse_of => :music_session, :class_name => "JamRuby::Invitation"
has_many :invited_musicians, :through => :invitations, :class_name => "JamRuby::User", :foreign_key => "receiver_id", :source => :receiver
has_many :fan_invitations, :foreign_key => "music_session_id", :inverse_of => :music_session, :class_name => "JamRuby::FanInvitation", :foreign_key => "music_session_id"
has_many :fan_invitations, :foreign_key => "music_session_id", :inverse_of => :music_session, :class_name => "JamRuby::FanInvitation"
has_many :invited_fans, :through => :fan_invitations, :class_name => "JamRuby::User", :foreign_key => "receiver_id", :source => :receiver
has_many :rsvp_slots, :class_name => "JamRuby::RsvpSlot", :foreign_key => "music_session_id", :dependent => :destroy
has_many :music_notations, :class_name => "JamRuby::MusicNotation", :foreign_key => "music_session_id"

6
web/Gemfile
View File

@ -20,8 +20,8 @@ end
gem 'oj', '2.10.2'
gem 'builder'
gem 'rails', '~>3.2.11'
gem 'railties', '~>3.2.11'
gem 'rails', '~>3.2.22'
gem 'railties', '~>3.2.22'
gem 'jquery-rails'
gem 'jquery-ui-rails', '4.2.1'
gem 'bootstrap-sass', '2.0.4'
@ -107,7 +107,7 @@ group :development, :test do
gem 'execjs', '1.4.0'
gem 'factory_girl_rails', '4.1.0' # in dev because in use by rake task
gem 'database_cleaner', '1.3.0' #in dev because in use by rake task
gem 'test-unit'
# gem 'teaspoon'
# gem 'teaspoon-jasmine'
# gem 'puma'

4
websocket-gateway/Gemfile
View File

@ -24,8 +24,8 @@ gem 'bcrypt-ruby', '3.0.1'
gem 'ruby-protocol-buffers', '1.2.2'
gem 'em-websocket', '>=0.4.0' #, :path=> "#{workspace}/em-websocket-jam"
gem 'amqp'
gem 'activerecord', '3.2.13'
gem 'actionpack', '3.2.13'
gem 'activerecord', '3.2.22'
gem 'actionpack', '3.2.22'
gem 'logging'
gem 'will_paginate'
gem 'actionmailer'