Merge pull request #79 from ENSL/develop

Merge develop into master

.gitignore

@@ -44,3 +44,13 @@ pickle-email-*.html
 
 # Direnv
 .envrc
+
+# Sublime
+*.sublime*
+
+# Gemtags
+*.tags
+*.gemtags
+
+# Staging files
+tmp/*.gz

app/controllers/api/v1/teams_controller.rb

@@ -0,0 +1,23 @@
+class Api::V1::TeamsController < Api::V1::BaseController
+  def index
+    render json: Api::V1::UsersCollection.as_json
+  end
+
+  def show
+    @team = Team.find params[:id]
+    render json: {
+      id: @team.id,
+      name: @team.name,
+      logo: @team.logo,
+      members: @team.teamers.active.map do |m| 
+        { 
+          id: m.user.id,
+          username: m.user.username,
+          steamid: m.user.steamid
+        } 
+      end
+    }
+  rescue ActiveRecord::RecordNotFound
+    raise ActionController::RoutingError.new("User Not Found")
+  end
+end

config/routes.rb

@@ -6,6 +6,7 @@ Ensl::Application.routes.draw do
   namespace :api do
     namespace :v1 do
       resources :users, only: [:show, :index]
+      resources :teams, only: [:show]
       resources :servers, only: [:index]
       resources :maps, only: [:index]
     end

spec/controllers/api/v1/teams_controller_spec.rb

@@ -0,0 +1,35 @@
+require "spec_helper"
+
+describe Api::V1::TeamsController do
+  before do
+    request.accept = "application/json"
+  end
+
+  describe "#show" do
+    before(:each) do
+      @founder = create :user
+      @team_member = create :user
+      @ex_team_member = create :user
+      @team = create :team, founder: @founder
+      Teamer.create user: @team_member, team: @team, rank: Teamer::RANK_MEMBER
+      Teamer.create user: @ex_team_member, team: @team, rank: Teamer::RANK_REMOVED
+    end
+
+    it "returns team data" do
+      get :show, id: @team.id
+      expect(response).to be_success
+      expect(json["id"]).to eq(@team.id)
+      expect(json["name"]).to eq(@team.name)
+
+      json["members"].each do |member|
+        expect(@team.teamers.active.map(&:user_id)).to include(member["id"])
+      end
+    end
+
+    it "returns 404 if team not found" do
+      expect {
+        get :show, id: Team.last.id + 1
+      }.to raise_error(ActionController::RoutingError)
+    end
+  end
+end