record_history 0.8.8 → 0.8.9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/lib/record_history/has_record_history.rb +41 -11
  2. data/lib/record_history/record_history_model.rb +2 -2
  3. data/lib/record_history/version.rb +1 -1
  4. metadata +22 -22
data/lib/record_history/has_record_history.rb CHANGED
@@ -1,3 +1,4 @@
1
+ # -*- encoding: utf-8 -*-
1
2
  module RecordHistory
2
3
  module Model
3
4
 
@@ -20,6 +21,9 @@ module RecordHistory
20
21
  class_attribute :record_history_on
21
22
  self.record_history_on = ([options[:on] || ['create', 'update']].flatten.compact).map{|attr| attr.to_s}
22
23
 
24
+ class_attribute :record_history_polymorphic_group
25
+ self.record_history_polymorphic_group = ([options[:polymorphic_group]].flatten.compact || []).map{|attr| attr.to_s}
26
+
23
27
  has_many :record_history,
24
28
  :class_name => 'RecordHistoryModel',
25
29
  :order => "created_at DESC",
@@ -46,23 +50,49 @@ module RecordHistory
46
50
  def build_history_on_update
47
51
  return if self.new_record?
48
52
  self.record_history_obj = []
53
+ ignore = self.attr_ignore
49
54
  self.class.new.attributes.keys.each do |attr_name|
50
- if (self.send("#{attr_name}_changed?"))
51
- next if !self.class.record_history_only.blank? && !self.class.record_history_only.include?(attr_name)
52
- next if !self.class.record_history_ignore.blank? && self.record_history_ignore.include?(attr_name)
53
- self.record_history_obj << RecordHistoryModel.new(
54
- :item_type => self.class.name,
55
+ next unless (self.send("#{attr_name}_changed?"))
56
+
57
+ next if ignore.include?(attr_name)
58
+ next if !self.class.record_history_only.blank? && !self.class.record_history_only.include?(attr_name)
59
+ next if !self.class.record_history_ignore.blank? && self.record_history_ignore.include?(attr_name)
60
+ self.record_history_obj << RecordHistoryModel.new(
61
+ :item_type => self.class.name,
62
+ :item_id => self.id,
63
+ :attr_name => attr_name,
64
+ :old_value => self.send("#{attr_name}_was"),
65
+ :new_value => self.send("#{attr_name}"),
66
+ :author => RecordHistory.author,
67
+ :transaction_id => Time.now.to_f
68
+ )
69
+ end
70
+ self.record_history_polymorphic_group.each do |attr|
71
+ next if !self.send("#{attr}_type_changed?") && !self.send("#{attr}_id_changed?")
72
+ self.record_history_obj << RecordHistoryModel.new(
73
+ :item_type => self.class.name,
55
74
  :item_id => self.id,
56
- :attr_name => attr_name,
57
- :old_value => self.send("#{attr_name}_was"),
58
- :new_value => self.send("#{attr_name}"),
75
+ :attr_name => attr,
76
+ :old_value => {"#{attr}_type".to_sym => self.send("#{attr}_type_was"), "#{attr}_id".to_sym => self.send("#{attr}_id_was")},
77
+ :new_value => {"#{attr}_type".to_sym => self.send("#{attr}_type"), "#{attr}_id".to_sym => self.send("#{attr}_id")},
59
78
  :author => RecordHistory.author,
60
79
  :transaction_id => Time.now.to_f
61
- )
62
- end
63
- end
80
+ )
81
+ end
64
82
  end
65
83
 
84
+ def attr_ignore
85
+ attr_ignore = []
86
+ self.record_history_polymorphic_group.each do |attr|
87
+ if !self.reflections[attr.to_sym].options[:polymorphic]
88
+ raise "Тип связи должен быть polymorphic"
89
+ else
90
+ attr_ignore += ["#{attr}_id", "#{attr}_type"]
91
+ end
92
+ end
93
+ attr_ignore
94
+ end
95
+
66
96
  def save_history_on_update
67
97
  self.record_history_obj.each{|item| item.save}
68
98
  end
data/lib/record_history/record_history_model.rb CHANGED
@@ -19,11 +19,11 @@ class RecordHistoryModel < ActiveRecord::Base
19
19
 
20
20
  def new_value
21
21
  self.new_value = nil if self.new_value_dump.nil?
22
- Marshal.load(self.new_value_dump)
22
+ decode_value(self.new_value_dump)
23
23
  end
24
24
 
25
25
  def new_value=(value)
26
- self.new_value_dump = Marshal.dump(value)
26
+ self.new_value_dump = encode_value(value)
27
27
  end
28
28
 
29
29
  private
data/lib/record_history/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RecordHistory
2
- VERSION = "0.8.8"
2
+ VERSION = "0.8.9"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: record_history
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.8
4
+ version: 0.8.9
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-05-12 00:00:00.000000000 Z
12
+ date: 2012-05-15 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rspec
16
- requirement: &17195040820 !ruby/object:Gem::Requirement
16
+ requirement: &17194997480 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :development
23
23
  prerelease: false
24
- version_requirements: *17195040820
24
+ version_requirements: *17194997480
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: factory_girl
27
- requirement: &17195040140 !ruby/object:Gem::Requirement
27
+ requirement: &17194996960 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *17195040140
35
+ version_requirements: *17194996960
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: yard
38
- requirement: &17195039100 !ruby/object:Gem::Requirement
38
+ requirement: &17194996320 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 0.7.5
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *17195039100
46
+ version_requirements: *17194996320
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: redcarpet
49
- requirement: &17195037860 !ruby/object:Gem::Requirement
49
+ requirement: &17194995520 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '1.17'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *17195037860
57
+ version_requirements: *17194995520
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: sqlite3
60
- requirement: &17195037480 !ruby/object:Gem::Requirement
60
+ requirement: &17194994740 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *17195037480
68
+ version_requirements: *17194994740
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rspec-set
71
- requirement: &17195036980 !ruby/object:Gem::Requirement
71
+ requirement: &17194994280 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *17195036980
79
+ version_requirements: *17194994280
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: faker
82
- requirement: &17195036180 !ruby/object:Gem::Requirement
82
+ requirement: &17194993740 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *17195036180
90
+ version_requirements: *17194993740
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: activesupport
93
- requirement: &17195035520 !ruby/object:Gem::Requirement
93
+ requirement: &17194993060 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *17195035520
101
+ version_requirements: *17194993060
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: activemodel
104
- requirement: &17195035040 !ruby/object:Gem::Requirement
104
+ requirement: &17194992400 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :runtime
111
111
  prerelease: false
112
- version_requirements: *17195035040
112
+ version_requirements: *17194992400
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: activerecord
115
- requirement: &17195034620 !ruby/object:Gem::Requirement
115
+ requirement: &17194991820 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
120
120
  version: '0'
121
121
  type: :runtime
122
122
  prerelease: false
123
- version_requirements: *17195034620
123
+ version_requirements: *17194991820
124
124
  description: ActiveRecord versioning
125
125
  email:
126
126
  - m.gulin@gmail.com