Use steam-condenser from GitHub source again to avoid issues with Constant collisions

This commit is contained in:
Luke Barratt 2015-08-23 11:25:35 +01:00
parent 48dc948fc0
commit f8fd66e152
3 changed files with 12 additions and 7 deletions

View file

@ -22,8 +22,8 @@ gem 'dynamic_form', '~> 1.1.4'
gem 'i18n_country_select', '~> 1.1.5'
gem 'active_link_to', '~> 1.0.2'
gem 'rmagick', '~> 2.13.4', require: false
gem 'steam-condenser', '~> 1.3.11'
gem 'test-unit', '~> 3.1.3'
gem 'steam-condenser', github: 'koraktor/steam-condenser-ruby'
# Please install nodejs locally.
gem 'therubyracer', '~> 0.12.1' if RUBY_PLATFORM == 'x86_64-linux'

View file

@ -1,3 +1,11 @@
GIT
remote: git://github.com/koraktor/steam-condenser-ruby.git
revision: 6bc46e5638f984765f198ad5ae4dbe38ef9341f9
specs:
steam-condenser (1.3.11)
multi_json (~> 1.6)
multi_xml (~> 0.5)
GEM
remote: http://rubygems.org/
specs:
@ -226,9 +234,6 @@ GEM
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
term-ansicolor
steam-condenser (1.3.11)
multi_json (~> 1.6)
multi_xml (~> 0.5)
term-ansicolor (1.3.0)
tins (~> 1.0)
test-unit (3.1.3)
@ -301,7 +306,7 @@ DEPENDENCIES
sass-rails (~> 5.0.3)
selenium-webdriver (~> 2.41.0)
simplecov (~> 0.7.1)
steam-condenser (~> 1.3.11)
steam-condenser!
test-unit (~> 3.1.3)
timecop (~> 0.7.1)
tinymce-rails (~> 3.5.9)
@ -309,4 +314,4 @@ DEPENDENCIES
will_paginate (~> 3.0.5)
BUNDLED WITH
1.10.5
1.10.6

View file

@ -5,7 +5,7 @@ class Api::V1::UsersController < Api::V1::BaseController
def show
@user = User.find(params[:id])
@steam = SteamId.from_steam_id("STEAM_#{@user.steamid}")
@steam = SteamCondenser::Community::SteamId.from_steam_id("STEAM_#{@user.steamid}")
render json: {
id: @user.id,