customize 0.0.7 → 0.0.8

data/VERSION

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

data/app/models/customize/inherit_node.rb

@@ -11,13 +11,33 @@ class Customize::InheritNode < ActiveRecord::Base
 		}
 	}
 
+	validates_presence_of :node_type, :node_id
+
 	scope :by_type, lambda { |type| where(:node_type=>type) }
 		
 	after_destroy { |object|
 		object.class.where("right > :right and node_type = :type", 
 											 :right=>object.right, :type=>object.node_type).update_all("right = right -2")
+		object.class.where("left > :right and node_type = :type", 
+											 :right=>object.right, :type=>object.node_type).update_all("left = left -2")
+	}
+	before_create { |object|
+		if object.parent_id.nil?
+			left = self.class.where(:node_type=>object.node_type).maximum(:right) || -1
+			left = left + 1
+			object.left = left
+			object.right = left + 1
+		else
+			object.left = object.parent_node.right
+			object.right = object.parent_node.right + 1
+			object.class.where("right >= :right and node_type = :type", 
+												 :right=>object.left, :type=>object.node_type).update_all("right = right + 2")
+			object.class.where("left >= :right and node_type = :type", 
+												 :right=>object.right, :type=>object.node_type).update_all("left = left + 2")
+		end
 	}
 
+
 	def leaf?
 		children.empty?
 	end

data/customize.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "customize"
-  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-05-07"
+  s.date = "2012-05-08"
   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 = [
@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
     "lib/generators/customize/templates/migration.rb",
     "spec/customize/characterize_spec.rb",
     "spec/customize/formulaic_spec.rb",
+    "spec/customize/inherit_node_spec.rb",
     "spec/customize/inherited_spec.rb",
     "spec/customize_spec.rb",
     "spec/dummy/Rakefile",

data/lib/customize/inherited.rb

@@ -28,7 +28,7 @@ module Customize
 			}
 
 			base.after_create { |object|
-				object.create_inherit_node :left=>0, :right=>1
+				object.create_inherit_node
 			}
 
 			base.delegate :leaf?, :to=>:inherit_node
@@ -81,12 +81,8 @@ module Customize
 			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
-				InheritNode.where("right >= ?", inherit_node.left).update_all("right = right+2")
-				inherit_node.left = right
-				inherit_node.right = right + 1
-				inherit_node.save
+				inherit_node.destroy
+				create_inherit_node(:parent_id=>parent.inherit_node.id)
 			end
 		end
 

data/spec/customize/characterize_spec.rb

@@ -39,6 +39,8 @@ describe Customize::Characterize do
 	context :model_with_inherit do
 		subject {
 			Customize::Character.delete_all
+			Product.delete_all
+			Customize::InheritNode.delete_all
 			parent = Product.create!
 			parent.characters.create! :key=>:p, :value=>1
 			p = Product.create! 

data/spec/customize/inherit_node_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+describe Customize::InheritNode do
+
+	before :each do
+		described_class.delete_all
+	end
+
+	context :single_tree do
+		context :one do
+			let(:root) { described_class.create! :node_type=>"Node", :node_id=>1 }
+
+			it { root.left.should == (root.right-1) }
+		end
+
+		context :two do
+			before :each do
+				@root = described_class.create!(:node_type=>"Node", :node_id=>2)
+				@node = described_class.create!(:node_type=>"Node", :node_id=>3, :parent_id=>@root.id)
+				@root.reload
+			end
+
+			it :node_right do
+				@root.right.should == (@node.right+1)
+			end
+			it :node_left do 
+				@root.left.should == (@node.left-1)
+			end
+
+			it :destroy do
+				@last = described_class.create!(:node_type=>"Node", :node_id=>4)
+				@node.destroy
+				@last.reload
+				@root.reload
+				@root.left.should == (@root.right - 1)
+				@last.left.should == (@root.right + 1)
+			end
+
+		end
+
+	end
+	context :forest do
+		context :lvl_one do
+			before :each do
+				@root = (1..3).collect do |i|
+				described_class.create :node_type=>"Node", :node_id=>i
+				end
+				@node = described_class.create :node_type=>"Node", :node_id=>4, :parent_id=>@root.first.id
+			end
+
+			let(:root){described_class.where(:node_type=>"Node", :parent_id=>nil)}
+			let(:node){described_class.find_by_node_id 4}
+
+			it :first_left do (root.first.left + 1).should == node.left end
+			it :first_right do
+				root.reload
+				(root.first.right - 1).should == node.right
+			end
+			it :second do (root[1].left - 1).should == root.first.right end
+		end
+	end
+
+end

data/spec/customize/inherited_spec.rb

@@ -22,6 +22,8 @@ describe Customize::Inherited do
 	end
 
 	before :each do
+		Customize::InheritNode.delete_all
+		Product.delete_all
 		@parent = Product.create!
 		@child = Product.create!
 		@child.inherit @parent
@@ -29,6 +31,9 @@ describe Customize::Inherited do
 	end
 
 	context "inherit" do
+		after :each do
+		  #Customize::InheritNode.all.each do |n| pp [n.left, n.right] end
+		end
 		it "cannot inherit different class" do
 			expect {
 				@child.inherit Object.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: customize
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-07 00:00:00.000000000 Z
+date: 2012-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -252,6 +252,7 @@ files:
 - lib/generators/customize/templates/migration.rb
 - spec/customize/characterize_spec.rb
 - spec/customize/formulaic_spec.rb
+- spec/customize/inherit_node_spec.rb
 - spec/customize/inherited_spec.rb
 - spec/customize_spec.rb
 - spec/dummy/Rakefile
@@ -304,7 +305,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 562141071
+      hash: -683783373
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: