webmoney 0.0.4.8 → 0.0.5

data/.gitignore

@@ -0,0 +1,5 @@
+doc/*
+lib/wmsigner.so
+pkg/*
+tmp/*
+

data/ChangeLog

@@ -1,5 +1,13 @@
 ChangeLog
 
+Fri Feb 12 2010 11:22:35 + 0400
+----------------------------
+  V 0.0.5
+  * Using Nokogiri instead Hpricot+Builder, incompatible with libxml2 < 2.7.0
+  * Using jeweler+rake-compiler
+  * Complete parse attestat fields (X11)
+  * Add X2 -Create transaction
+
 Sat Oct 03 2009 16:18:00 + 0400
 ----------------------------
   V 0.0.4.8

data/README

@@ -5,6 +5,8 @@ XML-interfaces: http://www.wmtransfer.com/eng/developers/interfaces/index.shtml
 
 Gem have built-in native *wmsigner*.
 
+Reqirements: Nokogiri >= 1.4.1 built with libxml2 >= 2.7 (IMPORTANT!)
+
 Author::    Alexander Oryol (mailto:eagle.alex@gmail.com)
 License::   MIT License
 
@@ -62,11 +64,17 @@ wmid = '111222333444'
 = Passport (X11)
 
 Get attestat data:
-passport = Passport.new(wmid)
-passport.attestat     # { # Hash
+passport = Webmoney::Passport.new(wmid)
+passport.attestat     # { # hash
                       #   :attestat => 110, # == FORMAL attestat, as example
                       #   :created_at => Wed Feb 25 21:54:01 +0300 2004 # Time object
+                      #   :cid => "103453"
+                      #   and etc.
                       # }
+passport.wmids        # All wmids attached to the attestat
+passport.userinfo[:country]          # => 'Russia' # Userinfo fields in string context
+passport.userinfo[:country].checked  # => true     # with checked/locked attribute
+passport.directory    # Base dictionary
 
 = Bussines level
 

data/RUNNING_TESTS

@@ -0,0 +1,12 @@
+== Running tests
+
+For run tests create ~/.wm/config.yml file:
+
+common:
+  type: classic
+  wmid: '123456789012'
+  key: 'gQABAIR6... YOUR BASE64-KEY (see wmsigner readme) ...2cC8FZTyKyjBM='
+  password: _your_password_
+  ca_cert: file_or_path_to_directory # optional, all needed certs in lib
+
+and type (RSpec required): rake spec

data/VERSION

@@ -0,0 +1 @@
+0.0.5

data/lib/passport.rb

@@ -1,9 +1,12 @@
-require 'hpricot'
-
 # Class for store attestat information
 module Webmoney
+
   class Passport < Wmid
 
+    class Attribute < String
+      attr_accessor :checked, :locked
+    end
+
     # Attestate types
     ALIAS       = 100
     FORMAL      = 110
@@ -18,8 +21,6 @@ module Webmoney
     SERVICE2    = 200
     OPERATOR    = 300
 
-    attr_reader :attestat
-
     def self.worker= (worker)
       @@worker = worker
     end
@@ -28,9 +29,73 @@ module Webmoney
       @@worker
     end
 
-    def attestat
-      # memoize
-      @attestat ||= @@worker.request(:get_passport, :wmid => self)
+    # memoize data
+    def attestat; @attestat ||= getinfo[:attestat] end
+    def directory; @directory ||= getinfo[:directory] end
+    def full_access; @full_access = getinfo[:full_access] end
+    def userinfo; @userinfo ||= getinfo[:userinfo] end
+
+    protected
+
+    def getinfo
+      info = @@worker.request(:get_passport, :wmid => self)
+      @attestat = info[:attestat]
+      @full_access = info[:full_access]
+      @userinfo = info[:userinfo]
+      @directory = info[:directory]
+      info
+    end
+
+    def self.parse_result(doc)
+      root = doc.at('/response')
+
+      # We use latest attestat
+      att_elm = root.at('certinfo/attestat/row')
+
+      tid = att_elm['tid'].to_i
+      recalled = att_elm['recalled'].to_i
+      locked = root.at('certinfo/userinfo/value/row')['locked'].to_i
+
+      attestat = {
+        :attestat => (recalled + locked > 0) ? ALIAS : tid,
+        :created_at => Time.xmlschema(att_elm['datecrt'])
+      }
+      attestat.merge!( att_elm.attributes.inject({}) do |memo, a|
+        a[1].value.empty? ? memo : memo.merge!(a[0].to_sym => a[1].value)
+      end )
+
+      userinfo = root.at('certinfo/userinfo/value/row').attributes.inject({}) { |memo, a|
+        memo.merge!(a[0].to_sym => Attribute.new(a[1].value.strip))
+      }
+      root.at('certinfo/userinfo/check-lock/row').attributes.each_pair do |k,v|
+        attr = userinfo[k.to_sym]
+        attr.checked = v.to_s[0,1] == '1'
+        attr.locked  = v.to_s[1,2] == '1'
+      end
+
+      wmids = root.xpath('certinfo/wmids/row').inject({}) do |memo, elm|
+        attrs = {:created_at => Time.xmlschema(elm['datereg'])}
+        attrs.merge!(:nickname => elm['nickname']) unless elm['nickname'].empty?
+        attrs.merge!(:info => elm['info']) unless elm['info'].empty?
+        memo.merge!(elm['wmid'] => attrs)
+      end
+
+      if dir = root.at('directory')
+        directory = {
+          :ctype => dir.xpath('ctype').inject({}){|memo, node| memo.merge!(node['id'].to_i => node.text)},
+          :jstatus => dir.xpath('jstatus').inject({}){|memo, node| memo.merge!(node['id'].to_i => node.text)},
+          :types => dir.xpath('tid').inject({}){|memo, node| memo.merge!(node['id'].to_i => node.text)}
+        }
+      end
+
+      result = {
+        :full_access => root.at('fullaccess').text == '1',
+        :attestat => attestat,
+        :wmids => wmids,
+        :userinfo => userinfo
+      }
+      result.merge!(:directory => directory) if dir
+      result
     end
 
   end

data/lib/request_result.rb

@@ -5,13 +5,7 @@ module Webmoney::RequestResult    # :nodoc:all
   end
 
   def result_get_passport(doc)
-    tid = doc.at('/response/certinfo/attestat/row')['tid'].to_i
-    recalled = doc.at('/response/certinfo/attestat/row')['recalled'].to_i
-    locked = doc.at('/response/certinfo/userinfo/value/row')['locked'].to_i
-    { # TODO more attestat fields...
-      :attestat => ( recalled + locked > 0) ? Webmoney::Passport::ALIAS : tid,
-      :created_at => Time.xmlschema(doc.at('/response/certinfo/attestat/row')['datecrt'])
-    }
+    Webmoney::Passport.parse_result(doc)
   end
 
   def result_bussines_level(doc)
@@ -33,4 +27,14 @@ module Webmoney::RequestResult    # :nodoc:all
     }
   end
 
+  def result_create_transaction(doc)
+    op = doc.at('//operation')
+    {
+      :operation_id => op['id'],
+      :operation_ts => op['ts']
+    }.merge( op.children.inject({}) do |memo, elm|
+      memo.merge!(elm.name.to_sym => elm.text)
+    end )
+  end
+
 end

data/lib/request_xml.rb

@@ -1,87 +1,107 @@
 module Webmoney::RequestXML    # :nodoc:all
 
-  def envelope(utf = true)
-    x = Builder::XmlMarkup.new(:indent => 1)
-    encoding = utf ? "utf-8" : "windows-1251"
-    x.instruct!(:xml, :version => "1.0", :encoding => encoding)
-    x
-  end
-
   def xml_get_passport(opt)
-    x = envelope(false)
-    x.request do
-      x.wmid @wmid
-      x.passportwmid opt[:wmid]
-      x.params { x.dict 0; x.info 1; x.mode 0 }
-      x.sign sign(@wmid + opt[:wmid]) if classic?
-    end
-    x
+    Nokogiri::XML::Builder.new { |x|
+      x.request {
+        x.wmid @wmid
+        x.passportwmid opt[:wmid]
+        x.params {
+          x.dict opt[:dict] || 0
+          x.info opt[:info] || 1
+          x.mode opt[:mode] || 0
+        }
+        # unless mode == 1, signed data need'nt
+        x.sign( (classic? && opt[:mode]) ? sign(@wmid + opt[:wmid]) : nil )
+      }
+    }
   end
 
   def xml_bussines_level(opt)
-    x = envelope
-    x.tag!('WMIDLevel.request') do
-      x.signerwmid @wmid
-      x.wmid opt[:wmid]
-    end
-    x
+    Nokogiri::XML::Builder.new { |x|
+      x.send('WMIDLevel.request') {
+        x.signerwmid @wmid
+        x.wmid opt[:wmid]
+      }
+    }
   end
 
   def xml_check_sign(opt)
-    x = envelope(false)
-    x.tag!('w3s.request') do
-      x.wmid @wmid
-      plan_out = @ic_out.iconv(opt[:plan])
-      x.testsign do
-        x.wmid opt[:wmid]
-        x.plan { x.cdata! plan_out }
-        x.sign opt[:sign]
-      end
-      if classic?
-        plan = @wmid + opt[:wmid] + plan_out + opt[:sign]
-        x.sign sign(plan)
-      end
-    end
-    x
+    plan_out = @ic_out.iconv(opt[:plan])
+    Nokogiri::XML::Builder.new( :encoding => 'windows-1251' ) { |x|
+      x.send('w3s.request') {
+        x.wmid @wmid
+        x.testsign {
+          x.wmid opt[:wmid]
+          x.plan { x.cdata opt[:plan] }
+          x.sign opt[:sign]
+        }
+        if classic?
+          plan = @wmid + opt[:wmid] + plan_out + opt[:sign]
+          x.sign sign(plan)
+        end
+      }
+    }
   end
 
   def xml_send_message(opt)
-    x = envelope(false)
     req = reqn()
-    x.tag!('w3s.request') do
-      x.wmid @wmid
-      x.reqn req
-      msgsubj = @ic_out.iconv(opt[:subj])
-      msgtext = @ic_out.iconv(opt[:text])
-      x.message do
-        x.receiverwmid opt[:wmid]
-        x.msgsubj { x.cdata! msgsubj }
-        x.msgtext { x.cdata! msgtext }
-      end
-      if classic?
-        @plan = opt[:wmid] + req + msgtext + msgsubj
-        x.sign sign(@plan)
-      end
-    end
-    x
+    msgsubj = @ic_out.iconv(opt[:subj])
+    msgtext = @ic_out.iconv(opt[:text])
+    Nokogiri::XML::Builder.new( :encoding => 'windows-1251' ) { |x|
+      x.send('w3s.request') {
+        x.wmid @wmid
+        x.reqn req
+        x.message do
+          x.receiverwmid opt[:wmid]
+          x.msgsubj { x.cdata opt[:subj] }
+          x.msgtext { x.cdata opt[:text] }
+        end
+        if classic?
+          @plan = opt[:wmid] + req + msgtext + msgsubj
+          x.sign sign(@plan)
+        end
+      }
+    }
   end
 
   def xml_find_wm(opt)
-    x = envelope(false)
     req = reqn()
-    x.tag!('w3s.request') do
-      x.wmid @wmid
-      x.reqn req
-      x.testwmpurse do
-        x.wmid( opt[:wmid] || '' )
-        x.purse( opt[:purse] || '' )
-      end
-      if classic?
-        @plan = "#{opt[:wmid]}#{opt[:purse]}"
-        x.sign sign(@plan)
-      end
-    end
-    x
+    Nokogiri::XML::Builder.new { |x|
+      x.send('w3s.request') {
+        x.wmid @wmid
+        x.reqn req
+        x.testwmpurse do
+          x.wmid( opt[:wmid] || '' )
+          x.purse( opt[:purse] || '' )
+        end
+        if classic?
+          @plan = "#{opt[:wmid]}#{opt[:purse]}"
+          x.sign sign(@plan)
+        end
+      }
+    }
+  end
+
+    def xml_create_transaction(opt)
+    req = reqn()
+    desc = @ic_out.iconv(opt[:desc])                  # description
+    Nokogiri::XML::Builder.new( :encoding => 'windows-1251' ) { |x|
+      x.send('w3s.request') {
+        x.reqn req
+        x.wmid(@wmid) if classic?
+          x.sign sign(@plan) if classic?
+        x.trans {
+          x.tranid opt[:transid]                      # transaction id - unique
+          x.pursesrc opt[:pursesrc]                   # sender purse
+          x.pursedest opt[:pursedest]                 # recipient purse
+          x.amount opt[:amount]
+          x.period( opt[:period] || 0 )                # protection period (0 - no protection)
+          x.pcode( opt[:pcode].strip ) if opt[:period] > 0 && opt[:pcode]  # protection code
+          x.desc desc
+          x.wminvid( opt[:wminvid] || 0 )             # invoice number (0 - without invoice)
+        }
+      }
+    }
   end
 
 end

data/lib/webmoney.rb

@@ -7,8 +7,7 @@ require 'net/http'
 require 'net/https'
 require 'rubygems'
 require 'iconv'
-require 'builder'
-require 'hpricot'
+require 'nokogiri'
 
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 %w(wmsigner wmid passport purse request_xml request_retval request_result messenger).each { |lib| require lib }
@@ -31,8 +30,40 @@ module Webmoney
   class NonExistentWmidError < WebmoneyError; end
   class CaCertificateError < WebmoneyError; end
   
-  attr_reader :wmid, :error, :errormsg, :last_request
-  attr_accessor :interfaces, :messenger
+  attr_reader :wmid, :error, :errormsg, :last_request, :last_response, :interfaces
+  attr_accessor :messenger
+
+
+  # Preset for W3S
+  def w3s_url
+    'https://w3s.wmtransfer.com/asp/'
+  end
+
+  # Presets for interfaces
+  def interface_urls
+    {
+      :create_invoice      => w3s_url + 'XMLInvoice.asp',       # x1
+      :create_transaction  => w3s_url + 'XMLTrans.asp',         # x2
+      :operation_history   => w3s_url + 'XMLOperations.asp',    # x3
+      :outgoing_invoices   => w3s_url + 'XMLOutInvoices.asp',   # x4
+      :finish_protect      => w3s_url + 'XMLFinishProtect.asp', # x5
+      :send_message        => w3s_url + 'XMLSendMsg.asp',       # x6
+      :check_sign          => w3s_url + 'XMLClassicAuth.asp',   # x7
+      :find_wm             => w3s_url + 'XMLFindWMPurse.asp',   # x8
+      :balance             => w3s_url + 'XMLPurses.asp',        # x9
+      :incoming_invoices   => w3s_url + 'XMLInInvoices.asp',    # x10
+      :get_passport        => 'https://passport.webmoney.ru/asp/XMLGetWMPassport.asp', # x11
+      :reject_protection   => w3s_url + 'XMLRejectProtect.asp', # x13
+      :transaction_moneyback => w3s_url + 'XMLTransMoneyback.asp', # x14
+      :i_trust             => w3s_url + 'XMLTrustList.asp',     # x15
+      :trust_me            => w3s_url + 'XMLTrustList2.asp',    # x15
+      :trust_save          => w3s_url + 'XMLTrustSave2.asp',    # x15
+      :create_purse        => w3s_url + 'XMLCreatePurse.asp',   # x16
+      :create_contract => 'https://arbitrage.webmoney.ru/xml/X17_CreateContract.aspx', # x17
+      :transaction_get => 'https://merchant.webmoney.ru/conf/xml/XMLTransGet.asp', # x18
+      :bussines_level  => 'https://stats.wmtransfer.com/levels/XMLWMIDLevel.aspx'
+    }
+  end
 
 
   # Required options:
@@ -52,6 +83,10 @@ module Webmoney
 
   def initialize(opt = {})
 
+    unless check_libxml_version
+      $stderr.puts "WARNING: webmoney lib will not work correctly with nokogori compiled with libxml2 version < 2.7.0"
+    end
+
     @wmid = Wmid.new(opt[:wmid])
 
     # classic or light
@@ -72,34 +107,12 @@ module Webmoney
         opt[:ca_cert]
       end
 
-    w3s = 'https://w3s.wmtransfer.com/asp/'
-
-    @interfaces = {
-      'create_invoice'  => URI.parse( w3s + 'XMLInvoice.asp' ), # x1
-      'create_transaction'  => URI.parse( w3s + 'XMLTrans.asp' ), # x2
-      'operation_history'  => URI.parse( w3s + 'XMLOperations.asp' ), # x3
-      'outgoing_invoices'  => URI.parse( w3s + 'XMLOutInvoices.asp' ), # x4
-      'finish_protect'  => URI.parse( w3s + 'XMLFinishProtect.asp' ), # x5
-      'send_message'  => URI.parse( w3s + 'XMLSendMsg.asp'), # x6
-      'check_sign'  => URI.parse( w3s + 'XMLClassicAuth.asp'), # x7
-      'find_wm'  => URI.parse( w3s + 'XMLFindWMPurse.asp'), # x8
-      'balance'  => URI.parse( w3s + 'XMLPurses.asp'), # x9
-      'incoming_invoices' => URI.parse( w3s + 'XMLInInvoices.asp'), # x10
-      'get_passport' => URI.parse( 'https://passport.webmoney.ru/asp/XMLGetWMPassport.asp'), # x11
-      'reject_protection' => URI.parse( w3s + 'XMLRejectProtect.asp'), # x13
-      'transaction_moneyback' => URI.parse( w3s + 'XMLTransMoneyback.asp'), # x14
-      'i_trust'  => URI.parse( w3s + 'XMLTrustList.asp'), # x15
-      'trust_me'  => URI.parse( w3s + 'XMLTrustList2.asp'), # x15
-      'trust_save'  => URI.parse( w3s + 'XMLTrustSave2.asp'), # x15
-      'create_purse'  => URI.parse( w3s + 'XMLCreatePurse.asp'), # x16
-      'create_contract' => URI.parse( 'https://arbitrage.webmoney.ru/xml/X17_CreateContract.aspx'), # x17
-      'transaction_get' => URI.parse( 'https://merchant.webmoney.ru/conf/xml/XMLTransGet.asp'), # x18
-      'bussines_level'  => URI.parse( 'https://stats.wmtransfer.com/levels/XMLWMIDLevel.aspx')
-    }
     # Iconv.new(to, from)
     @ic_in = Iconv.new('UTF-8', 'CP1251')
     @ic_out = Iconv.new('CP1251', 'UTF-8')
 
+    prepare_interface_urls
+
     # initialize workers by self
     Purse.worker = self
     Passport.worker = self
@@ -138,7 +151,7 @@ module Webmoney
     res = https_request(iface, make_xml(iface, opt))
 
     # Parse response
-    doc = Hpricot.XML(res)
+    doc = Nokogiri::XML(res)
     parse_retval(iface, doc)
     make_result(iface, doc)
   end
@@ -152,15 +165,25 @@ module Webmoney
 
   protected
 
+  def prepare_interface_urls
+    @interfaces = interface_urls.inject({}) do |m,k|
+      url = k[1]
+      url.sub!(/(\.asp)/, 'Cert.asp') if !classic? && url.match("^"+w3s_url)
+      m.merge!(k[0] => URI.parse(url))
+    end
+  end
+
   # Make HTTPS request, return result body if 200 OK
 
   def https_request(iface, xml)
+    @last_request = @last_response = nil
     url = case iface
       when Symbol
-        @interfaces[iface.to_s]
+        @interfaces[iface]
       when String
         URI.parse(iface)
     end
+    raise ArgumentError, iface unless url
     http = Net::HTTP.new(url.host, url.port)
     http.verify_mode = OpenSSL::SSL::VERIFY_PEER
     if File.file? @ca_cert
@@ -172,12 +195,10 @@ module Webmoney
     end
     http.use_ssl = true
     @last_request = xml
-    result = http.post( url.path, xml, "Content-Type" => "text/xml" )
+    @last_response = result = http.post( url.path, xml, "Content-Type" => "text/xml" )
     case result
       when Net::HTTPSuccess
-        # replace root tag for Hpricot
-        res = result.body.gsub(/(w3s\.response|WMIDLevel\.response)/,'w3s_response')
-        return @ic_in.iconv(res)
+        result.body
       else
         @error = result.code
         @errormsg = result.body if result.class.body_permitted?()
@@ -195,7 +216,7 @@ module Webmoney
 
   def make_xml(iface, opt)            # :nodoc:
     iface_func = "xml_#{iface}"
-    send(iface_func, opt).target!
+    send(iface_func, opt).to_xml
   end
 
   def parse_retval(iface, doc)         # :nodoc:
@@ -212,4 +233,12 @@ module Webmoney
     send(iface_result, doc)
   end
 
+  def check_libxml_version
+    libxml = Nokogiri::VERSION_INFO['libxml']
+    [libxml['compiled'], libxml['loaded']].each do |ver|
+      major, minor = ver.match(/^(\d+)\.(\d+).*/).to_a[1,2].map(&:to_i)
+      return false if major < 2 or minor < 7
+    end
+  end
+
 end

data/rakefile

@@ -1,17 +1,17 @@
 require 'rubygems'
 require 'rake'
 require 'rake/clean'
-require 'tools/rakehelp'
+begin
+  require 'rake/extensiontask'
+rescue LoadError
+  puts "Rake-compiler not available. Install it with: sudo gem install rake-compiler"
+  exit 1
+end
 require 'spec/rake/spectask'
 
-GEM_VERSION="0.0.4.7"
-
-setup_extension('wmsigner', 'wmsigner')
+CLEAN.include ["ext/wmsigner/*.{so,o}", "ext/wmsigner/Makefile", "lib/wmsigner.so", "pkg", "tmp"]
 
-desc "Compiles native extensions"
-task :compile => [:wmsigner]
-
-task :default => [:compile, :spec]
+Rake::ExtensionTask.new('wmsigner')
 
 Spec::Rake::SpecTask.new do |task|
   task.libs << 'spec'
@@ -19,32 +19,28 @@ Spec::Rake::SpecTask.new do |task|
   task.verbose = true
 end
 
-gemspec = Gem::Specification.new do |gemspec|
-  gemspec.name = "webmoney"
-  gemspec.version = GEM_VERSION
-  gemspec.author = "Alexander Oryol"
-  gemspec.email =  "eagle.alex@gmail.com"
-  gemspec.summary = "Webmoney interfaces and native wmsigner"
-  gemspec.files = %w( rakefile ChangeLog lib/WebMoneyCA.crt ) +
-                  Dir.glob( 'lib/*.rb' ) +
-                  Dir.glob( 'spec/*.rb' ) +
-                  Dir.glob( 'spec/unit/*.rb' ) +
-                  Dir.glob( 'ext/**/*.{h,cpp,rb}' ) +
-                  Dir.glob( 'tools/*.rb' )
-  gemspec.autorequire = 'webmoney'
-  gemspec.require_path = 'lib'
-  gemspec.add_dependency('hpricot')
-  gemspec.add_dependency('builder')
-  gemspec.add_dependency('iconv')
-
-  if RUBY_PLATFORM.match("win32")
-    gemspec.platform = Gem::Platform::WIN32
-    gemspec.files += []
-  else
-    gemspec.platform = Gem::Platform::RUBY
-    gemspec.extensions = Dir.glob( 'ext/**/extconf.rb' )
+spec = begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name = "webmoney"
+    gemspec.rubyforge_project = 'webmoney'
+    gemspec.authors = ["Alexander Oryol"]
+    gemspec.email =  "eagle.alex@gmail.com"
+    gemspec.summary = "Webmoney interfaces and native wmsigner"
+    gemspec.add_dependency('nokogiri')
+    gemspec.files << %w( rakefile ChangeLog lib/WebMoneyCA.crt ) +
+                      Dir.glob( 'ext/**/*.{h,cpp,rb}' ) +
+                      Dir.glob( 'tools/*.rb' )
+
+    if RUBY_PLATFORM.match("win32")
+      gemspec.platform = Gem::Platform::WIN32
+      gemspec.files += []
+    else
+      gemspec.platform = Gem::Platform::RUBY
+      gemspec.extensions = Dir.glob( 'ext/**/extconf.rb' )
+    end
   end
-end
-
-CLEAN.include ["ext/wmsigner/*.{so,o}", "ext/wmsigner/Makefile", "lib/wmsigner.so", "pkg", "*.gem"]
 
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install jeweler -s http://gemcutter.org"
+end

data/spec/spec

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'spec'
+exit ::Spec::Runner::CommandLine.run(::Spec::Runner::OptionParser.parse(ARGV, STDERR, STDOUT))

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'test/unit'
 require 'spec'
-require 'hpricot'
 require 'ostruct'
 require 'yaml'
 require 'time'

data/spec/unit/passport_spec.rb

@@ -12,16 +12,102 @@ module Webmoney
       Passport.new(@wm.wmid).should be_instance_of(Passport)
     end
 
-    it "request result get_passport should be Hash" do
-      @wm.request(:get_passport, :wmid => @wm.wmid).should be_instance_of(Hash)
+    it "request result get_passport should be hash with data" do
+      wmid = '000000000007'
+      created_at = Time.at(1077735241.37)
+      res = @wm.request(:get_passport, :wmid => wmid, :dict => 1)
+      res[:full_access].should be_false
+      res[:wmids].should == {
+        wmid => { :created_at=>Time.at(1077733193.353) }
+      }
+      res[:attestat].should == {
+        :regcid=>"10",
+        :locked=>"1",
+        :recalled=>"0",
+        :cid=>"103453",
+        :admlocked=>"0",
+        :created_at=>created_at,
+        :datecrt=>"2004-02-25T21:54:01.370",
+        :regnickname=>"WM Passport Service /Центр аттестации/",
+        :regwmid=>"464889785562",
+        :attestat=>150,
+        :tid=>"150",
+        :datediff=>(Date.today - created_at.send(:to_date)).to_s
+      }
+
+      u_info = {
+        :locked=>"0",
+        :ctype=>"1",
+        :citid=>"12918",
+        :cap_owner=>"0",
+        :region=>"Москва",
+        :countryid=>"195",
+        :city=>"Москва",
+        :pasdoc=>"0",
+        :nickname=>"Арбитр",
+        :country=>"Россия",
+        :inndoc=>"0",
+        :email=>"", :pdateMMDDYYYY => "", :pday => "", :pmonth => "", :pyear => "",
+        :iname=>"", :inn=>"", :okonx=>"", :bik=>"", :pbywhom=>"", :phonemobile=>"", :rcountry=>"",
+        :bmonth=>"", :jadres=>"", :okpo=>"", :bday=>"", :pnomer=>"", :bankname=>"", :pcountry=>"", :pcountryid=>"",
+        :jcountryid=>"", :ks=>"", :infoopen=>"", :icq=>"", :byear=>"", :oname=>"", :osnovainfo=>"", :dirfio=>"",
+        :pdate=>"", :bplace=>"", :rs=>"", :rcity=>"", :adres=>"", :phone=>"", :buhfio=>"", :radres=>"", :fname=>"",
+        :phonehome=>"", :jcity=>"", :name=>"", :pcity=>"", :jstatus=>"", :fax=>"", :zipcode=>"", :rcountryid=>"",
+        :web=>"", :jzipcode=>"", :jcountry=>""
+      }
+
+#      a1 = res[:userinfo].keys.map(&:to_s).sort
+#      a2 = u_info.keys.map(&:to_s).sort
+#      puts ((a1|a2) - (a1 & a2)).inspect
+
+      res[:userinfo].should == u_info
+
+      res[:directory].should == {
+        :ctype=>{
+          1=>"Частное лицо",
+          2=>"Юридическое лицо"
+        },
+        :jstatus=>{
+          20=>"Директор юридического лица",
+          21=>"Бухгалтер юридического лица",
+          22=>"Представитель юридического лица",
+          23=>"ИП"
+        },
+        :types=>{
+          100=>"Аттестат псевдонима",
+          110=>"Формальный аттестат",
+          120=>"Начальный аттестат",
+          130=>"Персональный аттестат",
+          135=>"Аттестат продавца",
+          136=>"Аттестат Capitaller",
+          140=>"Аттестат разработчика",
+          150=>"Аттестат регистратора",
+          170=>"Аттестат Гаранта",
+          190=>"Аттестат сервиса WMT",
+          200=>"Аттестат сервиса WMT",
+          300=>"Аттестат Оператора"
+        }
+      }
     end
-    
-    it "should return correct data" do
+
+    it "should return userinfo attributes with checked/locked" do
+      wmid = '000000000007'
+      p = Passport.new(wmid)
+      p.userinfo[:adres].should be_empty
+      p.userinfo[:adres].checked.should be_true
+      p.userinfo[:adres].locked.should be_true
+      p.userinfo[:inn].should be_empty
+      p.userinfo[:inn].checked.should be_false
+      p.userinfo[:inn].locked.should be_true
+    end
+
+    it "should return correct fields" do
       wmid = '000000000007'
       p = Passport.new(wmid)
       p.wmid.should == wmid
       p.attestat[:attestat].should == Webmoney::Passport::REGISTRATOR
       p.attestat[:created_at].strftime('%Y-%m-%d %H:%M:%S').should == '2004-02-25 21:54:01'
+      p.full_access.should be_false
       
       wmid = '370860915669'
       p = Passport.new(wmid)
@@ -35,6 +121,7 @@ module Webmoney
     end
 
     it "should raise exception on non existent WMID" do
+      @wm.stub!(:http_request).and_return("<?xml version='1.0' encoding='windows-1251'?><response retval='0'><fullaccess>0</fullaccess><certinfo wmid='012345678901'/><retdesc>WMID not found</retdesc></response>")
       lambda {@wm.request(:get_passport, :wmid => '012345678901')}.should raise_error(Webmoney::NonExistentWmidError)
     end
 

data/spec/unit/webmoney_spec.rb

@@ -9,7 +9,7 @@ module Webmoney
     end
 
     it "should be classic" do
-      @wm.classic?.should be_true
+      @wm.should be_classic # @wm.classic? == true
     end
     
     it "should return reqn" do
@@ -20,6 +20,16 @@ module Webmoney
       (t2 > t1).should be_true
     end
 
+    it "should correct prepare interfaces urls" do
+      wm = TestWM.new :wmid => WmConfig.wmid
+      wm.should_not be_classic
+      wm.interfaces[:balance].class.should == URI::HTTPS
+      # converted to light-auth version
+      wm.interfaces[:balance].to_s.should == 'https://w3s.wmtransfer.com/asp/XMLPursesCert.asp'
+      # non-converted to light-auth version
+      wm.interfaces[:get_passport].to_s.should == 'https://passport.webmoney.ru/asp/XMLGetWMPassport.asp'
+    end
+
     it "should correct reqn" do
       Time.stub!(:now).and_return(Time.at(1244704683.69677))
       @wm.send(:reqn).should == '2009061111180369'
@@ -36,9 +46,8 @@ module Webmoney
     end
     
     it "should send request" do
-      r = @wm.send(:https_request, :check_sign, '<w3s.request/>')
-      doc = Hpricot.XML(r.gsub(/w3s\.response/,'w3s_response'))
-      doc.at('w3s_response').should_not be_nil
+      doc = Nokogiri.XML(@wm.send(:https_request, :check_sign, '<w3s.request/>'))
+      doc.root.should_not be_nil
     end
 
     it"should raise error on bad response" do
@@ -80,9 +89,13 @@ module Webmoney
     it "should check_sign with specials" do
       plan = '<test>текст</test>'
       real_plan = Iconv.conv('CP1251', 'UTF-8', plan)
-      @wm.request(:check_sign, 
-        :wmid => @wm.wmid, :plan => plan, :sign => @wm.send(:sign, real_plan )).
-        should be_true
+      begin
+      @wm.request(:check_sign,
+        :wmid => @wm.wmid,
+        :plan => plan,
+        :sign => @wm.send(:sign, real_plan )
+      ).should be_true
+      end
     end
     
     it "should parse retval and raise error on broken get_passport" do
@@ -117,7 +130,11 @@ module Webmoney
       result[:id].should match(/^\d*$/)
       ((result[:date] + 60) > Time.now).should be_true
     end
-    
+
+    it "should create transaction" do
+      # TODO @wm.request( :create_transaction, ...)
+    end
+
     it "should raise error on undefined xml func" do
       lambda { @wm.request(:unexistent_interface) }.should raise_error(::NoMethodError)
     end

data/webmoney.gemspec

@@ -0,0 +1,94 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{webmoney}
+  s.version = "0.0.5"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Alexander Oryol"]
+  s.date = %q{2010-02-12}
+  s.email = %q{eagle.alex@gmail.com}
+  s.extensions = ["ext/wmsigner/extconf.rb"]
+  s.extra_rdoc_files = [
+    "ChangeLog",
+     "README"
+  ]
+  s.files = [
+    ".gitignore",
+     "ChangeLog",
+     "README",
+     "RUNNING_TESTS",
+     "VERSION",
+     "ext/wmsigner/base64.cpp",
+     "ext/wmsigner/base64.h",
+     "ext/wmsigner/cmdbase.cpp",
+     "ext/wmsigner/cmdbase.h",
+     "ext/wmsigner/crypto.cpp",
+     "ext/wmsigner/crypto.h",
+     "ext/wmsigner/extconf.rb",
+     "ext/wmsigner/md4.cpp",
+     "ext/wmsigner/md4.h",
+     "ext/wmsigner/rsalib1.cpp",
+     "ext/wmsigner/rsalib1.h",
+     "ext/wmsigner/signer.cpp",
+     "ext/wmsigner/signer.h",
+     "ext/wmsigner/stdafx.cpp",
+     "ext/wmsigner/stdafx.h",
+     "ext/wmsigner/wmsigner.cpp",
+     "lib/certs/02a6c417.0",
+     "lib/certs/3c58f906.0",
+     "lib/certs/AddTrust_External_Root.crt",
+     "lib/certs/WebMoneyCA.crt",
+     "lib/messenger.rb",
+     "lib/passport.rb",
+     "lib/purse.rb",
+     "lib/request_result.rb",
+     "lib/request_retval.rb",
+     "lib/request_xml.rb",
+     "lib/webmoney.rb",
+     "lib/wmid.rb",
+     "rakefile",
+     "spec/spec",
+     "spec/spec_helper.rb",
+     "spec/unit/messenger_spec.rb",
+     "spec/unit/passport_spec.rb",
+     "spec/unit/purse_spec.rb",
+     "spec/unit/signer_spec.rb",
+     "spec/unit/time_spec.rb",
+     "spec/unit/webmoney_spec.rb",
+     "spec/unit/wmid_spec.rb",
+     "webmoney.gemspec"
+  ]
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{webmoney}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Webmoney interfaces and native wmsigner}
+  s.test_files = [
+    "spec/unit/time_spec.rb",
+     "spec/unit/purse_spec.rb",
+     "spec/unit/signer_spec.rb",
+     "spec/unit/messenger_spec.rb",
+     "spec/unit/passport_spec.rb",
+     "spec/unit/webmoney_spec.rb",
+     "spec/unit/wmid_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
+    else
+      s.add_dependency(%q<nokogiri>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<nokogiri>, [">= 0"])
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webmoney
 version: !ruby/object:Gem::Version 
-  version: 0.0.4.8
+  version: 0.0.5
 platform: ruby
 authors: 
 - Alexander Oryol
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-03 00:00:00 +04:00
+date: 2010-02-12 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: nokogiri
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -22,21 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: builder
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-description: |
-  This library should help to make requests to WebMoney Transfer http://www.wmtransfer.com
-  XML-interfaces: http://www.wmtransfer.com/eng/developers/interfaces/index.shtml
-  Gem have built-in native wmsigner tool.
-
+description: 
 email: eagle.alex@gmail.com
 executables: []
 
@@ -46,28 +32,18 @@ extra_rdoc_files:
 - ChangeLog
 - README
 files: 
-- rakefile
+- .gitignore
 - ChangeLog
 - README
-- lib/certs/02a6c417.0
-- lib/certs/3c58f906.0
-- lib/certs/AddTrust_External_Root.crt
-- lib/certs/WebMoneyCA.crt
-- lib/messenger.rb
-- lib/request_result.rb
-- lib/request_retval.rb
-- lib/request_xml.rb
-- lib/passport.rb
-- lib/purse.rb
-- lib/webmoney.rb
-- lib/wmid.rb
-- ext/wmsigner/extconf.rb
+- RUNNING_TESTS
+- VERSION
 - ext/wmsigner/base64.cpp
 - ext/wmsigner/base64.h
 - ext/wmsigner/cmdbase.cpp
 - ext/wmsigner/cmdbase.h
 - ext/wmsigner/crypto.cpp
 - ext/wmsigner/crypto.h
+- ext/wmsigner/extconf.rb
 - ext/wmsigner/md4.cpp
 - ext/wmsigner/md4.h
 - ext/wmsigner/rsalib1.cpp
@@ -77,14 +53,36 @@ files:
 - ext/wmsigner/stdafx.cpp
 - ext/wmsigner/stdafx.h
 - ext/wmsigner/wmsigner.cpp
-- tools/rakehelp.rb
+- lib/certs/02a6c417.0
+- lib/certs/3c58f906.0
+- lib/certs/AddTrust_External_Root.crt
+- lib/certs/WebMoneyCA.crt
+- lib/messenger.rb
+- lib/passport.rb
+- lib/purse.rb
+- lib/request_result.rb
+- lib/request_retval.rb
+- lib/request_xml.rb
+- lib/webmoney.rb
+- lib/wmid.rb
+- rakefile
+- spec/spec
+- spec/spec_helper.rb
+- spec/unit/messenger_spec.rb
+- spec/unit/passport_spec.rb
+- spec/unit/purse_spec.rb
+- spec/unit/signer_spec.rb
+- spec/unit/time_spec.rb
+- spec/unit/webmoney_spec.rb
+- spec/unit/wmid_spec.rb
+- webmoney.gemspec
 has_rdoc: true
-homepage: http://github.com/eagleas/webmoney
+homepage: 
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -102,16 +100,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: webmoney
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Webmoney interfaces and native wmsigner
 test_files: 
-- spec/spec_helper.rb
-- spec/unit/messenger_spec.rb
-- spec/unit/passport_spec.rb
+- spec/unit/time_spec.rb
 - spec/unit/purse_spec.rb
 - spec/unit/signer_spec.rb
-- spec/unit/time_spec.rb
+- spec/unit/messenger_spec.rb
+- spec/unit/passport_spec.rb
 - spec/unit/webmoney_spec.rb
 - spec/unit/wmid_spec.rb
+- spec/spec_helper.rb

data/tools/rakehelp.rb

@@ -1,117 +0,0 @@
-def make(makedir)
-  Dir.chdir(makedir) do
-    sh(PLATFORM =~ /win32/ ? 'nmake' : 'make')
-  end
-end
-
-
-def extconf(dir)
-  Dir.chdir(dir) do ruby "extconf.rb" end
-end
-
-
-def setup_tests
-  Rake::TestTask.new do |t|
-    t.libs << "test"
-    t.test_files = FileList['test/test*.rb']
-    t.verbose = true
-  end
-end
-
-
-def setup_clean otherfiles
-  files = ['build/*', '**/*.o', '**/*.so', '**/*.a', 'lib/*-*', '**/*.log'] + otherfiles
-  CLEAN.include(files)
-end
-
-
-def setup_rdoc files
-  Rake::RDocTask.new do |rdoc|
-    rdoc.rdoc_dir = 'doc/rdoc'
-    rdoc.options << '--line-numbers'
-    rdoc.rdoc_files.add(files)
-  end
-end
-
-
-def setup_extension(dir, extension)
-  ext = "ext/#{dir}"
-  ext_so = "#{ext}/#{extension}.#{Config::CONFIG['DLEXT']}"
-  ext_files = FileList[
-    "#{ext}/*.cpp",
-    "#{ext}/*.h",
-    "#{ext}/extconf.rb",
-    "#{ext}/Makefile",
-    "lib"
-  ] 
-
-  task "lib" do
-    directory "lib"
-  end
-
-  desc "Builds just the #{extension} extension"
-  task extension.to_sym => ["#{ext}/Makefile", ext_so ]
-
-  file "#{ext}/Makefile" => ["#{ext}/extconf.rb"] do
-    extconf "#{ext}"
-  end
-
-  file ext_so => ext_files do
-    make "#{ext}"
-    cp ext_so, "lib"
-  end
-end
-
-
-def base_gem_spec(pkg_name, pkg_version)
-  rm_rf "test/coverage"
-  pkg_version = pkg_version
-  pkg_name    = pkg_name
-  pkg_file_name = "#{pkg_name}-#{pkg_version}"
-  Gem::Specification.new do |s|
-    s.name = pkg_name
-    s.version = pkg_version
-    s.platform = Gem::Platform::RUBY
-    s.has_rdoc = true
-    s.extra_rdoc_files = [ "README" ]
-
-    s.files = %w(COPYING LICENSE README Rakefile) +
-      Dir.glob("{bin,doc/rdoc,test}/**/*") + 
-      Dir.glob("ext/**/*.{h,cpp,rb,rl}") +
-      Dir.glob("{examples,tools,lib}/**/*.rb")
-
-    s.require_path = "lib"
-    s.extensions = FileList["ext/**/extconf.rb"].to_a
-    s.bindir = "bin"
-  end
-end
-
-def setup_gem(pkg_name, pkg_version)
-  spec = base_gem_spec(pkg_name, pkg_version)
-  yield spec if block_given?
-
-  Rake::GemPackageTask.new(spec) do |p|
-    p.gem_spec = spec
-    p.need_tar = true if RUBY_PLATFORM !~ /mswin/
-  end
-end
-
-def sub_project(project, *targets)
-  targets.each do |target|
-    Dir.chdir "projects/#{project}" do
-      sh %{rake --trace #{target.to_s} }
-    end
-  end
-end
-
-# Conditional require rcov/rcovtask if present
-begin
-  require 'rcov/rcovtask'
-  
-  Rcov::RcovTask.new do |t|
-    t.test_files = FileList['test/test*.rb']
-    t.rcov_opts << "-x /usr"
-    t.output_dir = "test/coverage"
-  end
-rescue Object
-end