customize 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/customize.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "customize"
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Wong"]
-  s.date = "2012-05-04"
+  s.date = "2012-05-07"
   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/inherited.rb

@@ -46,16 +46,20 @@ module Customize
 				joins(:inherit_node).where("parent_id is null")
 			end
 			
-			def type_tree
+			def type_tree node = nil
 				roots = root
-				converter = proc {|items|
-					out = items.collect { |item|
-						{:id=>item.id,:label=>item.label,:inherit_node_id=>item.inherit_node.id, :children=>converter.call(item.children)}
+				converter = proc {|items, node|
+					out = items.select { |item|
+						node.nil? || (item.inherit_node.id != node.id && 
+							(node.parent_node.nil? || item.inherit_node.id != node.parent_node.id))
+					}.collect { |item|
+						{:id=>item.id,:label=>item.label,:inherit_node_id=>item.inherit_node.id, :children=>converter.call(item.children, node)}
 					}
 				}
 				
-				converter.call(roots)
+				converter.call(roots, node)
 			end
+
 		end
 
 		def parent
@@ -74,6 +78,8 @@ 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
+			raise 'should not inherit descents' if self.descent_ids.include? parent.id
+			raise 'should not inherit parent' if self.parent.try(:id) == parent.id
 			self.class.transaction do
 				inherit_node.parent_id = parent.inherit_node.id
 				right = parent.inherit_node.right
@@ -90,10 +96,10 @@ module Customize
 		end
 
 		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
+			a = association(name)
+			sql = ascents(options).joins(name).select("#{a.aliased_table_name}.#{a.klass.primary_key}").to_sql
+			a.klass.from("(#{sql}) as subquery, #{a.klass.table_name}").
+				where("#{a.klass.table_name}.#{a.klass.primary_key} = subquery.#{a.klass.primary_key}")
 		end
 
 		def descents

data/spec/customize/inherited_spec.rb

@@ -28,60 +28,93 @@ describe Customize::Inherited do
 		@parent.reload
 	end
 
-	it "cannot inherit different class" do
-		expect {
-			@child.inherit Object.new
-		}.to raise_error
-	end
-
-	it "have method ascent_ids" do
-		@child.ascent_ids.should_not be_nil
-	end
-
-	it "child should have 1 ascent" do
-		@child.ascent_ids.should have(1).items
-	end
-
-	it "parent should have 1 descent" do
-		@parent.descent_ids.should have(1).items
-	end
+	context "inherit" do
+		it "cannot inherit different class" do
+			expect {
+				@child.inherit Object.new
+			}.to raise_error
+		end
+		
+		it "have method ascent_ids" do
+			@child.ascent_ids.should_not be_nil
+		end
+		
+		it "child should have 1 ascent" do
+			@child.ascent_ids.should have(1).items
+		end
+		
+		it "parent should have 1 descent" do
+			@parent.descent_ids.should have(1).items
+		end
+		
+		it "should support 2 levels inherit" do
+			c2 = Product.create!
+			c2.inherit @child
+			c2.ascent_ids.should have(2).items
+			@child.ascent_ids.should have(1).items
+		end
+		
+		it "root has 1 item" do
+			Product.root.should have(1).items
+		end
+		
+		it "child should have ascents" do
+			@child.ascents.should have(1).items
+		end
+		
+		it "child is leaf" do 
+			@child.leaf?.should be_true
+		end
+		
+		it "parent is not leaf" do
+			@parent.leaf?.should_not be_true
+		end
+		
+		it "should not inherit self" do
+			expect {
+				@parent.inherit @parent
+			}.to raise_error
+		end
 
-	it "should support 2 levels inherit" do
-		c2 = Product.create!
-		c2.inherit @child
-		c2.ascent_ids.should have(2).items
-		@child.ascent_ids.should have(1).items
-	end
+		it "should not inherit parent" do
+			expect {
+				@child.inherit @parent
+			}.to raise_error
+		end
 
-	it "root has 1 item" do
-		Product.root.should have(1).items
-	end
+		it "should not inherit child" do
+			expect {
+				@parent.inherit @child
+			}.to raise_error
+		end
 
-	it "child should have ascents" do
-		@child.ascents.should have(1).items
 	end
 
-	it "child is leaf" do 
-		@child.leaf?.should be_true
-	end
+	context :type_tree do
+		it "convert type_tree" do
+			tree = Product.type_tree
+			tree.first[:id].should == @parent.id
+			tree.first[:children].should have(1).items
+		end
 
-	it "parent is not leaf" do
-		@parent.leaf?.should_not be_true
-	end
+		it "convert type_tree for parent" do
+			tree = Product.type_tree @parent.inherit_node
+			tree.should be_empty
+		end
 
-	it "convert type_tree" do
-		tree = Product.type_tree
-		tree.first[:id].should == @parent.id
-		tree.first[:children].should have(1).items
-	end
+		it "convert type_tree for child" do
+			tree = Product.type_tree @child.inherit_node
+			tree.should be_empty
+		end
 
-	it "should not inherit self" do
-		expect {
-			@parent.inherit @parent
-		}.to raise_error
+		it "convert type_tree for 2lvl-child" do
+			node = Product.create
+			node.inherit @child
+			tree = Product.type_tree node.inherit_node
+			tree.should have(1).items
+		end
 	end
 
-
 	context "new node" do
 		subject { Product.new }
 
@@ -124,7 +157,6 @@ describe Customize::Inherited do
 		}
 
 		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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: customize
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-05-07 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: -197001151
+      hash: 562141071
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: