more refactoring using models/concerns

Dmitriy Zaporozhets
1 parent 40a956eb
Showing 11 changed files with 127 additions and 137 deletions Show diff stats
app/models/concerns/issuable.rb
app/models/issue.rb
app/models/merge_request.rb
app/models/project.rb
app/models/protected_branch.rb
app/models/users_project.rb
app/observers/key_observer.rb
lib/git_host.rb
lib/gitolited.rb
lib/issue_commonality.rb
lib/votes.rb
@@ -0,0 +1,102 @@
+# == Issuable concern
+#
+# Contains common functionality shared between Issues and MergeRequests
+#
+# Used by Issue, MergeRequest
+#
+module Issuable
+  extend ActiveSupport::Concern
+
+  included do
+    belongs_to :project
+    belongs_to :author, class_name: "User"
+    belongs_to :assignee, class_name: "User"
+    belongs_to :milestone
+    has_many :notes, as: :noteable, dependent: :destroy
+
+    validates :project, presence: true
+    validates :author, presence: true
+    validates :title, presence: true, length: { within: 0..255 }
+    validates :closed, inclusion: { in: [true, false] }
+
+    scope :opened, where(closed: false)
+    scope :closed, where(closed: true)
+    scope :of_group, ->(group) { where(project_id: group.project_ids) }
+    scope :assigned, ->(u) { where(assignee_id: u.id)}
+    scope :recent, order("created_at DESC")
+
+    delegate :name,
+             :email,
+             to: :author,
+             prefix: true
+
+    delegate :name,
+             :email,
+             to: :assignee,
+             allow_nil: true,
+             prefix: true
+
+    attr_accessor :author_id_of_changes
+  end
+
+  module ClassMethods
+    def search(query)
+      where("title like :query", query: "%#{query}%")
+    end
+  end
+
+  def today?
+    Date.today == created_at.to_date
+  end
+
+  def new?
+    today? && created_at == updated_at
+  end
+
+  def is_assigned?
+    !!assignee_id
+  end
+
+  def is_being_reassigned?
+    assignee_id_changed?
+  end
+
+  def is_being_closed?
+    closed_changed? && closed
+  end
+
+  def is_being_reopened?
+    closed_changed? && !closed
+  end
+
+  # Return the number of +1 comments (upvotes)
+  def upvotes
+    notes.select(&:upvote?).size
+  end
+
+  def upvotes_in_percent
+    if votes_count.zero?
+      0
+    else
+      100.0 / votes_count * upvotes
+    end
+  end
+
+  # Return the number of -1 comments (downvotes)
+  def downvotes
+    notes.select(&:downvote?).size
+  end
+
+  def downvotes_in_percent
+    if votes_count.zero?
+      0
+    else
+      100.0 - upvotes_in_percent
+    end
+  end
+
+  # Return the total number of votes
+  def votes_count
+    upvotes + downvotes
+  end
+end
@@ -17,8 +17,7 @@
 #
 class Issue < ActiveRecord::Base
-  include IssueCommonality
-  include Votes
+  include Issuable
   attr_accessible :title, :assignee_id, :closed, :position, :description,
                   :milestone_id, :label_list, :author_id_of_changes
@@ -23,8 +23,7 @@ require Rails.root.join(&quot;app/models/commit&quot;)
 require Rails.root.join("lib/static_model")
 class MergeRequest < ActiveRecord::Base
-  include IssueCommonality
-  include Votes
+  include Issuable
   attr_accessible :title, :assignee_id, :closed, :target_branch, :source_branch, :milestone_id,
                   :author_id_of_changes
@@ -21,7 +21,7 @@
 require "grit"
 class Project < ActiveRecord::Base
-  include GitHost
+  include Gitolited
   class TransferError < StandardError; end
@@ -408,7 +408,7 @@ class Project &lt; ActiveRecord::Base
       Gitlab::ProjectMover.new(self, old_dir, new_dir).execute
-      git_host.move_repository(old_repo, self)
+      gitolite.move_repository(old_repo, self)
       save!
     end
@@ -670,7 +670,7 @@ class Project &lt; ActiveRecord::Base
   end
   def url_to_repo
-    git_host.url_to_repo(path_with_namespace)
+    gitolite.url_to_repo(path_with_namespace)
   end
   def path_to_repo
@@ -682,11 +682,11 @@ class Project &lt; ActiveRecord::Base
   end
   def update_repository
-    git_host.update_repository(self)
+    gitolite.update_repository(self)
   end
   def destroy_repository
-    git_host.remove_repository(self)
+    gitolite.remove_repository(self)
   end
   def repo_exists?
@@ -10,7 +10,7 @@
 #
 class ProtectedBranch < ActiveRecord::Base
-  include GitHost
+  include Gitolited
   attr_accessible :name
@@ -22,7 +22,7 @@ class ProtectedBranch &lt; ActiveRecord::Base
   after_destroy :update_repository
   def update_repository
-    git_host.update_repository(project)
+    gitolite.update_repository(project)
   end
   def commit
@@ -11,7 +11,7 @@
 #
 class UsersProject < ActiveRecord::Base
-  include GitHost
+  include Gitolited
   GUEST     = 10
   REPORTER  = 20
@@ -152,7 +152,7 @@ class UsersProject &lt; ActiveRecord::Base
   end
   def update_repository
-    git_host.update_repository(project)
+    gitolite.update_repository(project)
   end
   def project_access_human
 class KeyObserver < ActiveRecord::Observer
-  include GitHost
+  include Gitolited
   def after_save(key)
-    git_host.set_key(key.identifier, key.key, key.projects)
+    gitolite.set_key(key.identifier, key.key, key.projects)
   end
   def after_destroy(key)
     return if key.is_deploy_key && !key.last_deploy?
-    git_host.remove_key(key.identifier, key.projects)
+    gitolite.remove_key(key.identifier, key.projects)
   end
 end
@@ -1,11 +0,0 @@
-# == GitHost role
-#
-# Provide a shortcut to Gitlab::Gitolite instance
-#
-# Used by Project, UsersProject
-#
-module GitHost
-  def git_host
-    Gitlab::Gitolite.new
-  end
-end
@@ -0,0 +1,11 @@
+# == Gitolited mixin
+#
+# Provide a shortcut to Gitlab::Gitolite instance by gitolite
+#
+# Used by Project, UsersProject, etc
+#
+module Gitolited
+  def gitolite
+    Gitlab::Gitolite.new
+  end
+end
@@ -1,71 +0,0 @@
-# == IssueCommonality role
-#
-# Contains common functionality shared between Issues and MergeRequests
-#
-# Used by Issue, MergeRequest
-#
-module IssueCommonality
-  extend ActiveSupport::Concern
-
-  included do
-    belongs_to :project
-    belongs_to :author, class_name: "User"
-    belongs_to :assignee, class_name: "User"
-    belongs_to :milestone
-    has_many :notes, as: :noteable, dependent: :destroy
-
-    validates :project, presence: true
-    validates :author, presence: true
-    validates :title, presence: true, length: { within: 0..255 }
-    validates :closed, inclusion: { in: [true, false] }
-
-    scope :opened, where(closed: false)
-    scope :closed, where(closed: true)
-    scope :of_group, ->(group) { where(project_id: group.project_ids) }
-    scope :assigned, ->(u) { where(assignee_id: u.id)}
-    scope :recent, order("created_at DESC")
-
-    delegate :name,
-             :email,
-             to: :author,
-             prefix: true
-
-    delegate :name,
-             :email,
-             to: :assignee,
-             allow_nil: true,
-             prefix: true
-
-    attr_accessor :author_id_of_changes
-  end
-
-  module ClassMethods
-    def search(query)
-      where("title like :query", query: "%#{query}%")
-    end
-  end
-
-  def today?
-    Date.today == created_at.to_date
-  end
-
-  def new?
-    today? && created_at == updated_at
-  end
-
-  def is_assigned?
-    !!assignee_id
-  end
-
-  def is_being_reassigned?
-    assignee_id_changed?
-  end
-
-  def is_being_closed?
-    closed_changed? && closed
-  end
-
-  def is_being_reopened?
-    closed_changed? && !closed
-  end
-end
@@ -1,39 +0,0 @@
-# == Votes role
-#
-# Provides functionality to upvote/downvote entity
-# based on +1 and -1 notes
-#
-# Used for Issue and Merge Request
-#
-module Votes
-  # Return the number of +1 comments (upvotes)
-  def upvotes
-    notes.select(&:upvote?).size
-  end
-
-  def upvotes_in_percent
-    if votes_count.zero?
-      0
-    else
-      100.0 / votes_count * upvotes
-    end
-  end
-
-  # Return the number of -1 comments (downvotes)
-  def downvotes
-    notes.select(&:downvote?).size
-  end
-
-  def downvotes_in_percent
-    if votes_count.zero?
-      0
-    else
-      100.0 - upvotes_in_percent
-    end
-  end
-
-  # Return the total number of votes
-  def votes_count
-    upvotes + downvotes
-  end
-end
@@ -0,0 +1,102 @@		@@ -0,0 +1,102 @@
	1	+# == Issuable concern
	2	+#
	3	+# Contains common functionality shared between Issues and MergeRequests
	4	+#
	5	+# Used by Issue, MergeRequest
	6	+#
	7	+module Issuable
	8	+ extend ActiveSupport::Concern
	9	+
	10	+ included do
	11	+ belongs_to :project
	12	+ belongs_to :author, class_name: "User"
	13	+ belongs_to :assignee, class_name: "User"
	14	+ belongs_to :milestone
	15	+ has_many :notes, as: :noteable, dependent: :destroy
	16	+
	17	+ validates :project, presence: true
	18	+ validates :author, presence: true
	19	+ validates :title, presence: true, length: { within: 0..255 }
	20	+ validates :closed, inclusion: { in: [true, false] }
	21	+
	22	+ scope :opened, where(closed: false)
	23	+ scope :closed, where(closed: true)
	24	+ scope :of_group, ->(group) { where(project_id: group.project_ids) }
	25	+ scope :assigned, ->(u) { where(assignee_id: u.id)}
	26	+ scope :recent, order("created_at DESC")
	27	+
	28	+ delegate :name,
	29	+ :email,
	30	+ to: :author,
	31	+ prefix: true
	32	+
	33	+ delegate :name,
	34	+ :email,
	35	+ to: :assignee,
	36	+ allow_nil: true,
	37	+ prefix: true
	38	+
	39	+ attr_accessor :author_id_of_changes
	40	+ end
	41	+
	42	+ module ClassMethods
	43	+ def search(query)
	44	+ where("title like :query", query: "%#{query}%")
	45	+ end
	46	+ end
	47	+
	48	+ def today?
	49	+ Date.today == created_at.to_date
	50	+ end
	51	+
	52	+ def new?
	53	+ today? && created_at == updated_at
	54	+ end
	55	+
	56	+ def is_assigned?
	57	+ !!assignee_id
	58	+ end
	59	+
	60	+ def is_being_reassigned?
	61	+ assignee_id_changed?
	62	+ end
	63	+
	64	+ def is_being_closed?
	65	+ closed_changed? && closed
	66	+ end
	67	+
	68	+ def is_being_reopened?
	69	+ closed_changed? && !closed
	70	+ end
	71	+
	72	+ # Return the number of +1 comments (upvotes)
	73	+ def upvotes
	74	+ notes.select(&:upvote?).size
	75	+ end
	76	+
	77	+ def upvotes_in_percent
	78	+ if votes_count.zero?
	79	+ 0
	80	+ else
	81	+ 100.0 / votes_count * upvotes
	82	+ end
	83	+ end
	84	+
	85	+ # Return the number of -1 comments (downvotes)
	86	+ def downvotes
	87	+ notes.select(&:downvote?).size
	88	+ end
	89	+
	90	+ def downvotes_in_percent
	91	+ if votes_count.zero?
	92	+ 0
	93	+ else
	94	+ 100.0 - upvotes_in_percent
	95	+ end
	96	+ end
	97	+
	98	+ # Return the total number of votes
	99	+ def votes_count
	100	+ upvotes + downvotes
	101	+ end
	102	+end
	@@ -17,8 +17,7 @@		@@ -17,8 +17,7 @@
17	#	17	#
18		18
19	class Issue < ActiveRecord::Base	19	class Issue < ActiveRecord::Base
20	- include IssueCommonality
21	- include Votes	20	+ include Issuable
22		21
23	attr_accessible :title, :assignee_id, :closed, :position, :description,	22	attr_accessible :title, :assignee_id, :closed, :position, :description,
24	:milestone_id, :label_list, :author_id_of_changes	23	:milestone_id, :label_list, :author_id_of_changes
	@@ -23,8 +23,7 @@ require Rails.root.join("app/models/commit")		@@ -23,8 +23,7 @@ require Rails.root.join("app/models/commit")
23	require Rails.root.join("lib/static_model")	23	require Rails.root.join("lib/static_model")
24		24
25	class MergeRequest < ActiveRecord::Base	25	class MergeRequest < ActiveRecord::Base
26	- include IssueCommonality
27	- include Votes	26	+ include Issuable
28		27
29	attr_accessible :title, :assignee_id, :closed, :target_branch, :source_branch, :milestone_id,	28	attr_accessible :title, :assignee_id, :closed, :target_branch, :source_branch, :milestone_id,
30	:author_id_of_changes	29	:author_id_of_changes
	@@ -21,7 +21,7 @@		@@ -21,7 +21,7 @@
21	require "grit"	21	require "grit"
22		22
23	class Project < ActiveRecord::Base	23	class Project < ActiveRecord::Base
24	- include GitHost	24	+ include Gitolited
25		25
26	class TransferError < StandardError; end	26	class TransferError < StandardError; end
27		27
	@@ -408,7 +408,7 @@ class Project < ActiveRecord::Base		@@ -408,7 +408,7 @@ class Project < ActiveRecord::Base
408		408
409	Gitlab::ProjectMover.new(self, old_dir, new_dir).execute	409	Gitlab::ProjectMover.new(self, old_dir, new_dir).execute
410		410
411	- git_host.move_repository(old_repo, self)	411	+ gitolite.move_repository(old_repo, self)
412		412
413	save!	413	save!
414	end	414	end
	@@ -670,7 +670,7 @@ class Project < ActiveRecord::Base		@@ -670,7 +670,7 @@ class Project < ActiveRecord::Base
670	end	670	end
671		671
672	def url_to_repo	672	def url_to_repo
673	- git_host.url_to_repo(path_with_namespace)	673	+ gitolite.url_to_repo(path_with_namespace)
674	end	674	end
675		675
676	def path_to_repo	676	def path_to_repo
	@@ -682,11 +682,11 @@ class Project < ActiveRecord::Base		@@ -682,11 +682,11 @@ class Project < ActiveRecord::Base
682	end	682	end
683		683
684	def update_repository	684	def update_repository
685	- git_host.update_repository(self)	685	+ gitolite.update_repository(self)
686	end	686	end
687		687
688	def destroy_repository	688	def destroy_repository
689	- git_host.remove_repository(self)	689	+ gitolite.remove_repository(self)
690	end	690	end
691		691
692	def repo_exists?	692	def repo_exists?
	@@ -10,7 +10,7 @@		@@ -10,7 +10,7 @@
10	#	10	#
11		11
12	class ProtectedBranch < ActiveRecord::Base	12	class ProtectedBranch < ActiveRecord::Base
13	- include GitHost	13	+ include Gitolited
14		14
15	attr_accessible :name	15	attr_accessible :name
16		16
	@@ -22,7 +22,7 @@ class ProtectedBranch < ActiveRecord::Base		@@ -22,7 +22,7 @@ class ProtectedBranch < ActiveRecord::Base
22	after_destroy :update_repository	22	after_destroy :update_repository
23		23
24	def update_repository	24	def update_repository
25	- git_host.update_repository(project)	25	+ gitolite.update_repository(project)
26	end	26	end
27		27
28	def commit	28	def commit
	@@ -11,7 +11,7 @@		@@ -11,7 +11,7 @@
11	#	11	#
12		12
13	class UsersProject < ActiveRecord::Base	13	class UsersProject < ActiveRecord::Base
14	- include GitHost	14	+ include Gitolited
15		15
16	GUEST = 10	16	GUEST = 10
17	REPORTER = 20	17	REPORTER = 20
	@@ -152,7 +152,7 @@ class UsersProject < ActiveRecord::Base		@@ -152,7 +152,7 @@ class UsersProject < ActiveRecord::Base
152	end	152	end
153		153
154	def update_repository	154	def update_repository
155	- git_host.update_repository(project)	155	+ gitolite.update_repository(project)
156	end	156	end
157		157
158	def project_access_human	158	def project_access_human
1	class KeyObserver < ActiveRecord::Observer	1	class KeyObserver < ActiveRecord::Observer
2	- include GitHost	2	+ include Gitolited
3		3
4	def after_save(key)	4	def after_save(key)
5	- git_host.set_key(key.identifier, key.key, key.projects)	5	+ gitolite.set_key(key.identifier, key.key, key.projects)
6	end	6	end
7		7
8	def after_destroy(key)	8	def after_destroy(key)
9	return if key.is_deploy_key && !key.last_deploy?	9	return if key.is_deploy_key && !key.last_deploy?
10	- git_host.remove_key(key.identifier, key.projects)	10	+ gitolite.remove_key(key.identifier, key.projects)
11	end	11	end
12	end	12	end
	@@ -1,11 +0,0 @@	@@ -1,11 +0,0 @@
1	-# == GitHost role
2	-#
3	-# Provide a shortcut to Gitlab::Gitolite instance
4	-#
5	-# Used by Project, UsersProject
6	-#
7	-module GitHost
8	- def git_host
9	- Gitlab::Gitolite.new
10	- end
11	-end
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+# == Gitolited mixin
	2	+#
	3	+# Provide a shortcut to Gitlab::Gitolite instance by gitolite
	4	+#
	5	+# Used by Project, UsersProject, etc
	6	+#
	7	+module Gitolited
	8	+ def gitolite
	9	+ Gitlab::Gitolite.new
	10	+ end
	11	+end
	@@ -1,71 +0,0 @@	@@ -1,71 +0,0 @@
1	-# == IssueCommonality role
2	-#
3	-# Contains common functionality shared between Issues and MergeRequests
4	-#
5	-# Used by Issue, MergeRequest
6	-#
7	-module IssueCommonality
8	- extend ActiveSupport::Concern
9	-
10	- included do
11	- belongs_to :project
12	- belongs_to :author, class_name: "User"
13	- belongs_to :assignee, class_name: "User"
14	- belongs_to :milestone
15	- has_many :notes, as: :noteable, dependent: :destroy
16	-
17	- validates :project, presence: true
18	- validates :author, presence: true
19	- validates :title, presence: true, length: { within: 0..255 }
20	- validates :closed, inclusion: { in: [true, false] }
21	-
22	- scope :opened, where(closed: false)
23	- scope :closed, where(closed: true)
24	- scope :of_group, ->(group) { where(project_id: group.project_ids) }
25	- scope :assigned, ->(u) { where(assignee_id: u.id)}
26	- scope :recent, order("created_at DESC")
27	-
28	- delegate :name,
29	- :email,
30	- to: :author,
31	- prefix: true
32	-
33	- delegate :name,
34	- :email,
35	- to: :assignee,
36	- allow_nil: true,
37	- prefix: true
38	-
39	- attr_accessor :author_id_of_changes
40	- end
41	-
42	- module ClassMethods
43	- def search(query)
44	- where("title like :query", query: "%#{query}%")
45	- end
46	- end
47	-
48	- def today?
49	- Date.today == created_at.to_date
50	- end
51	-
52	- def new?
53	- today? && created_at == updated_at
54	- end
55	-
56	- def is_assigned?
57	- !!assignee_id
58	- end
59	-
60	- def is_being_reassigned?
61	- assignee_id_changed?
62	- end
63	-
64	- def is_being_closed?
65	- closed_changed? && closed
66	- end
67	-
68	- def is_being_reopened?
69	- closed_changed? && !closed
70	- end
71	-end