Refatored code that will be used in every entity into a module: KalibroRecord

Rafael Manzo
1 parent ccb58e65
Showing 5 changed files with 27 additions and 22 deletions Show diff stats
app/models/.keep
app/models/concerns/.keep
app/models/concerns/kalibro_record.rb
app/models/project.rb
app/models/validators/kalibro_uniqueness_validator.rb
@@ -0,0 +1,25 @@
+module KalibroRecord
+  extend ActiveSupport::Concern
+
+  include ActiveModel::Validations
+  include ActiveModel::Conversion
+  extend ActiveModel::Naming
+  delegate :url_helpers, to: 'Rails.application.routes'
+
+  def persisted?
+    Project.exists?(self.id) unless self.id.nil? 
+  end
+
+  def update(attributes = {})
+    attributes.each { |field, value| send("#{field}=", value) if self.class.is_valid?(field) }
+    self.save
+  end
+
+  def save
+    if self.valid? and self.kalibro_errors.empty?
+      super
+    else
+      false
+    end
+  end
+end
 \ No newline at end of file
 require "validators/kalibro_uniqueness_validator.rb"
  
 class Project < KalibroEntities::Entities::Project
-  include ActiveModel::Validations
-  include ActiveModel::Conversion
-  extend ActiveModel::Naming
-  delegate :url_helpers, to: 'Rails.application.routes' 
+  include KalibroRecord
  
   attr_accessor :name
   validates :name, presence: true, kalibro_uniqueness: true
  
-  def persisted?
-    Project.exists?(self.id) unless self.id.nil? 
-  end
-
-  def update(attributes = {})
-    attributes.each { |field, value| send("#{field}=", value) if self.class.is_valid?(field) }
-    self.save
-  end
-
   def self.latest(count = 1)
     all.sort { |a,b| b.id <=> a.id }.first(count)
   end
-
-  def save
-    if self.valid? and self.kalibro_errors.empty?
-      super
-    else
-      false
-    end
-  end
 end
@@ -2,7 +2,7 @@ class KalibroUniquenessValidator &lt; ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     record.class.all.each do |entity|
       if entity.send(attribute) == value
-        record.errors[:attribute] << "There's already a #{record.class} with #{attribute} #{value}! Please, choose another one."
+        record.errors[attribute] << "There's already a #{record.class} with #{attribute} #{value}! Please, choose another one."
         break
       end
     end
...	...	@@ -0,0 +1,25 @@
	1	+module KalibroRecord
	2	+ extend ActiveSupport::Concern
	3	+
	4	+ include ActiveModel::Validations
	5	+ include ActiveModel::Conversion
	6	+ extend ActiveModel::Naming
	7	+ delegate :url_helpers, to: 'Rails.application.routes'
	8	+
	9	+ def persisted?
	10	+ Project.exists?(self.id) unless self.id.nil?
	11	+ end
	12	+
	13	+ def update(attributes = {})
	14	+ attributes.each { \|field, value\| send("#{field}=", value) if self.class.is_valid?(field) }
	15	+ self.save
	16	+ end
	17	+
	18	+ def save
	19	+ if self.valid? and self.kalibro_errors.empty?
	20	+ super
	21	+ else
	22	+ false
	23	+ end
	24	+ end
	25	+end
0	26	\ No newline at end of file
...	...
1	1	require "validators/kalibro_uniqueness_validator.rb"
2	2
3	3	class Project < KalibroEntities::Entities::Project
4		- include ActiveModel::Validations
5		- include ActiveModel::Conversion
6		- extend ActiveModel::Naming
7		- delegate :url_helpers, to: 'Rails.application.routes'
	4	+ include KalibroRecord
8	5
9	6	attr_accessor :name
10	7	validates :name, presence: true, kalibro_uniqueness: true
11	8
12		- def persisted?
13		- Project.exists?(self.id) unless self.id.nil?
14		- end
15		-
16		- def update(attributes = {})
17		- attributes.each { \|field, value\| send("#{field}=", value) if self.class.is_valid?(field) }
18		- self.save
19		- end
20		-
21	9	def self.latest(count = 1)
22	10	all.sort { \|a,b\| b.id <=> a.id }.first(count)
23	11	end
24		-
25		- def save
26		- if self.valid? and self.kalibro_errors.empty?
27		- super
28		- else
29		- false
30		- end
31		- end
32	12	end
...	...
...	...	@@ -2,7 +2,7 @@ class KalibroUniquenessValidator < ActiveModel::EachValidator
2	2	def validate_each(record, attribute, value)
3	3	record.class.all.each do \|entity\|
4	4	if entity.send(attribute) == value
5		- record.errors[:attribute] << "There's already a #{record.class} with #{attribute} #{value}! Please, choose another one."
	5	+ record.errors[attribute] << "There's already a #{record.class} with #{attribute} #{value}! Please, choose another one."
6	6	break
7	7	end
8	8	end
...	...