mod_factor 0.0.7 → 0.0.8

data/README.markdown

@@ -19,22 +19,27 @@ Include ModFactor::Owner to owner:
 		factors :financial_factors do
 			factor :prop_one
 			factor :prop_formula, :generate => true, 
-				:formula => proc {|owner|1 + 1}
+				:formula => proc {1 + 1}
 			factor :prop_one_times_ten, :generate=>true, 
-				:formula => proc {|owner| (owner.prop_one||0) * 10}
+				:formula => proc {(owner.prop_one||0) * 10}
+			factor :prop_condition, :generate => true,
+				:condition => proc {|extra| prop_one},
+				:formula => proc {|extra| prop_one || raise("prop one is nil")}
+			factor :prop_default, :default=>10
 		end
 	end
 
 
-Some sample usage:
+Sample usages:
 
 	some_model = SomeModel.new
 	some_model.prop_one				# nil
 	some_model.prop_one = 10	# 10
+	some_model.prop_default		# 10
 	some_model.calculate
 	some_model.prop_one_times_ten # 100
 
-Include some math helper
+Include Math helper:
 
 	class SomeModel < ActiveRecord::Base
 		include ModFactor::Math
@@ -43,6 +48,10 @@ Include some math helper
 Provides following:
 	
 	some_model.sigma_geometric # http://en.wikipedia.org/wiki/Geometric_progression
+
+Use validates as normal:
+	
+	validates :prop_one, :presence=>true
 	
 
 Contributing to mod_factor

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/mod_factor/owner.rb

@@ -10,6 +10,12 @@ module ModFactor
 						obj.instance_variable_set "@#{factor.key.to_sym}", factor.amount
 						obj.factor_hash[factor.key.to_sym] = factor.amount
 					end
+					base.factor_define.keys.each do |key|
+						if base.factor_define[key][:default] && obj.send(key).nil?
+							obj.instance_variable_set "@#{key}", base.factor_define[key][:default]
+						end
+					end
+
 				end
 			end
 

data/mod_factor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mod_factor"
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Wong"]
-  s.date = "2012-03-16"
+  s.date = "2012-03-20"
   s.description = "mod factor"
   s.email = "ryan@idolgo.com"
   s.extra_rdoc_files = [

data/spec/mod_factor/owner_spec.rb

@@ -26,6 +26,7 @@ describe ModFactor::Owner do
 
 			factors :financial_factors do
 				factor :prop_one
+				factor :prop_store
 				factor :prop_formula, :generate => true, 
 					:formula => proc {|extra| 1 + 1}
 				factor :prop_one_times_ten, :generate=>true, 
@@ -34,9 +35,12 @@ describe ModFactor::Owner do
 					:formula => proc {|extra| members.first.try :prop_member}
 				factor :prop_extra, :generate => true,
 					:formula => proc {|extra| extra[:extra_value]}
-				factor :prop_condition, :generate => true, :condition => proc {|extra| prop_one},
+				factor :prop_condition, :generate => true, :condition => proc {|extra| prop_one == 10},
 					:formula => proc {|extra| prop_one || raise("prop one is nil")}
+				factor :prop_default, :default=>10
 			end
+
+			validates :prop_one, :presence=>true
 		end
 	end
 
@@ -66,7 +70,7 @@ describe ModFactor::Owner do
 		end
 	end
 
-	subject { Family.create! }
+	subject { Family.create! :prop_one => 5 }
 
 	it "should has define factors" do
 		subject.respond_to? :financial_factors
@@ -79,7 +83,7 @@ describe ModFactor::Owner do
 
 	it "should store factor in factors table" do
 		expect {
-			subject.prop_one = 10
+			subject.prop_store = 10
 			subject.save!
 		}.to change {subject.financial_factors.size}
 	end
@@ -125,4 +129,13 @@ describe ModFactor::Owner do
 		subject.prop_condition.should == 10
 	end
 
+	it "should validate false when require factor blank" do
+		subject.prop_one = nil
+		subject.should_not be_valid
+	end
+
+	it "should have default value" do
+		subject.prop_default.should == 10
+	end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mod_factor
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000Z
+date: 2012-03-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &81917520 !ruby/object:Gem::Requirement
+  requirement: &84473610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *81917520
+  version_requirements: *84473610
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &81917130 !ruby/object:Gem::Requirement
+  requirement: &84473190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *81917130
+  version_requirements: *84473190
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &81916800 !ruby/object:Gem::Requirement
+  requirement: &84437070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81916800
+  version_requirements: *84437070
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &81916310 !ruby/object:Gem::Requirement
+  requirement: &84436750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81916310
+  version_requirements: *84436750
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &81911540 !ruby/object:Gem::Requirement
+  requirement: &84436400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *81911540
+  version_requirements: *84436400
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &81911220 !ruby/object:Gem::Requirement
+  requirement: &84436050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81911220
+  version_requirements: *84436050
 - !ruby/object:Gem::Dependency
   name: with_model
-  requirement: &81910880 !ruby/object:Gem::Requirement
+  requirement: &84435710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.1.5
   type: :development
   prerelease: false
-  version_requirements: *81910880
+  version_requirements: *84435710
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &81910590 !ruby/object:Gem::Requirement
+  requirement: &84435390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *81910590
+  version_requirements: *84435390
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &81910220 !ruby/object:Gem::Requirement
+  requirement: &84435030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81910220
+  version_requirements: *84435030
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &81909850 !ruby/object:Gem::Requirement
+  requirement: &84434670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *81909850
+  version_requirements: *84434670
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &81909500 !ruby/object:Gem::Requirement
+  requirement: &84434250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *81909500
+  version_requirements: *84434250
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &81909080 !ruby/object:Gem::Requirement
+  requirement: &84433890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81909080
+  version_requirements: *84433890
 description: mod factor
 email: ryan@idolgo.com
 executables: []
@@ -183,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -660223917
+      hash: 290821937
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: