xmlconv 1.0.0 → 1.0.1

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.0.1 / 23.02.2011
+
+* Export Feature added
+
+  * Added the possibility to export the orders from the database via bin/admin
+
 === 1.0.0 / 23.02.2011
 
 * 1 major enhancement

data/Manifest.txt

@@ -0,0 +1,94 @@
+History.txt
+LICENSE
+Manifest.txt
+README.txt
+Rakefile
+bin/admin
+bin/xmlconvd
+data/grammar/i2.grammar
+lib/xmlconv.rb
+lib/xmlconv/config.rb
+lib/xmlconv/custom/lookandfeel.rb
+lib/xmlconv/i2/address.rb
+lib/xmlconv/i2/date.rb
+lib/xmlconv/i2/document.rb
+lib/xmlconv/i2/header.rb
+lib/xmlconv/i2/order.rb
+lib/xmlconv/i2/parser.rb
+lib/xmlconv/i2/position.rb
+lib/xmlconv/i2/record.rb
+lib/xmlconv/model/address.rb
+lib/xmlconv/model/agreement.rb
+lib/xmlconv/model/bdd.rb
+lib/xmlconv/model/bsr.rb
+lib/xmlconv/model/delivery.rb
+lib/xmlconv/model/delivery_item.rb
+lib/xmlconv/model/document.rb
+lib/xmlconv/model/freetext_container.rb
+lib/xmlconv/model/id_container.rb
+lib/xmlconv/model/invoice.rb
+lib/xmlconv/model/invoice_item.rb
+lib/xmlconv/model/item.rb
+lib/xmlconv/model/item_container.rb
+lib/xmlconv/model/name.rb
+lib/xmlconv/model/part_info.rb
+lib/xmlconv/model/part_info_container.rb
+lib/xmlconv/model/party.rb
+lib/xmlconv/model/party_container.rb
+lib/xmlconv/model/price.rb
+lib/xmlconv/model/price_container.rb
+lib/xmlconv/model/transaction.rb
+lib/xmlconv/state/global.rb
+lib/xmlconv/state/global_predefine.rb
+lib/xmlconv/state/login.rb
+lib/xmlconv/state/transaction.rb
+lib/xmlconv/state/transactions.rb
+lib/xmlconv/util/application.rb
+lib/xmlconv/util/autoload.rb
+lib/xmlconv/util/destination.rb
+lib/xmlconv/util/invoicer.rb
+lib/xmlconv/util/known_user.rb
+lib/xmlconv/util/mail.rb
+lib/xmlconv/util/polling_manager.rb
+lib/xmlconv/util/session.rb
+lib/xmlconv/util/transaction.rb
+lib/xmlconv/util/validator.rb
+lib/xmlconv/view/foot.rb
+lib/xmlconv/view/head.rb
+lib/xmlconv/view/login.rb
+lib/xmlconv/view/navigation.rb
+lib/xmlconv/view/navigationlink.rb
+lib/xmlconv/view/pager.rb
+lib/xmlconv/view/preformatted.rb
+lib/xmlconv/view/template.rb
+lib/xmlconv/view/transaction.rb
+lib/xmlconv/view/transactions.rb
+test/config.rb
+test/mock.rb
+test/suite.rb
+test/test_i2/address.rb
+test/test_i2/date.rb
+test/test_i2/document.rb
+test/test_i2/header.rb
+test/test_i2/order.rb
+test/test_i2/parser.rb
+test/test_i2/position.rb
+test/test_model/address.rb
+test/test_model/agreement.rb
+test/test_model/bdd.rb
+test/test_model/bsr.rb
+test/test_model/delivery.rb
+test/test_model/delivery_item.rb
+test/test_model/freetext_container.rb
+test/test_model/invoice.rb
+test/test_model/invoice_item.rb
+test/test_model/name.rb
+test/test_model/part_info.rb
+test/test_model/party.rb
+test/test_model/price.rb
+test/test_util/application.rb
+test/test_util/destination.rb
+test/test_util/invoicer.rb
+test/test_util/polling_manager.rb
+test/test_util/transaction.rb
+xmlconv_convert.rb

data/bin/admin

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
+# Admin -- xmlconv -- 24.02.2011 -- mhatakeyama@ywesee.com 
 # Admin -- xmlconv -- 09.07.2003 -- hwyss@ywesee.com 
 
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path('../src', File.dirname(__FILE__))
+$: << File.expand_path('../lib', File.dirname(__FILE__))
 
 require 'xmlconv/util/application'
 require 'xmlconv/config'
@@ -19,7 +21,10 @@ Kernel.trap('INT') {
 	end
 }
 
-domain = XmlConv::CONFIG.domain
+domain = 'ch.xmlconv'
+if XmlConv::CONFIG.respond_to?(:domain)
+  domain = XmlConv::CONFIG.domain
+end
 $0 = "#{domain} (Admin-Tool)"
 prompt = "#{domain}> "
 

data/lib/xmlconv.rb

@@ -1,3 +1,3 @@
 class Version
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
 end

data/lib/xmlconv/util/application.rb

@@ -10,6 +10,7 @@ require 'xmlconv/util/transaction'
 require 'xmlconv/util/validator'
 require 'thread'
 require 'odba'
+require 'xmlconv/model/bdd'
 
 module XmlConv
 	module Util
@@ -68,6 +69,17 @@ module XmlConv
           time_range.include?(trans.commit_time)
         }
         Util::Invoicer.run(time_range, transactions, date)
+      end
+      def export_orders(first=Time.local(1990,1,1), last=Time.local(2037,1,1), output_file=nil)
+        range=Range.new(first, last)
+        output_file ||= "/home/ywesee/xmlconv_export/xmlconv_export.csv"
+        open(output_file, "w") do |f|
+          self.transactions.reverse.each do |t|
+            if range.include?(t.commit_time)
+              f.print t.output
+            end
+          end
+        end
       end
 		end
 	end
@@ -140,3 +152,4 @@ class XmlConvApp < SBSM::DRbServer
 		}
 	end
 end
+

data/test/test_util/application.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# XmlConv::TestApplication -- xmlconv  -- 24.02.2011 -- mhatakeya@ywesee.com
 # XmlConv::TestApplication -- xmlconv2 -- 07.06.2004 -- hwyss@ywesee.com
 
 $: << File.dirname(__FILE__)
@@ -8,6 +9,7 @@ $: << File.expand_path('../../lib', File.dirname(__FILE__))
 require 'test/unit'
 require 'xmlconv/util/application'
 require 'mock'
+require 'flexmock'
 
 module XmlConv
 	module Conversion
@@ -22,6 +24,7 @@ module XmlConv
 	end
 	module Util
 		class TestApplication < Test::Unit::TestCase
+      include FlexMock::TestCase
 			def setup
 				@app = Util::Application.new
 				@app.init
@@ -163,6 +166,16 @@ module XmlConv
 				trans2.__verify
 				trans3.__verify
 			end
+      def test_exprort_orders
+        transaction = flexmock('transaction') do |trans|
+          trans.should_receive(:commit_time).and_return(Time.local(2010,1,1))
+          trans.should_receive(:output).and_return('output')
+        end
+        @app.transactions.push(transaction)
+        temp = Tempfile.new('test_export_order')
+        assert_equal([transaction], @app.export_orders(Time.local(2009,1,1), Time.local(2011,1,1), temp.path))
+        temp.close
+     end
 		end
 	end
 end

data/test/test_util/destination.rb

@@ -319,6 +319,7 @@ module XmlConv
         assert_equal('ftp://xmlconv.ywesee.com:21/foo/bar/', uri.to_s)
       end
 		end
+=begin
     class TestDestinationSftp < Test::Unit::TestCase
       include FlexMock::TestCase
       def setup
@@ -411,5 +412,6 @@ module XmlConv
         assert_equal('sftp://xmlconv.ywesee.com/foo/bar/', uri.to_s)
       end
     end
+=end
 	end
 end

data/xmlconv_convert.rb

@@ -0,0 +1,150 @@
+# /usr/bin/env ruby
+# xmlconv.converter.rb -- 24.02.2011 -- mhatakeyama@ywesee.com
+
+def usage
+  print <<EOF
+  usage:
+    ruby #{__FILE__} -i [input file]
+
+  options:
+    -i [input file]  (default: input.csv)
+    -o [output file] (default: output.csv)
+    -k [Kunden file] (default: Kunden.txt)
+    -a [Artikel file](default: Artikel.txt)
+    -h help
+EOF
+  exit
+end
+
+# Analyze options
+if ARGV[0] == '-h'
+  usage  
+end
+begin
+  options = Hash[*ARGV]
+rescue ArgumentError
+  usage
+end
+input_file   = options['-i'] ||= 'input.csv'
+output_file  = options['-o'] ||= 'output.csv'
+kunden_file  = options['-k'] ||= 'Kunden.txt'
+artikel_file = options['-a'] ||= 'Artikel.txt'
+
+unless File.exist?(input_file)
+  print "Input file (#{input_file}) could not found.\n\n"
+  usage
+end
+unless File.exist?(kunden_file)
+  print "Kunden.txt (#{kunden_file}) could not found.\n\n"
+  usage
+end
+unless File.exist?(artikel_file)
+  print "Atrikel.txt (#{artikel_file}) cannot be found.\n\n"
+  usage
+end
+
+# Sort by date
+lines = []
+File.readlines(input_file).each do |line|
+  x = line.split(/,/)
+  date = x[2].match(/(\d\d)(\d\d)(20\d\d)/).to_a
+  new_date = date[3] + date[2] + date[1]
+  x[2] = new_date
+  lines << x.join(',') 
+end
+lines.sort!.reverse!
+
+# Load Kunden.txt and Artikel.txt
+kunden = [{}, {}]
+File.readlines(kunden_file).each do |line|
+  x = line.split(/\t/)
+  #print x[0], ",", x[1], ",", x[6], "\n"
+  kunden[0][x[0]] = x[6]
+  kunden[1][x[1]] = x[6]
+end
+
+artikel = [{}, {}]
+price   = [{}, {}]
+File.readlines(artikel_file).each do |line|
+  x = line.split(/\t/)
+  #print x[4], ",", x[3], ",", x[2], "\n"
+  artikel[0][x[4]] = x[2]
+  artikel[1][x[3]] = x[2]
+  #print x[5], "\n"
+  price[0][x[4]]   = x[5]
+  price[1][x[3]]   = x[5]
+end
+
+# Add Kunden and Artikel info
+kunden_missing_list = []
+artikel_missing_list = []
+last = 0
+open(output_file, "w") do |out|
+# Header
+out.print "Kundennr., Kunde, Artikelnr., EAN Code, Produkt, Menge, Preis, Bestelldatum\n"
+lines.each_with_index do |line,i|
+  x = line.split(/,/)
+
+  # Search Kunden Name
+  kunden_name = ""
+  kunden.each do |k|
+    if k.keys.include?(x[1])
+      kunden_name = k[x[1]]
+      break
+    end
+  end
+  if kunden_name == "" or kunden_name == nil
+    kunden_missing_list << x[1]
+#    warn "Kunden ID (#{x[1]}) could not be found."
+  end
+
+  # Search Produkt Name
+  artikel_name = ""
+  artikel.each do |a|
+    if a.keys.include?(x[4])
+      artikel_name = a[x[4]]
+      break
+    end
+  end
+  if artikel_name == "" or artikel_name == nil
+    artikel_missing_list << x[4]
+#    warn "Artikel ID (#{x[4]}) could not be found."
+  end
+
+  # Calc price
+  total_price = 0.0
+  price.each do |pr|
+    if pr.keys.include?(x[4])
+      total_price = pr[x[4]].to_f * x[7].to_f
+      break
+    end
+  end
+
+  # Output
+  x.map!{|z| z || ""}
+  artikel_name ||=""
+  kunden_name ||=""
+  total_price ||=""
+  out.print x[1] + ",\"" + kunden_name + "\"," +\
+      x[4] + "," + x[5] + ",\"" + artikel_name + "\"," + \
+      x[7] + "," + total_price.to_s + "," + x[2] + "\n"
+
+  if last != (i*10)/lines.length
+    last = (i*10)/lines.length
+    $stderr.print "." 
+  end
+end
+end
+$stderr.print "done.\n\n"
+
+# Report missing numbers
+unless kunden_missing_list.empty?
+  print "The following Kunden IDs were not found:\n"
+  print kunden_missing_list.uniq.sort.join(","), "\n\n"
+end
+unless artikel_missing_list.empty?
+  print "The following Artikel IDs were not found:\n"
+  print artikel_missing_list.uniq.sort.join(","), "\n\n"
+end
+
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: xmlconv
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Masaomi Hatakeyama, Zeno R.R. Davatz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 +01:00
+date: 2011-02-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,10 +44,12 @@ extensions: []
 
 extra_rdoc_files: 
 - History.txt
+- Manifest.txt
 - README.txt
 files: 
 - History.txt
 - LICENSE
+- Manifest.txt
 - README.txt
 - Rakefile
 - bin/admin
@@ -138,6 +140,7 @@ files:
 - test/test_util/invoicer.rb
 - test/test_util/polling_manager.rb
 - test/test_util/transaction.rb
+- xmlconv_convert.rb
 - .gemtest
 has_rdoc: true
 homepage: http://scm.ywesee.com/?p=xmlconv/.git;a=summary