xmlconv 1.0.1 → 1.0.2

data/test/test_model/party.rb

@@ -4,18 +4,13 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
 
-require 'test/unit'
 require 'xmlconv/model/party'
-require 'mock'
+require "minitest/autorun"
+require 'flexmock/minitest'
 
 module XmlConv
 	module Model
-		class TestParty < Test::Unit::TestCase
-			class ToSMock < Mock
-				def to_s
-					true
-				end
-			end
+		class TestParty < Minitest::Test
 			def setup
 				@party = Party.new
 			end
@@ -40,19 +35,19 @@ module XmlConv
 				assert_equal('id_string', @party.acc_id)
 			end
 			def test_add_party
-				employee = Mock.new('Employee')
-				employee.__next(:role) { 'Employee' }
+				employee = flexmock('Employee')
+				employee.should_receive(:role).at_least.once.and_return('Employee')
 				@party.add_party(employee)
 				assert_equal(employee, @party.employee)
 				assert_equal([employee], @party.parties)
-				ship_to = Mock.new('ShipTo')
-				ship_to.__next(:role) { 'ShipTo' }
+				ship_to = flexmock('ShipTo')
+				ship_to.should_receive(:role).at_least.once.and_return('ShipTo')
 				@party.add_party(ship_to)
 				assert_equal(employee, @party.employee)
 				assert_equal(ship_to, @party.ship_to)
 				assert_equal([employee, ship_to], @party.parties)
-				bill_to = Mock.new('BillTo')
-				bill_to.__next(:role) { 'BillTo' }
+				bill_to = flexmock('BillTo')
+				bill_to.should_receive(:role).at_least.once.and_return('BillTo')
 				@party.add_party(bill_to)
 				assert_equal(employee, @party.employee)
 				assert_equal(bill_to, @party.bill_to)
@@ -67,25 +62,24 @@ module XmlConv
 				assert_nil(@party.name)
 				@party.name = 'a_string'
 				assert_equal('a_string', @party.name)
-				name = ToSMock.new('Name')
+				name = flexmock('Name')
 				@party.name = name
 				assert_equal(name, @party.name)
-				name.__verify
 			end
 			def test_employee
-				employee = Mock.new('Employee')
-				employee.__next(:role) { 'Employee' }
+				employee = flexmock('Employee')
+				employee.should_receive(:role).at_least.once.and_return('Employee')
 				@party.add_party(employee)
 				assert_equal(employee, @party.employee)
 				assert_equal([employee], @party.parties)
-				ship_to = Mock.new('ShipTo')
-				ship_to.__next(:role) { 'ShipTo' }
+				ship_to = flexmock('ShipTo')
+				ship_to.should_receive(:role).at_least.once.and_return('ShipTo')
 				@party.add_party(ship_to)
 				assert_equal(employee, @party.employee)
 				assert_equal(ship_to, @party.ship_to)
 				assert_equal([employee, ship_to], @party.parties)
-				bill_to = Mock.new('BillTo')
-				bill_to.__next(:role) { 'BillTo' }
+				bill_to = flexmock('BillTo')
+				bill_to.should_receive(:role).at_least.once.and_return('BillTo')
 				@party.add_party(bill_to)
 				assert_equal(employee, @party.employee)
 				assert_equal(bill_to, @party.bill_to)

data/test/test_model/price.rb

@@ -4,12 +4,12 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'xmlconv/model/price'
 
 module XmlConv
 	module Model
-		class TestPrice < Test::Unit::TestCase
+		class TestPrice < ::Minitest::Test
 			def setup
 				@price = Price.new
 			end

data/test/test_util/application.rb

@@ -6,15 +6,14 @@ $: << File.dirname(__FILE__)
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
 
-require 'test/unit'
 require 'xmlconv/util/application'
-require 'mock'
-require 'flexmock'
+require 'minitest/autorun'
+require 'flexmock/minitest'
 
 module XmlConv
 	module Conversion
 		def const_get(symbol)
-			if(symbol.is_a?(Mock))
+			if(symbol.is_a?(FlexMock))
 				symbol
 			else
 				super
@@ -23,8 +22,7 @@ module XmlConv
 		module_function :const_get
 	end
 	module Util
-		class TestApplication < Test::Unit::TestCase
-      include FlexMock::TestCase
+		class TestApplication < ::Minitest::Test
 			def setup
 				@app = Util::Application.new
 				@app.init
@@ -34,100 +32,69 @@ module XmlConv
 				assert_respond_to(@app, :failed_transactions)
 			end
 			def test_execute
-				transaction = Mock.new('Transaction')
-				cache = Mock.new('Cache')
-				cache.__next(:transaction) { |block|
-					block.call
-				}
-				cache.__next(:store) { |transactions|
-					assert_equal(@app.transactions, transactions)
-				}
+				transaction = flexmock('Transaction')
+				cache = flexmock('Cache')
+        cache.should_receive(:transaction).with(Proc).once.and_return{ |block|  block.call }
+        cache.should_receive(:store).with(@app.transactions)
 				ODBA.cache = cache
-				transaction.__next(:transaction_id=) { |id|
-					assert_equal(1, id)
-				}
-				transaction.__next(:execute) { }
-				transaction.__next(:notify) { }
+        transaction.should_receive(:transaction_id=).with(1)
+        transaction.should_receive(:execute).once.and_return(transaction)
+        transaction.should_receive(:notify).once
 				assert_equal([], @app.transactions)
 				assert_equal(0, @app.transactions.size)
 				@app.execute(transaction)
 				assert_equal([transaction], @app.transactions)
-				transaction.__verify
-				cache.__verify
 			ensure
 				ODBA.cache = nil
 			end
 			def test_execute__survive_notification_failure
-				transaction = Mock.new('Transaction')
-				cache = Mock.new('Cache')
-				cache.__next(:transaction) { |block|
-					block.call
-				}
-				cache.__next(:store) { |transactions|
-					assert_equal(@app.transactions, transactions)
-				}
+				transaction = flexmock('Transaction')
+				cache = flexmock('Cache')
+        cache.should_receive(:transaction).with(Proc).once.and_return{ |block|  block.call }
+        cache.should_receive(:store).with(@app.transactions)
 				ODBA.cache = cache
-				transaction.__next(:transaction_id=) { |id|
-					assert_equal(1, id)
-				}
-				transaction.__next(:execute) { }
-				transaction.__next(:notify) { 
-					raise Net::SMTPFatalError, 'could not send email'
-				}
+        transaction.should_receive(:transaction_id=).with(1)
+        transaction.should_receive(:execute).once.and_raise(Net::SMTPFatalError, 'could not send email')
 				assert_equal([], @app.transactions)
 				assert_equal(0, @app.transactions.size)
 				@app.execute(transaction)
 				assert_equal([transaction], @app.transactions)
-				transaction.__verify
-				cache.__verify
 			ensure
 				ODBA.cache = nil
 			end
 			def test_execute__notify_errors
-				transaction = Mock.new('Transaction')
-				cache = Mock.new('Cache')
-				cache.__next(:transaction) { |block|
-					block.call
-				}
-				cache.__next(:store) { |transactions|
-					assert_equal(@app.transactions, transactions)
-				}
+				transaction = flexmock('Transaction')
+				cache = flexmock('Cache')
+        cache.should_receive(:transaction).with(Proc).once.and_return{ |block|  block.call }
+        cache.should_receive(:store).with(@app.transactions)
 				ODBA.cache = cache
-				transaction.__next(:transaction_id=) { |id|
-					assert_equal(1, id)
-				}
-				transaction.__next(:execute) {
-					raise 'oops, something went wrong'
-				}
-				transaction.__next(:error=) { }
-				transaction.__next(:notify) { }
+        transaction.should_receive(:transaction_id=).with(1)
+        transaction.should_receive(:execute).and_raise 'oops, something went wrong'
+        transaction.should_receive(:error=)
+        transaction.should_receive(:notify)
 				assert_equal([], @app.transactions)
 				assert_equal(0, @app.transactions.size)
 				@app.execute(transaction)
 				assert_equal([transaction], @app.transactions)
-				transaction.__verify
-				cache.__verify
 			ensure
 				ODBA.cache = nil
 			end
 			def test_dumpable
-				assert_nothing_raised { Marshal.dump(@app) }
+				Marshal.dump(@app)
 			end
 			def test_next_transaction_id
 				assert_equal([], @app.transactions)
 				assert_equal(1, @app.next_transaction_id)
 				assert_equal(2, @app.next_transaction_id)
 				assert_equal(3, @app.next_transaction_id)
-				trans1 = Mock.new('Transaction1')
-				trans2 = Mock.new('Transaction2')
+				trans1 = flexmock('Transaction1')
+				trans2 = flexmock('Transaction2')
+        trans1.should_receive(:transaction_id).and_return(6)
+        trans2.should_receive(:transaction_id).and_return(3)
 				@app.transactions.push(trans1)
 				@app.transactions.push(trans2)
 				@app.instance_variable_set('@next_transaction_id', nil)
-				trans1.__next(:transaction_id) { 6 }
-				trans2.__next(:transaction_id) { 3 }
 				assert_equal(7, @app.next_transaction_id)
-				trans1.__verify
-				trans2.__verify
 			end
 			def test_odba_exclude_vars
 				@app.instance_variable_set('@next_transaction_id', 10)
@@ -135,36 +102,19 @@ module XmlConv
 				assert_nil(@app.instance_variable_get('@next_transaction_id'))
 			end
 			def test_transaction
-				trans1 = Mock.new('Transaction1')
-				trans2 = Mock.new('Transaction2')
-				trans3 = Mock.new('Transaction2')
+				trans1 = flexmock('Transaction1')
+				trans2 = flexmock('Transaction2')
+				trans3 = flexmock('Transaction2')
+        trans1.should_receive(:transaction_id).and_return(1).at_least.once
+        trans2.should_receive(:transaction_id).and_return(2).at_least.once
+        trans3.should_receive(:transaction_id).and_return(5).at_least.once
 				@app.transactions.push(trans1)
 				@app.transactions.push(trans2)
-				trans2.__next(:transaction_id) { 2 }
-				trans1.__next(:transaction_id) { 1 }
 				assert_equal(trans1, @app.transaction(1))
-				trans1.__verify
-				trans2.__verify
 				@app.transactions.push(trans3)
-				trans3.__next(:transaction_id) { 5 }
-				trans1.__next(:transaction_id) { 1 }
-				trans2.__next(:transaction_id) { 2 }
 				assert_equal(trans2, @app.transaction(2))
-				trans1.__verify
-				trans2.__verify
-				trans3.__verify
-				trans3.__next(:transaction_id) { 5 }
-				trans3.__next(:transaction_id) { 5 }
 				assert_equal(trans3, @app.transaction(5))
-				trans1.__verify
-				trans2.__verify
-				trans3.__verify
-				trans3.__next(:transaction_id) { 5 }
-				trans3.__next(:transaction_id) { 5 }
 				assert_equal(trans3, @app.transaction('5'))
-				trans1.__verify
-				trans2.__verify
-				trans3.__verify
 			end
       def test_exprort_orders
         transaction = flexmock('transaction') do |trans|

data/test/test_util/destination.rb

@@ -5,15 +5,14 @@ $: << File.dirname(__FILE__)
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
 
-require 'test/unit'
 require 'xmlconv/util/destination'
-require 'flexmock'
 require 'xmlconv/config'
+require 'minitest/autorun'
+require 'flexmock/minitest'
 
 module XmlConv
 	module Util
-		class TestDestination < Test::Unit::TestCase
-      include FlexMock::TestCase
+		class TestDestination < ::Minitest::Test
 			def setup
 				@destination = Destination.new
         super
@@ -44,8 +43,7 @@ module XmlConv
                            Destination.book('ftp://www.example.com'))
       end
 		end
-		class TestDestinationDir < Test::Unit::TestCase
-      include FlexMock::TestCase
+		class TestDestinationDir < ::Minitest::Test
 			def setup
 				@destination = DestinationDir.new
 				@target_dir = File.expand_path('data/destination', 
@@ -129,8 +127,7 @@ module XmlConv
 				assert_equal(20, @destination.status_comparable)
 			end
 		end
-		class TestRemoteDestination < Test::Unit::TestCase
-      include FlexMock::TestCase
+		class TestRemoteDestination < ::Minitest::Test
 			def setup
 				@destination = RemoteDestination.new
         super
@@ -144,8 +141,7 @@ module XmlConv
 				assert_respond_to(@destination, :host=)
 			end
 		end
-		class TestDestinationHttp < Test::Unit::TestCase
-      include FlexMock::TestCase
+		class TestDestinationHttp < ::Minitest::Test
 			def setup
 				@destination = DestinationHttp.new
         @destination.transport = @transport = flexmock('DestinationHttp::HTTP_CLASS')
@@ -201,8 +197,7 @@ module XmlConv
 				assert_equal('http://xmlconv.ywesee.com:12345/test.rbx', uri.to_s)
 			end
 		end
-		class TestDestinationFtp < Test::Unit::TestCase
-      include FlexMock::TestCase
+		class TestDestinationFtp < ::Minitest::Test
 			def setup
 				@destination = DestinationFtp.new
         @destination.transport = @transport = flexmock('DestinationFtp::FTP_CLASS')
@@ -265,7 +260,7 @@ module XmlConv
 				delivery.should_receive(:to_s).and_return { 'The Delivery' }
         delivery.should_receive(:filename).and_return { 'test.dat' }
         ftp_session.should_receive(:chdir).and_return { |path|
-          assert_equal('/foo/bar/', path)
+          assert_equal('foo/bar/', path)
         }
         expecteds = %w{000_test.dat 001_test.dat}
         ftp_session.should_receive(:puttextfile).times(2)\
@@ -289,16 +284,14 @@ module XmlConv
 			end
       def test_deliver_tmp
         path = 'ftp://testaccount:password@xmlconv.ywesee.com/foo/bar/'
-        tmp = '/foo/tmp'
+        tmp = '/foo/tmp/'
         @destination = Destination.book(path, tmp)
         @destination.transport = @transport = flexmock('DestinationHttp::FTP_CLASS')
         ftp_session = flexmock('FtpSession')
         delivery = flexmock('Delivery')
         delivery.should_receive(:to_s).and_return { 'The Delivery' }
         delivery.should_receive(:filename).and_return { 'test.dat' }
-        ftp_session.should_receive(:chdir).and_return { |path|
-          assert_equal('/foo/bar/', path)
-        }
+        ftp_session.should_receive(:chdir).with('foo/bar/')
         ftp_session.should_receive(:puttextfile).and_return { |local, remote|
           assert_equal("The Delivery\n", File.read(local))
           assert_equal('/foo/tmp/test.dat', remote)
@@ -320,8 +313,7 @@ module XmlConv
       end
 		end
 =begin
-    class TestDestinationSftp < Test::Unit::TestCase
-      include FlexMock::TestCase
+    class TestDestinationSftp < ::Minitest::Test
       def setup
         @destination = DestinationSftp.new
         @destination.transport = @transport = flexmock('DestinationSftp::SFTP_CLASS')

data/test/test_util/invoicer.rb

@@ -4,13 +4,13 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
 
-require 'test/unit'
 require 'xmlconv/util/invoicer'
-require 'flexmock'
+require 'minitest/autorun'
+require 'flexmock/minitest'
 
 module XmlConv
 	module Util
-		class TestInvoicer < Test::Unit::TestCase
+		class TestInvoicer < ::Minitest::Test
       def setup
         @invoicer = Invoicer
       end

data/test/test_util/polling_manager.rb

@@ -4,19 +4,20 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
 
-require 'test/unit'
 require 'xmlconv/util/polling_manager'
-require 'mock'
-require 'flexmock'
 require 'rexml/document'
 require 'config'
+require 'mail'
+require 'minitest/autorun'
+require 'flexmock/minitest'
+
+Mail.defaults do
+  delivery_method :test
+end
 
 module XmlConv
 	module Util
-    module Mail
-      SMTP_HANDLER = FlexMock.new('SMTP-Handler')
-    end
-    class TestPollingMission < Test::Unit::TestCase
+    class TestPollingMission < ::Minitest::Test
       def setup
         @mission = PollingMission.new
 				@dir = File.expand_path('data/i2', 
@@ -99,7 +100,7 @@ module XmlConv
         }
 			end
     end
-    class TestPopMission < Test::Unit::TestCase
+    class TestPopMission < ::Minitest::Test
       def setup
         @popserver = TCPServer.new('127.0.0.1', 0)
         addr = @popserver.addr 
@@ -194,10 +195,9 @@ module XmlConv
         @popserver.close
       end
     end
-		class TestPollingManager < Test::Unit::TestCase
-      include FlexMock::TestCase
+		class TestPollingManager < ::Minitest::Test
 			def setup
-				@sys = Mock.new('System')
+				@sys = flexmock('System')
 				@polling = PollingManager.new(@sys)
 				@dir = File.expand_path('data/i2', 
 					File.dirname(__FILE__))

data/test/test_util/transaction.rb

@@ -5,14 +5,19 @@ $: << File.dirname(__FILE__)
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
 
-require 'test/unit'
 require 'xmlconv/util/transaction'
-require 'mock'
+require 'mail'
+require 'minitest/autorun'
+require 'flexmock/minitest'
+
+Mail.defaults do
+  delivery_method :test
+end
 
 module XmlConv
 	module Conversion
 		def const_get(symbol)
-			if(symbol.is_a?(Mock))
+			if(symbol.is_a?(FlexMock))
 				symbol
 			else
 				super
@@ -21,10 +26,7 @@ module XmlConv
 		module_function :const_get
 	end
 	module Util
-    module Mail
-      SMTP_HANDLER = Mock.new('SMTP-Handler')
-    end
-		class TestTransaction < Test::Unit::TestCase
+		class TestTransaction < ::Minitest::Test
 			def setup
 				@transaction = Util::Transaction.new
 			end
@@ -47,33 +49,22 @@ module XmlConv
 				assert_respond_to(@transaction, :commit_time)
 			end
 			def test_execute
-				src = Mock.new('source')
-				input = Mock.new('input')
-				reader = Mock.new('reader')
-				model = Mock.new('model')
-				writer = Mock.new('writer')
-				output = Mock.new('output')
-				destination = Mock.new('destination')
+				src = flexmock('source')
+				input = flexmock('input')
+				reader = flexmock('reader')
+				model = flexmock('model')
+				writer = flexmock('writer')
+				output = flexmock('output')
+				destination = flexmock('destination')
 				@transaction.input = src
 				@transaction.reader = reader
 				@transaction.writer = writer
 				@transaction.destination = destination
-				reader.__next(:parse) { |read_src|
-					assert_equal(src, read_src)
-					input	
-				}
-				reader.__next(:convert) { |read_input|
-					assert_equal(input, read_input)
-					model
-				}
-				writer.__next(:convert) { |write_input|
-					assert_equal(model, write_input)
-					output
-				}
-				destination.__next(:deliver) { |delivery|
-					assert_equal(output, delivery)
-				}
-				destination.__next(:forget_credentials!) { }
+        reader.should_receive(:parse).with(src).once.and_return(input)
+        reader.should_receive(:convert).with(input).once.and_return(model)
+        writer.should_receive(:convert).with(model).once.and_return(output)
+        destination.should_receive(:deliver).with(output).once
+        destination.should_receive(:forget_credentials!).once
 				time1 = Time.now
 				result = @transaction.execute
 				time2 = Time.now
@@ -85,45 +76,30 @@ module XmlConv
 				assert_equal(output.to_s, result)
 				assert_in_delta(time1, @transaction.start_time, 0.001)
 				assert_in_delta(time2, @transaction.commit_time, 0.001)
-				input.__verify
-				reader.__verify
-				model.__verify
-				writer.__verify
-				output.__verify
-				destination.__verify
 			end
 			def test_persistable
 				assert_kind_of(ODBA::Persistable, @transaction)
 			end
 			def test_dumpable
-				assert_nothing_raised { Marshal.dump(@transaction) }
+				Marshal.dump(@transaction)
 			end
 			def test_notify
+          ::Mail::TestMailer.deliveries.clear
+          ::Mail.defaults do
+          delivery_method :test
+        end
 				@transaction.instance_variable_set('@start_time', Time.now)
 				@transaction.error_recipients = ['bar']
-				smtp = Mail::SMTP_HANDLER
 				@transaction.notify
+        assert_equal(0, ::Mail::TestMailer.deliveries.size)
 				@transaction.debug_recipients = ['foo']
-				mail = Mock.new('MailSession')
-				mail.__next(:sendmail) { |encoded, from, recipients| 
-					assert_equal(['foo'], recipients)
-				
-				}
-				smtp.__next(:start) { |block, server|
-					block.call(mail)
-				}
 				@transaction.notify
+        assert_equal(1, ::Mail::TestMailer.deliveries.size)
+        assert_equal(['foo'], ::Mail::TestMailer.deliveries.last.to)
 				@transaction.error = 'error!'
-				mail.__next(:sendmail) { |encoded, from, recipients| 
-					assert_equal(['foo', 'bar'], recipients)
-				
-				}
-				smtp.__next(:start) { |block, server|
-					block.call(mail)
-				}
 				@transaction.notify
-				smtp.__verify
-				mail.__verify
+        assert_equal(2, ::Mail::TestMailer.deliveries.size)
+        assert_equal(['foo', 'bar'], ::Mail::TestMailer.deliveries.last.to)
 			end
 		end
 	end

data/xmlconv.gemspec

@@ -0,0 +1,45 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'xmlconv/version'
+
+Gem::Specification.new do |spec|
+  spec.name        = "xmlconv"
+  spec.version     = XmlConv::VERSION
+  spec.author      = "Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger"
+  spec.email       = "mhatakeyama@ywesee.com, zdavatz@ywesee.com, ngiger@ywesee.com"
+  spec.description = "xmlconverter, convert XML to flat files. A Ruby gem"
+  spec.summary     = "xmlconverter, convert XML to flat files"
+  spec.homepage    = "https://github.com/zdavatz/xmlconv"
+  spec.license       = "GPL-v2"
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "odba",    '>= 1.1.2'
+  spec.add_dependency "ydbd-pg", '>= 0.5.1'
+  spec.add_dependency "ydbi",    '>= 0.5.1'
+  spec.add_dependency "json"
+  spec.add_dependency "sbsm"
+  spec.add_dependency "htmlgrid"
+  spec.add_dependency "ydim",    '>= 0.5.1'
+  spec.add_dependency "syck"
+  spec.add_dependency "mail"
+  spec.add_dependency "rclconf"
+  spec.add_dependency "needle"
+  spec.add_dependency "ypdf-writer"
+  spec.add_dependency "hpricot"
+  spec.add_runtime_dependency 'deprecated', '= 2.0.1'
+
+  spec.add_runtime_dependency "yus"
+
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "flexmock"
+  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "minitest-should_syntax"
+  spec.add_development_dependency "rspec"
+end
+