o 2.0.2 → 2.0.3

data/.gitignore

@@ -1 +1,2 @@
 *~
+Gemfile.lock

data/Gemfile

@@ -1,8 +1,10 @@
 source :rubygems
 
 group :development do
+	gem 'rspec'
 	gem 'watchr'
 	gem 'rag'
+  gem 'pd'
 end
 
 gemspec

data/README.md

@@ -1,4 +1,4 @@
-O, a configuration libraray for Ruby
+O, a configuration gem for Ruby
 ====================================
 
 **Homepage**: [https://github.com/GutenYe/o](https://github.com/GutenYe/o) <br/>
@@ -7,32 +7,33 @@ O, a configuration libraray for Ruby
 **Documentation**: [http://rubydoc.info/gems/o/frames](http://rubydoc.info/gems/o/frames) <br/>
 **Issue Tracker**: [https://github.com/GutenYe/o/issues](https://github.com/GutenYe/o/issues) <br/>
 
-then name `o` comes from option/setting, short and handy, eh-ah~
+The name `o` comes from option/setting, short and handy, eh-ah~
 
 Features
 --------
 
-* support variable, computed attribute
-* DSL syntax in pure ruby
-* tree way to do configration.
-* hash compatibility
+* Variable and computed attribute support
+* Pure Ruby DSL syntax
+* Multiple configuration levels including system, user, and command-line.
+* Hash compatibility
 
 Introduction
 -------------
 
-do configuration at three levels: system, user, cmdline
+The three levels of configuration include system, user, and cmdline:
 
-	lib/guten/rc.rb   # system level
+	APP/lib/guten/rc.rb   # system level
 	~/.gutenrc        # user level
 	$ guten --list or ENV[GEMFILE]=x guten  # cmdline level
-		
+
 	module Guten
-		Rc = O.require("guten/rc") + O.require("~/.gutenrc")
+		Rc = O.require("guten/rc") + O.require("~/.gutenrc") # require use $:
 		Rc.list = true or Rc.gemfile = ENV[GEMFILE] # from cmdline.
 	end
 
+	a constant works very well in many places, but you are free to use any variable.
 
-### a completed example ###
+### An example ###
 
 	Rc = O do
 		host "localhost"
@@ -48,7 +49,7 @@ do configuration at three levels: system, user, cmdline
 		time proc{|offset| Time.now} # computed attribute
 	end
 
-alternative syntax
+### An example using alternative syntax ###
 
 	Rc = O do |c|
 		c.host = "localhost"
@@ -64,7 +65,7 @@ alternative syntax
 		c.time = proc{|offset| Time.now}
 	end
 
-a sugar syntax. _works in a file only_ 
+### An example of some sugar syntax. _works in a file only_ ###
 
 	# file: guten/rc.rb
 	development:
@@ -80,36 +81,50 @@ a sugar syntax. _works in a file only_
 		username "guten"
 	end
 
-this is not pure ruby syntax, but it works.
 
-**WARNNING**:  must use \t to indent for this sugar syntax.
 
-### initialize ###
+**NOTE**: This is not pure ruby syntax, but it works.
+In order for this to work, a tab ("\t") must be used for indention.
+
+### Initialize ###
 
-either way is fine
+In order to initialize the configuration object either of the two ways can be used.
 
 	Rc = O.new
 	Rc = O.require "guten/rc"  # from file
 	Rc = O do 
 		a 1 
 	end
-	Rc = O[a:1]  # from hash   
-	Rc._merge! O_or_Hash  
+	Rc = O[a: 1]  # from a hash data
+	Rc._merge!(a: 1)
 
 file: "guten/rc.rb"
 
 	a 1
 
+Initalize with a default value
+
+	Rc = O.new
+	p Rc[:hello] #=> nil
+	Rc = O.new 1
+	p Rc[:hello] #=> 1
+	p Rc.hello #=> <#O>  be careful here
+
+### Assignment & Access ###
 
-### assignment & access ###
+Flexibility has been built in to allow for various ways to assign configuration 
+data values and access the same values within your application. Here are some
+examples of how this can be done:
 
-either way is fine
+Assignment:
 
 	Rc.age 1
 	Rc.age = 1
 	Rc[:age] = 1
 	Rc["age"] = 1
-	---
+
+Access:
+
 	Rc.age    #=> 1
 	Rc.age?   #=> true
 	Rc[:age]  #=> 1
@@ -121,15 +136,23 @@ either way is fine
 		c[:age] = 2
 	end
 
-### node ###
+### Node ###
 
-	Rc.a.b.c 1
+	Rc = O.new
+	Rc.a.b.c = 1
 	p Rc.a.b.c #=> <#Fixnum 1>
 	p Rc.a.b   #=> <#O>
 	p Rc.a     #=> <#O>
-	p Rc.i.dont.exists #=> <#O> #check use #_empty?
+	p Rc.i.dont.exists #=> <#O>
 
-### variable & path ###
+	Rc = O.new
+	p Rc.a._empty? #=> true  # if a node is empty?
+	Rc.a.b = 1
+	p Rc.a._empty? #=> false
+	p O===Rc.a     #=> true  # if it is a node?
+	p O===Rc.a.b   #=> false
+
+### Variable & Path ###
 
 	O do
 		age 1
@@ -146,9 +169,9 @@ either way is fine
 		end
 	end
 
-### namespace ###
+### Namespace ###
 
-either way is fine
+Either way is fine:
 
 	O do
 		mail.stmp.address "stmp.gmail.com"
@@ -157,7 +180,7 @@ either way is fine
 		end
 	end
 
-another example
+Another namespace example:
 
 	O do
 		age 1 
@@ -172,9 +195,9 @@ another example
 	end
 
 
-### group ###
+### Group ###
 
-use namespace or use some seperate files like rails.
+Use namespace or use some separate files like rails.
 
 	config/
 		applications.rb
@@ -183,7 +206,7 @@ use namespace or use some seperate files like rails.
 			test.rb
 			production.rb
 
-### computed attribute ###
+### Computed attribute ###
 
 	Rc = O do
 		time proc{|n| Time.now}
@@ -193,19 +216,25 @@ use namespace or use some seperate files like rails.
 	Rc.time = 2 # assign new value
 	p Rc[:time] #=> <#Proc>
 
-### semantic ###
+### Semantic ###
 
 	O do
 		is_started no # yes ...
 	end
 
-for a list of semantic methods, see O::Semantics
+Note: for a list of semantic methods, see O::Semantics
+
+### Hash compatibility ###
 
-### hash compatibility ###
+Internal, datas are stored as a Hash. You can access all hash methods via `_method`
+
+	Rc = O.new
+	Rc.a = 1
+	Rc._child #=> {:a=>1}
 
-	Rc._keys # access hash method via `_method`
+	Rc._keys #=> [:a]
 
-### temporarily change ###
+### Temporarily change ###
 
 	Rc.a = 1
 	Rc._temp do
@@ -214,17 +243,16 @@ for a list of semantic methods, see O::Semantics
 	p Rc.a #=> 1
 
 
-### access builtin method inside block ###
+### Access built-in method inside block ###
 
 	Rc = O do
 		sleep 10     # is a data. Rc.sleep #=> 10
 		O.sleep 10   # call builtin 'sleep' method
 	end
 
-a list of blocked methods is in O::BUILTIN_METHODS
-
+Note: for a list of blocked methods, see O::BUILTIN_METHODS
 
-### some other examples ###
+### Additional examples ###
 
 	O do
 		name do
@@ -243,16 +271,12 @@ a list of blocked methods is in O::BUILTIN_METHODS
 		c.first = "Guten"
 	end
 
-
-
 Contributing
 -------------
 
-* join the project.
-* report bugs/featues to issue tracker.
-* fork it and pull a request.
-* improve documentation.
-* feel free to post any ideas. 
+* Feel free to join the project and make contributions (by submitting a pull request)
+* Submit any bugs/features/ideas to github issue tracker
+* Codeing style: https://gist.github.com/1105334
 
 Install
 ----------

data/lib/o.rb

@@ -1,277 +1,338 @@
 libdir = File.dirname(__FILE__)
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
-%w(semantics hash_method_fix parser).each{|n| require "o/#{n}"}
-
+%w(
+  semantics
+  hash_method_fix 
+  parser
+).each { |n| require "o/#{n}" }
+
+# <#O> is a node, it has _child, _parent and _root attribute.
+#
+#  Rc = O do
+#    a.b 1
+#    a.c do
+#      d 2
+#    end
+#  end
+#
+#  p Rc
+#  #=> <#O
+#     :a => <#O
+#       :b => 1
+#       :c => <#O
+#         :d => 2>>>
+#
+#  Rc.a #=> <#O>
+#  Rc.a._child #=> {:b => 1, :c => <#O>}
+#  Rc.a._parent #=> is Rc
+#  Rc.a._root #=> is Rc
+#
+#  Rc._parent #=>  nil
+#  Rc._root #=> is Rc
+#
 class O
-	autoload :VERSION, "o/version"
-
-	Error 		= Class.new Exception 
-	LoadError = Class.new Error
-
-	BUILTIN_METHODS = [ :p, :raise, :sleep, :rand, :srand, :exit, :require, :at_exit, :autoload, :open]
-
-	class << self
-		public *BUILTIN_METHODS 
-
-		# @params [String] content
-		def eval content=nil, &blk
-			o = O.new nil
-			content ? o.instance_eval(Parser.compile(content)) : o.instance_eval(&blk)
-			o._root
-		end
-
-		# convert hash, O to O
-		# @param [O,Hash] data
-		def [] data
-			case data
-			when O
-				data
-			when Hash
-				o = O.new
-				o._child = data
-				o
-			end
-		end
-
-		# get hash data from obj
-		#
-		# @param [O, Hash] obj
-		#
-		# @return [Hash] 
-		def get obj
-			case obj
-			when Hash
-				obj
-			when O
-				obj._child
-			end
-		end
-
-		# load a configuration file,
-		# use $: and support '~/.gutenrc'
-		#
-		# @example
-		#   option = O.load("~/.gutenrc")
-		#
-		#   option = O.load("/absolute/path/a.rb")
-		#   
-		#   O::Path << "/home"
-		#   option = O.load("guten")  #=> try "guten.rb"; then try "guten"
-		#   option = O.load("guten.rb")
-		#
-		# @param [String] name
-		# @return [O]
-		def require name
-			path = nil
-
-			# ~/.gutenrc
-			if name =~ /^~/
-				file = File.expand_path(name)
-				path = file if File.exists?(file)
-
-			# /absolute/path/to/rc
-			elsif File.absolute_path(name) == name
-				path = name if File.exists?(name)
-
-			# relative/rc
-			else
-				catch :break do
-					$:.each do |p|
-						['.rb', ''].each {|ext|
-							file = File.join(p, name+ext)
-							if File.exists? file
-								path = file
-								throw :break
-							end
-						}
-					end
-				end
-			end
-
-			raise LoadError, "can't find file -- #{name}" unless path
-
-			O.eval File.read(path)
-		end
-	end
-
-	undef_method *BUILTIN_METHODS
-	include Semantics
-	include HashMethodFix
-
-	attr_accessor :_parent, :_child, :_root
-
-	def initialize default=nil, options={}, &blk
-		@_root = options[:_root]
-		@_child = Hash.new(default)
-
-		if blk
-			method = _blk2method(&blk)
-			if blk.arity == 0
-				method.call
-			else
-				method.call self
-			end
-		end
-	end
-
-	def _temp &blk
-		data = _child.dup
-		blk.call
-		self._child = data
-	end
-
-	def _parent
-		@_parent || nil
-	end
-
-	def _root
-		@_root || self
-	end
-
-	def _child= obj
-		@_child = O.get(obj)
-	end
-
-	def []= key, value
-		key = key.respond_to?(:to_sym) ? key.to_sym : key
-		@_child[key] = value
-	end
-
-	def [] key
-		key = key.respond_to?(:to_sym) ? key.to_sym : key
-		@_child[key]
-	end
-
-	def == other
-		_child == other._child
-	end
-
-	def _dup
-		o = O.new
-		o._child = _child.dup
-		o
-	end
-
-	def _replace obj
-		self._child = O.get(obj)
-		self
-	end
-
-	def + other
-		raise Error, "not support type for + -- #{other.inspect}" unless O === other
-		O.new(_child, other._child)
-	end
-
-	# convert block to method.
-	#
-	#   you can call a block with arguments
-	#
-	# @example USAGE
-	#   instance_eval(&blk)
-	#   blk2method(&blk).call *args
-	#
-	def _blk2method &blk
-		self.class.class_eval do
-			define_method(:__blk2method, &blk)
-		end
-		method(:__blk2method)
-	end
-
-
-	#
-	# .name? 
-	# .name= value 
-	# .name value 
-	# ._name
-	#
-	# .c 
-	# .a.b.c
-	#
-	def method_missing name, *args, &blk
-		#O.p d 'missing', name, args, blk
-
-		# path: root
-		if name == :_
-			return _root
-
-		# relative path.
-		elsif name =~ /^__+$/
-			num = name.to_s.count('_') - 1
-			node = self
-			num.times {
-				return unless node
-				node = node._parent
-			}
-			return node
-
-		# .name=
-		elsif name =~ /(.*)=$/
-			return @_child[$1.to_sym] = args[0]
-
-		# .name?
-		elsif name =~ /(.*)\?$/
-			return !! @_child[$1.to_sym]
-
-		# ._name
-		elsif name =~ /^_(.*)/
-			name = $1.to_sym
-			args.map!{|arg| O===arg ? arg._child : arg} 
-			return @_child.send(name, *args, &blk)
-
-		elsif Proc === @_child[name]
-			return @_child[name].call *args
-
-		# a.c  # return data if has :c
-		# a.c  # create new <#O> if no :c 
-		#
-		elsif args.empty?
-
-			# a.b.c 1
-			# a.b do
-			#   c 2
-			# end
-			if @_child.has_key?(name)
-				o = @_child[name]
-				o.instance_eval(&blk) if blk
-				return o
-
-			else
-				next_o = O.new(nil, {_root: _root})
-				next_o._parent = self
-				self._child[name] = next_o
-				next_o.instance_eval(&blk) if blk
-				return next_o
-			end
-
-		# .name value
-		else
-			@_child[name] = args[0]
-			return args[0]
-		end
-	end
-
-	#
-	# <#O 
-	#   :b => 1
-	#   :c => 2
-	#   :d => <#O
-	#     :c => 2>> 
-	def inspect(indent="  ")
-		o={rst: ""}
-		o[:rst] << "<#O\n"
-		_child.each do |k,v|
-			o[:rst] << "#{indent}#{k.inspect} => "
-			o[:rst] << (O === v ? "#{v.inspect(indent+"  ")}\n" : "#{v.inspect}\n")
-		end
-		o[:rst].rstrip! << ">"
-	end
-
-	alias to_s inspect
+  autoload :VERSION, "o/version"
+
+  Error     = Class.new Exception 
+  LoadError = Class.new Error
+
+  BUILTIN_METHODS = [ :p, :raise, :sleep, :rand, :srand, :exit, :require, :at_exit, :autoload, :open]
+
+  class << self
+    public *BUILTIN_METHODS 
+
+    # eval a file/string configuration.
+    #
+    # @params [String] content
+    # @return [O] configuration
+    def eval(content=nil, &blk)
+      o = O.new nil
+      content ? o.instance_eval(Parser.compile(content)) : o.instance_eval(&blk)
+
+      o._root
+    end
+
+    # convert Hash, O to O
+    # @param [O,Hash] data
+    # @return [O]
+    def [](data)
+      case data
+      when O
+        data
+      when Hash
+        o = O.new
+        o._child = data
+        o
+      end
+    end
+
+    # get Hash data from any object
+    #
+    # @param [O, Hash] obj
+    # @return [Hash] 
+    def get(obj)
+      case obj
+      when Hash
+        obj
+      when O
+        obj._child
+      end
+    end
+
+    # load a configuration file,
+    # use $: and support '~/.gutenrc'
+    #
+    # @example
+    #   Rc = O.require("~/.gutenrc")
+    #
+    #   Rc = O.require("/absolute/path/rc.rb")
+    #
+    #   Rc = O.require("guten/rc") #=> load 'APP/lib/guten/rc.rb'
+    #   # first try 'guten/rc.rb', then 'guten/rc'
+    #   
+    # @param [String] name
+    # @return [O]
+    def require(name)
+      path = nil
+
+      # ~/.gutenrc
+      if name =~ /^~/
+        file = File.expand_path(name)
+        path = file if File.exists?(file)
+
+      # /absolute/path/to/rc
+      elsif File.absolute_path(name) == name
+        path = name if File.exists?(name)
+
+      # relative/rc
+      else
+        catch :break do
+          $:.each { |p|
+            ['.rb', ''].each { |ext|
+              file = File.join(p, name+ext)
+              if File.exists? file
+                path = file
+                throw :break
+              end
+            }
+          }
+        end
+      end
+
+      raise LoadError, "can't find file -- #{name}" unless path
+
+      O.eval File.read(path)
+    end
+  end
+
+  undef_method *BUILTIN_METHODS
+  include Semantics
+  include HashMethodFix
+
+  # parent node, a <#O>
+  attr_accessor :_parent 
+
+  # child node, a hash data
+  attr_accessor :_child 
+
+  # root node, a <#O>
+  attr_accessor :_root
+
+  # @param [Object] (nil) default create a new hash with the defalut value
+  def initialize(default=nil, options={}, &blk)
+    @_root = options[:_root]
+    @_child = Hash.new(default)
+
+    if blk
+      method = _blk2method(&blk)
+      if blk.arity == 0
+        method.call
+      else
+        method.call self
+      end
+    end
+  end
+
+  # a temporarily change
+  def _temp(&blk)
+    data = _child.dup
+    blk.call
+    self._child = data
+
+    self
+  end
+
+  def _parent
+    @_parent || nil
+  end
+
+  def _root
+    @_root || self
+  end
+
+  def _child=(obj)
+    @_child = O.get(obj)
+  end
+
+  # set data
+  def []=(key, value)
+    key = key.respond_to?(:to_sym) ? key.to_sym : key
+
+    @_child[key] = value
+  end
+
+  # get data
+  def [](key)
+    key = key.respond_to?(:to_sym) ? key.to_sym : key
+
+    @_child[key]
+  end
+
+  def ==(other)
+    _child == other._child
+  end
+
+  # duplicate
+  #
+  # @return [O] new <#O>
+  def _dup
+    o = O.new
+    o._child = _child.dup
+
+    o
+  end
+
+  # replace with a new data
+  #
+  # @param [Hash,O] obj
+  # @return [O] self
+  def _replace(obj)
+    self._child = O.get(obj)
+
+    self
+  end
+
+  def +(other)
+    raise Error, "not support type for + -- #{other.inspect}" unless O === other
+
+    O.new _child, other._child
+  end
+
+  # everything goes here.
+  #
+  #   .name? 
+  #   .name= value 
+  #   .name value 
+  #   ._name
+  #
+  #   .c 
+  #   .a.b.c
+  #
+  def method_missing(name, *args, &blk)
+    # path: root
+    if name == :_
+      return _root
+
+    # relative path: __
+    elsif name =~ /^__+$/
+      num = name.to_s.count('_') - 1
+      node = self
+      num.times {
+        return unless node
+        node = node._parent
+      }
+      return node
+
+    # .name=
+    elsif name =~ /(.*)=$/
+      return @_child[$1.to_sym] = args[0]
+
+    # ._name
+    elsif name =~ /^_(.*)/
+      name = $1.to_sym
+      args.map!{|arg| O===arg ? arg._child : arg} 
+      return @_child.send(name, *args, &blk)
+
+    # .name?
+    elsif name =~ /(.*)\?$/
+      return !! @_child[$1.to_sym]
+
+    elsif Proc === @_child[name]
+      return @_child[name].call *args
+
+    # a.c  # return data if has :c
+    # a.c  # create new <#O> if no :c 
+    #
+    elsif args.empty?
+
+      # a.b.c 1
+      # a.b do
+      #   c 2
+      # end
+      if @_child.has_key?(name)
+        o = @_child[name]
+        o.instance_eval(&blk) if blk
+        return o
+
+      else
+        next_o = O.new(nil, {_root: _root})
+        next_o._parent = self
+        self._child[name] = next_o
+        next_o.instance_eval(&blk) if blk
+        return next_o
+      end
+
+    # .name value
+    else
+      @_child[name] = args[0]
+      return args[0]
+    end
+  end
+
+  # pretty print
+  # 
+  #   <#O 
+  #     :b => 1
+  #     :c => 2
+  #     :d => <#O
+  #       :c => 2>> 
+  def inspect(indent="  ")
+    o={rst: ""}
+    o[:rst] << "<#O\n"
+    _child.each { |k,v|
+      o[:rst] << "#{indent}#{k.inspect} => "
+      o[:rst] << (O === v ? "#{v.inspect(indent+"  ")}\n" : "#{v.inspect}\n")
+    }
+    o[:rst].rstrip! << ">"
+
+    o[:rst]
+  end
+
+  alias to_s inspect
+
+private
+  # convert block to method.
+  #
+  #   you can call a block with arguments
+  #
+  # @example USAGE
+  #   instance_eval(&blk)
+  #   blk2method(&blk).call *args
+  #
+  def _blk2method(&blk)
+    self.class.class_eval {
+      define_method(:__blk2method, &blk)
+    }
+
+    method(:__blk2method)
+  end
+
 end
 
 module Kernel
-	def O default=nil, &blk
-		O.new(default, &blk)
-	end
+  # a handy method 
+  def O(default=nil, &blk)
+    O.new default, &blk
+  end
 end

data/lib/o/hash_method_fix.rb

@@ -1,13 +1,26 @@
 class O
-	module HashMethodFix
-	def _merge! obj
-		_child.merge! O.get(obj)
-		self
-	end
+  #
+  # make some hash methods works for <#O>
+  #
+  module HashMethodFix
+    
+    # merge new data IN PLACE
+    #
+    # @params [Hash,O] obj
+    # @return [self]
+    def _merge! obj
+      _child.merge! O.get(obj)
+      self
+    end
 
-	def _merge obj
-		data = _child.merge(O.get(obj))
-		O[data]
-	end
-	end
+    # merge new data
+    #
+    # @params [Hash,O] obj
+    # @return [O] new <#O>
+    def _merge obj
+      data = _child.merge(O.get(obj))
+      O[data]
+    end
+
+  end
 end

data/lib/o/parser.rb

@@ -1,87 +1,99 @@
 class O
-	class Parser
-		attr_reader :content
+  # convert sugar syntax
+  #
+  #   develoment:
+  #     database 'postgresql'
+  #
+  # to a pure ruby syntax
+  #
+  #   development do
+  #     database 'postgresql'
+  #   end
+  #
+  class Parser
+    # the string data.
+    attr_reader :content
 
-		class << self
-			def compile content
-				parser = Parser.new content
-				parser.compile
-			end
-		end
+    class << self
+      # a handy method for Parser.new(content).compile
+      def compile(content)
+        parser = Parser.new(content)
 
-		def initialize content
-			@content = content
-		end
+        parser.compile
+      end
+    end
 
-		def compile
-			script = ""
-			indent_counts = 0
-			block_start = false
+    def initialize content
+      @content = content
+    end
 
-			scan do |token, statement|
-				case token
-				when :block_start
-					block_start = true
-					statement = statement.sub(":", " do")
-					script << statement << "\n"
-				when :statement
-					script << statement << "\n"
-				when :indent
-					indent_counts += 1
-					script << "\t"*indent_counts
-				when :undent
-					script << "\t"*indent_counts
-				when :dedent
-					if block_start
-						block_start = false
-						script << "\t"*(indent_counts-1) + "end\n"
-					else
-						script << "\t"*(indent_counts-1)
-					end
-					indent_counts -= 1
-				end
-			end
-			script
-		end
-		
-	private
-	
-		def scan
-			last_indent = 0
+    # compile sugar-syntax into ruby-syntax
+    def compile
+      script = ""
+      indent_counts = 0
+      block_start = false
 
-			content.scan(/(.*?)(\n+|\Z)/).each do |line, newline|
+      scan { |token, statement|
+        case token
+        when :block_start
+          block_start = true
+          statement = statement.sub(":", " do")
+          script << statement << "\n"
+        when :statement
+          script << statement << "\n"
+        when :indent
+          indent_counts += 1
+          script << "\t"*indent_counts
+        when :undent
+          script << "\t"*indent_counts
+        when :dedent
+          if block_start
+            block_start = false
+            script << "\t"*(indent_counts-1) + "end\n"
+          else
+            script << "\t"*(indent_counts-1)
+          end
+          indent_counts -= 1
+        end
+      }
 
-				_, indents, statement = line.match(/^(\t*)(.*)/).to_a
+      script
+    end
+    
+  private
+    def scan
+      last_indent = 0
 
-				# indent
-				# a:
-				#   b 1
-				#   c:
-				#     d 1
-				#     e:
-				#       f 1
-				#   g 1
-				indent = indents.count("\t")
-				counts = indent - last_indent
-				last_indent = indent
+      content.scan(/(.*?)(\n+|\Z)/).each { |line, newline|
+        _, indents, statement = line.match(/^(\t*)(.*)/).to_a
 
-				if counts == 0
-					yield :undent
-				else
-					counts.abs.times {
-						yield (counts>0 ? :indent : :dedent)
-					}
-				end
+        # indent
+        # a:
+        #   b 1
+        #   c:
+        #     d 1
+        #     e:
+        #       f 1
+        #   g 1
+        indent = indents.count("\t")
+        counts = indent - last_indent
+        last_indent = indent
 
-				# statement
-				if statement =~ /:\s*$/
-					yield :block_start, statement.gsub(/\s*:\s*$/, ':')
-				else
-					yield :statement, statement
-				end
-			end
+        if counts == 0
+          yield :undent
+        else
+          counts.abs.times {
+            yield (counts>0 ? :indent : :dedent)
+          }
+        end
 
-
-		end
-	end
+        # statement
+        if statement =~ /:\s*$/
+          yield :block_start, statement.gsub(/\s*:\s*$/, ':')
+        else
+          yield :statement, statement
+        end
+      }
+    end
+  end
 end

data/lib/o/semantics.rb

@@ -1,12 +1,14 @@
 class O
-	module Semantics
-	# semantic
-	def no
-		false
-	end
+  # some semantic names for meaningfull configuration.
+  module Semantics
+    # @return false
+    def no
+      false
+    end
 
-	def yes
-		true
-	end
-	end
+    # @return true
+    def yes
+      true
+    end
+  end
 end

data/lib/o/version.rb

@@ -1,9 +1,9 @@
 class O
-	module VERSION
-		MAJOR = 2
-		MINOR = 0
-		PATCH = 2
-
-		IS = [MAJOR, MINOR, PATCH].join(".") 
-	end
+  module VERSION
+    MAJOR = 2
+    MINOR = 0
+    PATCH = 3
+    PRE = ''
+    IS = [MAJOR, MINOR, PATCH].join(".") + PRE
+  end
 end

data/o.gemspec

@@ -4,9 +4,9 @@ require "o/version"
 Gem::Specification.new do |s|
 	s.name = "o"
 	s.version = O::VERSION::IS
-	s.summary = "a configuration libraray for Ruby"
+	s.summary = "a configuration library for Ruby"
 	s.description = <<-EOF
-a coonfiguration libraray for Ruby
+a coonfiguration library for Ruby
 	EOF
 
 	s.author = "Guten"
@@ -15,7 +15,4 @@ a coonfiguration libraray for Ruby
 	s.rubyforge_project = "xx"
 
 	s.files = `git ls-files`.split("\n")
-	#s.executables = ["x"]
-
-	#s.add_dependency "x"
 end

data/spec/o_spec.rb

@@ -82,6 +82,19 @@ describe O do
 			@rc[:a].should == 1
 		end
 	end
+
+	context "initalize with default value" do
+		it "default value is nil" do
+			rc = O.new
+			rc[:foo].should == nil
+		end
+
+		it "init with default value 1" do
+			rc = O.new 1
+			rc[:foo].should == 1
+		end
+	end
+
 	it "return <#O> if key doesn't exist" do
 		rc = O.new
 		rc.i.dont.exists.should be_an_instance_of O
@@ -245,6 +258,13 @@ describe O do
 
 			rc._keys.should == [:a]
 		end
+
+		it "_method? must comes before method?" do
+			rc = O.new
+			rc.i._empty?.should be_true
+			rc.i.empty?.should be_false
+		end
+
 	end
 
 	context "temporarily change" do

data/spec/test_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+describe O do
+	it 'works' do
+		o = O.new
+		#pd o.i
+	end
+end

metadata

@@ -2,7 +2,7 @@
 name: o
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors: 
 - Guten
@@ -10,11 +10,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-26 00:00:00 Z
+date: 2011-07-27 00:00:00 Z
 dependencies: []
 
 description: |
-  a coonfiguration libraray for Ruby
+  a coonfiguration library for Ruby
 
 email: ywzhaifei@Gmail.com
 executables: []
@@ -27,7 +27,6 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Ragfile
@@ -46,6 +45,7 @@ files:
 - spec/o/parser_spec.rb
 - spec/o_spec.rb
 - spec/spec_helper.rb
+- spec/test_spec.rb
 homepage: http://github.com/GutenYe/o
 licenses: []
 
@@ -72,6 +72,6 @@ rubyforge_project: xx
 rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
-summary: a configuration libraray for Ruby
+summary: a configuration library for Ruby
 test_files: []
 

data/Gemfile.lock

@@ -1,31 +0,0 @@
-PATH
-  remote: .
-  specs:
-    o (2.0.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.0.9)
-    pa (1.0.2)
-      pa (~> 1.0.0)
-      tagen (~> 1.0.0)
-      thor (~> 0.14.0)
-    pd (1.0.2)
-    rag (1.0.6)
-      pa (~> 1.0.0)
-      tagen (~> 1.0.0)
-      thor (~> 0.14.0)
-    tagen (1.0.2)
-      activesupport
-      pd
-    thor (0.14.6)
-    watchr (0.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  o!
-  rag
-  watchr