eim_xml 0.0.3 → 0.0.4

data/Rakefile

@@ -1,4 +1,6 @@
 load "Rakefile.utirake"
+VER = "0.0.4"
+
 UtiRake.setup do
 	rdoc do |t|
 		t.title = "Easy IMplemented XML"
@@ -13,6 +15,7 @@ UtiRake.setup do
 		s.email = "hiraku@hinet.mydns.jp"
 		s.homepage = "http://eimxml.rubyforge.org/"
 		s.rubyforge_project = "eimxml"
+		s.version = VER
 	end
 
 	publish("eimxml", "hiraku")

data/Rakefile.utirake

@@ -5,12 +5,13 @@
 
 require "rake/clean"
 require "rake/testtask"
-require "rake/rdoctask"
-require "rake/gempackagetask"
+require "rdoc/task"
 require "rake/contrib/rubyforgepublisher"
 require "rubygems/package_task"
 
 class UtiRake
+	include Rake::DSL
+
 	def self.setup(opt={}, &proc)
 		ur = new
 		ur.setup(opt, &proc)
@@ -23,12 +24,19 @@ class UtiRake
 	def setup(opt={}, &proc)
 		@opt = opt
 		directory "external"
-		CLOBBER << "external" << "coverage" << "coverage.spec" << "coverage.cuke" << "doc"
+		CLEAN << "coverage" << "coverage.spec" << "coverage.cuke" << "doc"
+		CLOBBER << "external"
 
 		instance_eval(&proc) if proc
 
 		if need_spec?
-			require "spec/rake/spectask"
+			begin
+				@rspec2_flg = false
+				require "rspec/core/rake_task"
+				@rspec2_flg = true
+			rescue LoadError
+				require "spec/rake/spectask"
+			end
 			define_spec_task
 		end
 
@@ -44,6 +52,12 @@ class UtiRake
 		define_alias_task if @alias_task
 	end
 
+	def rspec2?; @rspec2_flg; end
+
+	def spec_task
+		rspec2? ? RSpec::Core::RakeTask : Spec::Rake::SpecTask
+	end
+
 	def need_spec?
 		File.directory?("spec")
 	end
@@ -160,22 +174,21 @@ class UtiRake
 		spec = Gem::Specification.new do |s|
 			s.platform = Gem::Platform::RUBY
 			s.files = FileList["Rakefile*", "lib/**/*", "spec/**/*"]
-			s.version = ENV["VER"] || "0.0.0.noversion"
+			s.version = "0.0.0.noversion"
 			gemspec_proc.call(s) if gemspec_proc
 		end
 
 		gem = Gem::PackageTask.new(spec) do |t|
 			t.need_tar_gz = true
-			t.need_zip = true
 			package_proc.call(t) if package_proc
 		end
 
-		task "utirake:gem" do
+		task "utirake:copy_for_package" do
 			mv "Rakefile.utirake", "Rakefile.utirake_#{$$}"
-			symlink "external/utirake/utirake.rb", "Rakefile.utirake"
+			cp "external/utirake/utirake.rb", "Rakefile.utirake"
 		end
 
-		file "#{gem.package_dir}/#{gem.gem_spec.file_name}" => "utirake:gem"
+		file gem.package_dir_path => "utirake:copy_for_package"
 
 		task :gem do
 			rm "Rakefile.utirake"
@@ -185,7 +198,7 @@ class UtiRake
 
 	def publish(project_name, user_id)
 		task :publish => "rdoc" do
-			yield if block_given
+			yield if block_given?
 			Rake::RubyForgePublisher.new(project_name, user_id).upload
 		end
 	end
@@ -197,8 +210,15 @@ class UtiRake
 	end
 
 	def set_spec_opts(spec)
-		spec.spec_opts << "-c"
-		spec.libs << "." << "./lib" << "./external/lib"
+		spec.verbose = false
+		if rspec2?
+			spec.rspec_opts ||= []
+			spec.rspec_opts << "-c"
+			spec.rspec_opts << "-I" << "." << "-I" << "./lib" << "-I" << "./external/lib"
+		else
+			spec.spec_opts << "-c"
+			spec.libs << "." << "./lib" << "./external/lib"
+		end
 	end
 
 	def define_spec_task
@@ -206,8 +226,12 @@ class UtiRake
 		namespace :spec do
 			spec_files.each do |f|
 				desc ""
-				Spec::Rake::SpecTask.new(:apart) do |s|
-					s.spec_files = FileList[f]
+				spec_task.new(:apart) do |s|
+					if rspec2?
+						s.pattern = f
+					else
+						s.spec_files = FileList[f]
+					end
 					set_spec_opts(s)
 					spec_proc.call(s) if spec_proc
 				end
@@ -215,27 +239,36 @@ class UtiRake
 			task(:apart).comment = "Run all specs separately"
 
 			desc "Run all specs in a lump"
-			Spec::Rake::SpecTask.new(:lump) do |s|
-				s.spec_files = spec_files
+			spec_task.new(:lump) do |s|
+				s.spec_files = spec_files unless rspec2?
 				set_spec_opts(s)
 				spec_proc.call(s) if spec_proc
 			end
 
 			desc "Run all specs to profile"
-			Spec::Rake::SpecTask.new(:profile) do |s|
+			spec_task.new(:profile) do |s|
 				set_spec_opts(s)
-				s.spec_opts << "-f" << "profile"
+				if rspec2?
+					s.rspec_opts << "-p"
+				else
+					s.spec_opts << "-f" << "profile"
+				end
 			end
 
-			`grep -sRn '#[[:space:]]*here[[:space:]]*$' spec`.split(/\n/).map{|l|
+			`grep -sRn '#[[:space:]]*here\\([[:space:]]\\|$\\)' --include='*.rb' spec`.split(/\n/).map{|l|
 				next nil unless l=~/\A(.*?):(\d+):/
 				[$1, $2.to_i]
 			}.compact.sort{|a, b| FILE_SORT.call(a[0], b[0])}.reverse.each do |file, line|
 				desc ""
-				Spec::Rake::SpecTask.new(:here) do |s|
-					s.spec_files = [file]
+				spec_task.new(:here) do |s|
 					set_spec_opts(s)
-					s.spec_opts << "-l#{line}"
+					if rspec2?
+						s.pattern = file
+						s.rspec_opts << "-l#{line}"
+					else
+						s.spec_files = [file]
+						s.spec_opts << "-l#{line}"
+					end
 					spec_proc.call(s) if spec_proc
 				end
 			end
@@ -273,6 +306,8 @@ class UtiRake
 	end
 
 	def rcov_opts(t, aggregation)
+		t.rcov_opts ||= []
+		t.rcov_opts << "-I" << "./spec:./lib:./external/lib"
 		t.rcov_opts << "--exclude" << "gems\/,features\/,external\/"
 		t.rcov_opts << "--aggregate" << "coverage.data" if aggregation
 		t.rcov = true
@@ -280,12 +315,17 @@ class UtiRake
 
 	def define_rcov_each_task(aggregation)
 		if need_spec?
-			Spec::Rake::SpecTask.new do |t|
-				t.spec_files = spec_files
+			spec_task.new do |t|
+				t.verbose = false
 				rcov_opts(t, aggregation)
-				set_spec_opts(t)
+				if rspec2?
+					t.rcov_opts << "-o" << "coverage.spec" unless aggregation
+				else
+					set_spec_opts(t)
+					t.spec_files = spec_files
+					t.rcov_dir = "coverage.spec" unless aggregation
+				end
 				rcov_spec_proc.call(t) if rcov_spec_proc
-				t.rcov_dir = "coverage.spec" unless aggregation
 			end
 		else
 			task "spec"

data/lib/eim_xml/formatter.rb

@@ -16,10 +16,13 @@ module EimXML
 			@preserve_space = false
 			@indent_string = "  "
 			@indent_depth = 0
+			@option = opt.dup.tap{|h| [:out, :preservers].each{|k| h.delete(k)}}
 		end
 
 		def write(src)
 			case src
+			when ElementWrapper
+				write_wrapper(src)
 			when Comment
 				write_comment(src)
 			when Element
@@ -27,7 +30,7 @@ module EimXML
 			when PCString
 				write_pcstring(src)
 			else
-				write_string(src)
+				write_string(src.to_s)
 			end
 		end
 
@@ -108,5 +111,13 @@ module EimXML
 			end
 			write_newline
 		end
+
+		def write_wrapper(wrapper)
+			wrapper.each(@option) do |i|
+				write(i)
+			end
+		end
 	end
 end
+
+require "eim_xml/formatter/element_wrapper"

data/lib/eim_xml/formatter/element_wrapper.rb

@@ -0,0 +1,7 @@
+class EimXML::Formatter
+	class ElementWrapper
+		def each(option, &proc)
+			contents(option).each(&proc)
+		end
+	end
+end

data/lib/eim_xml/xhtml.rb

@@ -31,11 +31,20 @@ module EimXML::XHTML
 		end
 	end
 
-	class PreserveSpace_ < Simple_; end
+	class PreserveSpace_ < Base_
+		def initialize(name={}, attributes={})
+			if name.is_a?(Hash)
+				super(self.class.name[/.*::(.*)/, 1].downcase.to_sym, name)
+			else
+				super(name, attributes)
+			end
+		end
+	end
 
 	class HEAD < Simple_; end
 	class META < Simple_; end
 	class LINK < Simple_; end
+	class IMG < Simple_; end
 	class STYLE < PreserveSpace_; end
 	class SCRIPT < PreserveSpace_; end
 	class TITLE < Simple_; end
@@ -79,6 +88,9 @@ module EimXML::XHTML
 	class TD < PreserveSpace_; end
 	class BR < Simple_; end
 	class HR < Simple_; end
+	class SELECT < Simple_; end
+	class OPTION < Simple_; end
+
 
 	module Hn
 		def self.new(level, attr={}, &proc)
@@ -96,7 +108,7 @@ module EimXML::XHTML
 		end
 	end
 
-	class BUTTON < Base_
+	class BUTTON < PreserveSpace_
 		def initialize(opt={})
 			super(:button, opt)
 		end
@@ -126,6 +138,12 @@ module EimXML::XHTML
 		end
 	end
 
+	class FILE < INPUT
+		def initialize(opt={})
+			super(opt.merge(:type=>:file))
+		end
+	end
+
 	PRESERVE_SPACES = [PreserveSpace_]
 	class Formatter < EimXML::Formatter
 		def self.write(element, opt={})

data/spec/{assertions_spec.rb → assertions_test.rb}

@@ -3,6 +3,7 @@
 # Copyright (C) 2006, KURODA Hiraku <hiraku@hinet.mydns.jp>
 # You can redistribute it and/or modify it under GPL2.
 
+$:.unshift "#{File.dirname(File.dirname(File.expand_path(__FILE__)))}/lib"
 require "test/unit"
 require "eim_xml/assertions"
 

data/spec/formatter_spec.rb

@@ -4,7 +4,7 @@ require "eim_xml/dsl"
 describe EimXML::Formatter do
 	describe ".write" do
 		it "should return output object" do
-			s = stub(:null_object=>true)
+			s = ""
 			EimXML::Formatter.write(EimXML::Element.new(:e), :out=>s).should be_equal(s)
 		end
 
@@ -213,3 +213,48 @@ EOT
 		end
 	end
 end
+
+describe EimXML::Formatter::ElementWrapper do
+	before do
+		@out = ""
+		@opt = {:out=>@out, :preservers=>[], :a=>10, :b=>20}
+		@formatter = EimXML::Formatter.new(@opt)
+		@m = Module.new
+		class @m::Wrapper < EimXML::Formatter::ElementWrapper
+			def initialize(mocks)
+				@mocks = mocks
+			end
+
+			def contents(option)
+				@mocks
+			end
+		end
+		@mocks = [mock(:m1).as_null_object, mock(:m2).as_null_object]
+		@wrapper = @m::Wrapper.new(@mocks)
+		@xml = EimXML::Element.new(:e) do |e|
+			e << @wrapper
+		end
+	end
+
+	describe "#each" do
+		it "will give options from formatter"  do
+			@wrapper.should_receive(:contents).with(:a=>10, :b=>20).and_return([])
+			@formatter.write(@xml)
+		end
+
+		it "yield result of contents" do
+			@mocks.each_with_index do |mock, index|
+				mock.should_receive(:to_s).and_return("m#{index}")
+			end
+			@formatter.write(@xml)
+			@out.should == "<e>\n  m0\n  m1\n</e>\n"
+		end
+
+		it "raise error when subclass of ElementWrapper is not implement #contents" do
+			class @m::Wrapper2 < EimXML::Formatter::ElementWrapper; end
+			@xml << @m::Wrapper2.new
+
+			expect{@formatter.write(@xml)}.to raise_error(NoMethodError)
+		end
+	end
+end

data/spec/xhtml_spec.rb

@@ -56,6 +56,12 @@ module Module.new::M
 			OpenDSL.style.should be_kind_of(STYLE)
 		end
 
+		it "IMG" do
+			IMG.new.name.should == :img
+			XDSL.img.should be_kind_of(IMG)
+			OpenDSL.img.should be_kind_of(IMG)
+		end
+
 		it "SCRIPT" do
 			SCRIPT.new.name.should == :script
 			XDSL.script.should be_kind_of(SCRIPT)
@@ -263,6 +269,10 @@ module Module.new::M
 			t[:name].should == "t"
 		end
 
+		it "BUTTON" do
+			BUTTON.new.should == Element.new(:button)
+		end
+
 		it "INPUT" do
 			INPUT.new(:type=>:test, :name=>:item, :value=>"v").should == Element.new(:input, :type=>:test, :name=>:item, :value=>"v")
 			INPUT.new(:type=>"test", :name=>"item", :value=>"v").should == Element.new(:input, :type=>"test", :name=>"item", :value=>"v")
@@ -295,9 +305,9 @@ module Module.new::M
 		end
 
 		it "SUBMIT" do
-			SUBMIT.new.should == Element.new(:input, :type=>:submit)
-			SUBMIT.new(:value=>"OK").should == Element.new(:input, :type=>:submit, :value=>"OK")
-			SUBMIT.new(:value=>"OK", :class=>"c").should == Element.new(:input, :type=>:submit, :value=>"OK", :class=>"c")
+			SUBMIT.new.should == Element.new(:button, :type=>:submit)
+			SUBMIT.new(:value=>"OK").should == Element.new(:button, :type=>:submit, :value=>"OK")
+			SUBMIT.new(:value=>"OK", :class=>"c").should == Element.new(:button, :type=>:submit, :value=>"OK", :class=>"c")
 			opt = {:value=>"v", :name=>"n"}
 			opt2 = opt.dup
 			SUBMIT.new(opt2)
@@ -351,6 +361,27 @@ module Module.new::M
 			t.should == PASSWORD.new(:name=>:n, :value=>:v)
 		end
 
+		it "FILE" do
+			FILE.new(:name=>:foo).should == Element.new(:input, :type=>:file, :name=>:foo)
+			XDSL.file(:name=>:foo).should =~ FILE.new(:name=>:foo)
+
+			OpenDSL.file(:name=>:foo).should == FILE.new(:name=>:foo)
+		end
+
+		it "SELECT" do
+			SELECT.new(:name=>:foo).should == Element.new(:select, :name=>:foo)
+			XDSL.select(:name=>:foo).should == SELECT.new(:name=>:foo)
+
+			OpenDSL.select(:name=>:foo).should == SELECT.new(:name=>:foo)
+		end
+
+		it "OPTION" do
+			OPTION.new(:value=>:bar, :selected=>true){|e| e << "TEXT"}.should == Element.new(:option, :value=>:bar, :selected=>true){|e| e.add("TEXT")}
+			XDSL.option(:value=>:bar).should == OPTION.new(:value=>:bar)
+
+			OpenDSL.option(:value=>:bar).should == OPTION.new(:value=>:bar)
+		end
+
 		it "BR" do
 			BR.new.name.should == :br
 			XDSL.br.should be_kind_of(BR)
@@ -427,6 +458,7 @@ module Module.new::M
 						caption.add("c\nt")
 						th.add("th\nt")
 						td.add("td\nt")
+						button.add("button\nt")
 					end
 				end
 
@@ -480,6 +512,8 @@ t</caption>
 t</th>
     <td>td
 t</td>
+    <button>button
+t</button>
   </body>
 </html>
 EOT

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eim_xml
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - KURODA Hiraku
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-06 00:00:00 +09:00
-default_executable: 
+date: 2011-07-19 00:00:00 Z
 dependencies: []
 
 description: 
@@ -30,21 +29,21 @@ extra_rdoc_files: []
 files: 
 - Rakefile.utirake
 - Rakefile
-- lib/eim_xml/parser.rb
-- lib/eim_xml/dsl.rb
+- lib/eim_xml/matcher.rb
 - lib/eim_xml/xhtml.rb
+- lib/eim_xml/dsl.rb
+- lib/eim_xml/parser.rb
+- lib/eim_xml/formatter.rb
 - lib/eim_xml/xhtml/dsl.rb
 - lib/eim_xml/assertions.rb
-- lib/eim_xml/formatter.rb
-- lib/eim_xml/matcher.rb
+- lib/eim_xml/formatter/element_wrapper.rb
 - lib/eim_xml.rb
-- spec/dsl_spec.rb
-- spec/assertions_spec.rb
-- spec/eim_xml_spec.rb
+- spec/assertions_test.rb
 - spec/formatter_spec.rb
-- spec/parser_spec.rb
+- spec/eim_xml_spec.rb
+- spec/dsl_spec.rb
 - spec/xhtml_spec.rb
-has_rdoc: true
+- spec/parser_spec.rb
 homepage: http://eimxml.rubyforge.org/
 licenses: []
 
@@ -65,16 +64,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: eimxml
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Easy IMplemented XML