notification scaffold

Dmitriy Zaporozhets
1 parent 5f14a6bc
Showing 10 changed files with 119 additions and 7 deletions Show diff stats
app/controllers/notifications_controller.rb
app/helpers/notifications_helper.rb
app/models/notification.rb
app/models/user.rb
app/views/layouts/profile.html.haml
app/views/notifications/show.html.haml
config/routes.rb
spec/helpers/notifications_helper_spec.rb
spec/requests/notifications_spec.rb
spec/routing/notifications_routing_spec.rb
@@ -0,0 +1,11 @@
+class NotificationsController < ApplicationController
+  layout 'profile'
+
+  def show
+    @notification = current_user.notification
+  end
+
+  def update
+    @notification = current_user.notification
+  end
+end
@@ -0,0 +1,2 @@
+module NotificationsHelper
+end
@@ -0,0 +1,30 @@
+class Notification
+  #
+  # Notification levels
+  #
+  N_DISABLED = 0
+  N_PARTICIPATING = 1
+  N_WATCH = 2
+
+  attr_accessor :user
+
+  def self.notification_levels
+    [N_DISABLED, N_PARTICIPATING, N_WATCH]
+  end
+
+  def initialize(user)
+    @user = user
+  end
+
+  def disabled?
+    user.notification_level == N_DISABLED
+  end
+
+  def participating?
+    user.notification_level == N_PARTICIPATING
+  end
+
+  def watch?
+    user.notification_level == N_WATCH
+  end
+end
@@ -55,13 +55,6 @@ class User &lt; ActiveRecord::Base
  
  
   #
-  # Notification levels
-  #
-  N_DISABLED = 0
-  N_PARTICIPATING = 1
-  N_WATCH = 2
-
-  #
   # Relations
   #
  
@@ -116,6 +109,9 @@ class User &lt; ActiveRecord::Base
             format: { with: Gitlab::Regex.username_regex,
                       message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" }
  
+  validates :notification_level,
+    inclusion: { in: Notification.notification_levels },
+    presence: true
  
   validate :namespace_uniq, if: ->(user) { user.username_changed? }
  
@@ -216,6 +212,10 @@ class User &lt; ActiveRecord::Base
     username
   end
  
+  def notification
+    @notification ||= Notification.new(self)
+  end
+
   def generate_password
     if self.force_random_password
       self.password = self.password_confirmation = Devise.friendly_token.first(8)
@@ -11,6 +11,8 @@
             %i.icon-home
         = nav_link(path: 'profiles#account') do
           = link_to "Account", account_profile_path
+        = nav_link(controller: :notifications) do
+          = link_to "Notifications", profile_notifications_path
         = nav_link(controller: :keys) do
           = link_to keys_path do
             SSH Keys
@@ -0,0 +1,26 @@
+%h3.page_title Setup your notification level
+%hr
+
+
+= form_tag profile_notifications_path do
+
+  %ul.unstyled
+    %li
+      .row
+        .span3
+          %h5 Global
+        .span9
+          = label_tag do
+            = radio_button_tag :notification_level, Notification::N_DISABLED, @notification.disabled?
+            %span Disabled
+
+          = label_tag do
+            = radio_button_tag :notification_level, Notification::N_PARTICIPATING, @notification.participating?
+            %span Participating
+
+          = label_tag do
+            = radio_button_tag :notification_level, Notification::N_WATCH, @notification.watch?
+            %span Watch
+
+  .form-actions
+    = submit_tag 'Save', class: 'btn btn-save'
@@ -110,6 +110,8 @@ Gitlab::Application.routes.draw do
       put :reset_private_token
       put :update_username
     end
+
+    resource :notifications
   end
  
   resources :keys
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the NotificationsHelper. For example:
+#
+# describe NotificationsHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       helper.concat_strings("this","that").should == "this that"
+#     end
+#   end
+# end
+describe NotificationsHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe "Notifications" do
+  describe "GET /notifications" do
+    it "works! (now write some real specs)" do
+      # Run the generator again with the --webrat flag if you want to use webrat methods/matchers
+      get notifications_path
+      response.status.should be(200)
+    end
+  end
+end
@@ -0,0 +1,13 @@
+require "spec_helper"
+
+describe NotificationsController do
+  describe "routing" do
+    it "routes to #show" do
+      get("/profile/notifications").should route_to("notifications#show")
+    end
+
+    it "routes to #update" do
+      put("/profile/notifications").should route_to("notifications#update")
+    end
+  end
+end
...	...	@@ -0,0 +1,11 @@
	1	+class NotificationsController < ApplicationController
	2	+ layout 'profile'
	3	+
	4	+ def show
	5	+ @notification = current_user.notification
	6	+ end
	7	+
	8	+ def update
	9	+ @notification = current_user.notification
	10	+ end
	11	+end
...	...
...	...	@@ -0,0 +1,2 @@
	1	+module NotificationsHelper
	2	+end
...	...
...	...	@@ -0,0 +1,30 @@
	1	+class Notification
	2	+ #
	3	+ # Notification levels
	4	+ #
	5	+ N_DISABLED = 0
	6	+ N_PARTICIPATING = 1
	7	+ N_WATCH = 2
	8	+
	9	+ attr_accessor :user
	10	+
	11	+ def self.notification_levels
	12	+ [N_DISABLED, N_PARTICIPATING, N_WATCH]
	13	+ end
	14	+
	15	+ def initialize(user)
	16	+ @user = user
	17	+ end
	18	+
	19	+ def disabled?
	20	+ user.notification_level == N_DISABLED
	21	+ end
	22	+
	23	+ def participating?
	24	+ user.notification_level == N_PARTICIPATING
	25	+ end
	26	+
	27	+ def watch?
	28	+ user.notification_level == N_WATCH
	29	+ end
	30	+end
...	...
...	...	@@ -55,13 +55,6 @@ class User < ActiveRecord::Base
55	55
56	56
57	57	#
58		- # Notification levels
59		- #
60		- N_DISABLED = 0
61		- N_PARTICIPATING = 1
62		- N_WATCH = 2
63		-
64		- #
65	58	# Relations
66	59	#
67	60
...	...	@@ -116,6 +109,9 @@ class User < ActiveRecord::Base
116	109	format: { with: Gitlab::Regex.username_regex,
117	110	message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" }
118	111
	112	+ validates :notification_level,
	113	+ inclusion: { in: Notification.notification_levels },
	114	+ presence: true
119	115
120	116	validate :namespace_uniq, if: ->(user) { user.username_changed? }
121	117
...	...	@@ -216,6 +212,10 @@ class User < ActiveRecord::Base
216	212	username
217	213	end
218	214
	215	+ def notification
	216	+ @notification \|\|= Notification.new(self)
	217	+ end
	218	+
219	219	def generate_password
220	220	if self.force_random_password
221	221	self.password = self.password_confirmation = Devise.friendly_token.first(8)
...	...
...	...	@@ -11,6 +11,8 @@
11	11	%i.icon-home
12	12	= nav_link(path: 'profiles#account') do
13	13	= link_to "Account", account_profile_path
	14	+ = nav_link(controller: :notifications) do
	15	+ = link_to "Notifications", profile_notifications_path
14	16	= nav_link(controller: :keys) do
15	17	= link_to keys_path do
16	18	SSH Keys
...	...
...	...	@@ -0,0 +1,26 @@
	1	+%h3.page_title Setup your notification level
	2	+%hr
	3	+
	4	+
	5	+= form_tag profile_notifications_path do
	6	+
	7	+ %ul.unstyled
	8	+ %li
	9	+ .row
	10	+ .span3
	11	+ %h5 Global
	12	+ .span9
	13	+ = label_tag do
	14	+ = radio_button_tag :notification_level, Notification::N_DISABLED, @notification.disabled?
	15	+ %span Disabled
	16	+
	17	+ = label_tag do
	18	+ = radio_button_tag :notification_level, Notification::N_PARTICIPATING, @notification.participating?
	19	+ %span Participating
	20	+
	21	+ = label_tag do
	22	+ = radio_button_tag :notification_level, Notification::N_WATCH, @notification.watch?
	23	+ %span Watch
	24	+
	25	+ .form-actions
	26	+ = submit_tag 'Save', class: 'btn btn-save'
...	...
...	...	@@ -110,6 +110,8 @@ Gitlab::Application.routes.draw do
110	110	put :reset_private_token
111	111	put :update_username
112	112	end
	113	+
	114	+ resource :notifications
113	115	end
114	116
115	117	resources :keys
...	...
...	...	@@ -0,0 +1,15 @@
	1	+require 'spec_helper'
	2	+
	3	+# Specs in this file have access to a helper object that includes
	4	+# the NotificationsHelper. For example:
	5	+#
	6	+# describe NotificationsHelper do
	7	+# describe "string concat" do
	8	+# it "concats two strings with spaces" do
	9	+# helper.concat_strings("this","that").should == "this that"
	10	+# end
	11	+# end
	12	+# end
	13	+describe NotificationsHelper do
	14	+ pending "add some examples to (or delete) #{__FILE__}"
	15	+end
...	...
...	...	@@ -0,0 +1,11 @@
	1	+require 'spec_helper'
	2	+
	3	+describe "Notifications" do
	4	+ describe "GET /notifications" do
	5	+ it "works! (now write some real specs)" do
	6	+ # Run the generator again with the --webrat flag if you want to use webrat methods/matchers
	7	+ get notifications_path
	8	+ response.status.should be(200)
	9	+ end
	10	+ end
	11	+end
...	...
...	...	@@ -0,0 +1,13 @@
	1	+require "spec_helper"
	2	+
	3	+describe NotificationsController do
	4	+ describe "routing" do
	5	+ it "routes to #show" do
	6	+ get("/profile/notifications").should route_to("notifications#show")
	7	+ end
	8	+
	9	+ it "routes to #update" do
	10	+ put("/profile/notifications").should route_to("notifications#update")
	11	+ end
	12	+ end
	13	+end
...	...