Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: elpassion/elranks
base: 9789798dc2
...
head fork: elpassion/elranks
compare: 393c1fc1cc
  • 2 commits
  • 12 files changed
  • 0 commit comments
  • 1 contributor
View
4 Gemfile
@@ -42,4 +42,6 @@ group :production do
end
gem 'angularjs-rails'
-gem "select2-rails"
+gem 'select2-rails'
+gem 'inherited_resources'
+gem 'active_model_serializers'
View
12 Gemfile.lock
@@ -10,6 +10,8 @@ GEM
erubis (~> 2.7.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
+ active_model_serializers (0.8.1)
+ activemodel (>= 3.0)
activemodel (4.0.1)
activesupport (= 4.0.1)
builder (~> 3.1.0)
@@ -84,12 +86,18 @@ GEM
guard-rspec (4.2.0)
guard (>= 2.1.1)
rspec (>= 2.14, < 4.0)
+ has_scope (0.6.0.rc)
+ actionpack (>= 3.2, < 5)
+ activesupport (>= 3.2, < 5)
hashie (2.0.5)
hike (1.2.3)
http-cookie (1.0.2)
domain_name (~> 0.5)
httpauth (0.2.0)
i18n (0.6.9)
+ inherited_resources (1.4.1)
+ has_scope (~> 0.6.0.rc)
+ responders (~> 1.0.0.rc)
jquery-rails (3.0.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
@@ -181,6 +189,8 @@ GEM
ffi (>= 0.5.0)
rdoc (3.12.2)
json (~> 1.4)
+ responders (1.0.0)
+ railties (>= 3.2, < 5)
rspec (2.14.1)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
@@ -245,6 +255,7 @@ PLATFORMS
ruby
DEPENDENCIES
+ active_model_serializers
angularjs-rails
api_matchers
bootstrap-sass (~> 3.0.3.0)
@@ -255,6 +266,7 @@ DEPENDENCIES
figaro
fog
guard-rspec
+ inherited_resources
jquery-rails
mechanize
omniauth-google-oauth2
View
3  app/assets/javascripts/teams.js.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
View
3  app/assets/stylesheets/teams.css.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the teams controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
View
4 app/controllers/teams_controller.rb
@@ -0,0 +1,4 @@
+class TeamsController < InheritedResources::Base
+ actions :index
+ respond_to :json
+end
View
2  app/helpers/teams_helper.rb
@@ -0,0 +1,2 @@
+module TeamsHelper
+end
View
3  app/serializers/team_serializer.rb
@@ -0,0 +1,3 @@
+class TeamSerializer < ActiveModel::Serializer
+ attributes :id, :logo_url
+end
View
2  app/views/teams/index.html.erb
@@ -0,0 +1,2 @@
+<h1>Teams#index</h1>
+<p>Find me in app/views/teams/index.html.erb</p>
View
1  config/routes.rb
@@ -1,4 +1,5 @@
Elranks::Application.routes.draw do
+ get "teams/index"
root to: 'welcome#index'
match "/sign_in" => "welcome#sign_in", via: [:get]
View
12 spec/controllers/teams_controller_spec.rb
@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe TeamsController do
+
+ describe "GET 'index'" do
+ it "returns http success" do
+ get 'index'
+ response.should be_success
+ end
+ end
+
+end
View
15 spec/helpers/teams_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the TeamsHelper. For example:
+#
+# describe TeamsHelper do
+# describe "string concat" do
+# it "concats two strings with spaces" do
+# expect(helper.concat_strings("this","that")).to eq("this that")
+# end
+# end
+# end
+describe TeamsHelper do
+ pending "add some examples to (or delete) #{__FILE__}"
+end
View
5 spec/views/teams/index.html.erb_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "teams/index.html.erb" do
+ pending "add some examples to (or delete) #{__FILE__}"
+end

No commit comments for this range

Something went wrong with that request. Please try again.