khrl 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1faa3ce3e6ef4077bc2827ea44d4c1d34ca9b448
-  data.tar.gz: ffa294e7c9fea7bdced04d77989819e294fe5d36
+  metadata.gz: fb2a9d22000286cb0b9770246be887d24aa35dac
+  data.tar.gz: 17ee13ae884eec3e5e02d9762143cee888ab0667
 SHA512:
-  metadata.gz: 56fe3f34ea956d5db38e4246ffd41a9ecc5faa21230606fdd1ff37086045f0e9bd50084585560b28719dd75b10ebb5021826fce6f86a240b4562b3a9fca1ddd7
-  data.tar.gz: 5946cbcf8fffd4373fa94ab15dfdfed92da2326abf7ceb6c142b45306a9a28e24153772379658a83c5d1207e0c16fbfdbf6b5b10bba697af44bfbbf7ddebd2d9
+  metadata.gz: 413a2bf4974a8fb2f4ab719c4992f67e9596055b934f91040608ebe2126d191e009fa00a2c6f0386dc5d6865c64fe4fc98fe2bc5c631e41e5fe6a839c5df06f5
+  data.tar.gz: 12fb11b25bd175a37ceea324cacca996eafca442e935111853f01a7efe186150ab83e543268c362dbb2e55678b7211b8d274f69b67b31f51acf5a3b1b99346d2

data/khrl.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'khrl'
-  s.version     = '0.0.3'
-  s.date        = '2014-12-03'
+  s.version     = '0.0.4'
+  s.date        = '2015-04-22'
   s.summary     = "KHRL"
   s.description = "private ruby lib"
   s.authors     = ["Koihik"]

data/lib/Test.rb

@@ -0,0 +1,5 @@
+require File.expand_path("../file/kfile.rb",__FILE__)
+require File.expand_path("../xml/kxml.rb",__FILE__)
+
+include KXML
+

data/lib/file/kfile.rb

@@ -1,56 +1,51 @@
 module KFile
-    require "fileutils"
-
-    def self.delete(dir)
-        FileUtils.remove_dir(dir) if File.exists? dir
-    end
-
-    def self.clear(dir)
-        return if !File.exists? dir
-        Dir.foreach(dir) do |path|
-            if path !="." and path !=".."
-                delete(dir+"/"+path)
-            end
-        end
-    end
-
-    def self.copy(src,dest)
-        return if !File.exists? src
-        if File.directory? src
-            Dir.mkdir(dest) if !File.exist? dest
-            Dir.foreach(src) do |path|
-                if path !="." and path !=".."
-                    copy(src+"/"+path,dest+"/"+path)
-                end
-            end
-        else
-            FileUtils.cp(src,dest)
-        end
-    end
-
-    def self.list(dir,recursive = true,&proc)
-        return if !File.exists? dir
-        if File.directory?(dir)
-            Dir.foreach(dir) do |path|
-                if path !="." && path !=".."
-                    full_path = dir + "/" + path
-                    if recursive
-                        list(full_path,recursive,&proc)
-                    else
-                        yield full_path
-                    end
-                end
-            end
-        else
-        yield dir
-        end
-    end
-    
-    def self.read(file_path,encoding = 'utf-8')
-    	File.open(file_path,"r:#{encoding}"){|f|
-    		return f.read
-    	}
-    end
-
+	require "fileutils"
+	
+	def self.delete(dir)
+		FileUtils.rm_r(dir) if File.exists? dir
+	end
+	
+	def self.clear(dir)
+		FileUtils.rm_r Dir.glob("#{dir}/.")
+	end
+	
+	def self.copy(src,dest)
+		return if !File.exists? src
+		if File.directory? src
+			Dir.mkdir(dest) if !File.exist? dest
+			Dir.foreach(src) do |path|
+				if path !="." and path !=".."
+					copy(src+"/"+path,dest+"/"+path)
+				end
+			end
+		else
+			FileUtils.cp(src,dest)
+		end
+	end
+	
+	def self.list(dir,recursive = true,&proc)
+		return if !File.exists? dir
+		if File.directory?(dir)
+			Dir.foreach(dir) do |path|
+				if path !="." && path !=".."
+					full_path = dir + "/" + path
+					if recursive
+						list(full_path,recursive,&proc)
+					else
+						yield full_path
+					end
+				end
+			end
+		else
+			yield dir
+		end
+	end
+	
+	def self.read(file_path,encoding = 'utf-8')
+		File.open(file_path,"r:#{encoding}"){|f|
+			return f.read
+		}
+	end
+	
 end
 

data/lib/test.xml

@@ -0,0 +1,15 @@
+<Root>
+	<NodeA 
+		a="1"
+		b="2"/>
+
+	<NodeB>
+		<NodeC c="qwe"/>
+	</NodeB>
+
+	<NodeB>
+		<NodeC c="asd"/>
+	</NodeB>
+
+
+</Root>

data/lib/xml/kxml.rb

@@ -1,276 +1,337 @@
 module KXML
-    class Document
+	class Document
 		attr_accessor :encoding
 		attr_accessor :version
 		attr_accessor :root
 		
 		def initialize(data)
 			case data
-				when KXML::Node
-					@root = data
-	            when String
-		            if data =~ /^[<>\/]/
-		                parse_from_string(data)
-		            else
-		                @root = Node.new(data)
-		            end
-	            when File
-	            	parse_from_file(data)
-	            else
-	            	raise "Unsupport Param Type : #{data.class}"
-            end
-            yield @root if block_given?
-		end
-		
-		def to_s(format = Format::MINIMUM)
+			when KXML::Node
+				@root = data
+			when String
+				if data =~ /^[<>\/]/
+					parse_from_string(data)
+				else
+					@root = Node.new(data)
+				end
+			when File
+				parse_from_file(data)
+			else
+				raise "Unsupport Param Type : #{data.class}"
+			end
+			yield @root if block_given?
+		end
+		
+		def save_to(file_path)
+			File.open(file_path,"w+"){|f|
+				f.write to_s
+			}
+		end
+		
+		def to_s(format = Format::PRETTY)
 			return @root.to_s(format)
 		end
 		
-		private 
+		private
 		
 		def parse_from_string(data)
-        	pre_parse()
-        	push_data(data)
-        	post_parse()
-        end
-        
-        def parse_from_file(file)
-        	pre_parse()
-        	line = file.gets
-        	while(line != nil)
-        		push_data(line)
-        		line = file.gets
-        	end
-        	post_parse()
-        end
+			pre_parse()
+			push_data(data)
+			post_parse()
+		end
+		
+		def parse_from_file(file)
+			pre_parse()
+			line = file.gets
+			while(line != nil)
+				push_data(line)
+				line = file.gets
+			end
+			post_parse()
+		end
 		
 		def pre_parse
-            require File.expand_path('../xml_parser.rb',__FILE__)
-        	@__parser = SAXParser.new
-        	@__tag_stack = []
-        	@__parser.handler=->(param){
-	            case param[:type]
-	            when SAXParser::DOCUMENT_STATEMENT
-	            	@encoding = param[:attributes]['encoding']
-	            	@version = param[:attributes]['version']
-	            when SAXParser::START_TAG
-            		node = Node.new(param[:name])
-            		node.attributes.merge!(param[:attributes]) if param[:attributes] != nil
-	            	if @root == nil
-	            		@root = node
-	            	else
-	            		@__tag_stack.last << node
-	            	end
-            		@__tag_stack << node
-	            when SAXParser::END_TAG
-            		raise "Tag mismatch : <#{@__tag_stack.last.name}> - </#{param[:name]}>" if @__tag_stack.last ==nil || @__tag_stack.last.name != param[:name]
-            		@__tag_stack.pop
-	            when SAXParser::SELF_CLOSE_TAG
-            		node = Node.new(param[:name])
-            		node.attributes.merge!(param[:attributes]) if param[:attributes] != nil
-            		if @root == nil
-	            		@root = node
-	            	else
-	            		@__tag_stack.last << node
-	            	end
-	            when SAXParser::COMMENTS
-	            	#ignore
-	            when SAXParser::CONTENT
-	            	next if @__tag_stack.last == nil
-	            	@__tag_stack.last.content = '' if @__tag_stack.last.content == nil
-	            	@__tag_stack.last.content += param[:name].gsub(/\s/,"")
-	            end
-            }
-        end
-        
-        def push_data(data)
-        	@__parser << data
-        end
-        
-        def post_parse
-        	@__parser.end
-        	
-        	@__parser = nil
-        	@__tag_stack = nil
-        end
-    end
-
-    class Node
-        # @_children
-        # @_content
-        # @_name
-        # @_attributes
-        def initialize(data)
-            @_children = []
-            @_attributes = {}
-            case data
-	            when String
-		            if data =~ /^[<>\/]/
-		                parse_from_string(data)
-		            else
-		                @_name = data
-		            end
-	            when File
-	            	parse_from_file(data)
-	            else
-	            	raise "Unsupport Param Type : #{data.class}"
-            end
-            yield self if block_given?
-        end
-
-        def add_child(node)
-            @_children << node
-            return self
-        end
-
-        def <<(data)
-        	case data
-        	when Hash
-        		data.each{|k,v|
-        			k = k.to_s if k.is_a? Symbol
-        			@_attributes[k] = v
-        		}
-        	when KXML::Node
-        		add_child(data)
-        	when String 
-        		if data =~ /^[<>\/]/
-        			self << Node.new(data)
-        		else
-        			append_content(data)
-        		end
-        	when Symbol
-        		append_content(data.to_s)
-        	when Array
-        		data.each{|e|
-        			self << e
-        		}
-        	else
-        		raise "method << not support this type : #{data.class}"
-        	end
-            return self
-        end
-        
-        def append_content(data)
-        	@_content = "" if @_content == nil
-        	@_content += data
-        end
-    	
-        def to_ary
-            return [] << to_s
-        end
-
-        def to_s(format = Format::MINIMUM)
-        	case format
-        	when Format::MINIMUM
-	            attributes_str = ""
-	            @_attributes.each{|key,value|
-	                attributes_str += " #{key}=\"#{value}\""
-	            }
-	            content = ""
-	            @_children.each{|child|
-	                content += child.to_s
-	            }
-	            content += @_content if @_content != nil
-	            return "<#{@_name}#{attributes_str}>#{content}</#{@_name}>"
-	        when Format::PRETTY
-	        	return _to_s_pretty
-	        else
-	        	raise "Unsupport Format : #{format}"
-	        end
-        end
-        
-        def _to_s_pretty(deepth = 0)
-            attributes_str = ""
-            indent = "\t" * deepth
-            wrap = "\n"
-            @_attributes.each{|key,value|
-                attributes_str += " #{key}=\"#{value}\""
-            }
-            content = ""
-            @_children.each{|child|
-            	content += wrap
-                content += child._to_s_pretty(deepth+1)
-            }
-            content += wrap if @_children.size > 0
-            content += @_content if @_content != nil
-            return "#{indent}<#{@_name}#{attributes_str}>#{content}#{@_children.size > 0 ? indent : ""}</#{@_name}>"
-        end
-        
-        # getter setter
-
-        def [](key)
-            return @_attributes[key.to_s]
-        end
-
-        def []=(key,value)
-            @_attributes[key.to_s] = value
-        end
-        
-        def attributes
-        	return @_attributes
-        end
-        
-        def content
-            return @_content
-        end
-
-        def content=(value)
-            @_content = value
-        end
-
-        def name
-            return @_name
-        end
-
-        def name=(value)
-            @_name = value
-        end
-        
-        def children
-        	return @_children
-        end
-        
-        private
-        
-        def parse_from_string(data)
-        	document = Document.new(data)
-        	@_name = document.root.name
-        	@_children = document.root.children
-        	@_content = document.root.content
-        	@_attributes = document.root.attributes
-        end
-        
-        def parse_from_file(file)
-        	document = Document.new(file)
-        	@_name = document.root.name
-        	@_children = document.root.children
-        	@_content = document.root.content
-        	@_attributes = document.root.attributes
-        end
-
-        def find_children_by_name(name)
-            ret = []
-            @_children.each{|child|
-                ret << child if name.to_s == child.name.to_s
-            }
-            return nil if ret.size == 0
-            return ret[0] if ret.size == 1
-            return ret
-        end
-
-        def method_missing(method_name,*args,&block)
-        	super if args.size != 0
-            child = find_children_by_name(method_name)
-            raise "<#{@_name}> have not this child : <#{method_name}>" if child == nil
-            return child
-        end
-
-    end
-    
-    class Format
-    	MINIMUM = 'minimum'
-    	PRETTY	= 'pretty'
-    end
-
+			require File.expand_path('../xml_parser.rb',__FILE__)
+			@__parser = SAXParser.new
+			@__tag_stack = []
+			@__parser.handler=->(param){
+				case param[:type]
+				when SAXParser::DOCUMENT_STATEMENT
+					@encoding = param[:attributes]['encoding']
+					@version = param[:attributes]['version']
+				when SAXParser::START_TAG
+					node = Node.new(param[:name])
+					node.attributes.merge!(param[:attributes]) if param[:attributes] != nil
+					if @root == nil
+						@root = node
+					else
+						@__tag_stack.last << node
+					end
+					@__tag_stack << node
+				when SAXParser::END_TAG
+					raise "Tag mismatch : <#{@__tag_stack.last.name}> - </#{param[:name]}>" if @__tag_stack.last ==nil || @__tag_stack.last.name != param[:name]
+					@__tag_stack.pop
+				when SAXParser::SELF_CLOSE_TAG
+					node = Node.new(param[:name])
+					node.attributes.merge!(param[:attributes]) if param[:attributes] != nil
+					if @root == nil
+						@root = node
+					else
+						@__tag_stack.last << node
+					end
+				when SAXParser::COMMENTS
+					#ignore
+				when SAXParser::CONTENT
+					next if @__tag_stack.last == nil
+					@__tag_stack.last.content = '' if @__tag_stack.last.content == nil
+					@__tag_stack.last.content += param[:name].gsub(/\s/,"")
+				end
+			}
+		end
+		
+		def push_data(data)
+			@__parser << data
+		end
+		
+		def post_parse
+			@__parser.end
+			
+			@__parser = nil
+			@__tag_stack = nil
+		end
+	end
+	
+	class Node
+		# @_children
+		# @_content
+		# @_name
+		# @_attributes
+		# @_parent
+		def initialize(data)
+			@_children = []
+			@_attributes = {}
+			case data
+			when String
+				if data =~ /^[<>\/]/
+					parse_from_string(data)
+				else
+					@_name = data
+				end
+			when File
+				parse_from_file(data)
+			else
+				raise "Unsupport Param Type : #{data.class}"
+			end
+			yield self if block_given?
+		end
+		
+		def add_child(node)
+			@_children << node
+			node.parent = self
+			return self
+		end
+		
+		def <<(data)
+			case data
+			when Hash
+				data.each{|k,v|
+					k = k.to_s if k.is_a? Symbol
+					@_attributes[k] = v
+				}
+			when KXML::Node
+				add_child(data)
+			when String
+				if data =~ /^[<>\/]/
+					self << Node.new(data)
+				else
+					append_content(data)
+				end
+			when Symbol
+				append_content(data.to_s)
+			when Array
+				data.each{|e|
+					self << e
+				}
+			else
+				raise "method << not support this type : #{data.class}"
+			end
+			return self
+		end
+		
+		def append_content(data)
+			@_content = "" if @_content == nil
+			@_content += data
+		end
+		
+		def next_node
+			p = parent
+			return nil if p==nil
+			index = -1
+			p.children.each_with_index{|c,i|
+				index = i if c==self
+			}
+			return nil if index == -1
+			return p.children[index+1] if p.children[index+1]!=nil
+			return nil
+		end
+		
+		def last_node
+			p = parent
+			return nil if p==nil
+			index = -1
+			p.children.each_with_index{|c,i|
+				index = i if c==self
+			}
+			return nil if index == -1 or index == 0
+			return p.children[index-1] if p.children[index-1]!=nil
+			return nil
+		end
+		
+		def to_ary
+			return [] << to_s
+		end
+		
+		def to_s(format = Format::PRETTY)
+			case format
+			when Format::MINIMUM
+				attributes_str = ""
+				@_attributes.each{|key,value|
+					attributes_str += " #{key}=\"#{value}\""
+				}
+				content = ""
+				@_children.each{|child|
+					content += child.to_s
+				}
+				content += @_content if @_content != nil
+				return "<#{@_name}#{attributes_str}>#{content}</#{@_name}>"
+			when Format::PRETTY
+				return _to_s_pretty
+			else
+				raise "Unsupport Format : #{format}"
+			end
+		end
+		
+		def _to_s_pretty(deepth = 0)
+			attributes_str = ""
+			indent = "\t" * deepth
+			wrap = "\n"
+			@_attributes.each{|key,value|
+				attributes_str += " #{key}=\"#{value}\""
+			}
+			content = ""
+			@_children.each{|child|
+				content += wrap
+				content += child._to_s_pretty(deepth+1)
+			}
+			content += wrap if @_children.size > 0
+			content += @_content if @_content != nil
+			return "#{indent}<#{@_name}#{attributes_str}>#{content}#{@_children.size > 0 ? indent : ""}</#{@_name}>"
+		end
+		
+		# getter setter
+		
+		def parent
+			return @_parent
+		end
+		
+		def [](key)
+			return @_attributes[key.to_s]
+		end
+		
+		def []=(key,value)
+			@_attributes[key.to_s] = value
+		end
+		
+		def attributes
+			return @_attributes
+		end
+		
+		def content
+			return @_content
+		end
+		
+		def content=(value)
+			@_content = value
+		end
+		
+		def name
+			return @_name
+		end
+		
+		def name=(value)
+			@_name = value
+		end
+		
+		def children
+			return @_children
+		end
+		
+		def call(*arg)
+			if arg[1].class == Array then
+				find_children_by_name(arg[0])
+			else
+				return find_child_by_name(arg[0])
+			end
+		end
+		
+		protected
+		
+		def parent=(p)
+			@_parent = p
+		end
+		
+		private
+		
+		def parse_from_string(data)
+			document = Document.new(data)
+			@_name = document.root.name
+			@_children = document.root.children
+			@_content = document.root.content
+			@_attributes = document.root.attributes
+		end
+		
+		def parse_from_file(file)
+			document = Document.new(file)
+			@_name = document.root.name
+			@_children = document.root.children
+			@_content = document.root.content
+			@_attributes = document.root.attributes
+		end
+		
+		def find_child_by_name(name)
+			@_children.each{|child|
+				return child if name.to_s == child.name.to_s
+			}
+			return nil
+		end
+		
+		def find_children_by_name(name)
+			ret = []
+			@_children.each{|child|
+				ret << child if name.to_s == child.name.to_s
+			}
+			return ret
+		end
+		
+		
+		def method_missing(method_name,*args,&block)
+			if respond_to? method_name then
+				super
+			else
+				if args[0].class == Array then
+					return find_children_by_name(method_name)
+				else
+					return find_child_by_name(method_name)
+				end
+			end
+		end
+		
+	end
+	
+	class Format
+		MINIMUM = 'minimum'
+		PRETTY	= 'pretty'
+	end
+	
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: khrl
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Koihik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies: []
 description: private ruby lib
 email: koihik@hotmail.com
@@ -16,10 +16,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- khrl-0.0.2.gem
+- khrl-0.0.3.gem
 - khrl.gemspec
+- lib/Test.rb
 - lib/file/kfile.rb
 - lib/khrl.rb
+- lib/test.xml
 - lib/xml/kxml.rb
 - lib/xml/xml_parser.rb
 homepage: https://rubygems.org/gems/khrl
@@ -42,7 +44,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: KHRL