customize 0.0.3 → 0.0.4

data/Gemfile

@@ -5,6 +5,8 @@ source "http://ruby.taobao.org"
 
 gem "rails", ">= 3.0.12"
 gem "capybara", ">= 0.4.0"
+gem "inherited_resources"
+gem "has_scope"
 
 group :development,:test do
   gem "sqlite3"

data/Gemfile.lock

@@ -38,7 +38,7 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.3.1)
+    childprocess (0.3.2)
       ffi (~> 1.0.6)
     cucumber (1.1.9)
       builder (>= 2.1.2)
@@ -52,8 +52,12 @@ GEM
     gherkin (2.9.3)
       json (>= 1.4.6)
     git (1.2.5)
+    has_scope (0.5.1)
     hike (1.2.1)
     i18n (0.6.0)
+    inherited_resources (1.3.1)
+      has_scope (~> 0.5.0)
+      responders (~> 0.6)
     jeweler (1.8.3)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -96,6 +100,8 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
+    responders (0.9.1)
+      railties (~> 3.1)
     rspec (2.9.0)
       rspec-core (~> 2.9.0)
       rspec-expectations (~> 2.9.0)
@@ -116,8 +122,8 @@ GEM
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
-    simplecov (0.6.1)
-      multi_json (~> 1.0)
+    simplecov (0.6.2)
+      multi_json (~> 1.3)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
     sprockets (2.1.2)
@@ -147,6 +153,8 @@ DEPENDENCIES
   bundler (>= 1.0.0)
   capybara (>= 0.4.0)
   cucumber
+  has_scope
+  inherited_resources
   jeweler (>= 1.8.3)
   rails (>= 3.0.12)
   rdoc (~> 3.12)

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/app/controllers/customize/inherit_nodes_controller.rb

@@ -0,0 +1,27 @@
+class Customize::InheritNodesController < InheritedResources::Base
+	include InheritedResources::DSL
+	respond_to :json, :xml
+	has_scope :by_type
+
+	custom_actions :resource=>:select
+
+	index! do |format|
+		format.json do
+			render :json=>collection.collect{|item|{:label=>item.node.label,:value=>item.node.id}}
+		end
+	end
+
+	def select
+		select! do |format|
+			node = Customize::InheritNode.find params[:target]
+			begin
+				resource.node.inherit node.node
+			rescue
+			end
+			format.json do
+				render :json=>resource.save
+			end
+		end
+	end
+
+end

data/app/models/customize/character.rb

@@ -0,0 +1,31 @@
+class Customize::Character < ActiveRecord::Base
+	attr_accessor :content
+	self.table_name = "customize_characters"
+	serialize :value
+	belongs_to :related, :polymorphic => true
+
+	before_validation do |object|
+		unless object.content.nil?
+			case
+			when object.content =~ /\d+/
+				object.value = content.to_i
+				object.value_type = :integer
+			when content =~ /(true)|(false)/
+				object.value = Boolean.new content
+				object.value_type = :boolean
+			when content =~ /[0-9\.]+/
+				object.value = Decimal.new content
+				object.value_type = :decimal
+			when content =~ /^\[/
+				object.value = ""
+				object.value_type = :list
+			when content =~ /^\{/
+				object.value = ""
+				object.value_type = :hash
+			else
+				object.value = content
+				object.value_type = :string
+			end
+		end
+	end
+end

data/{lib → app/models}/customize/inherit_node.rb

@@ -1,11 +1,19 @@
 class Customize::InheritNode < ActiveRecord::Base
 	self.table_name = "customize_inherit_nodes"
 	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'
+
+	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")
 	}
+
+	def leaf?
+		children.empty?
+	end
+
 end
 		

data/config/routes.rb

@@ -0,0 +1,8 @@
+Customize::Engine.routes.draw do
+	resources :characters
+	resources :inherit_nodes do
+		member do
+			get :select
+		end
+	end
+end

data/customize.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "customize"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Wong"]
-  s.date = "2012-04-20"
+  s.date = "2012-05-02"
   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 = [
@@ -24,12 +24,14 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "app/controllers/customize/inherit_nodes_controller.rb",
+    "app/models/customize/character.rb",
+    "app/models/customize/inherit_node.rb",
+    "config/routes.rb",
     "customize.gemspec",
     "lib/customize.rb",
-    "lib/customize/character.rb",
     "lib/customize/characterize.rb",
     "lib/customize/engine.rb",
-    "lib/customize/inherit_node.rb",
     "lib/customize/inherited.rb",
     "lib/generators/customize/USAGE",
     "lib/generators/customize/customize_generator.rb",
@@ -85,6 +87,8 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, [">= 3.0.12"])
       s.add_runtime_dependency(%q<capybara>, [">= 0.4.0"])
+      s.add_runtime_dependency(%q<inherited_resources>, [">= 0"])
+      s.add_runtime_dependency(%q<has_scope>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<rspec-rails>, [">= 2.8.0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
@@ -97,6 +101,8 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<rails>, [">= 3.0.12"])
       s.add_dependency(%q<capybara>, [">= 0.4.0"])
+      s.add_dependency(%q<inherited_resources>, [">= 0"])
+      s.add_dependency(%q<has_scope>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<rspec-rails>, [">= 2.8.0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
@@ -110,6 +116,8 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<rails>, [">= 3.0.12"])
     s.add_dependency(%q<capybara>, [">= 0.4.0"])
+    s.add_dependency(%q<inherited_resources>, [">= 0"])
+    s.add_dependency(%q<has_scope>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<rspec-rails>, [">= 2.8.0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])

data/lib/customize.rb

@@ -1,9 +1,8 @@
 require 'active_record'
+require 'has_scope'
 require 'customize/engine'
 
 module Customize
 	autoload :Characterize, 'customize/characterize'
 	autoload :Inherited, 'customize/inherited'
-	autoload :InheritNode, 'customize/inherit_node'
-	autoload :Character, 'customize/character'
 end

data/lib/customize/characterize.rb

@@ -4,6 +4,7 @@ module Customize
 		def self.included base
 			base.extend ClassMethods
 			base.has_many :characters, :class_name=>Customize::Character.name, :as=>:related
+			base.accepts_nested_attributes_for :characters
 		end
 
 		module ClassMethods
@@ -20,7 +21,12 @@ module Customize
 			}.call
 
 		end
-
+		
+		def inherited_characters
+			if self.class.include?(Customize::Inherited)
+				Character.where(:related_id=>ascent_ids, :related_type=>self.class.name)
+			end
+		end
 	end
 
 end

data/lib/customize/engine.rb

@@ -1,5 +1,6 @@
 module Customize
 	class Engine < ::Rails::Engine
+		isolate_namespace Customize
 		config.generators do |g|
 			# g.test_framework :rspec, :view_specs => false
 		end

data/lib/customize/inherited.rb

@@ -2,12 +2,15 @@ module Customize
 	module Inherited
 		def self.included base
 			base.extend ClassMethods
+
 			base.has_one :inherit_node, :class_name=>Customize::InheritNode.name, :as=>:node, :dependent=>:destroy
 
 			base.after_create { |object|
 				object.create_inherit_node :left=>0, :right=>1
 			}
 
+			base.delegate :leaf?, :to=>:inherit_node
+
 			base.before_destroy { |object|
 				raise 'object should not have children when destroy' if object.inherit_node.children.size > 0
 			}
@@ -18,11 +21,35 @@ module Customize
 			def root
 				joins(:inherit_node).where("parent_id is null")
 			end
+			
+			def type_tree
+				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.call(roots)
+			end
+		end
+
+		def parent
+			inherit_node.parent_node.try(:node)
+		end
+
+		def children
+			inherit_node.children.collect(&:node)
+		end
+
+		def label
+			self.to_s
 		end
 
 		def inherit parent
 			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")

data/lib/generators/customize/templates/migration.rb

@@ -3,7 +3,7 @@ class CreateCustomize < ActiveRecord::Migration
 	def	change
 		create_table :customize_characters do |t|
 			t.string :key
-			t.string :type
+			t.string :value_type
 			t.text :value
 			t.string :related_type
 			t.integer :related_id

data/spec/customize/characterize_spec.rb

@@ -9,8 +9,8 @@ describe Customize::Characterize do
 		end
 
 		model do
-			include Customize::Characterize
 			include Customize::Inherited
+			include Customize::Characterize
 		end
 	end
 
@@ -31,10 +31,20 @@ describe Customize::Characterize do
 			subject.character[:foo].should be_true
 		end
 
+		it :should_not_return_inherited_characters do
+			subject.inherited_characters.should be_nil
+		end
 	end
 
 	context :model_with_inherit do
-		subject { Product.create! }
+		subject {
+			Customize::Character.delete_all
+			parent = Product.create!
+			parent.characters.create! :key=>:p, :value=>1
+			p = Product.create! 
+			p.inherit parent
+			p
+		}
 		
 		it "has characters" do
 			subject.characters.should_not be_nil
@@ -70,11 +80,11 @@ describe Customize::Characterize do
 		end
 		
 		it "has inherited character" do
-			parent = Product.create!
-			parent.characters.create! :key=>:p, :value=>1
-			subject.inherit parent
 			subject.character[:p].should == 1
 		end
+		it :has_def_inherited_characters do
+			subject.inherited_characters.should_not be_empty
+		end
 	end
 
 end

data/spec/customize/inherited_spec.rb

@@ -51,6 +51,27 @@ describe Customize::Inherited 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 "convert type_tree" do
+		tree = Product.type_tree
+		tree.first[:id].should == @parent.id
+		tree.first[:children].should have(1).items
+	end
+
+	it "should not inherit self" do
+		expect {
+			@parent.inherit @parent
+		}.to raise_error
+	end
+
+
 	context "new node" do
 		subject { Product.new }
 

data/spec/dummy/config/routes.rb

@@ -1,4 +1,5 @@
 Dummy::Application.routes.draw do
+  mount Customize::Engine, :at => "customize"
   # The priority is based upon order of creation:
   # first created -> highest priority.
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: customize
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000 Z
+date: 2012-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -43,6 +43,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: inherited_resources
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: has_scope
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -202,12 +234,14 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- app/controllers/customize/inherit_nodes_controller.rb
+- app/models/customize/character.rb
+- app/models/customize/inherit_node.rb
+- config/routes.rb
 - customize.gemspec
 - lib/customize.rb
-- lib/customize/character.rb
 - lib/customize/characterize.rb
 - lib/customize/engine.rb
-- lib/customize/inherit_node.rb
 - lib/customize/inherited.rb
 - lib/generators/customize/USAGE
 - lib/generators/customize/customize_generator.rb
@@ -265,7 +299,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 348052147
+      hash: -24310993
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/customize/character.rb

@@ -1,5 +0,0 @@
-class Customize::Character < ActiveRecord::Base
-	self.table_name = "customize_characters"
-	serialize :value
-	belongs_to :related, :polymorphic => true
-end