Merge pull request #61 from ENSL/develop

Develop

.hound.yml

@@ -0,0 +1,2 @@
+ruby:
+  config/styles/ruby.yml

app/controllers/api/v1/users_controller.rb

@@ -5,7 +5,9 @@ class Api::V1::UsersController < Api::V1::BaseController
 
   def show
     @user = User.find(params[:id])
-    @steam = steam_profile @user
+    if @user.steamid.present?
+      @steam = steam_profile @user
+    end
 
     render json: {
       id: @user.id,
@@ -14,7 +16,8 @@ class Api::V1::UsersController < Api::V1::BaseController
       time_zone: @user.time_zone,
       avatar: @user.profile.avatar.url,
       admin: @user.admin?,
-      steam: {
+      moderator: @user.gather_moderator?,
+      steam: @user.steamid.nil? ? nil : {
         id: @user.steamid,
         url: @steam.nil? ? nil : @steam.base_url,
         nickname: @steam.nil? ? nil : @steam.nickname

app/models/ban.rb

@@ -33,13 +33,13 @@ class Ban < ActiveRecord::Base
   scope :effective, conditions: "expiry > UTC_TIMESTAMP()"
   scope :ineffective, conditions: "expiry < UTC_TIMESTAMP()"
 
+  before_validation :check_user
+
   validate :validate_type
   validate :validate_ventban
-  validates_format_of :steamid, with: /\A([0-9]{1,10}:){2}[0-9]{1,10}\Z/, allow_blank: true
-  validates_format_of :addr, with: /\A([0-9]{1,3}\.){3}[0-9]{1,3}:?[0-9]{0,5}\z/, allow_blank: true
-  validates_length_of :reason, maximum: 255, allow_nil: true, allow_blank: true
-
-  before_validation :check_user
+  validates :steamid, length: {maximum: 14}, format: /\A0:[01]:[0-9]{1,10}\Z/, allow_blank: true
+  validates :addr, format: /\A([0-9]{1,3}\.){3}[0-9]{1,3}:?[0-9]{0,5}\z/, allow_blank: true
+  validates :reason, length: {maximum: 255}, allow_blank: true
 
   belongs_to :user
   belongs_to :server

app/models/group.rb

@@ -21,6 +21,7 @@ class Group < ActiveRecord::Base
   CHAMPIONS = 7
   PREDICTORS = 8
   STAFF = 10
+  GATHER_MODERATORS = 14
 
   attr_protected :id, :updated_at, :created_at, :founder_id
   validates_length_of :name, :maximum => 20

app/models/user.rb

@@ -100,22 +100,22 @@ class User < ActiveRecord::Base
   scope :idle,
     :conditions => ["lastvisit < ?", 30.minutes.ago.utc]
 
-  validates_uniqueness_of :username, :email, :steamid
-  validates_length_of :firstname, :in => 1..15, :allow_blank => true
-  validates_length_of :lastname, :in => 1..25, :allow_blank => true
-  validates_length_of :username, :in => 2..20
-  validates_format_of :username, :with => /\A[A-Za-z0-9_\-\+]{2,20}\Z/
-    validates_presence_of :raw_password, :on => :create
-  validates_length_of :email, :maximum => 50
-  validates_format_of :email, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
-  validates_length_of :steamid, :maximum => 30
-  validates_format_of :steamid, :with => /\A([0-9]{1,10}:){2}[0-9]{1,10}\Z/
-    validates_length_of :time_zone, :maximum => 100, :allow_blank => true, :allow_nil => true
-  validates_inclusion_of [:public_email], :in => [true, false], :allow_nil => true
+  before_validation :update_password
+
+  validates :username, uniqueness: true, length: {in: 2..20}, format: /\A[A-Za-z0-9_\-\+]{2,20}\Z/
+  validates :firstname, length: {in: 1..15}, allow_blank: true
+  validates :lastname, length: {in: 1..25}, allow_blank: true
+  validates :raw_password, presence: {on: :create}
+  validates :email, uniqueness: true, length: {maximum: 50}, format: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
+  validates :steamid, uniqueness: {allow_nil: true}, length: {maximum: 14}, presence: {on: :create}
+  validate :validate_steamid
+  validates :time_zone, length: {maximum: 100}, allow_blank: true
+  validates :public_email, inclusion: [true, false], allow_nil: true
   validate :validate_team
 
   before_create :init_variables
-  before_validation :update_password
+
+  before_save :correct_steamid_universe
 
   accepts_nested_attributes_for :profile
 
@@ -205,6 +205,10 @@ class User < ActiveRecord::Base
     groups.exists? :id => Group::CASTERS
   end
 
+  def gather_moderator?
+    groups.exists? id: Group::GATHER_MODERATORS
+  end
+
   def verified?
     #		created_at < DateTime.now.ago(VERIFICATION_TIME)
     true
@@ -238,6 +242,20 @@ class User < ActiveRecord::Base
     issues.unread_by(self)
   end
 
+  def validate_steamid
+    errors.add :steamid unless
+	  steamid.nil? ||
+      (m = steamid.match(/\A([01]):([01]):(\d{1,10})\Z/)) &&
+      (id = m[3].to_i) &&
+      id >= 1 && id <= 2147483647
+  end
+
+  def correct_steamid_universe
+    if steamid.present?
+      steamid[0] = "0"
+    end
+  end
+
   def validate_team
     if team and !active_teams.exists?({:id => team.id})
       errors.add :team

spec/controllers/api/v1/users_controller_spec.rb

@@ -19,6 +19,7 @@ describe Api::V1::UsersController do
       expect(json["country"]).to eq(@user.country)
       expect(json["time_zone"]).to eq(@user.time_zone)
       expect(json["admin"]).to eq(@user.admin?)
+      expect(json["moderator"]).to eq(@user.gather_moderator?)
       expect(json).to have_key("steam")
       expect(json["steam"]).to have_key("id")
       expect(json["steam"]).to have_key("url")
@@ -29,16 +30,21 @@ describe Api::V1::UsersController do
       expect(json["team"]).to be_nil
     end
 
-    it "returns data for users with invalid steam ids" do
-      @user.steamid = "0:0:000"
+    it "returns nulled steam data for users who had invalid steam ids" do
+      @user.steamid = nil
       @user.save!
 
       get :show, id: @user.id
 
       expect(response).to be_success
-      expect(json["steam"]["id"]).to_not be_nil
-      expect(json["steam"]["url"]).to be_nil
-      expect(json["steam"]["nickname"]).to be_nil
+      expect(json["steam"]).to be_nil
+    end
+
+    it "returns gather moderator status" do
+      group = create :group, :gather_moderator
+      create :grouper, user: @user, group: group
+      get :show, id: @user.id
+      expect(json["moderator"]).to eq(true)
     end
 
     it "returns 404 if user does not exist" do

spec/factories/group.rb

@@ -19,4 +19,9 @@ FactoryGirl.define do
   	name "Donors"
   	id Group::DONORS
   end
+
+  trait :gather_moderator do
+    name "Gather Moderator"
+    id Group::GATHER_MODERATORS
+  end
 end

spec/features/users/user_signs_up_spec.rb

@@ -1,46 +1,64 @@
-require 'spec_helper'
+require "spec_helper"
 
-feature 'Visitor signs up', js: :true do
+feature "Visitor signs up", js: :true do
   let(:user) { attributes_for(:user) }
 
   before do
     visit new_user_path
   end
 
-  scenario 'with valid Username, Email, Password and Steam ID' do
+  scenario "with valid Username, Email, Password and Steam ID" do
     within registration_form do
       fill_form(:user, user.slice(*sign_up_attributes))
       click_button submit(:user, :create)
     end
     
-    expect(user_status).to have_content('ACCOUNT')
+    expect(user_status).to have_content("ACCOUNT")
   end
 
-  scenario 'with invalid Email' do
+  scenario "with invalid Email" do
     within registration_form do
-      fill_form(:user, user.slice(*sign_up_attributes).merge({ email: "invalid" }))
+      fill_form(:user, user.slice(*sign_up_attributes).merge(email: "invalid"))
       click_button submit(:user, :create)
     end
 
-    expect(page).to have_content(error_message('email.invalid'))
+    expect(page).to have_content(error_message("email.invalid"))
   end
 
-  scenario 'with blank Password' do
+  scenario "with blank Password" do
     within registration_form do
-      fill_form(:user, user.slice(*sign_up_attributes).merge({ raw_password: "" }))
+      fill_form(:user, user.slice(*sign_up_attributes).merge(raw_password: ""))
       click_button submit(:user, :create)
     end
 
-    expect(page).to have_content(error_message('raw_password.blank'))
+    expect(page).to have_content(error_message("raw_password.blank"))
   end
 
-  scenario 'with invalid Steam ID' do
+  scenario "with invalid Steam ID" do
     within registration_form do
-      fill_form(:user, user.slice(*sign_up_attributes).merge({ steamid: "invalid" }))
+      fill_form(:user, user.slice(*sign_up_attributes).merge(steamid: "invalid"))
       click_button submit(:user, :create)
     end
 
-    expect(page).to have_content(error_message('steamid.invalid'))
+    expect(page).to have_content(error_message("steamid.invalid"))
+  end
+
+  scenario "with out of range Steam ID" do
+    within registration_form do
+      fill_form(:user, user.slice(*sign_up_attributes).merge(steamid: "0:0:2147483648"))
+      click_button submit(:user, :create)
+    end
+
+    expect(page).to have_content(error_message("steamid.invalid"))
+  end
+
+  scenario "with nil Steam ID" do
+    within registration_form do
+      fill_form(:user, user.slice(*sign_up_attributes).merge(steamid: nil))
+      click_button submit(:user, :create)
+    end
+
+    expect(page).to have_content(error_message("steamid.invalid"))
   end
 
   def sign_up_attributes

spec/models/user_spec.rb

@@ -48,4 +48,16 @@ describe User do
       expect(user.banned? Ban::TYPE_MUTE).to be_truthy
     end
   end
+
+  describe "#gather_moderator?" do
+    let!(:group) { create :group, :gather_moderator }
+
+    it "returns true if gather moderator" do
+      create :grouper, group: group, user: user
+      expect(user.gather_moderator?).to eq(true)
+    end
+    it "returns false if not gather moderator" do
+      expect(user.gather_moderator?).to eq(false)
+    end
+  end
 end