gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 17aa374b99 into bee4dc9038

Browse source
This commit is contained in:
Anitha Palanisamy 2017-02-08 18:38:34 +00:00 • committed by GitHub
commit 5c198a11aa
11 changed files with 215 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Gemfile.lock
View file

@ -181,8 +181,8 @@ GEM
fastimage (2.0.0)
addressable (~> 2)
ffi (1.9.3)
font-awesome-rails (4.1.0.0)
railties (>= 3.2, < 5.0)
font-awesome-rails (4.6.3.1)
railties (>= 3.2, < 5.1)
formatador (0.2.4)
formtastic (3.1.3)
actionpack (>= 3.2.13)

9
app/assets/stylesheets/osem.css.scss
View file

@ -90,3 +90,12 @@ p.comment-body {
.changeset{
display: none;
}
.user-profile-icon{
text-align: center;
display: table;
.concat-text{
display: block;
font-size: 14px;
}
}

4
app/controllers/users_controller.rb
View file

@ -24,6 +24,8 @@ class UsersController < ApplicationController
# Only allow a trusted parameter "white list" through.
def user_params
params.require(:user).permit(:name, :biography, :nickname, :affiliation)
params.require(:user).permit(:name, :biography, :nickname, :affiliation,
:website_url, :linkedin, :twitter, :googleplus,
:gnu, :diaspora, :github, :gitlab, :gna, :savannah)
end
end

4
app/models/user.rb
View file

@ -54,7 +54,6 @@ class User < ActiveRecord::Base
scope :admin, -> { where(is_admin: true) }
validates :email, presence: true
validates :username,
uniqueness: {
case_sensitive: false
@ -62,6 +61,9 @@ class User < ActiveRecord::Base
presence: true
validate :biography_limit
validates :website_url, :linkedin, :googleplus, :gnu, :twitter, :gitlab, :github, :gna, :savannah, :diaspora,
format: { with: URI.regexp(%w(http https)), message: 'This is an invalid URL. It should start with http or https'},
allow_blank: true
##
# Checkes if the user attended the event

21
app/views/users/edit.html.haml
View file

@ -14,6 +14,27 @@
= link_to 'Change your avatar here', 'https://gravatar.com'
= f.input :affiliation, as: :string,
hint: 'This could be a company, a user group, or nothing at all.'
= f.input :website_url, type: :url, label: 'Personal Website'
= f.inputs :name => 'Social Media' do
= f.input :linkedin, type: :url, as: :string,
hint: 'e.g. https://linkedin.com/osem'
= f.input :twitter, type: :url, as: :string,
hint: 'e.g. https://twitter.com/osem'
= f.input :googleplus, type: :url, label: 'Google+ Url', as: :string,
hint: 'e.g. https://googleplus.com/798239DR45'
= f.input :gnu, type: :url, label: 'GNU Social', as: :string,
hint: 'e.g. https://gnu.io/osem'
= f.input :diaspora, type: :url, as: :string,
hint: 'e.g http://joindiaspora.com/osem'
= f.inputs :name => 'Social Code' do
= f.input :github, type: :url, as: :string,
hint: 'e.g http://github.com/osem'
= f.input :gitlab, type: :url, as: :string,
hint: 'e.g http://gitlab.com/osem'
= f.input :savannah, type: :url, as: :string,
hint: 'e.g http://savannah.gnu.org/osem'
= f.input :gna, type: :url, label: 'Gna!', as: :string,
hint: 'e.g http://gna.com/osem'
= f.input :biography, input_html: { rows: 5, data: { provide: 'markdown-editable' }, 'onkeyup' => "word_count(this, 'biography-count', 150)" },
hint: markdown_hint
You have used

86
app/views/users/show.html.haml
View file

@ -7,18 +7,82 @@
= @user.name
%small
= @user.nickname
%h3.text-center
Social Media and Social Code
%ul.list-inline.list-unstyled.text-center
- if @user.website_url.present?
%li
= link_to(@user.website_url) do
%div.user-profile-icon
%icon.fa.fa-external-link.fa-3x
%span.concat-text Blog
- if @user.linkedin.present?
%li
= link_to(@user.linkedin) do
%div.user-profile-icon
%icon.fa.fa-linkedin.fa-3x
%span.concat-text Linkedin
- if @user.twitter.present?
%li
= link_to(@user.twitter) do
%div.user-profile-icon
%icon.fa.fa-twitter.fa-3x
%span.concat-text Twitter
- if @user.googleplus.present?
%li
= link_to(@user.googleplus) do
%div.user-profile-icon
%icon.fa.fa-google-plus.fa-3x
%span.concat-text Google+
- if @user.gnu.present?
%li
= link_to(@user.gnu) do
%div.user-profile-icon
%icon.fa.fa-linux.fa-3x
%span.concat-text Gnu
- if @user.diaspora.present?
%li
= link_to(@user.diaspora) do
%div.user-profile-icon
%icon.fa.fa-asterisk.fa-3x
%span.concat-text Diaspora
- if @user.savannah.present?
%li
= link_to(@user.savannah) do
%div.user-profile-icon
%icon.fa.fa-linux.fa-3x
%span.concat-text Savannah
- if @user.gna.present?
%li
= link_to(@user.gna) do
%div.user-profile-icon
%icon.fa.fa-linux.fa-3x
%span.concat-text Gna!
- if @user.github.present?
%li
= link_to(@user.github) do
%div.user-profile-icon
%icon.fa.fa-github.fa-3x
%span.concat-text Github
- if @user.gitlab.present?
%li
= link_to(@user.gitlab) do
%div.user-profile-icon
%icon.fa.fa-gitlab.fa-3x
%span.concat-text Gitlab
%h3.text-center Bio
%p
= markdown(@user.biography)
.row
.col-md-12
- if @user.events.confirmed.any?
%h3
= "#{@user.name} presents #{pluralize(@user.events.confirmed.count, 'Event')}:"
%ul.list-unstyled
- @user.events.confirmed.each do |event|
%li
%h4
= link_to event.title, conference_program_proposal_path(event.program.conference.short_title, event.id)
%strong
at
= event.program.conference.title
- if @user.events.confirmed.any?
%h3
= "#{@user.name} presents #{pluralize(@user.events.confirmed.count, 'Event')}:"
%ul.list-unstyled
- @user.events.confirmed.each do |event|
%li
%h4
= link_to event.title, conference_program_proposal_path(event.program.conference.short_title, event.id)
%strong
at
= event.program.conference.title

14
db/migrate/20160830122446_add_twitter_to_users.rb Normal file
View file

@ -0,0 +1,14 @@
class AddTwitterToUsers < ActiveRecord::Migration
def change
add_column :users, :twitter, :string
add_column :users, :googleplus, :string
add_column :users, :linkedin, :string
add_column :users, :gnu, :string
add_column :users, :diaspora, :string
add_column :users, :github, :string
add_column :users, :gitlab, :string
add_column :users, :gna, :string
add_column :users, :savannah, :string
add_column :users, :website_url, :string
end
end

12
db/schema.rb
View file

@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20160815140302) do
ActiveRecord::Schema.define(version: 20160830122446) do
create_table "ahoy_events", force: :cascade do |t|
t.uuid "visit_id", limit: 16
@ -489,6 +489,16 @@ ActiveRecord::Schema.define(version: 20160815140302) do
t.boolean "is_admin", default: false
t.string "username"
t.boolean "is_disabled", default: false
t.string "twitter"
t.string "googleplus"
t.string "linkedin"
t.string "gnu"
t.string "diaspora"
t.string "github"
t.string "gitlab"
t.string "gna"
t.string "savannah"
t.string "website_url"
end
add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true

14
spec/factories/users.rb
View file

@ -20,6 +20,20 @@ FactoryGirl.define do
sequence(:username) { |n| "username#{n}" }
password 'changeme'
password_confirmation 'changeme'
trait :with_social_media_and_code_info do
googleplus { Faker::Internet.url('plus.google.com') }
linkedin {Faker::Internet.url('linkedin.com')}
website_url{Faker::Internet.url('example.com')}
gnu{Faker::Internet.url('gnu.io')}
twitter{Faker::Internet.url('twitter.com')}
github{Faker::Internet.url('github.com')}
gitlab{Faker::Internet.url('gitlab')}
savannah{Faker::Internet.url('savannah.gnu.org')}
diaspora{Faker::Internet.url('joindiaspora.com')}
gna{Faker::Internet.url('gna.com')}
end
confirmed_at { Time.now }
biography <<-EOS
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus enim

34
spec/features/user_spec.rb
View file

@ -1,6 +1,39 @@
require 'spec_helper'
feature User do
let!(:user) {create(:user, :with_social_media_and_code_info)}
describe 'update user profile' do
scenario 'sucessfully', feature: true do
sign_in user
visit edit_user_path(user.id)
fill_in 'user_website_url', with: 'http://www.example1.com'
fill_in 'user_linkedin', with: 'http://www.linkedin.com/testosemuser1'
fill_in 'user_gnu', with: 'http://gnu.io/testosemuser1'
fill_in 'user_twitter', with: 'http://www.twitter.com/testosemuser1'
fill_in 'user_github', with: 'http://www.github.com/testosemuser1'
fill_in 'user_gitlab', with: 'http://www.gitlab.com/testosemuser1'
fill_in 'user_gna', with: 'http://www.gna.com/testosemuser1'
fill_in 'user_diaspora', with: 'http://joindiaspora.com/testosemuser1'
fill_in 'user_savannah', with: 'http://savannah.gnu.org/testosemuser1'
fill_in 'user_googleplus', with: 'http://plus.google.com/testosemurl1'
click_button 'Update'
expect(flash). to eq('User was successfully updated.')
user.reload
expect(user.website_url).to eq('http://www.example1.com')
expect(user.linkedin).to eq('http://www.linkedin.com/testosemuser1')
expect(user.gnu).to eq('http://gnu.io/testosemuser1')
expect(user.twitter).to eq('http://www.twitter.com/testosemuser1')
expect(user.github).to eq('http://www.github.com/testosemuser1')
expect(user.gitlab).to eq('http://www.gitlab.com/testosemuser1')
expect(user.googleplus).to eq('http://plus.google.com/testosemurl1')
expect(user.gna).to eq('http://www.gna.com/testosemuser1')
expect(user.diaspora).to eq('http://joindiaspora.com/testosemuser1')
expect(user.savannah).to eq('http://savannah.gnu.org/testosemuser1')
end
end
shared_examples 'admin ability' do
@ -9,4 +42,5 @@ feature User do
describe 'admin' do
it_behaves_like 'admin ability', :admin
end
end

31
spec/models/user_spec.rb
View file

@ -9,8 +9,7 @@ describe User do
let(:cfp_role) { Role.find_by(name: 'cfp', resource: conference) }
let(:volunteers_coordinator_role) { Role.find_by(name: 'volunteers_coordinator', resource: conference) }
let(:organizer) { create(:user, role_ids: [organizer_role.id]) }
let(:user) { create(:user) }
let!(:user) {create(:user, :with_social_media_and_code_info)}
let(:event1) { create(:event, program: conference.program) }
let(:another_conference) { create(:conference) }
let(:event2) { create(:event, program: another_conference.program) }
@ -48,6 +47,34 @@ describe User do
end
end
describe 'url format validation' do
context 'with valid url' do
it { should allow_value('http://example.com').for(:website_url) }
it { should allow_value('http://linkedin.com').for(:linkedin) }
it { should allow_value('http://googleplus.com').for(:googleplus) }
it { should allow_value('http://gnu.com').for(:gnu) }
it { should allow_value('http://twitter.com').for(:twitter) }
it { should allow_value('http://github.com').for(:github) }
it { should allow_value('http://gitlab.com').for(:gitlab) }
it { should allow_value('http://joindiaspora.com').for(:diaspora) }
it { should allow_value('http://savannah.gnu.org').for(:savannah) }
it { should allow_value('https://linkedin.com').for(:gna) }
end
context 'with invalid url' do
it { should_not allow_value('example').for(:website_url) }
it { should_not allow_value('linkedin').for(:linkedin) }
it { should_not allow_value('googleplus').for(:googleplus) }
it { should_not allow_value('gnu').for(:gnu) }
it { should_not allow_value('@twitter').for(:twitter) }
it { should_not allow_value('@github').for(:github) }
it { should_not allow_value('@gitlab').for(:gitlab) }
it { should_not allow_value('diaspora').for(:diaspora) }
it { should_not allow_value('savannah').for(:savannah) }
it { should_not allow_value('gna').for(:gna) }
end
end
describe 'association' do
it { is_expected.to have_many(:openids) }
it { is_expected.to have_many(:event_users).dependent(:destroy) }