webmoney 0.0.9 → 0.0.10

data/ChangeLog

@@ -1,5 +1,14 @@
 ChangeLog
 
+Wed Oct 06 2010 11:14:00 +0300
+----------------------------
+  V 0.0.10
+  * Add login interface
+  * Fix bug in Passport, when datereg == 0
+  * Earlier added:
+  - create_invoice     - x1
+  - outgoing_invoices  - x4
+
 Mon Sep 20 2010 14:31:00 +0300
 ----------------------------
   V 0.0.9

data/README

@@ -14,16 +14,17 @@ License::   MIT License
 == Request types
 
 Completed:
+- create_invoice     - x1
+- create_transaction - x2
+- outgoing_invoices  - x4
 - send_message       - x6
 - get_passport       - x11
 - find_wm            - x8
 - bussines_level
+- login
 
 Incompleted (help need!):
-- create_invoice     - x1
-- create_transaction - x2
 - operation_history  - x3
-- outgoing_invoices  - x4
 - finish_protect     - x5
 - check_sign         - x7
 - balance            - x9

data/RUNNING_TESTS

@@ -1,12 +1,27 @@
 == Running tests
 
-For run tests create ~/.wm/config.yml file:
+First, you should have two WMIDs associated with Personal attestate (WMT require!).
+Then, create ~/.wm/config.yml file:
 
-common:
-  type: classic
-  wmid: '123456789012'
+ca_cert: file_or_path_to_directory # optional, all needed certs in lib
+first:
+  wmtype: classic
+  wmid: '123456789012' # quotes for interpretate as string
   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
+  wmz: Z123456789012
+second:
+  wmtype: light
+  wmid: '012345678901'
+  password: _your_another_password_
+  cert: webmoney.pem
+  key: webmoney.key
+  wmz: Z012345678901
+  rid: 57f9ff86-1afb-431f-aff4-9dfb00b70773     # site RID from login.wmtransfer.com
 
-and type (RSpec required): rake spec
+
+
+HOWTO convert Light-keys:
+Russian: https://wiki.webmoney.ru/wiki/show/Konvertatsiya_klyuchey_WM_Keeper_Light_v_PEM_format
+
+Then type (RSpec required): rake spec

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/lib/interfaces.rb

@@ -0,0 +1,28 @@
+module Webmoney
+  # 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',
+      :login           => 'https://login.wmtransfer.com/ws/authorize.xiface'           # login
+    }
+  end
+end

data/lib/passport.rb

@@ -76,7 +76,7 @@ module Webmoney
       end
 
       wmids = root.xpath('certinfo/wmids/row').inject({}) do |memo, elm|
-        attrs = {:created_at => Time.xmlschema(elm['datereg'])}
+        attrs = {:created_at => (Time.xmlschema(elm['datereg']) rescue nil)}
         attrs.merge!(:nickname => elm['nickname']) unless elm['nickname'].empty?
         attrs.merge!(:info => elm['info']) unless elm['info'].empty?
         memo.merge!(elm['wmid'] => attrs)

data/lib/request_result.rb

@@ -14,10 +14,10 @@ module Webmoney::RequestResult    # :nodoc:all
   end
 
   def result_send_message(doc)
-    time = doc.at('//message/datecrt').inner_html
-    m = time.match(/(\d{4})(\d{2})(\d{2}) (\d{2}):(\d{2}):(\d{2})/)
-    time = Time.mktime(*m[1..6])
-    { :id => doc.at('//message')['id'], :date => time }
+    {
+      :id => doc.at('//message')['id'],
+      :date => Time.parse(doc.at('//message/datecrt').inner_html)
+    }
   end
 
   def result_find_wm(doc)
@@ -38,7 +38,7 @@ module Webmoney::RequestResult    # :nodoc:all
       res[:id]  = (doc.at('//invoice').attributes['id'].value.to_i)
       res[:ts]  = (doc.at('//invoice').attributes['ts'].value.to_i)
       res[:state] = (doc.at('//invoice/state').inner_html.to_i)
-      res[:created_at] = (DateTime.strptime(doc.at('//invoice/datecrt').inner_html, "%Y%m%d %H:%M:%S"))
+      res[:created_at] = Time.parse(doc.at('//invoice/datecrt').inner_html)
     end
     res
   end
@@ -69,7 +69,7 @@ module Webmoney::RequestResult    # :nodoc:all
           value = tag.inner_html
           value = value.to_i if [:orderid, :tranid, :period, :expiration, :wmtranid, :state].include?(name)
           value = value.to_f if [:rest, :amount, :comiss].include?(name)
-          value = DateTime.strptime(value, "%Y%m%d %H:%M:%S") if [:datecrt, :dateupd].include?(name)
+          value = Time.parse(value) if [:datecrt, :dateupd].include?(name)
           r[name] = value
         end
         r
@@ -77,4 +77,14 @@ module Webmoney::RequestResult    # :nodoc:all
     end
     res
   end
+
+  def result_login(doc)
+    {
+      :retval => doc.at('/response')['retval'].to_i,
+      :retdesc   => doc.at('/response')['sval'],
+      :lastAccess => doc.at('/response')['lastAccess'],
+      :expires => doc.at('/response')['expires']
+    }
+  end
+
 end

data/lib/request_retval.rb

@@ -32,4 +32,16 @@ module Webmoney::RequestRetval    # :nodoc:all
     @errormsg = doc.at('//retdesc').inner_html
     raise Webmoney::ResultError, [@error, @errormsg].join(' ') unless @error == 0
   end
+
+  def retval_login(doc)
+    if retval = doc.at('/response')['retval']
+      @error = retval.to_i
+      @errormsg = doc.at('/response')['sval']
+    else
+      @error = -3
+      @errormsg = 'Unknown response'
+    end
+    raise Webmoney::ResultError, [@error, @errormsg].join(' ') unless @error == 0
+  end
+
 end

data/lib/request_xml.rb

@@ -154,4 +154,18 @@ module Webmoney::RequestXML    # :nodoc:all
       }
     }
   end
+
+  def xml_login(opt)
+    Nokogiri::XML::Builder.new { |x|
+      x.send('request') {
+        x.siteHolder opt[:siteHolder] || @wmid
+        x.user opt[:WmLogin_WMID]
+        x.ticket opt[:WmLogin_Ticket]
+        x.urlId  opt[:WmLogin_UrlID]
+        x.authType opt[:WmLogin_AuthType]
+        x.userAddress opt[:remote_ip]
+      }
+    }
+  end
+
 end

data/lib/webmoney.rb

@@ -11,7 +11,7 @@ require 'iconv'
 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 }
+%w(wmsigner interfaces wmid passport purse request_xml request_retval request_result messenger).each{|lib| require lib}
 
 # Module for Webmoney lib. Instance contain info
 # for WMT-interfaces requests (wmid, key, etc).
@@ -31,7 +31,7 @@ module Webmoney
   class NonExistentWmidError < WebmoneyError; end
   class CaCertificateError < WebmoneyError; end
   
-  attr_reader :wmid, :error, :errormsg, :last_request, :last_response, :interfaces
+  attr_reader :wmid, :error, :errormsg, :last_request, :last_response, :interfaces, :rid
   attr_accessor :messenger
 
 
@@ -40,46 +40,18 @@ module Webmoney
     '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:
   #
   # - :wmid - WMID
+  #
+  # Optional:
+  #
   # - :password - on Classic key or Light X509 certificate & key
   # - :key - Base64 string for Classic key
-  #
   # OR
-  # #TODO
   # - :key - OpenSSL::PKey::RSA or OpenSSL::PKey::DSA object
   # - :cert - OpenSSL::X509::Certificate object
   #
-  # Optional:
-  #
   # - :ca_cert - file CA certificate or path to directory with certs (in PEM format)
 
   def initialize(opt = {})
@@ -108,6 +80,8 @@ module Webmoney
         opt[:ca_cert]
       end
 
+    @rid = opt[:rid]
+
     # Iconv.new(to, from)
     @ic_in = Iconv.new('UTF-8', 'CP1251')
     @ic_out = Iconv.new('CP1251', 'UTF-8')

data/spec/spec_helper.rb

@@ -1,24 +1,6 @@
 #encoding: utf-8
 #
-# ~/.wm/config.yml example:
-#
-# ca_cert:
-#
-# first:
-#   wmtype: classic
-#   wmid: 
-#   password: 
-#   key: 
-#   wmz:
-#
-# second:
-#   wmtype: light
-#   wmid: 
-#   password: 
-#   cert: webmoney.cert
-#   key: webmoney.key
-#   wmz:
-#
+# Please, see RUNNING_TESTS
 
 require 'rubygems'
 require 'test/unit'
@@ -53,18 +35,30 @@ end
 def getwm(config)
   if config.wmtype == "light"
     # light
-    cert = OpenSSL::X509::Certificate.new(File.read(config.cert))
-    key = OpenSSL::PKey::RSA.new(File.read(config.key), config.password)
+    cert = OpenSSL::X509::Certificate.new(
+      begin
+        File.read(config.cert)
+      rescue
+        File.read("#{ENV['HOME']}/.wm/#{config.cert}")
+      end)
+    key = OpenSSL::PKey::RSA.new(
+      begin
+        File.read(config.key)
+      rescue
+        File.read("#{ENV['HOME']}/.wm/#{config.key}")
+      end, config.password)
     TestWM.new :wmid => config.wmid,
       :key => key,
       :cert => cert,
-      :ca_cert => WmConfig.ca_cert
+      :ca_cert => WmConfig.ca_cert,
+      :rid => config.rid
   else
     # classic
     TestWM.new :wmid => config.wmid,
       :password => config.password,
       :key => config.key,
-      :ca_cert => config.ca_cert
+      :ca_cert => config.ca_cert,
+      :rid => config.rid
   end
 end
 

data/spec/unit/webmoney_spec.rb

@@ -134,19 +134,6 @@ describe Webmoney, "class" do
     ((result[:date] + 60) > Time.now).should be_true
   end
 
-  it "should create invoice" do
-    # TODO
-    #@wm.request(
-    #  :create_invoice,
-    #  :orderid => 3,
-    #  :amount => 10.0,
-    #  :customerwmid => "TEST_WMID",
-    #  :storepurse => "Z161888783954",
-    #  :desc => "Test invoice",
-    #  :address => "Address"
-    #)
-  end
-
   it "should return operation history" do
     # TODO
     #@mywm.request(:operation_history,
@@ -206,4 +193,33 @@ describe Webmoney, "class" do
     end
   end
 
+  describe "login interface" do
+
+    before(:each) do
+      @ca = contragent()
+    end
+
+    it "return InvalidArgument" do
+      lambda { @ca.request(:login,
+        :WmLogin_WMID => @ca.wmid,
+        :WmLogin_UrlID => 'invalid_rid')
+      }.should raise_error(Webmoney::ResultError, "1 InvalidArgument")
+      @ca.error.should == 1
+      @ca.errormsg.should == 'InvalidArgument'
+    end
+
+    it "return InvalidTicket" do
+      lambda { @ca.request(:login,
+        :WmLogin_WMID => @ca.wmid,
+        :WmLogin_UrlID => @ca.rid,
+        :WmLogin_Ticket => 'XVWuooAEOJ0gG5NyDXJ0Zu0GffroqkG7APNKFmCAzA7XNVSx',
+        :WmLogin_AuthType => 'KeeperLight',
+        :remote_ip => '127.0.0.1'
+        )
+      }.should raise_error(Webmoney::ResultError)
+      @ca.error.should == 2
+      @ca.errormsg.should == 'FalseTicket'
+    end
+  end
+
 end

data/webmoney.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webmoney}
-  s.version = "0.0.9"
+  s.version = "0.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Oryol"]
-  s.date = %q{2010-09-20}
+  s.date = %q{2010-10-06}
   s.email = %q{eagle.alex@gmail.com}
   s.extensions = ["ext/wmsigner/extconf.rb"]
   s.extra_rdoc_files = [
@@ -44,6 +44,7 @@ Gem::Specification.new do |s|
      "lib/certs/3c58f906.0",
      "lib/certs/AddTrust_External_Root.crt",
      "lib/certs/WebMoneyCA.crt",
+     "lib/interfaces.rb",
      "lib/messenger.rb",
      "lib/passport.rb",
      "lib/purse.rb",

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: webmoney
 version: !ruby/object:Gem::Version 
-  hash: 13
   prerelease: false
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Alexander Oryol
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 +04:00
+date: 2010-10-06 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -69,6 +67,7 @@ files:
 - lib/certs/3c58f906.0
 - lib/certs/AddTrust_External_Root.crt
 - lib/certs/WebMoneyCA.crt
+- lib/interfaces.rb
 - lib/messenger.rb
 - lib/passport.rb
 - lib/purse.rb
@@ -102,7 +101,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -111,7 +109,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"