mod_factor 0.0.10 → 0.0.11

data/README.markdown

@@ -27,6 +27,12 @@ Include ModFactor::Owner to owner:
 				:formula => proc {|extra| prop_one || raise("prop one is nil")}
 			factor :prop_default, :default=>10
 		end
+
+		properties :preferences do
+			property :pref_boolean, :boolean, :default=>false
+			property :pref_name, :string, :default=>'name'
+		end
+
 	end
 
 
@@ -39,6 +45,11 @@ Sample usages:
 	some_model.calculate
 	some_model.prop_one_times_ten # 100
 
+	some_model.pref_boolean  # true
+	some_model.pref_boolean = false
+
+	some_model.save
+
 Include Math helper:
 
 	class SomeModel < ActiveRecord::Base

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/lib/mod_factor/owner.rb

@@ -24,7 +24,7 @@ module ModFactor
 				if base.instance_variable_defined? :@factor_model
 					factor_model = base.instance_variable_get :@factor_model
 
-					changeset.each do |key|
+					factor_changes.each do |key|
 						factor = obj.send(factor_model).find_or_initialize_by_key key
 						factor.amount = BigDecimal.new(obj.send(key).to_s)
 						factor.save!
@@ -33,6 +33,18 @@ module ModFactor
 					obj.reload
 				end
 
+				if base.instance_variable_defined? :@property_model
+					property_model = base.instance_variable_get :@property_model
+
+					property_changes.each do |key|
+						property = obj.send(property_model).find_or_initialize_by_key key
+						property.value = obj.send(key)
+						property.save!
+						obj.instance_variable_set "@#{key}", property.value
+					end
+					obj.reload
+				end
+
 			end
 		end
 
@@ -60,22 +72,50 @@ module ModFactor
 			def generate_list
 				@generate_list ||= factor_define.keys.select { |key| factor_define[key][:generate] }
 			end
+
+			def property_define
+				@property_define ||= {}
+			end
+
+			def properties model, options = {}
+				has_many model, :as=>:owner
+				@property_model = model
+				yield if block_given?
+			end
+
+			def property name, type, options = {}
+				attr_accessor name
+				property_define[name] = options
+			end
 			
 		end
 
 		def factor_hash
 			@factor_hash ||= self.class.factor_define.keys.inject({}) do 
-				|out, item| out[item] = nil
+				|out, item| out[item] = self.class.factor_define[item][:default]
 				out
 			end
 		end
 
-		def changeset
+		def factor_changes
 			self.class.factor_define.keys.select do |key|
 				factor_hash[key] != __send__(key)
 			end
 		end
 
+		def property_hash
+			@property_hash ||= self.class.factor_define.keys.inject({}) do 
+				|out, item| out[item] = self.class.factor_define[item][:default]
+				out
+			end
+		end
+
+		def property_changes
+			self.class.property_define.keys.select do |key|
+				property_hash[key] != __send__(key)
+			end
+		end
+
 		def calculate options={}
 			self.class.generate_list.each do |key|
 				if (condition = self.class.factor_define[key][:condition]).nil? || self.instance_exec(options, &condition)
@@ -92,7 +132,7 @@ module ModFactor
 		end
 
 		def changed_for_autosave?
-			!changeset.empty? || super
+			!factor_changes.empty? || !property_changes.empty? || super
 		end
 
 	end

data/mod_factor.gemspec

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

data/spec/mod_factor/owner_spec.rb

@@ -14,6 +14,19 @@ describe ModFactor::Owner do
 		end
 	end
 
+	with_model :preference do 
+		table do |t|
+			t.string :key
+			t.string :owner_type
+			t.string :owner_id
+			t.text :value
+			t.timestamps
+		end
+		model do 
+			belongs_to :owner, :polymorphic => true
+		end
+	end
+
 	with_model :family do
 		table do |t|
 			t.boolean "visible"
@@ -40,6 +53,11 @@ describe ModFactor::Owner do
 				factor :prop_default, :default=>10
 			end
 
+			properties :preferences do
+				property :pref_boolean, :boolean, :default=>false
+				property :pref_name, :string, :default=>'name'
+			end
+
 			validates :prop_one, :presence=>true
 		end
 	end
@@ -150,4 +168,17 @@ describe ModFactor::Owner do
 		subject.should be_changed_for_autosave
 		member.should be_changed_for_autosave
 	end
+
+	it "should write and read property" do
+		subject.pref_boolean = true
+		subject.pref_boolean.should be_true
+	end
+
+	it "should store property to database" do
+		subject.pref_boolean = true
+		expect {
+			subject.save!
+		}.to change {subject.preferences.size}
+	end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mod_factor
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-23 00:00:00.000000000Z
+date: 2012-03-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &81301410 !ruby/object:Gem::Requirement
+  requirement: &84919800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *81301410
+  version_requirements: *84919800
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &81300980 !ruby/object:Gem::Requirement
+  requirement: &84919460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *81300980
+  version_requirements: *84919460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &81300650 !ruby/object:Gem::Requirement
+  requirement: &84912910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81300650
+  version_requirements: *84912910
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &81300320 !ruby/object:Gem::Requirement
+  requirement: &84912650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81300320
+  version_requirements: *84912650
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &81299990 !ruby/object:Gem::Requirement
+  requirement: &84912310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *81299990
+  version_requirements: *84912310
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &81299680 !ruby/object:Gem::Requirement
+  requirement: &84912020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81299680
+  version_requirements: *84912020
 - !ruby/object:Gem::Dependency
   name: with_model
-  requirement: &81299330 !ruby/object:Gem::Requirement
+  requirement: &84911740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.1.5
   type: :development
   prerelease: false
-  version_requirements: *81299330
+  version_requirements: *84911740
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &81298940 !ruby/object:Gem::Requirement
+  requirement: &84911410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *81298940
+  version_requirements: *84911410
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &81298590 !ruby/object:Gem::Requirement
+  requirement: &84911090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81298590
+  version_requirements: *84911090
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &81298240 !ruby/object:Gem::Requirement
+  requirement: &84910770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *81298240
+  version_requirements: *84910770
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &81297910 !ruby/object:Gem::Requirement
+  requirement: &84910380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *81297910
+  version_requirements: *84910380
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &81297590 !ruby/object:Gem::Requirement
+  requirement: &84909990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81297590
+  version_requirements: *84909990
 description: mod factor
 email: ryan@idolgo.com
 executables: []
@@ -183,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 105907457
+      hash: 623796861
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: