mod_factor 0.0.5 → 0.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. data/VERSION +1 -1
  2. data/lib/mod_factor/owner.rb +3 -1
  3. data/mod_factor.gemspec +2 -2
  4. data/spec/mod_factor/owner_spec.rb +10 -0
  5. metadata +27 -27
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.0.5
1
+ 0.0.6
data/lib/mod_factor/owner.rb CHANGED
@@ -67,7 +67,9 @@ module ModFactor
67
67
 
68
68
  def calculate options={}
69
69
  self.class.generate_list.each do |key|
70
- instance_variable_set "@#{key}", self.class.factor_define[key][:formula].try(:call, self, options)
70
+ if (condition = self.class.factor_define[key][:condition]).nil? || condition.call( self, options)
71
+ instance_variable_set "@#{key}", self.class.factor_define[key][:formula].try(:call, self, options)
72
+ end
71
73
  end
72
74
  end
73
75
 
data/mod_factor.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "mod_factor"
8
- s.version = "0.0.5"
8
+ s.version = "0.0.6"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Ryan Wong"]
12
- s.date = "2012-03-15"
12
+ s.date = "2012-03-16"
13
13
  s.description = "mod factor"
14
14
  s.email = "ryan@idolgo.com"
15
15
  s.extra_rdoc_files = [
data/spec/mod_factor/owner_spec.rb CHANGED
@@ -34,6 +34,8 @@ describe ModFactor::Owner do
34
34
  :formula => proc {|owner, extra| owner.members.first.try :prop_member}
35
35
  factor :prop_extra, :generate => true,
36
36
  :formula => proc {|owner, extra| extra[:extra_value]}
37
+ factor :prop_condition, :generate => true, :condition => proc {|owner| owner.prop_one},
38
+ :formula => proc {|owner| owner.prop_one || raise("prop one is nil")}
37
39
  end
38
40
  end
39
41
  end
@@ -115,4 +117,12 @@ describe ModFactor::Owner do
115
117
  subject.prop_extra.should == 10
116
118
  end
117
119
 
120
+ it "should meet condition before generate" do
121
+ subject.calculate
122
+ subject.prop_condition.should == nil
123
+ subject.prop_one = 10
124
+ subject.calculate
125
+ subject.prop_condition.should == 10
126
+ end
127
+
118
128
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mod_factor
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.5
4
+ version: 0.0.6
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-03-15 00:00:00.000000000Z
12
+ date: 2012-03-16 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: i18n
16
- requirement: &79191140 !ruby/object:Gem::Requirement
16
+ requirement: &76110770 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 0.6.0
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *79191140
24
+ version_requirements: *76110770
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: activerecord
27
- requirement: &79190780 !ruby/object:Gem::Requirement
27
+ requirement: &76110400 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 3.0.9
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *79190780
35
+ version_requirements: *76110400
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rake
38
- requirement: &79190410 !ruby/object:Gem::Requirement
38
+ requirement: &76110050 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *79190410
46
+ version_requirements: *76110050
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: sqlite3
49
- requirement: &79190050 !ruby/object:Gem::Requirement
49
+ requirement: &76109780 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *79190050
57
+ version_requirements: *76109780
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rspec
60
- requirement: &79189780 !ruby/object:Gem::Requirement
60
+ requirement: &76109470 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 2.8.0
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *79189780
68
+ version_requirements: *76109470
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: sqlite3-ruby
71
- requirement: &79189410 !ruby/object:Gem::Requirement
71
+ requirement: &76109100 !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: *79189410
79
+ version_requirements: *76109100
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: with_model
82
- requirement: &79189110 !ruby/object:Gem::Requirement
82
+ requirement: &76108790 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: 0.1.5
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *79189110
90
+ version_requirements: *76108790
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: rdoc
93
- requirement: &79188800 !ruby/object:Gem::Requirement
93
+ requirement: &76108520 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ~>
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '3.12'
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *79188800
101
+ version_requirements: *76108520
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: cucumber
104
- requirement: &79178560 !ruby/object:Gem::Requirement
104
+ requirement: &76098210 !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: :development
111
111
  prerelease: false
112
- version_requirements: *79178560
112
+ version_requirements: *76098210
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: bundler
115
- requirement: &79178190 !ruby/object:Gem::Requirement
115
+ requirement: &76097830 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: 1.0.0
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *79178190
123
+ version_requirements: *76097830
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: jeweler
126
- requirement: &79177810 !ruby/object:Gem::Requirement
126
+ requirement: &76097500 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: 1.8.3
132
132
  type: :development
133
133
  prerelease: false
134
- version_requirements: *79177810
134
+ version_requirements: *76097500
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: simplecov
137
- requirement: &79177370 !ruby/object:Gem::Requirement
137
+ requirement: &76096880 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
142
142
  version: '0'
143
143
  type: :development
144
144
  prerelease: false
145
- version_requirements: *79177370
145
+ version_requirements: *76096880
146
146
  description: mod factor
147
147
  email: ryan@idolgo.com
148
148
  executables: []
@@ -183,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
183
183
  version: '0'
184
184
  segments:
185
185
  - 0
186
- hash: -208297155
186
+ hash: 145750925
187
187
  required_rubygems_version: !ruby/object:Gem::Requirement
188
188
  none: false
189
189
  requirements: