mod_factor 0.0.6 → 0.0.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/VERSION +1 -1
  2. data/lib/mod_factor/owner.rb +4 -2
  3. data/mod_factor.gemspec +1 -1
  4. data/spec/mod_factor/owner_spec.rb +6 -6
  5. metadata +26 -26
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.0.6
1
+ 0.0.7
data/lib/mod_factor/owner.rb CHANGED
@@ -67,8 +67,10 @@ module ModFactor
67
67
 
68
68
  def calculate options={}
69
69
  self.class.generate_list.each do |key|
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)
70
+ if (condition = self.class.factor_define[key][:condition]).nil? || self.instance_exec(options, &condition)
71
+ raise "formula should be defined when generate" unless callable = self.class.factor_define[key][:formula]
72
+
73
+ instance_variable_set "@#{key}", self.instance_exec(options, &callable)
72
74
  end
73
75
  end
74
76
  end
data/mod_factor.gemspec CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "mod_factor"
8
- s.version = "0.0.6"
8
+ s.version = "0.0.7"
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"]
data/spec/mod_factor/owner_spec.rb CHANGED
@@ -27,15 +27,15 @@ describe ModFactor::Owner do
27
27
  factors :financial_factors do
28
28
  factor :prop_one
29
29
  factor :prop_formula, :generate => true,
30
- :formula => proc {|owner|1 + 1}
30
+ :formula => proc {|extra| 1 + 1}
31
31
  factor :prop_one_times_ten, :generate=>true,
32
- :formula => proc {|owner| (owner.prop_one||0) * 10}
32
+ :formula => proc {|extra| (prop_one||0) * 10}
33
33
  factor :prop_child, :generate => true,
34
- :formula => proc {|owner, extra| owner.members.first.try :prop_member}
34
+ :formula => proc {|extra| members.first.try :prop_member}
35
35
  factor :prop_extra, :generate => true,
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")}
36
+ :formula => proc {|extra| extra[:extra_value]}
37
+ factor :prop_condition, :generate => true, :condition => proc {|extra| prop_one},
38
+ :formula => proc {|extra| prop_one || raise("prop one is nil")}
39
39
  end
40
40
  end
41
41
  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.6
4
+ version: 0.0.7
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-03-16 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: i18n
16
- requirement: &76110770 !ruby/object:Gem::Requirement
16
+ requirement: &81917520 !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: *76110770
24
+ version_requirements: *81917520
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: activerecord
27
- requirement: &76110400 !ruby/object:Gem::Requirement
27
+ requirement: &81917130 !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: *76110400
35
+ version_requirements: *81917130
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rake
38
- requirement: &76110050 !ruby/object:Gem::Requirement
38
+ requirement: &81916800 !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: *76110050
46
+ version_requirements: *81916800
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: sqlite3
49
- requirement: &76109780 !ruby/object:Gem::Requirement
49
+ requirement: &81916310 !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: *76109780
57
+ version_requirements: *81916310
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rspec
60
- requirement: &76109470 !ruby/object:Gem::Requirement
60
+ requirement: &81911540 !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: *76109470
68
+ version_requirements: *81911540
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: sqlite3-ruby
71
- requirement: &76109100 !ruby/object:Gem::Requirement
71
+ requirement: &81911220 !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: *76109100
79
+ version_requirements: *81911220
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: with_model
82
- requirement: &76108790 !ruby/object:Gem::Requirement
82
+ requirement: &81910880 !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: *76108790
90
+ version_requirements: *81910880
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: rdoc
93
- requirement: &76108520 !ruby/object:Gem::Requirement
93
+ requirement: &81910590 !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: *76108520
101
+ version_requirements: *81910590
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: cucumber
104
- requirement: &76098210 !ruby/object:Gem::Requirement
104
+ requirement: &81910220 !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: *76098210
112
+ version_requirements: *81910220
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: bundler
115
- requirement: &76097830 !ruby/object:Gem::Requirement
115
+ requirement: &81909850 !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: *76097830
123
+ version_requirements: *81909850
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: jeweler
126
- requirement: &76097500 !ruby/object:Gem::Requirement
126
+ requirement: &81909500 !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: *76097500
134
+ version_requirements: *81909500
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: simplecov
137
- requirement: &76096880 !ruby/object:Gem::Requirement
137
+ requirement: &81909080 !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: *76096880
145
+ version_requirements: *81909080
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: 145750925
186
+ hash: -660223917
187
187
  required_rubygems_version: !ruby/object:Gem::Requirement
188
188
  none: false
189
189
  requirements: