tagen 0.1.1 → 0.2.0

data/Rakefile

@@ -1,12 +1,17 @@
 desc "build a gem file"
 task :release do
-	`rm *.gem`
-	`gem build tagen.gemspec`
-	`gem push *.gem`
-	`rm *.gem`
+	`rm *.gem &>/dev/null`
+	sh "gem build tagen.gemspec"
+	sh "gem push *.gem"
+	sh "rm *.gem"
 end
 
 desc "testing the library"
 task :test do
-	system "rspec --color spec"
+	sh "rspec --color spec"
+end
+
+def sh cmd
+	puts cmd
+	system cmd
 end

data/lib/tagen/core/string/pyformat.rb

@@ -6,30 +6,33 @@ a python like string format libraray.
 
 1. "this is #{guten}"  # Ruby Builtin
 2. "this is %s" % "guten"  # Ruby Builtin
-3. "this is {guten}".format(guten: 'x')
+3. "this is %{guten}".format(guten: 'x')
 
 use "#{var}" is easy and quick in many cases, but some times we need a more powerful format support.
 
   "I like %s and %s" % %(apple, football)
-  "I like {fruit} and {sport}".format(%w(apple football))   # it has semantic meaning.
+  "I like %{fruit} and %{sport}".format(%w(apple football))   # it has semantic meaning.
 
 == Usage
 
   require "tagen/core"
-  "it costs {:.2f} dollar".format(1.123) #=> "it costs 1.12 dollar"
+  "it costs %{:.2f} dollar".format(1.123) #=> "it costs 1.12 dollar"
 
 * support abritry-argument or hash-argument
-  "{} {}".format(1,2) #=> "1 2"
-  "{a} {b}".format(a:1, b:2) #=> "1 2"
-  "{a} {b}".format(1, b:2) #=> "1 2"
+  "%{} %{}".format(1,2) #=> "1 2"
+  "%{a} %{b}".format(a:1, b:2) #=> "1 2"
+  "%{a} %{b}".format(1, b:2) #=> "1 2"
 
 * escape 
-  "my {{name}} is {name}".format("guten") #=> my name is guten.
+  "my \\%{name} is %{name}".format("guten") #=> my name is guten.
 
 == Examples
 
-  "{:.2f}" 
-  "{name:.2f}" 
+  "%{:.2f}" 
+  "%{name:.2f}" 
+
+	"I'm %{guten} and is #{age} years old".format(guten: "guten") # combine Ruby Buintin with PyFormat
+
 
 == Specification
 
@@ -77,10 +80,14 @@ class PyFormat
 		# args -> argh and args
 		argh = Hash===args[-1] ? args.pop : {}
 
-		# "{0:.5f}"
-		pat = /{{.*?}} | { (.*?)? (?: :(.*?) )? } /x
+		# "%{0:.5f}"
+		pat = /
+			\\%{.*?}  # esacpe
+		  | %{ (.*?)? (?: :(.*?) )? }  # %{0:.f}
+			/x
+
 		ret = @fmt.gsub(pat) do |m|
-			if m.start_with? "{{"
+			if m.start_with? "\\%{"
 				m
 			else
 				field, spec = $1, $2

data/spec/tagen/core/string/pyformat_spec.rb

@@ -5,60 +5,61 @@ require "spec_helper"
 describe PyFormat do
 	before :all do
 	# from go-src/fmt
-	@test_datas = [
+	@test_datas = [ #{{{1
 
 	# type        ::=  s c b o d x X ¦ f/F g/G e/E n % 
-	[ "{}", 	1, 		"1"],
-	[ "{:s}", 1, 		"1"],
-	[ "{:c}", 'a', 	"a" ],
-	[ "{:b}", 0b10, "10" ],
-	[ "{:o}", 010, 	"10" ],
-	[ "{:x}", 0xa, 	"a" ],
-	[ "{:X}", 0xa, 	"A" ],
-	[ "{:f}", 1, 		"1.0"],
-	[ "{:F}", 1, 		"1.0"],
-	[ "{:e}", 1,	 "1.000000e+00" ],
-	[ "{:E}", 1,	 "1.000000E+00" ],
-	[ "{:g}", 1, 		"1"],
-	[ "{:g}", 1e6, "1e+06" ],
-	[ "{:G}", 1e6, "1E+06" ],
+	[ "%{}", 	1, 		"1"],
+	[ "%{:s}", 1, 		"1"],
+	[ "%{:c}", 'a', 	"a" ],
+	[ "%{:b}", 0b10, "10" ],
+	[ "%{:o}", 010, 	"10" ],
+	[ "%{:x}", 0xa, 	"a" ],
+	[ "%{:X}", 0xa, 	"A" ],
+	[ "%{:f}", 1, 		"1.0"],
+	[ "%{:F}", 1, 		"1.0"],
+	[ "%{:e}", 1,	 "1.000000e+00" ],
+	[ "%{:E}", 1,	 "1.000000E+00" ],
+	[ "%{:g}", 1, 		"1"],
+	[ "%{:g}", 1e6, "1e+06" ],
+	[ "%{:G}", 1e6, "1E+06" ],
 	#[ "{:n}" ],
-	[ "{:%}", 1, 	"100%" ],
+	[ "%{:%}", 1, 	"100%" ],
 
 	# width 
-	[ "{:5s}", 	1234, " 1234"],
-	[ "{:3s}", 	1234, "1234"],
-	[ "{:.3s}", 1234, "123"],
+	[ "%{:5s}", 	1234, " 1234"],
+	[ "%{:3s}", 	1234, "1234"],
+	[ "%{:.3s}", 1234, "123"],
 
-	[ "{:3f}",	1.123, "1.123"],
-	[ "{:.1f}", 1.123, "1.1"],
-	[ "{:4.1f}", 1.123, " 1.1"],
+	[ "%{:3f}",	1.123, "1.123"],
+	[ "%{:.1f}", 1.123, "1.1"],
+	[ "%{:4.1f}", 1.123, " 1.1"],
 
 	# fill align
-	[ "{:0<2}", 1, "10"],
-	[ "{:0>2}", 1, "01"],
-	[ "{:0^4}", 1, "0100"],
-	[ "{:02}", 1, "01"],
+	[ "%{:0<2}", 1, "10"],
+	[ "%{:0>2}", 1, "01"],
+	[ "%{:0^4}", 1, "0100"],
+	[ "%{:02}", 1, "01"],
 
 	# sign
-	[ "{:+}", 1, "+1"],
-	[ "{: }", 1, " 1"],
-	[ "{:-}", 1, "1"],
+	[ "%{:+}", 1, "+1"],
+	[ "%{: }", 1, " 1"],
+	[ "%{:-}", 1, "1"],
 
-	[ "{:+3}", 1, " +1"],
-	[ "{:=3}", 1, "+01"],
+	[ "%{:+3}", 1, " +1"],
+	[ "%{:=3}", 1, "+01"],
 
 	# alternate
-	[ "{:#b}", 0b1, "0b1"],
-	[ "{:#4b}", 0b1, " 0b1"],
-	[ "{:#o}", 01, "01"],
-	[ "{:#x}", 0x1, "0x1"],
+	[ "%{:#b}", 0b1, "0b1"],
+	[ "%{:#4b}", 0b1, " 0b1"],
+	[ "%{:#o}", 01, "01"],
+	[ "%{:#x}", 0x1, "0x1"],
 
 	# comma
-	[ "{:,}", 1234, "1,234"],
+	[ "%{:,}", 1234, "1,234"],
 
 	] # 
 	end
+#}}}1
 
 	it "parse_spec. PAT.match()" do
 		a = "0> #07,.7f"
@@ -66,13 +67,23 @@ describe PyFormat do
 		PyFormat::Field::PAT.match(a).to_a[1..-1].should == b
 	end
 
-	it "parse: '{} {}'" do
-		[
-			[ "{} {}", 			[1, 2], 			"1 2" 			],
-			[ "{a} {{b}}", 	[{a:1}], 			"1 {{b}}" 	],
-			[ "{} {a} {b}", [1,2,3,{b:4}],"1 2 4"			],
-		].each do |src, args, rst|
-			src.format(*args).should == rst
+	describe "#format" do
+		it "parse %{name}" do
+			"%{a}".format(a: 1).should == "1"
+			"%{a}".format(1).should == "1"
+		end
+		
+		it "parse empty format %{}" do
+			"%{}".format(1).should == "1"
+		end
+
+		it "parse escape format. \%{name}" do
+			'\%{a}'.format.should == '\%{a}'
+		end
+
+		it "parse all formats %{} %{name} \%{name}" do
+			'%{} %{a} \%{a}'.format(1,a: 2).should == '1 2 \%{a}'
+			'%{} %{a} \%{a}'.format(1, 2).should == '1 2 \%{a}'
 		end
 	end
 
@@ -83,3 +94,5 @@ describe PyFormat do
 		end
 	end
 end
+
+# vim: foldmethod=marker

data/version.rb

@@ -1,7 +1,7 @@
 module VERSION
 	MAJOR = 0
-	MINOR = 1
-	PATCH = 1
+	MINOR = 2
+	PATCH = 0
 
 	IS = [MAJOR, MINOR, PATCH].join(".") 
 end

metadata

@@ -2,7 +2,7 @@
 name: tagen
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Guten