From 6170007875a76cf6bba977f7abde5eeecccb96f3 Mon Sep 17 00:00:00 2001 From: KateGL Date: Sat, 10 Jan 2015 12:33:20 +0200 Subject: [PATCH 01/14] =?UTF-8?q?=D0=A2=D0=B8=D0=BF=20=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B8=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D0=B8?= =?UTF-8?q?=20=D0=B0=D0=BA=D0=BA=D0=B0=D1=83=D0=BD=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/application_controller.rb | 10 ++++++++++ app/controllers/users_controller.rb | 1 + app/models/user.rb | 10 ++++++++++ app/views/devise/registrations/new.html.erb | 8 ++++++++ app/views/users/profile.html.erb | 6 ++++-- 5 files changed, 33 insertions(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d83690e..eb92e3b 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -2,4 +2,14 @@ class ApplicationController < ActionController::Base # Prevent CSRF attacks by raising an exception. # For APIs, you may want to use :null_session instead. protect_from_forgery with: :exception + + before_filter :configure_permitted_parameters, if: :devise_controller? + + protected + + def configure_permitted_parameters + devise_parameter_sanitizer.for(:sign_up) {|u| u.permit(:email, :password, :kind)} + devise_parameter_sanitizer.for(:account_update){|u| u.permit(:email, :password)} + + end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 59e9eab..665f873 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,4 +1,5 @@ class UsersController < ApplicationController def profile end + end diff --git a/app/models/user.rb b/app/models/user.rb index b5e8f87..cf4be34 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -15,4 +15,14 @@ class User < ActiveRecord::Base has_many :user_owner_relations, :class_name =>'UserRelation', :foreign_key =>"owner_id", :inverse_of => :user_owner, dependent: :destroy has_many :user_rel_relations, :class_name => 'UserRelation', :foreign_key =>"user_rel_id", :inverse_of => :user_rel, dependent: :destroy has_many :posts, dependent: :destroy + + def kind_name + if self.kind == 1 + 'User' + elsif self.kind == 10 + 'Community' + else + 'Unknown kind' + end + end end diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index 343b265..befd479 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -8,6 +8,12 @@ <%= f.email_field :email, autofocus: true %> +
+ <%= f.label :kind %>
+ <%= f.radio_button :kind, '1', :checked => true %><%= f.label :kind, "User" %> + <%= f.radio_button :kind, '10' %><%= f.label :kind, "Community" %> +
+
<%= f.label :password %> <% if @validatable %> @@ -21,6 +27,8 @@ <%= f.password_field :password_confirmation, autocomplete: "off" %>
+ +
<%= f.submit "Sign up" %>
diff --git a/app/views/users/profile.html.erb b/app/views/users/profile.html.erb index ee16858..626423a 100644 --- a/app/views/users/profile.html.erb +++ b/app/views/users/profile.html.erb @@ -1,6 +1,8 @@ <% if user_signed_in? %> - Здравствуйте, <%= current_user.email %> - <%= link_to 'Выйти', destroy_user_session_path, :method => :delete %> + Здравствуйте, <%= current_user.email %>
+ Тип учетной записи: <%= current_user.kind_name %> + +
<%= link_to 'Выйти', destroy_user_session_path, :method => :delete %> <% else %> <%= link_to 'Войти', new_user_session_path %> или <%= link_to 'Зарегистрироваться', new_user_registration_path %> <% end %> \ No newline at end of file From 77b5777ca32c2aa94cc2cfa56f86d2f2a32ff8f6 Mon Sep 17 00:00:00 2001 From: KateGL Date: Sat, 10 Jan 2015 16:32:39 +0200 Subject: [PATCH 02/14] =?UTF-8?q?=D0=A0=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0=20=D1=81=D0=BE=D0=BE?= =?UTF-8?q?=D0=B1=D1=89=D0=B5=D1=81=D1=82=D0=B2=D0=B0=20=D0=B8=20=D0=BB?= =?UTF-8?q?=D1=8E=D0=B4=D0=B5=D0=B9=20:=20=D0=BD=D0=B0=D1=87=D0=B0=D0=BB?= =?UTF-8?q?=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 2 ++ Gemfile.lock | 2 ++ app/controllers/application_controller.rb | 6 +++--- app/controllers/users_controller.rb | 2 ++ app/models/user.rb | 11 ++++++++++- app/views/devise/registrations/edit.html.erb | 5 +++++ app/views/devise/registrations/new.html.erb | 6 ++++++ app/views/layouts/application.html.erb | 1 + app/views/users/profile.html.erb | 20 +++++++++++++++++--- 9 files changed, 48 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 09643ba..ee26e84 100644 --- a/Gemfile +++ b/Gemfile @@ -31,6 +31,8 @@ gem 'sdoc', '~> 0.4.0', group: :doc #auth gem 'devise' gem 'cancancan', '~> 1.7' +gem 'will_paginate','~>3.0.5' + # Use ActiveModel has_secure_password # gem 'bcrypt', '~> 3.1.7' diff --git a/Gemfile.lock b/Gemfile.lock index e36077a..00c2f4b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -214,6 +214,7 @@ GEM webmock (1.20.4) addressable (>= 2.3.6) crack (>= 0.3.2) + will_paginate (3.0.7) PLATFORMS ruby @@ -243,3 +244,4 @@ DEPENDENCIES unicorn web-console (~> 2.0) webmock + will_paginate (~> 3.0.5) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index eb92e3b..e848a2d 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -2,14 +2,14 @@ class ApplicationController < ActionController::Base # Prevent CSRF attacks by raising an exception. # For APIs, you may want to use :null_session instead. protect_from_forgery with: :exception - + #before_action :authenticate_user! before_filter :configure_permitted_parameters, if: :devise_controller? protected def configure_permitted_parameters - devise_parameter_sanitizer.for(:sign_up) {|u| u.permit(:email, :password, :kind)} - devise_parameter_sanitizer.for(:account_update){|u| u.permit(:email, :password)} + devise_parameter_sanitizer.for(:sign_up) {|u| u.permit(:email, :password, :kind, :name)} + devise_parameter_sanitizer.for(:account_update){|u| u.permit(:email, :password, :current_password, :name)} end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 665f873..349544c 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,4 +1,6 @@ class UsersController < ApplicationController + #before_action :authenticate_user! + def profile end diff --git a/app/models/user.rb b/app/models/user.rb index cf4be34..0e9ea95 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -18,11 +18,20 @@ class User < ActiveRecord::Base def kind_name if self.kind == 1 - 'User' + 'Person' elsif self.kind == 10 'Community' else 'Unknown kind' end end + + def person? + self.kind == 1 + end + + def community? + self.kind == 10 + end + end diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb index 3ea40f0..d7aea1a 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -8,6 +8,11 @@ <%= f.email_field :email, autofocus: true %> +
+ <%= f.label :name %>
+ <%= f.text_field :name, autocomplete: "on" %> +
+ <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
Currently waiting confirmation for: <%= resource.unconfirmed_email %>
<% end %> diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index befd479..20e4b6f 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -8,6 +8,12 @@ <%= f.email_field :email, autofocus: true %> +
+ <%= f.label :name %>
+ <%= f.text_field :name, autocomplete: "on" %> +
+ +
<%= f.label :kind %>
<%= f.radio_button :kind, '1', :checked => true %><%= f.label :kind, "User" %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index c2d3b91..f6f65a0 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -53,6 +53,7 @@ <%if user_signed_in? %>
  • <%= link_to "My profile", user_root_path %>
  • <%= link_to "News", "/" %>
    • +
  • <%= link_to "Search", "/" %>
  • <%= link_to "Sign out", destroy_user_session_path, :method => :delete %>
    • <%else%>
  • <%= link_to "Log in", new_user_session_path %>
    • diff --git a/app/views/users/profile.html.erb b/app/views/users/profile.html.erb index 626423a..7208b88 100644 --- a/app/views/users/profile.html.erb +++ b/app/views/users/profile.html.erb @@ -1,8 +1,22 @@ +<% content_for :title do %> + Social: My profile +<% end %> + <% if user_signed_in? %> - Здравствуйте, <%= current_user.email %>
    - Тип учетной записи: <%= current_user.kind_name %> + Здравствуйте, <%= current_user.name %>
    + Тип учетной записи: <%= current_user.kind_name %>
    + <%= link_to 'Изменить данные учетной записи', edit_user_registration_path %>
    + + <% if current_user.person? %> + <%= render "person" %> + <% end %> + + <% if current_user.community? %> + <%= render "community" %> + <% end %> -
    <%= link_to 'Выйти', destroy_user_session_path, :method => :delete %> + +     <% else %> <%= link_to 'Войти', new_user_session_path %> или <%= link_to 'Зарегистрироваться', new_user_registration_path %> <% end %> \ No newline at end of file From e3f5fa304c0c0f63256f6f03590a228824a9f538 Mon Sep 17 00:00:00 2001 From: KateGL Date: Sat, 10 Jan 2015 16:37:06 +0200 Subject: [PATCH 03/14] =?UTF-8?q?=D0=A0=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0=20=D1=81=D0=BE=D0=BE?= =?UTF-8?q?=D0=B1=D1=89=D0=B5=D1=81=D1=82=D0=B2=D0=B0=20=D0=B8=20=D0=BB?= =?UTF-8?q?=D1=8E=D0=B4=D0=B5=D0=B9=20:=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/people_controller.rb | 7 +++++++ app/views/users/_community.html.erb | 1 + app/views/users/_person.html.erb | 1 + spec/controllers/people_controller_spec.rb | 5 +++++ 4 files changed, 14 insertions(+) create mode 100644 app/controllers/people_controller.rb create mode 100644 app/views/users/_community.html.erb create mode 100644 app/views/users/_person.html.erb create mode 100644 spec/controllers/people_controller_spec.rb diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb new file mode 100644 index 0000000..6e2c61f --- /dev/null +++ b/app/controllers/people_controller.rb @@ -0,0 +1,7 @@ +class PeopleController < ApplicationController + + def index + @people = Person.all + end + +end diff --git a/app/views/users/_community.html.erb b/app/views/users/_community.html.erb new file mode 100644 index 0000000..c0afad8 --- /dev/null +++ b/app/views/users/_community.html.erb @@ -0,0 +1 @@ +Community \ No newline at end of file diff --git a/app/views/users/_person.html.erb b/app/views/users/_person.html.erb new file mode 100644 index 0000000..579bc25 --- /dev/null +++ b/app/views/users/_person.html.erb @@ -0,0 +1 @@ +Person data \ No newline at end of file diff --git a/spec/controllers/people_controller_spec.rb b/spec/controllers/people_controller_spec.rb new file mode 100644 index 0000000..318c688 --- /dev/null +++ b/spec/controllers/people_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe PeopleController, :type => :controller do + +end From 324375e22a9a83fa8e5760b30189ade91ae5ce69 Mon Sep 17 00:00:00 2001 From: KateGL Date: Sun, 11 Jan 2015 01:59:35 +0200 Subject: [PATCH 04/14] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA?= =?UTF-8?q?=D0=B8=20=D1=81=D0=BE=20=D1=81=D0=B2=D1=8F=D0=B7=D1=8C=D1=8E=20?= =?UTF-8?q?community=5Fmembership=20=D0=BF=D1=80=D0=B8=20=D1=83=D0=B4?= =?UTF-8?q?=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D0=B8=20User?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 1 + app/models/community.rb | 3 ++- app/models/user.rb | 5 +++-- app/views/layouts/application.html.erb | 12 +++++++++++- app/views/users/profile.html.erb | 2 +- config/routes.rb | 2 ++ 6 files changed, 20 insertions(+), 5 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 349544c..ef8836f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -4,4 +4,5 @@ class UsersController < ApplicationController def profile end + end diff --git a/app/models/community.rb b/app/models/community.rb index 454db8b..c0ca09e 100644 --- a/app/models/community.rb +++ b/app/models/community.rb @@ -1,4 +1,5 @@ class Community < ActiveRecord::Base has_one :user, :foreign_key => "id" - has_many :users, through: :community_memberships, dependent: :destroy + has_many :users, through: :community_memberships#, dependent: :destroy + has_many :community_memberships, dependent: :destroy end diff --git a/app/models/user.rb b/app/models/user.rb index 0e9ea95..85e4b0e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -11,8 +11,9 @@ class User < ActiveRecord::Base #has_many :posts belongs_to :person, dependent: :destroy belongs_to :community, dependent: :destroy - has_many :community, through: :community_memberships, dependent: :destroy - has_many :user_owner_relations, :class_name =>'UserRelation', :foreign_key =>"owner_id", :inverse_of => :user_owner, dependent: :destroy + has_many :community, through: :community_memberships#, dependent: :delete_all + has_many :community_memberships, dependent: :destroy + has_many :user_owner_relations, :class_name =>'UserRelation', :foreign_key =>"user_owner_id", :inverse_of => :user_owner, dependent: :destroy has_many :user_rel_relations, :class_name => 'UserRelation', :foreign_key =>"user_rel_id", :inverse_of => :user_rel, dependent: :destroy has_many :posts, dependent: :destroy diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f6f65a0..ac23897 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -51,7 +51,17 @@
      <%if user_signed_in? %> -
    • <%= link_to "My profile", user_root_path %>
      • + + <% if current_user.person? %> +
    • <%= link_to "Person profile", user_root_path %>
      • + <% end %> + + <% if current_user.community? %> +
    • <%= link_to "Community profile", user_root_path %>
      • + <% end %> + + +
    • <%= link_to "News", "/" %>
    • <%= link_to "Search", "/" %>
    • <%= link_to "Sign out", destroy_user_session_path, :method => :delete %>
      • diff --git a/app/views/users/profile.html.erb b/app/views/users/profile.html.erb index 7208b88..aae312b 100644 --- a/app/views/users/profile.html.erb +++ b/app/views/users/profile.html.erb @@ -8,7 +8,7 @@ <%= link_to 'Изменить данные учетной записи', edit_user_registration_path %>
      <% if current_user.person? %> - <%= render "person" %> + <%= render "person" %> <% end %> <% if current_user.community? %> diff --git a/config/routes.rb b/config/routes.rb index dd5dcdb..fac7adc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,8 @@ #get 'users/profile' devise_for :users + resources :people + resources :communities #get 'welcome/index' root 'welcome#index' get 'users/profile', as: 'user_root' From 154a5defbb80d1c02da4e8c4717dd9436969288a Mon Sep 17 00:00:00 2001 From: KateGL Date: Sun, 11 Jan 2015 04:37:05 +0200 Subject: [PATCH 05/14] =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=BB=D0=BB=D0=B5=D1=80=D1=8B=20=D0=B4=D0=BB=D1=8F=20people=20?= =?UTF-8?q?=D0=B8=20community=20=D0=BF=D0=BE=D0=BA=D0=B0=20=D0=B1=D0=B5?= =?UTF-8?q?=D0=B7=20=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2.=20=D0=98=D1=81?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88?= =?UTF-8?q?=D0=B8=D0=B1=D0=BA=D0=B0=20=D0=B2=20=D1=81=D0=B2=D1=8F=D0=B7?= =?UTF-8?q?=D1=8F=D1=85=20=D0=BF=D1=80=D0=B8=20=D1=83=D0=B4=D0=B0=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B8=20User?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/communities_controller.rb | 29 +++++++++++++++++++ app/controllers/people_controller.rb | 21 ++++++++++++++ app/controllers/users_controller.rb | 28 ++++++++++++++++++ app/models/community.rb | 2 +- app/models/person.rb | 2 +- app/models/user.rb | 7 ++--- app/views/communities/index.html.erb | 1 + app/views/communities/new.html.erb | 16 ++++++++++ app/views/communities/show.html.erb | 16 ++++++++++ app/views/layouts/application.html.erb | 11 +------ app/views/people/index.html.erb | 1 + app/views/people/new.html.erb | 21 ++++++++++++++ app/views/people/show.html.erb | 16 ++++++++++ app/views/shared/_communities_errors.html.erb | 0 app/views/shared/_people_errors.html.erb | 0 config/routes.rb | 3 +- .../communities_controller_spec.rb | 5 ++++ spec/controllers/users_controller_spec.rb | 12 ++++---- spec/models/community_spec.rb | 2 +- spec/models/person_spec.rb | 2 +- 20 files changed, 169 insertions(+), 26 deletions(-) create mode 100644 app/controllers/communities_controller.rb create mode 100644 app/views/communities/index.html.erb create mode 100644 app/views/communities/new.html.erb create mode 100644 app/views/communities/show.html.erb create mode 100644 app/views/people/index.html.erb create mode 100644 app/views/people/new.html.erb create mode 100644 app/views/people/show.html.erb create mode 100644 app/views/shared/_communities_errors.html.erb create mode 100644 app/views/shared/_people_errors.html.erb create mode 100644 spec/controllers/communities_controller_spec.rb diff --git a/app/controllers/communities_controller.rb b/app/controllers/communities_controller.rb new file mode 100644 index 0000000..87a1ccf --- /dev/null +++ b/app/controllers/communities_controller.rb @@ -0,0 +1,29 @@ +class CommunitiesController < ApplicationController + +def index + @communities = Community.all + end + + def new + @community = Community.new + end + + def create + @community = Community.new(community_params) + @community.user_id = current_user.id + if @community.save + redirect_to url_for(:controller => :communities, :action => :show, :id => @community.id) + else + render :new + end + end + + + private + + + def community_params + params.require(:community).permit(:subject) + end + +end diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb index 6e2c61f..20f2e3e 100644 --- a/app/controllers/people_controller.rb +++ b/app/controllers/people_controller.rb @@ -4,4 +4,25 @@ def index @people = Person.all end + def new + @person = Person.new + end + + def create + @person = Person.new(person_params) + @person.user_id = current_user.id + if @person.save + redirect_to url_for(:controller => :people, :action => :show, :id => @person.id) + else + render :new + end + end + + + private + + + def person_params + params.require(:person).permit(:surename, :date_of_birth) + end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index ef8836f..aaf1934 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -4,5 +4,33 @@ class UsersController < ApplicationController def profile end + def show_profile + user = User.where(id: current_user.id).take + if user == nil + resirect_to root_path + return + end + + if user.person? + person = Person.where(user_id: user.id).take + if person == nil + redirect_to url_for(:controller => :people, :action => :new) + else + redirect_to url_for(:controller => :people, :action => :show, :id => person.id) + end + + elsif user.community? + community = Community.where(user_id: user.id).take + if community == nil + redirect_to url_for(:controller => :communities, :action => :new) + else + redirect_to url_for(:controller => :communities, action => :show, :id =>community.id) + end + else + redirect_to root_path + end + + + end end diff --git a/app/models/community.rb b/app/models/community.rb index c0ca09e..1224117 100644 --- a/app/models/community.rb +++ b/app/models/community.rb @@ -1,5 +1,5 @@ class Community < ActiveRecord::Base - has_one :user, :foreign_key => "id" + belongs_to :user, :foreign_key => "id" has_many :users, through: :community_memberships#, dependent: :destroy has_many :community_memberships, dependent: :destroy end diff --git a/app/models/person.rb b/app/models/person.rb index 5352276..157a0c8 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -1,3 +1,3 @@ class Person < ActiveRecord::Base - has_one :user, :foreign_key => "id" + belongs_to :user, :foreign_key => "id" end diff --git a/app/models/user.rb b/app/models/user.rb index 85e4b0e..0ae7987 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -7,11 +7,8 @@ class User < ActiveRecord::Base :rememberable, :trackable, :validatable -#has_many :communications -#has_many :posts - belongs_to :person, dependent: :destroy - belongs_to :community, dependent: :destroy - has_many :community, through: :community_memberships#, dependent: :delete_all + has_one :person, dependent: :destroy + has_one :community, dependent: :destroy has_many :community_memberships, dependent: :destroy has_many :user_owner_relations, :class_name =>'UserRelation', :foreign_key =>"user_owner_id", :inverse_of => :user_owner, dependent: :destroy has_many :user_rel_relations, :class_name => 'UserRelation', :foreign_key =>"user_rel_id", :inverse_of => :user_rel, dependent: :destroy diff --git a/app/views/communities/index.html.erb b/app/views/communities/index.html.erb new file mode 100644 index 0000000..d7d679d --- /dev/null +++ b/app/views/communities/index.html.erb @@ -0,0 +1 @@ +Hello? index comm! \ No newline at end of file diff --git a/app/views/communities/new.html.erb b/app/views/communities/new.html.erb new file mode 100644 index 0000000..b3cd2cc --- /dev/null +++ b/app/views/communities/new.html.erb @@ -0,0 +1,16 @@ +

      Create community data

      + +<%= form_for(@community) do |f| %> +<%= render 'shared/communities_errors' %> + +
      + <%= f.label :subject %>
      + <%= f.text_field :subject, autofocus: true, autocomplete: "on"%> +

      + + +
      + <%= f.submit "Save" %> +
      + +<% end %> diff --git a/app/views/communities/show.html.erb b/app/views/communities/show.html.erb new file mode 100644 index 0000000..a512292 --- /dev/null +++ b/app/views/communities/show.html.erb @@ -0,0 +1,16 @@ +<% content_for :title do %> + Social: Community profile +<% end %> + +<% if user_signed_in? %> + Здравствуйте, <%= current_user.name %>
      + Тип учетной записи: <%= current_user.kind_name %>
      + <%= link_to 'Изменить данные учетной записи', edit_user_registration_path %>
      + + + + +       +<% else %> + <%= link_to 'Войти', new_user_session_path %> или <%= link_to 'Зарегистрироваться', new_user_registration_path %> +<% end %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index ac23897..2f03a0e 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -52,16 +52,7 @@ <%if user_signed_in? %> - <% if current_user.person? %> -
    • <%= link_to "Person profile", user_root_path %>
      • - <% end %> - - <% if current_user.community? %> -
    • <%= link_to "Community profile", user_root_path %>
      • - <% end %> - - - +
    • <%= link_to "My profile", user_root_path %>
    • <%= link_to "News", "/" %>
    • <%= link_to "Search", "/" %>
    • <%= link_to "Sign out", destroy_user_session_path, :method => :delete %>
      • diff --git a/app/views/people/index.html.erb b/app/views/people/index.html.erb new file mode 100644 index 0000000..ec7d200 --- /dev/null +++ b/app/views/people/index.html.erb @@ -0,0 +1 @@ +Hello index person! \ No newline at end of file diff --git a/app/views/people/new.html.erb b/app/views/people/new.html.erb new file mode 100644 index 0000000..b366d74 --- /dev/null +++ b/app/views/people/new.html.erb @@ -0,0 +1,21 @@ +

      Create person data

      + +<%= form_for(@person) do |f| %> +<%= render 'shared/people_errors' %> + +
      + <%= f.label :surename %>
      + <%= f.text_field :surename, autofocus: true, autocomplete: "on"%> +

      + + +
      + <%= f.label :date_of_birth %>
      + <%= f.date_select :date_of_birth %> +

      + +
      + <%= f.submit "Save" %> +
      + +<% end %> \ No newline at end of file diff --git a/app/views/people/show.html.erb b/app/views/people/show.html.erb new file mode 100644 index 0000000..cb6d4cd --- /dev/null +++ b/app/views/people/show.html.erb @@ -0,0 +1,16 @@ +<% content_for :title do %> + Social: My profile +<% end %> + +<% if user_signed_in? %> + Здравствуйте, <%= current_user.name %>
      + Тип учетной записи: <%= current_user.kind_name %>
      + <%= link_to 'Изменить данные учетной записи', edit_user_registration_path %>
      + + + + +       +<% else %> + <%= link_to 'Войти', new_user_session_path %> или <%= link_to 'Зарегистрироваться', new_user_registration_path %> +<% end %> diff --git a/app/views/shared/_communities_errors.html.erb b/app/views/shared/_communities_errors.html.erb new file mode 100644 index 0000000..e69de29 diff --git a/app/views/shared/_people_errors.html.erb b/app/views/shared/_people_errors.html.erb new file mode 100644 index 0000000..e69de29 diff --git a/config/routes.rb b/config/routes.rb index fac7adc..798ff39 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,7 +4,8 @@ devise_for :users resources :people resources :communities + # resorces :users, only:[:show, :index] #get 'welcome/index' root 'welcome#index' - get 'users/profile', as: 'user_root' + get 'user_root' => 'users#show_profile' end diff --git a/spec/controllers/communities_controller_spec.rb b/spec/controllers/communities_controller_spec.rb new file mode 100644 index 0000000..581cdaa --- /dev/null +++ b/spec/controllers/communities_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe CommunitiesController, :type => :controller do + +end diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 951bc7d..02f8801 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -2,11 +2,11 @@ RSpec.describe UsersController, :type => :controller do - describe "GET profile" do - it "returns http success" do - get :profile - expect(response).to be_success - end - end +# describe "GET profile" do +# it "returns http success" do +# get :profile +# expect(response).to be_success +# end +# end end diff --git a/spec/models/community_spec.rb b/spec/models/community_spec.rb index 83a2878..c55edb3 100644 --- a/spec/models/community_spec.rb +++ b/spec/models/community_spec.rb @@ -5,5 +5,5 @@ expect(FactoryGirl.build(:community)).to be_valid end - it {should have_one(:user).class_name(User)} + it {should belong_to(:user).class_name(User)} end diff --git a/spec/models/person_spec.rb b/spec/models/person_spec.rb index 9bd0eb9..f57be25 100644 --- a/spec/models/person_spec.rb +++ b/spec/models/person_spec.rb @@ -5,6 +5,6 @@ expect(FactoryGirl.build(:person)).to be_valid end - it {should have_one(:user).class_name(User)} + it {should belong_to(:user).class_name(User)} end From 7c526cb1ebcb73cc92c65181778882a8a6c8f13b Mon Sep 17 00:00:00 2001 From: KateGL Date: Sun, 11 Jan 2015 05:27:07 +0200 Subject: [PATCH 06/14] =?UTF-8?q?=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B8=20?= =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20Person?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/people_controller.rb | 28 ++++++++++++++++++++++++++++ app/views/communities/show.html.erb | 13 +++---------- app/views/people/_form.html.erb | 20 ++++++++++++++++++++ app/views/people/edit.html.erb | 3 +++ app/views/people/new.html.erb | 21 +-------------------- app/views/people/show.html.erb | 18 ++++++++---------- app/views/shared/_user_info.html.erb | 12 ++++++++++++ 7 files changed, 75 insertions(+), 40 deletions(-) create mode 100644 app/views/people/_form.html.erb create mode 100644 app/views/people/edit.html.erb create mode 100644 app/views/shared/_user_info.html.erb diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb index 20f2e3e..f3aa5b1 100644 --- a/app/controllers/people_controller.rb +++ b/app/controllers/people_controller.rb @@ -1,9 +1,30 @@ class PeopleController < ApplicationController + before_action :find_current_person, only: [:show, :edit, :update] + def index @people = Person.all end + def show + + end + + def edit + if @person == nil + redirect_to url_for(:controller => :people, :action => :new) + return + end + end + + def update + if @person.update(person_params) + redirect_to url_for(:controller => :people, :action => :show, :id => @person.id) + else + render :edit + end + end + def new @person = Person.new end @@ -16,6 +37,7 @@ def create else render :new end + d end @@ -25,4 +47,10 @@ def create def person_params params.require(:person).permit(:surename, :date_of_birth) end + + def find_current_person + @person = Person.where(id: params[:id]).take + end + + end diff --git a/app/views/communities/show.html.erb b/app/views/communities/show.html.erb index a512292..19d6086 100644 --- a/app/views/communities/show.html.erb +++ b/app/views/communities/show.html.erb @@ -2,15 +2,8 @@ Social: Community profile <% end %> -<% if user_signed_in? %> - Здравствуйте, <%= current_user.name %>
      - Тип учетной записи: <%= current_user.kind_name %>
      - <%= link_to 'Изменить данные учетной записи', edit_user_registration_path %>
      +<%= render 'shared/user_info' %> +
      - - -       -<% else %> - <%= link_to 'Войти', new_user_session_path %> или <%= link_to 'Зарегистрироваться', new_user_registration_path %> -<% end %> +Community data here diff --git a/app/views/people/_form.html.erb b/app/views/people/_form.html.erb new file mode 100644 index 0000000..0f3654b --- /dev/null +++ b/app/views/people/_form.html.erb @@ -0,0 +1,20 @@ + +<%= form_for(@person) do |f| %> +<%= render 'shared/people_errors' %> + +
      + <%= f.label :surename %>
      + <%= f.text_field :surename, autofocus: true, autocomplete: "on"%> +

      + + +
      + <%= f.label :date_of_birth %>
      + <%= f.date_select :date_of_birth %> +

      + +
      + <%= f.submit "Save" %> +
      + +<% end %> diff --git a/app/views/people/edit.html.erb b/app/views/people/edit.html.erb new file mode 100644 index 0000000..9365fd9 --- /dev/null +++ b/app/views/people/edit.html.erb @@ -0,0 +1,3 @@ +

      Edit person data

      + +<%= render "form" %> diff --git a/app/views/people/new.html.erb b/app/views/people/new.html.erb index b366d74..22dfa27 100644 --- a/app/views/people/new.html.erb +++ b/app/views/people/new.html.erb @@ -1,21 +1,2 @@

      Create person data

      - -<%= form_for(@person) do |f| %> -<%= render 'shared/people_errors' %> - -
      - <%= f.label :surename %>
      - <%= f.text_field :surename, autofocus: true, autocomplete: "on"%> -

      - - -
      - <%= f.label :date_of_birth %>
      - <%= f.date_select :date_of_birth %> -

      - -
      - <%= f.submit "Save" %> -
      - -<% end %> \ No newline at end of file +<%= render "form" %> diff --git a/app/views/people/show.html.erb b/app/views/people/show.html.erb index cb6d4cd..7fdaf3e 100644 --- a/app/views/people/show.html.erb +++ b/app/views/people/show.html.erb @@ -2,15 +2,13 @@ Social: My profile <% end %> -<% if user_signed_in? %> - Здравствуйте, <%= current_user.name %>
      - Тип учетной записи: <%= current_user.kind_name %>
      - <%= link_to 'Изменить данные учетной записи', edit_user_registration_path %>
      +<%= render 'shared/user_info' %> +
      + + +Имя: <%= current_user.name %>
      +Фамилия: <%= @person.surename %>
      +Дата рождения: <%= @person.date_of_birth %>
      +<%= link_to 'Изменить данные пользователя', edit_person_path %>
      - - -       -<% else %> - <%= link_to 'Войти', new_user_session_path %> или <%= link_to 'Зарегистрироваться', new_user_registration_path %> -<% end %> diff --git a/app/views/shared/_user_info.html.erb b/app/views/shared/_user_info.html.erb new file mode 100644 index 0000000..d215f49 --- /dev/null +++ b/app/views/shared/_user_info.html.erb @@ -0,0 +1,12 @@ +<% if user_signed_in? %> + Здравствуйте, <%= current_user.name %>
      + Тип учетной записи: <%= current_user.kind_name %>
      + <%= link_to 'Изменить данные учетной записи', edit_user_registration_path %>
      + + + + +       +<% else %> + <%= link_to 'Войти', new_user_session_path %> или <%= link_to 'Зарегистрироваться', new_user_registration_path %> +<% end %> From 3625ad3ed0de6e500d17a4c4fdab7265cf9e20b0 Mon Sep 17 00:00:00 2001 From: KateGL Date: Sun, 11 Jan 2015 05:41:38 +0200 Subject: [PATCH 07/14] =?UTF-8?q?=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B8=20?= =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20Community?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/communities_controller.rb | 28 ++++++++++++++++++++++- app/controllers/people_controller.rb | 3 +-- app/controllers/users_controller.rb | 2 +- app/views/communities/_form.html.erb | 15 ++++++++++++ app/views/communities/edit.html.erb | 3 +++ app/views/communities/new.html.erb | 16 +------------ app/views/communities/show.html.erb | 4 +++- 7 files changed, 51 insertions(+), 20 deletions(-) create mode 100644 app/views/communities/_form.html.erb create mode 100644 app/views/communities/edit.html.erb diff --git a/app/controllers/communities_controller.rb b/app/controllers/communities_controller.rb index 87a1ccf..c7186f9 100644 --- a/app/controllers/communities_controller.rb +++ b/app/controllers/communities_controller.rb @@ -1,9 +1,31 @@ class CommunitiesController < ApplicationController +before_action :find_current_community, only: [:show, :edit, :update] -def index + def index @communities = Community.all end + def show + + end + + def edit + if @community == nil + redirect_to url_for(:controller => :communities, :action => :new) + return + end + end + + + def update + if @community.update(community_params) + redirect_to url_for(:controller => :communities, :action => :show, :id => @community.id) + else + render :edit + end + end + + def new @community = Community.new end @@ -26,4 +48,8 @@ def community_params params.require(:community).permit(:subject) end + + def find_current_community + @community = Community.where(id: params[:id]).take + end end diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb index f3aa5b1..54e645b 100644 --- a/app/controllers/people_controller.rb +++ b/app/controllers/people_controller.rb @@ -36,8 +36,7 @@ def create redirect_to url_for(:controller => :people, :action => :show, :id => @person.id) else render :new - end - d + end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index aaf1934..6e77307 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -24,7 +24,7 @@ def show_profile if community == nil redirect_to url_for(:controller => :communities, :action => :new) else - redirect_to url_for(:controller => :communities, action => :show, :id =>community.id) + redirect_to url_for(:controller => :communities, :action => :show, :id =>community.id) end else redirect_to root_path diff --git a/app/views/communities/_form.html.erb b/app/views/communities/_form.html.erb new file mode 100644 index 0000000..8a68ac1 --- /dev/null +++ b/app/views/communities/_form.html.erb @@ -0,0 +1,15 @@ + +<%= form_for(@community) do |f| %> +<%= render 'shared/communities_errors' %> + +
      + <%= f.label :subject %>
      + <%= f.text_field :subject, autofocus: true, autocomplete: "on"%> +

      + + +
      + <%= f.submit "Save" %> +
      + +<% end %> diff --git a/app/views/communities/edit.html.erb b/app/views/communities/edit.html.erb new file mode 100644 index 0000000..16fa0e1 --- /dev/null +++ b/app/views/communities/edit.html.erb @@ -0,0 +1,3 @@ +

      Edit community data

      + +<%= render "form" %> diff --git a/app/views/communities/new.html.erb b/app/views/communities/new.html.erb index b3cd2cc..9a8fd59 100644 --- a/app/views/communities/new.html.erb +++ b/app/views/communities/new.html.erb @@ -1,16 +1,2 @@

      Create community data

      - -<%= form_for(@community) do |f| %> -<%= render 'shared/communities_errors' %> - -
      - <%= f.label :subject %>
      - <%= f.text_field :subject, autofocus: true, autocomplete: "on"%> -

      - - -
      - <%= f.submit "Save" %> -
      - -<% end %> +<%= render "form" %> diff --git a/app/views/communities/show.html.erb b/app/views/communities/show.html.erb index 19d6086..7f24a58 100644 --- a/app/views/communities/show.html.erb +++ b/app/views/communities/show.html.erb @@ -6,4 +6,6 @@
      -Community data here +Название: <%= current_user.name %>
      +Тема: <%= @community.subject %>
      +<%= link_to 'Изменить данные сообщества', edit_community_path %>
      From 4509f67ed4c6a8b9fde2b5c4e7afd84e2845231d Mon Sep 17 00:00:00 2001 From: KateGL Date: Sun, 11 Jan 2015 09:41:03 +0200 Subject: [PATCH 08/14] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D1=8B=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20users,=20=D0=BF=D0=BE=D0=BA=D0=B0=20=D0=BD=D0=B5?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=BD=D0=B8=D0=BC=D0=B0=D1=8E=20=D0=BF=D0=BE?= =?UTF-8?q?=D1=87=D0=B5=D0=BC=D1=83=20=D0=BD=D0=B5=20=D1=81=D0=BE=D0=B7?= =?UTF-8?q?=D0=B4=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20=D0=BD=D0=BE=D1=80=D0=BC?= =?UTF-8?q?=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=20User=20=D0=B4=D0=BB=D1=8F=20Pe?= =?UTF-8?q?rson?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 7 ++- app/models/person.rb | 5 ++ app/models/user.rb | 13 ++++- app/views/devise/registrations/new.html.erb | 2 +- spec/controllers/users_controller_spec.rb | 63 +++++++++++++++++++++ spec/factories/people.rb | 2 +- spec/factories/users.rb | 20 ++++++- spec/rails_helper.rb | 2 + 8 files changed, 106 insertions(+), 8 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 6e77307..b036c07 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -5,9 +5,14 @@ def profile end def show_profile + if current_user == nil + redirect_to new_user_session_path + return + end + user = User.where(id: current_user.id).take if user == nil - resirect_to root_path + redirect_to root_path return end diff --git a/app/models/person.rb b/app/models/person.rb index 157a0c8..9573d09 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -1,3 +1,8 @@ class Person < ActiveRecord::Base belongs_to :user, :foreign_key => "id" + + + def user + User.where(id: self.user_id).take + end end diff --git a/app/models/user.rb b/app/models/user.rb index 0ae7987..e11e1c8 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -17,7 +17,7 @@ class User < ActiveRecord::Base def kind_name if self.kind == 1 'Person' - elsif self.kind == 10 + elsif self.kind == 2 'Community' else 'Unknown kind' @@ -29,7 +29,16 @@ def person? end def community? - self.kind == 10 + self.kind == 2 end +# def person_id +# person = Person.where(user_id: self.id).take +# if person == nil +# nil +# else +# person.id +# end +# end + end diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index 20e4b6f..a7f9ed4 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -17,7 +17,7 @@
      <%= f.label :kind %>
      <%= f.radio_button :kind, '1', :checked => true %><%= f.label :kind, "User" %> - <%= f.radio_button :kind, '10' %><%= f.label :kind, "Community" %> + <%= f.radio_button :kind, '2' %><%= f.label :kind, "Community" %>
      diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 02f8801..06c7349 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -9,4 +9,67 @@ # end # end + context 'when user not logged in' do + describe "GET user_profile" do + it 'redirect to login page' do + get :show_profile + expect(response).to redirect_to new_user_session_path + end + end + end + + + context 'when user logged in as person, but no person data' do + let(:user) {FactoryGirl.create(:user_person)} + + before do + sign_in user + + end + + describe "GET user_profile if user" + it 'redirect person#new view' do + get :show_profile + expect(response).to redirect_to new_person_path + end + + end + + context 'when user logged in as person with person data' do + let(:person) {FactoryGirl.create(:person)} +# let(:user){person.user} +# subject {FactoryGirl.create(:user_person)} + + before do + sign_in person.user + + end + + describe "GET user_profile if user" + it 'redirect person#show view' do + get :show_profile + expect(response).to redirect_to :controller => :people, :action => :show, :id => person.id + end + + end + + + + + context 'when user logged in as community, but no community data' do + let(:user) {FactoryGirl.create(:user_community)} + + before do + sign_in user + + end + + describe "GET user_profile if community" + it 'redirect community#new view' do + get :show_profile + expect(response).to redirect_to new_community_path + end + + end + end diff --git a/spec/factories/people.rb b/spec/factories/people.rb index bda01fb..9ddd27e 100644 --- a/spec/factories/people.rb +++ b/spec/factories/people.rb @@ -2,7 +2,7 @@ factory :person do surename {Faker::Name.last_name} date_of_birth {Faker::Time.between(10000.days.ago,10000.days.ago)} - association :user + association :user, factory: :user_person end end diff --git a/spec/factories/users.rb b/spec/factories/users.rb index 956d741..9321d8d 100644 --- a/spec/factories/users.rb +++ b/spec/factories/users.rb @@ -3,7 +3,7 @@ name {Faker::Name.name} email {Faker::Internet.email} password {Faker::Internet.password(20)} - kind {Faker::Number.number(1)} + kind {Faker::Number.number(2)} end @@ -11,7 +11,7 @@ name {Faker::Name.name} email {Faker::Internet.email} password {Faker::Internet.password(20)} - kind {Faker::Number.number(1)} + kind {Faker::Number.number(2)} end @@ -19,8 +19,22 @@ name {Faker::Name.name} email {Faker::Internet.email} password {Faker::Internet.password(20)} - kind {Faker::Number.number(1)} + kind {Faker::Number.number(2)} end + factory :user_person, :class => User do + name {Faker::Name.name} + email {Faker::Internet.email} + password {Faker::Internet.password(20)} + kind {1} + end + + + factory :user_community, :class => User do + name {Faker::Name.name} + email {Faker::Internet.email} + password {Faker::Internet.password(20)} + kind {2} + end end diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 4d1d439..887c4df 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -40,4 +40,6 @@ # The different available types are documented in the features, such as in # https://relishapp.com/rspec/rspec-rails/docs config.infer_spec_type_from_file_location! + + config.include Devise::TestHelpers, :type => :controller end From 33251b7d3201cfc2c743587dd2df295533529aa7 Mon Sep 17 00:00:00 2001 From: KateGL Date: Sun, 11 Jan 2015 16:43:24 +0200 Subject: [PATCH 09/14] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D1=8B=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20users=20=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=D1=8C=D0=BD=D1=8B=D0=B5.=20=D0=A3=D0=B1=D1=80=D0=B0=D0=BB?= =?UTF-8?q?=D0=B0=20paginate=20=D0=B8=D0=B7=20gemfile,=20=D0=B2=D0=B4?= =?UTF-8?q?=D1=80=D1=83=D0=B3=20=D0=BE=D0=BD=20=D1=83=D1=80=D0=BE=D0=BD?= =?UTF-8?q?=D0=B8=D0=BB=20=D1=82=D1=80=D0=B0=D0=B2=D0=B8=D1=81=20:(?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 2 +- Gemfile.lock | 2 -- app/models/community.rb | 6 +++++- app/models/person.rb | 2 +- spec/controllers/users_controller_spec.rb | 20 ++++++++++++++++++-- spec/factories/communities.rb | 2 +- 6 files changed, 26 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index ee26e84..62a6501 100644 --- a/Gemfile +++ b/Gemfile @@ -31,7 +31,7 @@ gem 'sdoc', '~> 0.4.0', group: :doc #auth gem 'devise' gem 'cancancan', '~> 1.7' -gem 'will_paginate','~>3.0.5' +#gem 'will_paginate','~>3.0.5' # Use ActiveModel has_secure_password # gem 'bcrypt', '~> 3.1.7' diff --git a/Gemfile.lock b/Gemfile.lock index 00c2f4b..e36077a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -214,7 +214,6 @@ GEM webmock (1.20.4) addressable (>= 2.3.6) crack (>= 0.3.2) - will_paginate (3.0.7) PLATFORMS ruby @@ -244,4 +243,3 @@ DEPENDENCIES unicorn web-console (~> 2.0) webmock - will_paginate (~> 3.0.5) diff --git a/app/models/community.rb b/app/models/community.rb index 1224117..372fe6c 100644 --- a/app/models/community.rb +++ b/app/models/community.rb @@ -1,5 +1,9 @@ class Community < ActiveRecord::Base - belongs_to :user, :foreign_key => "id" + belongs_to :user, :foreign_key => "user_id" has_many :users, through: :community_memberships#, dependent: :destroy has_many :community_memberships, dependent: :destroy + + def user + User.where(id: self.user_id).take + end end diff --git a/app/models/person.rb b/app/models/person.rb index 9573d09..5380967 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -1,5 +1,5 @@ class Person < ActiveRecord::Base - belongs_to :user, :foreign_key => "id" + belongs_to :user, :foreign_key => "user_id" def user diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 06c7349..11e401a 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -37,8 +37,6 @@ context 'when user logged in as person with person data' do let(:person) {FactoryGirl.create(:person)} -# let(:user){person.user} -# subject {FactoryGirl.create(:user_person)} before do sign_in person.user @@ -72,4 +70,22 @@ end + context 'when user logged in as community with community data' do + let(:community) {FactoryGirl.create(:community)} + + before do + sign_in community.user + + end + + describe "GET community_profile if user" + it 'redirect person#show view' do + get :show_profile + expect(response).to redirect_to :controller => :communities, :action => :show, :id => community.id + end + + end + + + end diff --git a/spec/factories/communities.rb b/spec/factories/communities.rb index 4000502..316ad24 100644 --- a/spec/factories/communities.rb +++ b/spec/factories/communities.rb @@ -1,7 +1,7 @@ FactoryGirl.define do factory :community do subject {Faker::Lorem.sentence} - association :user + association :user, factory: :user_community end end From f52e329e41ae1b05b85b511a4e63f4b5cb81c0e0 Mon Sep 17 00:00:00 2001 From: KateGL Date: Sun, 11 Jan 2015 18:10:43 +0200 Subject: [PATCH 10/14] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D1=8B=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20Person=20=D0=B8=20Community?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/communities_controller.rb | 3 + app/controllers/people_controller.rb | 5 +- .../communities_controller_spec.rb | 68 ++++++++++++++ spec/controllers/people_controller_spec.rb | 92 +++++++++++++++++++ 4 files changed, 166 insertions(+), 2 deletions(-) diff --git a/app/controllers/communities_controller.rb b/app/controllers/communities_controller.rb index c7186f9..319a1e5 100644 --- a/app/controllers/communities_controller.rb +++ b/app/controllers/communities_controller.rb @@ -27,6 +27,7 @@ def update def new + authenticate_user! @community = Community.new end @@ -50,6 +51,8 @@ def community_params def find_current_community + authenticate_user! + @community = Community.where(id: params[:id]).take end end diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb index 54e645b..66dcc1e 100644 --- a/app/controllers/people_controller.rb +++ b/app/controllers/people_controller.rb @@ -1,7 +1,6 @@ class PeopleController < ApplicationController before_action :find_current_person, only: [:show, :edit, :update] - def index @people = Person.all end @@ -26,6 +25,7 @@ def update end def new + authenticate_user! @person = Person.new end @@ -48,7 +48,8 @@ def person_params end def find_current_person - @person = Person.where(id: params[:id]).take + authenticate_user! + @person = Person.where(id: params[:id]).take end diff --git a/spec/controllers/communities_controller_spec.rb b/spec/controllers/communities_controller_spec.rb index 581cdaa..9110c29 100644 --- a/spec/controllers/communities_controller_spec.rb +++ b/spec/controllers/communities_controller_spec.rb @@ -2,4 +2,72 @@ RSpec.describe CommunitiesController, :type => :controller do + context 'when user not logged in' do + let(:community) {FactoryGirl.create(:community)} + + describe "Get community_profile" do + it 'redirect to login page' do + get :show, :id => community.id + expect(response).to redirect_to new_user_session_path + end + end + + + describe "Edit community_profile" do + it 'redirect to login page' do + get :edit, :id => community.id + expect(response).to redirect_to new_user_session_path + end + end + + describe "New community_profile" do + it 'redirect to login page' do + get :new + expect(response).to redirect_to new_user_session_path + end + end + + end + + + context 'when user logged in as community with community data' do + let(:community) {FactoryGirl.create(:community)} + + before do + sign_in community.user + + end + + describe "GET community profile" + it 'get community profile' do + get :show, :id => community.id + expect(response).to render_template :show + end + + describe "GET new community" + it 'assigns new community' do + get :new + expect(assigns(:community)).to be_new_record + end + + describe "render new community" + it 'render new community ' do + get :new + expect(response).to render_template :new + end + + describe "GET #edit" do + it "edit community data" do + get :edit, id: community + expect(assigns(:community)).to eq(community) + end + + it "renders the :edit view" do + get :edit, id: community + expect(response).to render_template :edit + end + end + + end + end diff --git a/spec/controllers/people_controller_spec.rb b/spec/controllers/people_controller_spec.rb index 318c688..9cf56b9 100644 --- a/spec/controllers/people_controller_spec.rb +++ b/spec/controllers/people_controller_spec.rb @@ -2,4 +2,96 @@ RSpec.describe PeopleController, :type => :controller do + context 'when user not logged in' do + let(:person) {FactoryGirl.create(:person)} + + describe "Get people_profile" do + it 'redirect to login page' do + get :show, :id => person.id + expect(response).to redirect_to new_user_session_path + end + end + + + describe "Edit people_profile" do + it 'redirect to login page' do + get :edit, :id => person.id + expect(response).to redirect_to new_user_session_path + end + end + + describe "New people_profile" do + it 'redirect to login page' do + get :new + expect(response).to redirect_to new_user_session_path + end + end + + end + + + context 'when user logged in as person with person data' do + let(:person) {FactoryGirl.create(:person)} + + before do + sign_in person.user + + end + + describe "GET person profile" + it 'get person profile' do + get :show, :id => person.id + expect(response).to render_template :show + end + + describe "GET new person" + it 'assigns new person' do + get :new + expect(assigns(:person)).to be_new_record + end + + describe "render new person" + it 'render new person ' do + get :new + expect(response).to render_template :new + end + + describe "GET #edit" do + it "edit person data" do + get :edit, id: person + expect(assigns(:person)).to eq(person) + end + + it "renders the :edit view" do + get :edit, id: person + expect(response).to render_template :edit + end + end + + end +=begin + context 'when user logged in as person, but no person data' do + subject { FactoryGirl.create(:person) } + + before do + sign_in subject.user + + end + describe "POST #create" do + context "with valid attributes" do + it "creates new object" do + expect{post :create, person: FactoryGirl.attributes_for(:person)}.to change(Person, :count).by(1) + end + + it "redirects to profile path" do + post :create, person: FactoryGirl.attributes_for(:person) + expect(response).to redirect_to :controller => :people, :action => :show, :id => person.id #how to find id? + end + end + +end +end +=end + + end From 736b74a052f4a6a55639574c5f2bd4553d1b39c3 Mon Sep 17 00:00:00 2001 From: KateGL Date: Sun, 11 Jan 2015 19:20:30 +0200 Subject: [PATCH 11/14] =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=BB=D0=BB=D0=B5=D1=80=D1=8B,=20=D0=B2=D1=8C=D1=8E=20=D0=B8?= =?UTF-8?q?=20=D1=82=D0=B5=D1=81=D1=82=D1=8B=20=D0=B4=D0=BB=D1=8F=20Commun?= =?UTF-8?q?ityMemberships?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../community_memberships_controller.rb | 46 +++++++++++++++++++ app/models/community_membership.rb | 8 ++++ .../community_memberships/_form.html.erb | 14 ++++++ .../community_memberships/index.html.erb | 1 + app/views/community_memberships/new.html.erb | 2 + app/views/community_memberships/show.html.erb | 5 ++ config/routes.rb | 1 + .../community_memberships_controller_spec.rb | 35 ++++++++++++++ 8 files changed, 112 insertions(+) create mode 100644 app/controllers/community_memberships_controller.rb create mode 100644 app/views/community_memberships/_form.html.erb create mode 100644 app/views/community_memberships/index.html.erb create mode 100644 app/views/community_memberships/new.html.erb create mode 100644 app/views/community_memberships/show.html.erb create mode 100644 spec/controllers/community_memberships_controller_spec.rb diff --git a/app/controllers/community_memberships_controller.rb b/app/controllers/community_memberships_controller.rb new file mode 100644 index 0000000..57eeda3 --- /dev/null +++ b/app/controllers/community_memberships_controller.rb @@ -0,0 +1,46 @@ +class CommunityMembershipsController < ApplicationController +before_action :find_current_community_membership, only: [:show, :destroy] + + def index + + end + + def show + + end + + + def new + authenticate_user! + @community_membership = CommunityMembership.new + end + + def create + @community_membership = CommunityMembership.new(community_params) + @community_membership.community_id = current_user.id + if @community_membership.save + redirect_to url_for(:controller => :community_memberships, :action => :show, :id => @community_membership.id) + else + render :new + end + end + + def destroy + @community_membership.destroy + redirect_to :back + end + + private + + + def community_membership_params + params.require(:community_membership).permit(:user_id) + end + + + def find_current_community_membership + authenticate_user! + + @community_membership = CommunityMembership.where(id: params[:id]).take + end +end diff --git a/app/models/community_membership.rb b/app/models/community_membership.rb index 050c12b..87ec90e 100644 --- a/app/models/community_membership.rb +++ b/app/models/community_membership.rb @@ -1,4 +1,12 @@ class CommunityMembership < ActiveRecord::Base belongs_to :user belongs_to :community + + def user + User.where(id: self.user_id).take + end + + def community + Community.where(id: self.community_id).take + end end diff --git a/app/views/community_memberships/_form.html.erb b/app/views/community_memberships/_form.html.erb new file mode 100644 index 0000000..6635cea --- /dev/null +++ b/app/views/community_memberships/_form.html.erb @@ -0,0 +1,14 @@ + +<%= form_for(@community_membership) do |f| %> + +
      + <%= f.label :user_id %>
      + <%= f.text_field :user_id, autofocus: true, autocomplete: "off"%> +

      + + +
      + <%= f.submit "Save" %> +
      + +<% end %> diff --git a/app/views/community_memberships/index.html.erb b/app/views/community_memberships/index.html.erb new file mode 100644 index 0000000..e22fab5 --- /dev/null +++ b/app/views/community_memberships/index.html.erb @@ -0,0 +1 @@ +Hello index community membership! diff --git a/app/views/community_memberships/new.html.erb b/app/views/community_memberships/new.html.erb new file mode 100644 index 0000000..603cb48 --- /dev/null +++ b/app/views/community_memberships/new.html.erb @@ -0,0 +1,2 @@ +

      Create community membership data

      +<%= render "form" %> diff --git a/app/views/community_memberships/show.html.erb b/app/views/community_memberships/show.html.erb new file mode 100644 index 0000000..5e0797f --- /dev/null +++ b/app/views/community_memberships/show.html.erb @@ -0,0 +1,5 @@ +Сообщество: <%= @community_membership.community.subject %>
      +Пользователь: <%= @community_membership.user.name %>
      +Добавлен: <%= @community_membership.create_at %>
      + + diff --git a/config/routes.rb b/config/routes.rb index 798ff39..7772475 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,6 +4,7 @@ devise_for :users resources :people resources :communities + resources :community_memberships # resorces :users, only:[:show, :index] #get 'welcome/index' root 'welcome#index' diff --git a/spec/controllers/community_memberships_controller_spec.rb b/spec/controllers/community_memberships_controller_spec.rb new file mode 100644 index 0000000..9cf5cfe --- /dev/null +++ b/spec/controllers/community_memberships_controller_spec.rb @@ -0,0 +1,35 @@ +require 'rails_helper' + +RSpec.describe CommunityMembershipsController, :type => :controller do + + context 'when user not logged in' do + let(:community_membership) {FactoryGirl.create(:community_membership)} + + describe "Get community_membership" do + it 'redirect to login page' do + get :show, :id => community_membership.id + expect(response).to redirect_to new_user_session_path + end + end + + + + describe "New community_membership" do + it 'redirect to login page' do + get :new + expect(response).to redirect_to new_user_session_path + end + end + + + describe "Delete community_membership" do + it 'redirect to login page' do + delete :destroy, id: community_membership + expect(response).to redirect_to new_user_session_path + end + end + + end + + +end From fab1f95cb031ba27ce709020bacaac3365e0c790 Mon Sep 17 00:00:00 2001 From: KateGL Date: Mon, 12 Jan 2015 01:00:58 +0200 Subject: [PATCH 12/14] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D1=8B=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20community=5Fmembership,=20=D0=BA=D0=BE=D0=BD?= =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=BB=D0=BB=D0=B5=D1=80=D1=8B,=20=D0=B2?= =?UTF-8?q?=D1=8C=D1=8E=20=D0=B8=20=D1=82=D0=B5=D1=81=D1=82=D1=8B=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20UserRelation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../community_memberships_controller.rb | 3 +- app/controllers/user_relations_controller.rb | 47 +++++++++++ app/models/community_membership.rb | 4 +- app/models/user_relation.rb | 8 ++ app/views/user_relations/_form.html.erb | 14 ++++ app/views/user_relations/index.html.erb | 1 + app/views/user_relations/new.html.erb | 2 + app/views/user_relations/show.html.erb | 5 ++ config/routes.rb | 1 + .../communities_controller_spec.rb | 2 + .../community_memberships_controller_spec.rb | 42 ++++++++++ .../user_relations_controller_spec.rb | 77 +++++++++++++++++++ spec/factories/community_memberships.rb | 4 +- spec/factories/user_relations.rb | 4 +- 14 files changed, 207 insertions(+), 7 deletions(-) create mode 100644 app/controllers/user_relations_controller.rb create mode 100644 app/views/user_relations/_form.html.erb create mode 100644 app/views/user_relations/index.html.erb create mode 100644 app/views/user_relations/new.html.erb create mode 100644 app/views/user_relations/show.html.erb create mode 100644 spec/controllers/user_relations_controller_spec.rb diff --git a/app/controllers/community_memberships_controller.rb b/app/controllers/community_memberships_controller.rb index 57eeda3..0887f1f 100644 --- a/app/controllers/community_memberships_controller.rb +++ b/app/controllers/community_memberships_controller.rb @@ -26,8 +26,9 @@ def create end def destroy + community_id = @community_membership.community_id @community_membership.destroy - redirect_to :back + redirect_to url_for(:controller => :communities, :action => :show, :id => community_id) end private diff --git a/app/controllers/user_relations_controller.rb b/app/controllers/user_relations_controller.rb new file mode 100644 index 0000000..cf4e8f8 --- /dev/null +++ b/app/controllers/user_relations_controller.rb @@ -0,0 +1,47 @@ +class UserRelationsController < ApplicationController +before_action :find_current_user_relation, only: [:show, :destroy] + + def index + + end + + def show + + end + + + def new + authenticate_user! + @user_relation = UserRelation.new + end + + def create + @user_relation = CommunityMembership.new(user_relation_params) + @user_relation.user_owner_id = current_user.id + if @user_relation.save + redirect_to url_for(:controller => :user_relations, :action => :show, :id => @user_relation.id) + else + render :new + end + end + + def destroy + @user_relation.destroy + redirect_to user_root_path + end + + private + + + def user_relation_params + params.require(:community_membership).permit(:user_rel_id) + end + + + def find_current_user_relation + authenticate_user! + + @user_relation = UserRelation.where(id: params[:id]).take + end + +end diff --git a/app/models/community_membership.rb b/app/models/community_membership.rb index 87ec90e..60adf5b 100644 --- a/app/models/community_membership.rb +++ b/app/models/community_membership.rb @@ -1,6 +1,6 @@ class CommunityMembership < ActiveRecord::Base - belongs_to :user - belongs_to :community + belongs_to :user, :foreign_key => "user_id" + belongs_to :community, :foreign_key => "community_id" def user User.where(id: self.user_id).take diff --git a/app/models/user_relation.rb b/app/models/user_relation.rb index d07b78c..8c63dd2 100644 --- a/app/models/user_relation.rb +++ b/app/models/user_relation.rb @@ -3,4 +3,12 @@ class UserRelation < ActiveRecord::Base validates :user_owner, :presence => true belongs_to :user_rel, :class_name => "User", :inverse_of => :user_rel_relations + + def user + User.where(id: self.user_owner_id).take + end + + def user_rel + User.where(id: self.user_rel_id).take + end end diff --git a/app/views/user_relations/_form.html.erb b/app/views/user_relations/_form.html.erb new file mode 100644 index 0000000..a8505be --- /dev/null +++ b/app/views/user_relations/_form.html.erb @@ -0,0 +1,14 @@ + +<%= form_for(@user_relation) do |f| %> + +
      + <%= f.label :user_rel_id %>
      + <%= f.text_field :user_rel_id, autofocus: true, autocomplete: "off"%> +

      + + +
      + <%= f.submit "Save" %> +
      + +<% end %> diff --git a/app/views/user_relations/index.html.erb b/app/views/user_relations/index.html.erb new file mode 100644 index 0000000..77e45ab --- /dev/null +++ b/app/views/user_relations/index.html.erb @@ -0,0 +1 @@ +Hello index user relation! diff --git a/app/views/user_relations/new.html.erb b/app/views/user_relations/new.html.erb new file mode 100644 index 0000000..8e8f824 --- /dev/null +++ b/app/views/user_relations/new.html.erb @@ -0,0 +1,2 @@ +

      Create user relation data

      +<%= render "form" %> diff --git a/app/views/user_relations/show.html.erb b/app/views/user_relations/show.html.erb new file mode 100644 index 0000000..7098d4a --- /dev/null +++ b/app/views/user_relations/show.html.erb @@ -0,0 +1,5 @@ +Текущий пользователь: <%= @user_relation.user.name %>
      +Пользователь-друг: <%= @user_relation.user_rel.name %>
      +Добавлен: <%= @user_relation.create_at %>
      + + diff --git a/config/routes.rb b/config/routes.rb index 7772475..56ddc3d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,6 +5,7 @@ resources :people resources :communities resources :community_memberships + resources :user_relations # resorces :users, only:[:show, :index] #get 'welcome/index' root 'welcome#index' diff --git a/spec/controllers/communities_controller_spec.rb b/spec/controllers/communities_controller_spec.rb index 9110c29..96f62d7 100644 --- a/spec/controllers/communities_controller_spec.rb +++ b/spec/controllers/communities_controller_spec.rb @@ -68,6 +68,8 @@ end end + + end end diff --git a/spec/controllers/community_memberships_controller_spec.rb b/spec/controllers/community_memberships_controller_spec.rb index 9cf5cfe..5962342 100644 --- a/spec/controllers/community_memberships_controller_spec.rb +++ b/spec/controllers/community_memberships_controller_spec.rb @@ -31,5 +31,47 @@ end +context 'when user logged in as community with community data' do + let(:community_membership) {FactoryGirl.create(:community_membership)} + + before do + sign_in community_membership.community.user + + end + + describe "GET community_membership profile" + it 'get community_membership profile' do + get :show, :id => community_membership.id + expect(response).to render_template :show + end + + describe "GET new community_membership" + it 'assigns new community_membership' do + get :new + expect(assigns(:community_membership)).to be_new_record + end + + describe "render new community_membership" + it 'render new community_membership ' do + get :new + expect(response).to render_template :new + end + + describe 'DELETE #destroy' do + before(:each) { + @community_membership = FactoryGirl.create :community_membership + } + it "deletes the community_membership" do + expect {delete :destroy, id: @community_membership}.to change(CommunityMembership, :count).by(-1) + end + + it "redirects to community" do + community_id = @community_membership.community_id + delete :destroy, id: @community_membership + expect(response).to redirect_to :controller => :communities, :action => :show, :id => community_id + end + end# + + end end diff --git a/spec/controllers/user_relations_controller_spec.rb b/spec/controllers/user_relations_controller_spec.rb new file mode 100644 index 0000000..d136eeb --- /dev/null +++ b/spec/controllers/user_relations_controller_spec.rb @@ -0,0 +1,77 @@ +require 'rails_helper' + +RSpec.describe UserRelationsController, :type => :controller do + +context 'when user not logged in' do + let(:user_relation) {FactoryGirl.create(:user_relation)} + + describe "Get user_relation" do + it 'redirect to login page' do + get :show, :id => user_relation.id + expect(response).to redirect_to new_user_session_path + end + end + + + + describe "New user_relation" do + it 'redirect to login page' do + get :new + expect(response).to redirect_to new_user_session_path + end + end + + + describe "Delete user_relation" do + it 'redirect to login page' do + delete :destroy, id: user_relation + expect(response).to redirect_to new_user_session_path + end + end + + end + + context 'when user logged in ' do + let(:user_relation) {FactoryGirl.create(:user_relation)} + + before do + sign_in user_relation.user + + end + + describe "GET user_relation profile" + it 'get user_relation profile' do + get :show, :id => user_relation.id + expect(response).to render_template :show + end + + describe "GET new user_relation" + it 'assigns new user_relation' do + get :new + expect(assigns(:user_relation)).to be_new_record + end + + describe "render new user_relation" + it 'render new user_relation ' do + get :new + expect(response).to render_template :new + end + + describe 'DELETE #destroy' do + before(:each) { + @user_relation = FactoryGirl.create :user_relation + } + it "deletes the user_relation" do + expect {delete :destroy, id: @user_relation}.to change(UserRelation, :count).by(-1) + end + + it "redirects to user_profile" do + user_id = @user_relation.user_owner_id + delete :destroy, id: @user_relation + expect(response).to redirect_to user_root_path + end + end# + + end + +end diff --git a/spec/factories/community_memberships.rb b/spec/factories/community_memberships.rb index b3a78e7..8d5f820 100644 --- a/spec/factories/community_memberships.rb +++ b/spec/factories/community_memberships.rb @@ -1,7 +1,7 @@ FactoryGirl.define do factory :community_membership do - association :community - association :user + association :community, factory: :community + association :user, factory: :user end end diff --git a/spec/factories/user_relations.rb b/spec/factories/user_relations.rb index 2d83e2e..aeb778e 100644 --- a/spec/factories/user_relations.rb +++ b/spec/factories/user_relations.rb @@ -1,7 +1,7 @@ FactoryGirl.define do factory :user_relation do - association :user_owner - association :user_rel + association :user_owner, factory: :user + association :user_rel, factory: :user end From 41e08b98677f852bdef5b73ac8232cd8bdca0f19 Mon Sep 17 00:00:00 2001 From: KateGL Date: Mon, 12 Jan 2015 01:31:05 +0200 Subject: [PATCH 13/14] =?UTF-8?q?=D0=B2=D1=81=D0=B5=20=D0=B4=D0=BB=D1=8F?= =?UTF-8?q?=20Post?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/posts_controller.rb | 59 ++++++++++++ app/models/post.rb | 6 +- app/views/posts/_form.html.erb | 19 ++++ app/views/posts/edit.html.erb | 3 + app/views/posts/index.html.erb | 1 + app/views/posts/new.html.erb | 2 + app/views/posts/show.html.erb | 5 + config/routes.rb | 1 + spec/controllers/posts_controller_spec.rb | 94 +++++++++++++++++++ .../user_relations_controller_spec.rb | 1 - spec/factories/posts.rb | 2 +- 11 files changed, 190 insertions(+), 3 deletions(-) create mode 100644 app/controllers/posts_controller.rb create mode 100644 app/views/posts/_form.html.erb create mode 100644 app/views/posts/edit.html.erb create mode 100644 app/views/posts/index.html.erb create mode 100644 app/views/posts/new.html.erb create mode 100644 app/views/posts/show.html.erb create mode 100644 spec/controllers/posts_controller_spec.rb diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb new file mode 100644 index 0000000..841b38a --- /dev/null +++ b/app/controllers/posts_controller.rb @@ -0,0 +1,59 @@ +class PostsController < ApplicationController +before_action :find_current_post, only: [:show, :edit, :update, :destroy] + + def index + + end + + def show + + end + + def edit + if @post == nil + redirect_to url_for(:controller => :posts, :action => :new) + return + end + end + + def update + if @post.update(post_params) + redirect_to url_for(:controller => :posts, :action => :show, :id => @post.id) + else + render :edit + end + end + + def new + authenticate_user! + @post = Post.new + end + + def create + @post = Post.new(post_params) + @post.user_id = current_user.id + if @post.save + redirect_to url_for(:controller => :posts, :action => :show, :id => @post.id) + else + render :new + end + end + + def destroy + @post.destroy + redirect_to user_root_path + end + + private + + + def post_params + params.require(:post).permit(:content, :publish_date) + end + + def find_current_post + authenticate_user! + @post = Post.where(id: params[:id]).take + end + +end diff --git a/app/models/post.rb b/app/models/post.rb index 542c073..a899fb9 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -1,3 +1,7 @@ class Post < ActiveRecord::Base - belongs_to :user + belongs_to :user, :foreign_key => "user_id" + + def user + User.where(id: self.user_id).take + end end diff --git a/app/views/posts/_form.html.erb b/app/views/posts/_form.html.erb new file mode 100644 index 0000000..54cd64a --- /dev/null +++ b/app/views/posts/_form.html.erb @@ -0,0 +1,19 @@ + +<%= form_for(@post) do |f| %> + +
      + <%= f.label :content %>
      + <%= f.text_field :content, autofocus: true, autocomplete: "off"%> +

      + + +
      + <%= f.label :publish_date %>
      + <%= f.date_select :publish_date %> +

      + +
      + <%= f.submit "Save" %> +
      + +<% end %> diff --git a/app/views/posts/edit.html.erb b/app/views/posts/edit.html.erb new file mode 100644 index 0000000..ac93df2 --- /dev/null +++ b/app/views/posts/edit.html.erb @@ -0,0 +1,3 @@ +

      Edit post data

      + +<%= render "form" %> diff --git a/app/views/posts/index.html.erb b/app/views/posts/index.html.erb new file mode 100644 index 0000000..42ff2ad --- /dev/null +++ b/app/views/posts/index.html.erb @@ -0,0 +1 @@ +Hello index post! diff --git a/app/views/posts/new.html.erb b/app/views/posts/new.html.erb new file mode 100644 index 0000000..42bf8fb --- /dev/null +++ b/app/views/posts/new.html.erb @@ -0,0 +1,2 @@ +

      Create post data

      +<%= render "form" %> diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb new file mode 100644 index 0000000..c4403ac --- /dev/null +++ b/app/views/posts/show.html.erb @@ -0,0 +1,5 @@ +Текущий пользователь: <%= @post.user.name %>
      +содержание: <%= @post.content %>
      +Дата публикации: <%= @post.publish_date %>
      + + diff --git a/config/routes.rb b/config/routes.rb index 56ddc3d..605a966 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,6 +6,7 @@ resources :communities resources :community_memberships resources :user_relations + resources :posts # resorces :users, only:[:show, :index] #get 'welcome/index' root 'welcome#index' diff --git a/spec/controllers/posts_controller_spec.rb b/spec/controllers/posts_controller_spec.rb new file mode 100644 index 0000000..f6689fd --- /dev/null +++ b/spec/controllers/posts_controller_spec.rb @@ -0,0 +1,94 @@ +require 'rails_helper' + +RSpec.describe PostsController, :type => :controller do + +context 'when user not logged in' do + let(:post) {FactoryGirl.create(:post)} + + describe "Get post" do + it 'redirect to login page' do + get :show, :id => post.id + expect(response).to redirect_to new_user_session_path + end + end + + + + describe "New post" do + it 'redirect to login page' do + get :new + expect(response).to redirect_to new_user_session_path + end + end + + describe "Edit post" do + it 'redirect to login page' do + get :edit, :id => post.id + expect(response).to redirect_to new_user_session_path + end + end + + describe "Delete post" do + it 'redirect to login page' do + delete :destroy, id: post + expect(response).to redirect_to new_user_session_path + end + end + + end + + context 'when user logged in ' do + let(:post) {FactoryGirl.create(:post)} + + before do + sign_in post.user + + end + + describe "GET post profile" + it 'get post profile' do + get :show, :id => post.id + expect(response).to render_template :show + end + + describe "GET new post" + it 'assigns new post' do + get :new + expect(assigns(:post)).to be_new_record + end + + describe "render new post" + it 'render new post ' do + get :new + expect(response).to render_template :new + end + + describe "GET #edit" do + it "edit post data" do + get :edit, id: post + expect(assigns(:post)).to eq(post) + end + + it "renders the :edit view" do + get :edit, id: post + expect(response).to render_template :edit + end + end + + describe 'DELETE #destroy' do + before(:each) { + @post = FactoryGirl.create :post + } + it "deletes the post" do + expect {delete :destroy, id: @post}.to change(Post, :count).by(-1) + end + + it "redirects to user_profile" do + delete :destroy, id: @post + expect(response).to redirect_to user_root_path + end + end# + + end + +end diff --git a/spec/controllers/user_relations_controller_spec.rb b/spec/controllers/user_relations_controller_spec.rb index d136eeb..f756a42 100644 --- a/spec/controllers/user_relations_controller_spec.rb +++ b/spec/controllers/user_relations_controller_spec.rb @@ -66,7 +66,6 @@ end it "redirects to user_profile" do - user_id = @user_relation.user_owner_id delete :destroy, id: @user_relation expect(response).to redirect_to user_root_path end diff --git a/spec/factories/posts.rb b/spec/factories/posts.rb index f4ae1d4..1cf964b 100644 --- a/spec/factories/posts.rb +++ b/spec/factories/posts.rb @@ -1,7 +1,7 @@ FactoryGirl.define do factory :post do content {Faker::Lorem.paragraph} - association :user + association :user, factory: :user end end From d917bee155946611b345c4bfb25ab6729f22b56c Mon Sep 17 00:00:00 2001 From: KateGL Date: Wed, 14 Jan 2015 16:12:49 +0200 Subject: [PATCH 14/14] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=20=D0=BF=D0=BE=20=D0=B7=D0=B0=D0=BC?= =?UTF-8?q?=D0=B5=D1=87=D0=B0=D0=BD=D0=B8=D1=8F=D0=BC=20=D0=BA=20=D0=BF?= =?UTF-8?q?=D1=83=D0=BB-=D1=80=D0=B5=D0=BA=D0=B2=D0=B5=D1=81=D1=82=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/communities_controller.rb | 13 ++++------- .../community_memberships_controller.rb | 6 ++--- app/controllers/people_controller.rb | 14 ++++------- app/controllers/posts_controller.rb | 12 ++++------ app/controllers/user_relations_controller.rb | 8 +++---- app/controllers/users_controller.rb | 7 +++--- spec/controllers/people_controller_spec.rb | 23 ------------------- spec/controllers/users_controller_spec.rb | 6 ----- 8 files changed, 21 insertions(+), 68 deletions(-) diff --git a/app/controllers/communities_controller.rb b/app/controllers/communities_controller.rb index 319a1e5..d3c58bb 100644 --- a/app/controllers/communities_controller.rb +++ b/app/controllers/communities_controller.rb @@ -1,5 +1,6 @@ class CommunitiesController < ApplicationController before_action :find_current_community, only: [:show, :edit, :update] +before_filter :authenticate_user! def index @communities = Community.all @@ -10,16 +11,13 @@ def show end def edit - if @community == nil - redirect_to url_for(:controller => :communities, :action => :new) - return - end + render :new unless @community end def update if @community.update(community_params) - redirect_to url_for(:controller => :communities, :action => :show, :id => @community.id) + render :show else render :edit end @@ -27,7 +25,6 @@ def update def new - authenticate_user! @community = Community.new end @@ -35,7 +32,7 @@ def create @community = Community.new(community_params) @community.user_id = current_user.id if @community.save - redirect_to url_for(:controller => :communities, :action => :show, :id => @community.id) + render :show else render :new end @@ -51,8 +48,6 @@ def community_params def find_current_community - authenticate_user! - @community = Community.where(id: params[:id]).take end end diff --git a/app/controllers/community_memberships_controller.rb b/app/controllers/community_memberships_controller.rb index 0887f1f..6cb1eda 100644 --- a/app/controllers/community_memberships_controller.rb +++ b/app/controllers/community_memberships_controller.rb @@ -1,5 +1,6 @@ class CommunityMembershipsController < ApplicationController before_action :find_current_community_membership, only: [:show, :destroy] +before_filter :authenticate_user! def index @@ -11,7 +12,6 @@ def show def new - authenticate_user! @community_membership = CommunityMembership.new end @@ -19,7 +19,7 @@ def create @community_membership = CommunityMembership.new(community_params) @community_membership.community_id = current_user.id if @community_membership.save - redirect_to url_for(:controller => :community_memberships, :action => :show, :id => @community_membership.id) + render :show else render :new end @@ -40,8 +40,6 @@ def community_membership_params def find_current_community_membership - authenticate_user! - @community_membership = CommunityMembership.where(id: params[:id]).take end end diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb index 66dcc1e..7aa5057 100644 --- a/app/controllers/people_controller.rb +++ b/app/controllers/people_controller.rb @@ -1,5 +1,6 @@ class PeopleController < ApplicationController - before_action :find_current_person, only: [:show, :edit, :update] +before_action :find_current_person, only: [:show, :edit, :update] +before_filter :authenticate_user! def index @people = Person.all @@ -10,22 +11,18 @@ def show end def edit - if @person == nil - redirect_to url_for(:controller => :people, :action => :new) - return - end + render :new unless @person end def update if @person.update(person_params) - redirect_to url_for(:controller => :people, :action => :show, :id => @person.id) + render :show else render :edit end end def new - authenticate_user! @person = Person.new end @@ -33,7 +30,7 @@ def create @person = Person.new(person_params) @person.user_id = current_user.id if @person.save - redirect_to url_for(:controller => :people, :action => :show, :id => @person.id) + render :show else render :new end @@ -48,7 +45,6 @@ def person_params end def find_current_person - authenticate_user! @person = Person.where(id: params[:id]).take end diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index 841b38a..0380e35 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -1,5 +1,6 @@ class PostsController < ApplicationController before_action :find_current_post, only: [:show, :edit, :update, :destroy] +before_filter :authenticate_user! def index @@ -10,22 +11,18 @@ def show end def edit - if @post == nil - redirect_to url_for(:controller => :posts, :action => :new) - return - end + render :new unless @post end def update if @post.update(post_params) - redirect_to url_for(:controller => :posts, :action => :show, :id => @post.id) + render :show else render :edit end end def new - authenticate_user! @post = Post.new end @@ -33,7 +30,7 @@ def create @post = Post.new(post_params) @post.user_id = current_user.id if @post.save - redirect_to url_for(:controller => :posts, :action => :show, :id => @post.id) + render :show else render :new end @@ -52,7 +49,6 @@ def post_params end def find_current_post - authenticate_user! @post = Post.where(id: params[:id]).take end diff --git a/app/controllers/user_relations_controller.rb b/app/controllers/user_relations_controller.rb index cf4e8f8..7439500 100644 --- a/app/controllers/user_relations_controller.rb +++ b/app/controllers/user_relations_controller.rb @@ -1,5 +1,6 @@ class UserRelationsController < ApplicationController before_action :find_current_user_relation, only: [:show, :destroy] +before_filter :authenticate_user! def index @@ -11,15 +12,14 @@ def show def new - authenticate_user! - @user_relation = UserRelation.new + @user_relation = UserRelation.new end def create @user_relation = CommunityMembership.new(user_relation_params) @user_relation.user_owner_id = current_user.id if @user_relation.save - redirect_to url_for(:controller => :user_relations, :action => :show, :id => @user_relation.id) + rednder :show else render :new end @@ -39,8 +39,6 @@ def user_relation_params def find_current_user_relation - authenticate_user! - @user_relation = UserRelation.where(id: params[:id]).take end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index b036c07..b02f8c6 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,18 +1,17 @@ class UsersController < ApplicationController - #before_action :authenticate_user! - + def profile end def show_profile if current_user == nil - redirect_to new_user_session_path + redirect_to new_user_session_path return end user = User.where(id: current_user.id).take if user == nil - redirect_to root_path + redirect_to root_path return end diff --git a/spec/controllers/people_controller_spec.rb b/spec/controllers/people_controller_spec.rb index 9cf56b9..7bb80e6 100644 --- a/spec/controllers/people_controller_spec.rb +++ b/spec/controllers/people_controller_spec.rb @@ -69,29 +69,6 @@ end end -=begin - context 'when user logged in as person, but no person data' do - subject { FactoryGirl.create(:person) } - - before do - sign_in subject.user - - end - describe "POST #create" do - context "with valid attributes" do - it "creates new object" do - expect{post :create, person: FactoryGirl.attributes_for(:person)}.to change(Person, :count).by(1) - end - - it "redirects to profile path" do - post :create, person: FactoryGirl.attributes_for(:person) - expect(response).to redirect_to :controller => :people, :action => :show, :id => person.id #how to find id? - end - end - -end -end -=end end diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 11e401a..f8025ab 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -2,12 +2,6 @@ RSpec.describe UsersController, :type => :controller do -# describe "GET profile" do -# it "returns http success" do -# get :profile -# expect(response).to be_success -# end -# end context 'when user not logged in' do describe "GET user_profile" do