customize 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/app/models/customize/formular.rb

@@ -4,12 +4,14 @@ module Customize
 		serialize :calculator_attributes
 
 		def calculator
+			return unless calculator_name
 			cal = calculator_name.constantize
 			cal_ins = cal.new
-			#calculator_attributes.try :symbolize_keys!
-			(calculator_attributes.keys & cal.inputs).each do |name|
+			calculator_attributes.try :symbolize_keys! if calculator_attributes.respond_to? :symbolize_keys!
+			names = (calculator_attributes.keys.map!(&:to_sym) & cal.inputs) if calculator_attributes
+			names.each do |name|
 				cal_ins.instance_variable_set "@#{name}", calculator_attributes[name]
-			end if calculator_attributes
+			end if names
 			cal_ins
 		end
 	end

data/app/models/customize/inherit_node.rb

@@ -3,6 +3,13 @@ class Customize::InheritNode < ActiveRecord::Base
 	belongs_to :parent_node, :class_name=>self.name, :foreign_key=> 'parent_id'
 	belongs_to :node, :polymorphic=>true
 	has_many :children, :class_name=>self.name, :foreign_key=>'parent_id'
+	has_many :ancestors, :class_name=>self.name, :finder_sql=> proc {
+		%Q{
+		select distinct nodes.*
+		from customize_inherit_nodes nodes
+		where nodes.right > #{right} and nodes.left < #{left} and nodes.node_type = "#{node_type}"
+		}
+	}
 
 	scope :by_type, lambda { |type| where(:node_type=>type) }
 		

data/customize.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "customize"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Wong"]
-  s.date = "2012-05-02"
+  s.date = "2012-05-04"
   s.description = "\n\t\teasy customize your domain model, including:\n\t\tcharacterize;\n\t\tinherit;\n\t\tformula\n\t"
   s.email = "ryan@idolgo.com"
   s.extra_rdoc_files = [

data/lib/customize/calculator/base.rb

@@ -1,15 +1,19 @@
 module Customize
 	module Calculator
-		class Base
+		class Base 
 			cattr_accessor :inputs
-			@@inputs = []
+			self.inputs = []
 			def self.input name
 				sym = name.to_sym
-				@@inputs << sym
+				inputs << sym
 				attr_accessor sym
 			end
 
-			def calculate instance
+			def calculate instance, options={}
+			end
+
+			def persisted?
+				false
 			end
 		end
 	end

data/lib/customize/calculator/expression_calculator.rb

@@ -3,7 +3,7 @@ module Customize
 		class ExpressionCalculator < Base
 			input :expression
 
-			def calculate instance
+			def calculate instance, options={}
 				instance.instance_eval expression
 			end
 		end

data/lib/customize/inherited.rb

@@ -5,6 +5,28 @@ module Customize
 
 			base.has_one :inherit_node, :class_name=>Customize::InheritNode.name, :as=>:node, :dependent=>:destroy
 
+			base.scope :ascents_for, lambda { |object, options={:include=>false}|
+				ntn = Customize::InheritNode.table_name
+				node = object.inherit_node
+				condition_string = if options[:include]
+														 "#{ntn}.left <= ? and #{ntn}.right >= ?"
+													 else
+														 "#{ntn}.left < ? and #{ntn}.right > ?"
+													 end
+				base.joins(:inherit_node).where(condition_string, node.left, node.right)
+			}
+
+			base.scope :descents_for, lambda { |object, options={:include=>false}|
+				ntn = Customize::InheritNode.table_name
+				node = object.inherit_node
+				condition_string = if options[:include]
+														 "#{ntn}.left >= ? and #{ntn}.right <= ?"
+													 else
+														 "#{ntn}.left > ? and #{ntn}.right < ?"
+													 end
+				base.joins(:inherit_node).where(condition_string, node.left, node.right)
+			}
+
 			base.after_create { |object|
 				object.create_inherit_node :left=>0, :right=>1
 			}
@@ -14,6 +36,8 @@ module Customize
 			base.before_destroy { |object|
 				raise 'object should not have children when destroy' if object.inherit_node.children.size > 0
 			}
+
+			
 			
 		end
 
@@ -50,30 +74,39 @@ module Customize
 			raise 'should be save first' if self.new_record?
 			raise 'should be same class' if self.class != parent.class
 			raise 'should not be self' if self.id == parent.id
-			inherit_node.parent_id = parent.inherit_node.id
-			right = parent.inherit_node.right
-			InheritNode.where("right >= ?", inherit_node.left).update_all("right = right+2")
-			inherit_node.left = right
-			inherit_node.right = right + 1
-			inherit_node.save
+			self.class.transaction do
+				inherit_node.parent_id = parent.inherit_node.id
+				right = parent.inherit_node.right
+				InheritNode.where("right >= ?", inherit_node.left).update_all("right = right+2")
+				inherit_node.left = right
+				inherit_node.right = right + 1
+				inherit_node.save
+			end
 		end
 
-		def ascent_ids
-			return [] if self.new_record?
-			r = InheritNode.where("left < :left and right > :right and node_type = :type",:left=>inherit_node.left, :right=>inherit_node.right, :type=>self.class.name)
-			r.pluck(:node_id)
+		def ascents options={:include=>false}
+			return [] if new_record?
+			self.class.ascents_for self, options
 		end
 
-		def descent_ids
-			return [] if self.new_record?
-			r = InheritNode.where("left > :left and right < :right and node_type = :type",
-												:left=>inherit_node.left, :right=>inherit_node.right, :type=>self.class.name)
-			r.pluck(:node_id)
+		def inherit_association name, options={:include=>false}
+			association_table_name = association(name).aliased_table_name
+
+			r = ascents(options).joins(name).select("#{association_table_name}.*").uniq
+			r.map(&name).flatten
 		end
 
-		def ascents
-			self.class.find ascent_ids
+		def descents
+			return [] if new_record?
+			self.class.descents_for self
 		end
 
+		def ascent_ids
+			ascents.map(&:id)
+		end
+
+		def descent_ids
+			descents.map(&:id)
+		end
 	end
 end

data/spec/customize/formulaic_spec.rb

@@ -29,7 +29,7 @@ describe Customize::Formulaic do
 		end
 
 		it "store input value" do
-			subject.calculator_attributes = {:expression=>1}
+			subject.calculator_attributes = {"expression"=>1}
 			subject.save
 			subject.reload
 			subject.calculator.expression.should == 1

data/spec/customize/inherited_spec.rb

@@ -8,6 +8,16 @@ describe Customize::Inherited do
 		end
 		model do
 			include Customize::Inherited
+			has_many :product_objects
+		end
+	end
+
+	with_model :product_object do
+		table do |t|
+			t.references :product
+		end
+		model do
+			belongs_to :product
 		end
 	end
 
@@ -103,5 +113,21 @@ describe Customize::Inherited do
 		end
 	end
 
+	context "associations" do
+		subject {
+			p1 = Product.create
+			p2 = Product.create
+			p2.inherit p1
+			p1.product_objects.create
+			p2.product_objects.create
+			p2
+		}
+
+		it "should have 2 inherit_association :product_objects" do
+			pending "cannot pass with with_model"
+			subject.inherit_association(:product_objects,:include=>true).should have(2).times
+		end
+	end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: customize
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-02 00:00:00.000000000 Z
+date: 2012-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -304,7 +304,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1041955549
+      hash: -197001151
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: