Move all serialization to marshall

randx
1 parent 11e4709f
Showing 3 changed files with 18 additions and 24 deletions Show diff stats
app/models/event.rb
app/models/gitlab_serialize.rb
app/models/merge_request.rb
@@ -14,7 +14,8 @@ class Event &lt; ActiveRecord::Base
   belongs_to :project
   belongs_to :target, :polymorphic => true
  
-  serialize :data, GitlabSerialize.new
+  # For Hash only
+  serialize :data
  
   scope :recent, order("created_at DESC")
   scope :code_push, where(:action => Pushed)
@@ -104,6 +105,14 @@ class Event &lt; ActiveRecord::Base
   delegate :name, :email, :to => :author, :prefix => true, :allow_nil => true
   delegate :title, :to => :issue, :prefix => true, :allow_nil => true
   delegate :title, :to => :merge_request, :prefix => true, :allow_nil => true
+
+  def load obj 
+    Marshal.load obj
+  end
+
+  def dump obj 
+    Marshal.dump obj
+  end
 end
 # == Schema Information
 #
@@ -1,23 +0,0 @@
-class GitlabSerialize
-  # Called to deserialize data to ruby object.
-  def load(data)
-    hash = parse_data(data)
-    hash = HashWithIndifferentAccess.new(hash) if hash
-    hash
-  end
-
-  def parse_data(data)
-    JSON.load(data)
-  rescue JSON::ParserError
-    begin
-      YAML.load(data)
-    rescue Psych::SyntaxError
-      nil
-    end
-  end
-
-  # Called to convert from ruby object to serialized data.
-  def dump(obj)
-    JSON.dump(obj)
-  end
-end
@@ -144,6 +144,14 @@ class MergeRequest &lt; ActiveRecord::Base
       :author_id => user_id
     )
   end
+
+  def load obj 
+    Marshal.load obj
+  end
+
+  def dump obj 
+    Marshal.dump obj
+  end
 end
 # == Schema Information
 #
...	...	@@ -14,7 +14,8 @@ class Event < ActiveRecord::Base
14	14	belongs_to :project
15	15	belongs_to :target, :polymorphic => true
16	16
17		- serialize :data, GitlabSerialize.new
	17	+ # For Hash only
	18	+ serialize :data
18	19
19	20	scope :recent, order("created_at DESC")
20	21	scope :code_push, where(:action => Pushed)
...	...	@@ -104,6 +105,14 @@ class Event < ActiveRecord::Base
104	105	delegate :name, :email, :to => :author, :prefix => true, :allow_nil => true
105	106	delegate :title, :to => :issue, :prefix => true, :allow_nil => true
106	107	delegate :title, :to => :merge_request, :prefix => true, :allow_nil => true
	108	+
	109	+ def load obj
	110	+ Marshal.load obj
	111	+ end
	112	+
	113	+ def dump obj
	114	+ Marshal.dump obj
	115	+ end
107	116	end
108	117	# == Schema Information
109	118	#
...	...
...	...	@@ -1,23 +0,0 @@
1		-class GitlabSerialize
2		- # Called to deserialize data to ruby object.
3		- def load(data)
4		- hash = parse_data(data)
5		- hash = HashWithIndifferentAccess.new(hash) if hash
6		- hash
7		- end
8		-
9		- def parse_data(data)
10		- JSON.load(data)
11		- rescue JSON::ParserError
12		- begin
13		- YAML.load(data)
14		- rescue Psych::SyntaxError
15		- nil
16		- end
17		- end
18		-
19		- # Called to convert from ruby object to serialized data.
20		- def dump(obj)
21		- JSON.dump(obj)
22		- end
23		-end
...	...	@@ -144,6 +144,14 @@ class MergeRequest < ActiveRecord::Base
144	144	:author_id => user_id
145	145	)
146	146	end
	147	+
	148	+ def load obj
	149	+ Marshal.load obj
	150	+ end
	151	+
	152	+ def dump obj
	153	+ Marshal.dump obj
	154	+ end
147	155	end
148	156	# == Schema Information
149	157	#
...	...