Merge pull request #1208 from tsigo/issue_commonality

Consolidate functionality shared between Issue and MergeRequest

Merge pull request #1208 from tsigo/issue_commonality
Consolidate functionality shared between Issue and MergeRequest
Dmitriy Zaporozhets
2 parents 5fd0e7ba b7f9b822
Showing 5 changed files with 76 additions and 86 deletions Show diff stats
app/models/issue.rb
app/models/merge_request.rb
app/roles/issue_commonality.rb
spec/models/issue_spec.rb
spec/models/merge_request_spec.rb
 class Issue < ActiveRecord::Base
+  include IssueCommonality
   include Upvote
  
   acts_as_taggable_on :labels
  
-  belongs_to :project
   belongs_to :milestone
-  belongs_to :author, :class_name => "User"
-  belongs_to :assignee, :class_name => "User"
-  has_many :notes, :as => :noteable, :dependent => :destroy
-
-  attr_protected :author, :author_id, :project, :project_id
-  attr_accessor :author_id_of_changes
-
-  validates_presence_of :project_id
-  validates_presence_of :author_id
-
-  delegate :name,
-           :email,
-           :to => :author,
-           :prefix => true
-
-  delegate :name,
-           :email,
-           :to => :assignee,
-           :allow_nil => true,
-           :prefix => true
-
-  validates :title,
-            :presence => true,
-            :length   => { :within => 0..255 }
  
   validates :description,
             :length   => { :within => 0..2000 }
  
-  scope :opened, where(:closed => false)
-  scope :closed, where(:closed => true)
-  scope :assigned, lambda { |u| where(:assignee_id => u.id)}
-
   acts_as_list
  
   def self.open_for(user)
     opened.assigned(user)
   end
  
-  def self.search query
-    where("title like :query", :query => "%#{query}%")
-  end
-
-  def today?
-    Date.today == created_at.to_date
-  end
-
-  def new?
-    today? && created_at == updated_at
-  end
-
   def is_assigned?
     !!assignee_id
   end
 require File.join(Rails.root, "app/models/commit")
  
 class MergeRequest < ActiveRecord::Base
+  include IssueCommonality
   include Upvote
  
   BROKEN_DIFF = "--broken-diff"
@@ -9,47 +10,15 @@ class MergeRequest &lt; ActiveRecord::Base
   CAN_BE_MERGED = 2
   CANNOT_BE_MERGED = 3
  
-  belongs_to :project
-  belongs_to :author, :class_name => "User"
-  belongs_to :assignee, :class_name => "User"
-  has_many :notes, :as => :noteable, :dependent => :destroy
-
   serialize :st_commits
   serialize :st_diffs
  
-  attr_protected :author, :author_id, :project, :project_id
-  attr_accessor :author_id_of_changes,
-                :should_remove_source_branch
+  attr_accessor :should_remove_source_branch
  
-  validates_presence_of :project_id
-  validates_presence_of :author_id
   validates_presence_of :source_branch
   validates_presence_of :target_branch
   validate :validate_branches
  
-  delegate :name,
-           :email,
-           :to => :author,
-           :prefix => true
-
-  delegate :name,
-           :email,
-           :to => :assignee,
-           :allow_nil => true,
-           :prefix => true
-
-  validates :title,
-            :presence => true,
-            :length   => { :within => 0..255 }
-
-  scope :opened, where(:closed => false)
-  scope :closed, where(:closed => true)
-  scope :assigned, lambda { |u| where(:assignee_id => u.id)}
-
-  def self.search query
-    where("title like :query", :query => "%#{query}%")
-  end
-
   def self.find_all_by_branch(branch_name)
     where("source_branch like :branch or target_branch like :branch", :branch => branch_name)
   end
@@ -95,14 +64,6 @@ class MergeRequest &lt; ActiveRecord::Base
     self.save
   end
  
-  def today?
-    Date.today == created_at.to_date
-  end
-
-  def new?
-    today? && created_at == updated_at
-  end
-
   def diffs
     st_diffs || []
   end
@@ -135,7 +96,7 @@ class MergeRequest &lt; ActiveRecord::Base
     commits.first
   end
  
-  def merged? 
+  def merged?
     merged && merge_event
   end
  
@@ -152,7 +113,7 @@ class MergeRequest &lt; ActiveRecord::Base
   end
  
   def probably_merged?
-    unmerged_commits.empty? && 
+    unmerged_commits.empty? &&
       commits.any? && open?
   end
  
@@ -170,8 +131,8 @@ class MergeRequest &lt; ActiveRecord::Base
     self.update_attributes :state => CANNOT_BE_MERGED
   end
  
-  def reloaded_commits 
-    if open? && unmerged_commits.any? 
+  def reloaded_commits
+    if open? && unmerged_commits.any?
       self.st_commits = unmerged_commits
       save
     end
@@ -0,0 +1,52 @@
+# Contains common functionality shared between Issues and MergeRequests
+module IssueCommonality
+  extend ActiveSupport::Concern
+
+  included do
+    attr_protected :author, :author_id, :project, :project_id
+
+    belongs_to :project
+    belongs_to :author, :class_name => "User"
+    belongs_to :assignee, :class_name => "User"
+    has_many :notes, :as => :noteable, :dependent => :destroy
+
+    validates_presence_of :project_id
+    validates_presence_of :author_id
+
+    validates :title,
+              :presence => true,
+              :length   => { :within => 0..255 }
+
+
+    scope :opened, where(:closed => false)
+    scope :closed, where(:closed => true)
+    scope :assigned, lambda { |u| where(:assignee_id => u.id)}
+
+    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
+end
@@ -106,6 +106,14 @@ describe Issue do
     end
   end
  
+  describe ".search" do
+    let!(:issue) { Factory.create(:issue, :title => "Searchable issue",
+                                 :project => Factory.create(:project)) }
+
+    it "matches by title" do
+      Issue.search('able').all.should == [issue]
+    end
+  end
 end
 # == Schema Information
 #
@@ -56,6 +56,15 @@ describe MergeRequest do
       subject.upvotes.should == 2
     end
   end
+
+  describe ".search" do
+    let!(:issue) { Factory.create(:issue, :title => "Searchable issue",
+                                 :project => Factory.create(:project)) }
+
+    it "matches by title" do
+      Issue.search('able').all.should == [issue]
+    end
+  end
 end
 # == Schema Information
 #
1	1	class Issue < ActiveRecord::Base
	2	+ include IssueCommonality
2	3	include Upvote
3	4
4	5	acts_as_taggable_on :labels
5	6
6		- belongs_to :project
7	7	belongs_to :milestone
8		- belongs_to :author, :class_name => "User"
9		- belongs_to :assignee, :class_name => "User"
10		- has_many :notes, :as => :noteable, :dependent => :destroy
11		-
12		- attr_protected :author, :author_id, :project, :project_id
13		- attr_accessor :author_id_of_changes
14		-
15		- validates_presence_of :project_id
16		- validates_presence_of :author_id
17		-
18		- delegate :name,
19		- :email,
20		- :to => :author,
21		- :prefix => true
22		-
23		- delegate :name,
24		- :email,
25		- :to => :assignee,
26		- :allow_nil => true,
27		- :prefix => true
28		-
29		- validates :title,
30		- :presence => true,
31		- :length => { :within => 0..255 }
32	8
33	9	validates :description,
34	10	:length => { :within => 0..2000 }
35	11
36		- scope :opened, where(:closed => false)
37		- scope :closed, where(:closed => true)
38		- scope :assigned, lambda { \|u\| where(:assignee_id => u.id)}
39		-
40	12	acts_as_list
41	13
42	14	def self.open_for(user)
43	15	opened.assigned(user)
44	16	end
45	17
46		- def self.search query
47		- where("title like :query", :query => "%#{query}%")
48		- end
49		-
50		- def today?
51		- Date.today == created_at.to_date
52		- end
53		-
54		- def new?
55		- today? && created_at == updated_at
56		- end
57		-
58	18	def is_assigned?
59	19	!!assignee_id
60	20	end
...	...
1	1	require File.join(Rails.root, "app/models/commit")
2	2
3	3	class MergeRequest < ActiveRecord::Base
	4	+ include IssueCommonality
4	5	include Upvote
5	6
6	7	BROKEN_DIFF = "--broken-diff"
...	...	@@ -9,47 +10,15 @@ class MergeRequest < ActiveRecord::Base
9	10	CAN_BE_MERGED = 2
10	11	CANNOT_BE_MERGED = 3
11	12
12		- belongs_to :project
13		- belongs_to :author, :class_name => "User"
14		- belongs_to :assignee, :class_name => "User"
15		- has_many :notes, :as => :noteable, :dependent => :destroy
16		-
17	13	serialize :st_commits
18	14	serialize :st_diffs
19	15
20		- attr_protected :author, :author_id, :project, :project_id
21		- attr_accessor :author_id_of_changes,
22		- :should_remove_source_branch
	16	+ attr_accessor :should_remove_source_branch
23	17
24		- validates_presence_of :project_id
25		- validates_presence_of :author_id
26	18	validates_presence_of :source_branch
27	19	validates_presence_of :target_branch
28	20	validate :validate_branches
29	21
30		- delegate :name,
31		- :email,
32		- :to => :author,
33		- :prefix => true
34		-
35		- delegate :name,
36		- :email,
37		- :to => :assignee,
38		- :allow_nil => true,
39		- :prefix => true
40		-
41		- validates :title,
42		- :presence => true,
43		- :length => { :within => 0..255 }
44		-
45		- scope :opened, where(:closed => false)
46		- scope :closed, where(:closed => true)
47		- scope :assigned, lambda { \|u\| where(:assignee_id => u.id)}
48		-
49		- def self.search query
50		- where("title like :query", :query => "%#{query}%")
51		- end
52		-
53	22	def self.find_all_by_branch(branch_name)
54	23	where("source_branch like :branch or target_branch like :branch", :branch => branch_name)
55	24	end
...	...	@@ -95,14 +64,6 @@ class MergeRequest < ActiveRecord::Base
95	64	self.save
96	65	end
97	66
98		- def today?
99		- Date.today == created_at.to_date
100		- end
101		-
102		- def new?
103		- today? && created_at == updated_at
104		- end
105		-
106	67	def diffs
107	68	st_diffs \|\| []
108	69	end
...	...	@@ -135,7 +96,7 @@ class MergeRequest < ActiveRecord::Base
135	96	commits.first
136	97	end
137	98
138		- def merged?
	99	+ def merged?
139	100	merged && merge_event
140	101	end
141	102
...	...	@@ -152,7 +113,7 @@ class MergeRequest < ActiveRecord::Base
152	113	end
153	114
154	115	def probably_merged?
155		- unmerged_commits.empty? &&
	116	+ unmerged_commits.empty? &&
156	117	commits.any? && open?
157	118	end
158	119
...	...	@@ -170,8 +131,8 @@ class MergeRequest < ActiveRecord::Base
170	131	self.update_attributes :state => CANNOT_BE_MERGED
171	132	end
172	133
173		- def reloaded_commits
174		- if open? && unmerged_commits.any?
	134	+ def reloaded_commits
	135	+ if open? && unmerged_commits.any?
175	136	self.st_commits = unmerged_commits
176	137	save
177	138	end
...	...
...	...	@@ -0,0 +1,52 @@
	1	+# Contains common functionality shared between Issues and MergeRequests
	2	+module IssueCommonality
	3	+ extend ActiveSupport::Concern
	4	+
	5	+ included do
	6	+ attr_protected :author, :author_id, :project, :project_id
	7	+
	8	+ belongs_to :project
	9	+ belongs_to :author, :class_name => "User"
	10	+ belongs_to :assignee, :class_name => "User"
	11	+ has_many :notes, :as => :noteable, :dependent => :destroy
	12	+
	13	+ validates_presence_of :project_id
	14	+ validates_presence_of :author_id
	15	+
	16	+ validates :title,
	17	+ :presence => true,
	18	+ :length => { :within => 0..255 }
	19	+
	20	+
	21	+ scope :opened, where(:closed => false)
	22	+ scope :closed, where(:closed => true)
	23	+ scope :assigned, lambda { \|u\| where(:assignee_id => u.id)}
	24	+
	25	+ delegate :name,
	26	+ :email,
	27	+ :to => :author,
	28	+ :prefix => true
	29	+
	30	+ delegate :name,
	31	+ :email,
	32	+ :to => :assignee,
	33	+ :allow_nil => true,
	34	+ :prefix => true
	35	+
	36	+ attr_accessor :author_id_of_changes
	37	+ end
	38	+
	39	+ module ClassMethods
	40	+ def search(query)
	41	+ where("title like :query", :query => "%#{query}%")
	42	+ end
	43	+ end
	44	+
	45	+ def today?
	46	+ Date.today == created_at.to_date
	47	+ end
	48	+
	49	+ def new?
	50	+ today? && created_at == updated_at
	51	+ end
	52	+end
...	...
...	...	@@ -106,6 +106,14 @@ describe Issue do
106	106	end
107	107	end
108	108
	109	+ describe ".search" do
	110	+ let!(:issue) { Factory.create(:issue, :title => "Searchable issue",
	111	+ :project => Factory.create(:project)) }
	112	+
	113	+ it "matches by title" do
	114	+ Issue.search('able').all.should == [issue]
	115	+ end
	116	+ end
109	117	end
110	118	# == Schema Information
111	119	#
...	...
...	...	@@ -56,6 +56,15 @@ describe MergeRequest do
56	56	subject.upvotes.should == 2
57	57	end
58	58	end
	59	+
	60	+ describe ".search" do
	61	+ let!(:issue) { Factory.create(:issue, :title => "Searchable issue",
	62	+ :project => Factory.create(:project)) }
	63	+
	64	+ it "matches by title" do
	65	+ Issue.search('able').all.should == [issue]
	66	+ end
	67	+ end
59	68	end
60	69	# == Schema Information
61	70	#
...	...