pattern 0.9.3 → 0.9.4

data/DOCS/todolist.txt

@@ -1,3 +1,11 @@
+
+2011-01-10
+1. refactoring the code							OK
+2. Adding 2or3 template of ruby pattern code.	
+3. when no parameter,get help          			OK
+4. lower_case replace 							OK
+before
+
 1. 制作为rubygem
    1.1. 添加可执行文件       	OK
    1.2. 添加环境路径         	OK
@@ -12,6 +20,6 @@
  6.3. 删除一个
 7. 添加新的templates
 8. 列出可用的template				OK
-9. help功能
+9. help功能               		Ok
+
 
-发现一个问题，如果我的问题不能按我的想法来排列，我先做下面的，再做上面的，我会很不舒服 

data/README

@@ -16,12 +16,23 @@ complex model (not support now.)
 
 simple model:
 * pattern ruby.composite Task -d target
-* pattern -t ruby.composite -d target -c Task;compositeTask;AddDryIngredientsTask,MixTask;MakeBatterTask -op execute 
+* pattern -t ruby.composite -d target -c Task;CompositeTask;AddDryIngredientsTask,MixTask,AddLiquidsTask;MakeBatterTask,MakeCakeTask -op get_time_required
 complex model(pattern_file):
 
 == Future
 Sharing pattern templates on website.
 
+== Version
+0.9.4 
+1. Refactoring the code							
+2. Template of ruby.composite work
+3. Getting help with no parameter          			
+4. Replacing lower_case name . Example: class_name:Task lc_class_name:task						
+
+
+== Question 
+If you get some Questions. Mailto :azhao.1981@gmail.com
+
 == Author
 
 Copyright 2010 @ weizhao 

data/bin/pattern

@@ -1,28 +1,27 @@
 #!/usr/bin/env ruby
 current_dir = File.dirname(__FILE__)
 
-if %w(--version -v).include? ARGV.first
-  require current_dir + '/../lib/version'
+require current_dir + '/../lib/version'
+puts "#{Pattern::HELP::WELLCOME}"
+if %w(--version -v).include? ARGV.first  
   puts "pattern #{Pattern::VERSION::STRING}"
   exit(0)
 end
+require current_dir + '/../lib/configuration'
 
 if %w(--set -s).include? ARGV.first
-  require current_dir + '/../lib/configuration'
   configuration = Configuration.new
   configuration.execute(ARGV)
   exit(0)
 end
 
 if %w(--list -l).include? ARGV.first
-  require current_dir + '/../lib/configuration'
   configuration = Configuration.new
   configuration.list
   exit(0)
 end
 
-if %w(--help -h).include? ARGV.first
-  require current_dir + '/../lib/version'
+if (ARGV.empty? || (%w(--help -h).include? ARGV.first))
   puts Pattern::HELP::STRING
   exit(0)
 end

data/lib/command.rb

@@ -1,8 +1,12 @@
 # commad for send parameter to CompositeCode
-require "pathname"
+# PathCommon is in common.rb
+
+require File.dirname(__FILE__)+'/common'
 
 class Command
+  include PathCommon
   attr_accessor :template_dir,:target_dir,:classes,:operations,:base_name
+  
   def initialize(params)
   	@params = params
   	get_template_dir
@@ -11,10 +15,14 @@ class Command
   	get_operations
   end
   def get_template_dir
-  	get_templates_dirs(get_template_dir_from_params).each do |dir|
+  	template = get_param("-t") || @params[0]
+  	get_templates(template).each do |dir|
   	  @template_dir = dir if File.directory?(dir) 
   	end
   end
+  def get_target_dir
+  	@target_dir = absolute_path(get_param("-d") || ".")
+  end
   def get_classes
   	classes = get_param("-c")
   	if classes
@@ -27,25 +35,13 @@ class Command
   def get_operations
   	@operations = parse_string( operations = get_param("-op") || " " )
   end
-  def get_templates_dirs(template)
-  	File.open("#{File.dirname(__FILE__)}/../etc/templates_path.conf").readlines.collect do |line|
-  		line = absolute_path(File.join(line.chomp,template),File.dirname(__FILE__))
-  	end
-  end
-  def get_target_dir
-  	@target_dir = absolute_path(get_param("-d") || ".")
-  end
-  def get_template_dir_from_params
-  	return get_param("-t") || @params[0]
+  
+private  
+  def get_templates(template)
+    get_path.collect { |dir| dir = join(dir,template) }
   end
   def get_param(option)
   	index = @params.index(option)
   	return index ? @params[index+1] : nil 
   end
-  def absolute_path(path,dir=Dir.pwd)
-  	Pathname.new(path).relative? ? File.expand_path(path,dir) : path
-  end
-  def parse_string(string)
-  	string.split(';').collect { |classes| classes.split(',') }
-  end
 end

data/lib/common.rb

@@ -0,0 +1,21 @@
+require 'pathname'
+
+module PathCommon
+  PROJECT_DIR = "#{File.dirname(__FILE__)}/../"
+  CONFIG_FILE = "#{PROJECT_DIR}etc/templates_path.conf"
+  
+  def absolute_path(path,dir=Dir.pwd)
+  	Pathname.new(path).relative? ? File.expand_path(path,dir) : path
+  end
+  def parse_string(string)
+  	string.split(';').collect { |classes| classes.split(',') }
+  end
+  def get_path
+  	File.open(CONFIG_FILE).readlines.collect do |path|
+  	  path = absolute_path(path.chomp,File.dirname(__FILE__))
+  	end
+  end
+  def join(path,file=".")
+  	File.join(path,file)
+  end
+end

data/lib/compositecode.rb

@@ -39,6 +39,7 @@ class CompositeCode < Code
   	  template_classes.each do |class_name|
   	  	replace_values = default_replace_values.clone
   	  	replace_values["#{key}"] = class_name
+  	  	replace_values["lc_#{key}"] = class_name.downcase
   	  	replace_values["operations"] = ""
   	    operations.each do |operation|
   	  	  replace_values["operations"] << operations_template.gsub("#operation#",operation) unless operation == " "
@@ -57,6 +58,7 @@ class CompositeCode < Code
   	default_replace_values = Hash.new
   	@template_replace_keys.each do |key|
   	  default_replace_values["#{key}"] = @classes[x+=1][0]
+  	  default_replace_values["lc_#{key}"] = @classes[x][0].downcase
   	end
   	return default_replace_values
   end

data/lib/configuration.rb

@@ -1,36 +1,25 @@
 # config templates_path
+# class Config is using
 
-require 'pathname'
+require File.dirname(__FILE__)+'/common'
 
 class Configuration
+  include PathCommon
+  
   def initialize
-  	@config_file = "#{File.dirname(__FILE__)}/../etc/templates_path.conf"
-  end
-  def get_path
-  	File.open(@config_file).readlines.collect do |path|
-  	  path = absolute_path(path.chomp,File.dirname(__FILE__))
-  	end
-  end
+  end 
   def add_path(path)
-  	File.open(@config_file,"a") do |file|
-  	  path.each do |p|
-  	  	file.puts absolute_path(p)
-  	  end
+  	File.open(CONFIG_FILE,"a") do |file|
+  	  path.each { |p| file.puts absolute_path(p) }
   	end
-  	puts "Now you get templates path:"
-  	puts get_path
+  	list_templates_path
   end
   def remove_path(path)
-  	puts "Now you remove templates path:"
-  	puts path
   	path_set = get_path - path.collect { |p| p= absolute_path(p) }
-    File.open(@config_file,"w") do |file|
-      path_set.each do |p|
-      	file.puts p
-      end
+    File.open(CONFIG_FILE,"w") do |file|
+      path_set.each { |p| file.puts p }
     end
-    puts "Now you get templates path:"
-  	puts get_path	
+    list_templates_path	
   end
   def list
   	list = []
@@ -47,11 +36,12 @@ class Configuration
   	get_default if action == "default"
   end
   def get_default
-  	File.open(@config_file,"w") do |file|
+  	File.open(CONFIG_FILE,"w") do |file|
   	  file.puts "../templates"
   	end
   end
-  def absolute_path(path,dir=Dir.pwd)
-  	Pathname.new(path).relative? ? File.expand_path(path,dir) : path
+  def list_templates_path
+  	puts "\nNow you get templates path:"
+  	puts get_path
   end
 end

data/lib/version.rb

@@ -2,7 +2,7 @@ module Pattern
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 9
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
@@ -25,5 +25,8 @@ module Pattern
   	  Further information:
   	  	https://github.com/azhao1981/pattern	  	
   	EOF
+  	WELLCOME = <<-EOF
+  	Thanks for using pattern beta.You get idea or Question.Mailto:azhao.1981@gmail.com
+  	EOF
   end
 end

data/pattern.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |spec|
 #  Package information
 #-----------------------------
 	spec.name = 'pattern'
-	spec.version = '0.9.3'
+	spec.version = '0.9.4'
 	spec.executables << 'pattern'
 	spec.has_rdoc = true
 	spec.rdoc_options << '--title' << 'Pattern' <<

data/templates/ruby.composite/component.rb

@@ -2,8 +2,10 @@
 # 
 
 class #class_name#
-  def initialize
-  	
+  attr_accessor :name,:parent
+  def initialize(name)
+  	@name = name
+  	@parent = nil
   end
   # TODO: operations
 #operations#

data/templates/ruby.composite/composite.rb

@@ -1,9 +1,31 @@
 # This is code of composite pattern . Generated by easypattern.
 # 
+require "#lc_class_name#"
 
-class #composite_name#
-  def initialize
-  	
+class #composite_name# < #class_name#
+  def initialize(name)
+  	super(name)
+  	@sub_#lc_class_name#s = []
+  end
+  def add_sub_#lc_class_name#(#lc_class_name#)
+  	@sub_#lc_class_name#s << #lc_class_name#
+  	#lc_class_name#.parent = self
+  end
+  def remove_sub_#lc_class_name#(#lc_class_name#)
+  	@sub_#lc_class_name#s.delete(#lc_class_name#)
+  	#lc_class_name#.parent = nil
+  end
+  def << (#lc_class_name#)
+  	@sub_#lc_class_name#s << #lc_class_name#
+  	#lc_class_name#.parent = self
+  end
+  def [](index)
+  	@sub_#lc_class_name#s[index]
+  end
+  def []=(index,new_value)
+  	@sub_#lc_class_name#s[index].parent = nil
+  	@sub_#lc_class_name#s[index] = new_value
+  	@sub_#lc_class_name#s[index].parent = self
   end
   # TODO: operations
 #operations#

data/templates/ruby.composite/compositeobject.rb

@@ -1,9 +1,12 @@
 # This is code of composite pattern . Generated by easypattern.
 # 
+require "#lc_composite_name#"
 
-class #composite_object_name#
+class #composite_object_name# < #composite_name#
   def initialize
-  	
+  	super("#lc_composite_object_name#")
+  	#ToDo :add sub class
+  	add_sub_task(#sub_class)
   end
   # TODO: operations
 #operations#

data/templates/ruby.composite/leaf.rb

@@ -1,9 +1,10 @@
 # This is code of composite pattern . Generated by easypattern.
 # 
+require "#lc_class_name#"
 
-class #leaf_name#
+class #leaf_name# < #class_name#
   def initialize
-  	
+  	super("#leaf_name#")
   end
   # TODO: operations
 #operations#

data/test/code_spec.rb

@@ -2,11 +2,13 @@
 # Copyright (c) 2010 weizhao
 #
 require File.dirname(__FILE__) + '/../lib/code'
+require File.dirname(__FILE__) + '/../lib/common'
+include PathCommon
 
 describe Code do
   before(:each) do
-  	template_file_name = "E:/dev/easypattern/templates/ruby.composite/component.rb"
-  	target_file_name = "E:/dev/easypattern/temp/task.rb"
+  	template_file_name = absolute_path("../templates/ruby.composite/component.rb",File.dirname(__FILE__))
+  	target_file_name = absolute_path("../temp/task",File.dirname(__FILE__))
   	@target_file_name_test = target_file_name
   	replace_values = {"class_name"=>"Task","operations"=>"  def execute\n  \t\n  end\n"}
   	@component_code = Code.new(template_file_name,target_file_name,replace_values)	

data/test/command_spec.rb

@@ -5,21 +5,14 @@ describe Command do
   	params = "-t ruby.composite -c Task;compositeTask;AddDryIngredientsTask,MixTask;MakeBatterTask -op execute".split(" ")
   	@command = Command.new(params)
   end
-  it "1. get_template_dir_from_params should return 'ruby.composite' " do
-  	@command.get_template_dir_from_params.should == "ruby.composite"
-  end
-  it "2. get_templates_dirs should return ['../templates','../templates2']" do
-  	@command.get_templates_dirs(@command.get_template_dir_from_params)[0].should == 
-  	                                      'E:/dev/pattern/templates/ruby.composite'
-  end
-  it "3. Command.new should get right parameter form param" do
+  it "1. Command.new should get right parameter form param" do
   	@command.template_dir.should == "E:/dev/pattern/templates/ruby.composite"
   	@command.classes.should == [["Task"],["compositeTask"],
   	                                ["AddDryIngredientsTask","MixTask"],["MakeBatterTask"]]
   	@command.operations.should == [['execute']]  
   	@command.target_dir.should == "E:/dev/pattern"	
   end
-  it "4. absolute_path should return absolute path " do
+  it "2. absolute_path should return absolute path " do
   	@command.absolute_path("../templates/ruby.composite","./bin/../lib").should == "E:/dev/pattern/templates/ruby.composite"
   end
 end

data/test/compositecode_spec.rb

@@ -16,6 +16,9 @@ describe CompositeCode do
   	code.replace_values.should == {"class_name"=>"Task","composite_name"=>"CompositeTask",
   									"leaf_name"=>"AddDryIngredientsTask",
   	                                "composite_object_name"=>"MakeBatterTask",
+  	                                "lc_class_name"=>"task","lc_composite_name"=>"compositetask",
+  									"lc_leaf_name"=>"adddryingredientstask",
+  	                                "lc_composite_object_name"=>"makebattertask",
   	                                "operations"=>"  def execute\n  \t\n  end\n  def test\n  \t\n  end\n"
                                    }
     code = @compositecode.codes[1]
@@ -24,6 +27,9 @@ describe CompositeCode do
   	code.replace_values.should == {"class_name"=>"Task","composite_name"=>"CompositeTask",
   									"leaf_name"=>"AddDryIngredientsTask",
   	                                "composite_object_name"=>"MakeBatterTask",
+  	                                "lc_class_name"=>"task","lc_composite_name"=>"compositetask",
+  									"lc_leaf_name"=>"adddryingredientstask",
+  	                                "lc_composite_object_name"=>"makebattertask",
   	                                "operations"=>"  def execute\n  \t\n  end\n  def test\n  \t\n  end\n"
                                    }
     code = @compositecode.codes[2]
@@ -32,6 +38,9 @@ describe CompositeCode do
   	code.replace_values.should == {"class_name"=>"Task","composite_name"=>"CompositeTask",
   									"leaf_name"=>"AddDryIngredientsTask",
   	                                "composite_object_name"=>"MakeBatterTask",
+  	                                "lc_class_name"=>"task","lc_composite_name"=>"compositetask",
+  									"lc_leaf_name"=>"adddryingredientstask",
+  	                                "lc_composite_object_name"=>"makebattertask",
   	                                "operations"=>"  def execute\n  \t\n  end\n  def test\n  \t\n  end\n"
                                    }
     code = @compositecode.codes[3]
@@ -40,6 +49,9 @@ describe CompositeCode do
   	code.replace_values.should == {"class_name"=>"Task","composite_name"=>"CompositeTask",
   									"leaf_name"=>"MixTask",
   	                                "composite_object_name"=>"MakeBatterTask",
+  	                                "lc_class_name"=>"task","lc_composite_name"=>"compositetask",
+  									"lc_leaf_name"=>"mixtask",
+  	                                "lc_composite_object_name"=>"makebattertask",
   	                                "operations"=>"  def execute\n  \t\n  end\n  def test\n  \t\n  end\n"
                                    }
     code = @compositecode.codes[4]
@@ -48,6 +60,9 @@ describe CompositeCode do
   	code.replace_values.should == {"class_name"=>"Task","composite_name"=>"CompositeTask",
   									"leaf_name"=>"AddDryIngredientsTask",
   	                                "composite_object_name"=>"MakeBatterTask",
+  	                                "lc_class_name"=>"task","lc_composite_name"=>"compositetask",
+  									"lc_leaf_name"=>"adddryingredientstask",
+  	                                "lc_composite_object_name"=>"makebattertask",
   	                                "operations"=>"  def execute\n  \t\n  end\n  def test\n  \t\n  end\n"
                                    }            
   end
@@ -62,6 +77,9 @@ describe CompositeCode do
   	code.replace_values.should == {"class_name"=>"Task","composite_name"=>"CompositeTask",
   									"leaf_name"=>"LeafTask",
   	                                "composite_object_name"=>"CompositeObjectTask",
+  	                                "lc_class_name"=>"task","lc_composite_name"=>"compositetask",
+  									"lc_leaf_name"=>"leaftask",
+  	                                "lc_composite_object_name"=>"compositeobjecttask",
   	                                "operations"=>""
                                    }
     code = @compositecode.codes[1]
@@ -70,6 +88,9 @@ describe CompositeCode do
   	code.replace_values.should == {"class_name"=>"Task","composite_name"=>"CompositeTask",
   									"leaf_name"=>"LeafTask",
   	                                "composite_object_name"=>"CompositeObjectTask",
+  	                                "lc_class_name"=>"task","lc_composite_name"=>"compositetask",
+  									"lc_leaf_name"=>"leaftask",
+  	                                "lc_composite_object_name"=>"compositeobjecttask",
   	                                "operations"=>""
                                    }
     code = @compositecode.codes[2]
@@ -78,6 +99,9 @@ describe CompositeCode do
   	code.replace_values.should == {"class_name"=>"Task","composite_name"=>"CompositeTask",
   									"leaf_name"=>"LeafTask",
   	                                "composite_object_name"=>"CompositeObjectTask",
+  	                                "lc_class_name"=>"task","lc_composite_name"=>"compositetask",
+  									"lc_leaf_name"=>"leaftask",
+  	                                "lc_composite_object_name"=>"compositeobjecttask",
   	                                "operations"=>""
                                    }
     code = @compositecode.codes[3]
@@ -86,6 +110,9 @@ describe CompositeCode do
   	code.replace_values.should == {"class_name"=>"Task","composite_name"=>"CompositeTask",
   									"leaf_name"=>"LeafTask",
   	                                "composite_object_name"=>"CompositeObjectTask",
+  	                                "lc_class_name"=>"task","lc_composite_name"=>"compositetask",
+  									"lc_leaf_name"=>"leaftask",
+  	                                "lc_composite_object_name"=>"compositeobjecttask",
   	                                "operations"=>""
                                    }        
   end

data/test/patterncode_spec.rb

@@ -2,11 +2,13 @@
 # Copyright (c) 2010 weizhao
 #
 require File.dirname(__FILE__) + '/../lib/patterncode'
+require File.dirname(__FILE__) + '/../lib/common'
+include PathCommon
 
 describe PatternCode do
   before(:each) do
-  	template_file_name = "E:/dev/easypattern/templates/ruby.composite/component.rb"
-  	target_file_name = "E:/dev/easypattern/temp/task.rb"
+  	template_file_name = absolute_path("../templates/ruby.composite/component.rb",File.dirname(__FILE__))
+  	target_file_name = absolute_path("../temp/task",File.dirname(__FILE__))
   	@target_file_name_test = target_file_name
   	replace_values = {"class_name"=>"Task","operations"=>"  def execute\n  \t\n  end\n"}
   	@component_code = PatternCode.new(template_file_name,target_file_name,replace_values)	

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pattern
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - weizhao
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-07 00:00:00 +08:00
+date: 2011-01-12 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -30,6 +30,7 @@ extra_rdoc_files: []
 files: 
 - lib/code.rb
 - lib/command.rb
+- lib/common.rb
 - lib/compositecode.rb
 - lib/configuration.rb
 - lib/patterncode.rb
@@ -39,6 +40,7 @@ files:
 - pattern-0.9.0.gem
 - pattern-0.9.1.gem
 - pattern-0.9.2.gem
+- pattern-0.9.3.gem
 - pattern.gemspec
 - Rakefile
 - README