webmoney 0.0.4.6 → 0.0.4.8

data/ChangeLog

@@ -1,5 +1,17 @@
 ChangeLog
 
+Sat Oct 03 2009 16:18:00 + 0400
+----------------------------
+  V 0.0.4.8
+  * Refactor class Passport
+
+Wed Sep 30 2009 16:09:00 + 0400
+----------------------------
+  V 0.0.4.7
+  * Class Webmoney refactor to module
+  * Add find_wm (X8) interface
+  * Add logger call when send message via simple queue
+
 Wed Aug 12 2009 20:31:00 + 0400
 ----------------------------
   V 0.0.4.6

data/README

@@ -13,6 +13,7 @@ License::   MIT License
 Completed:
 - send_message       - x6
 - get_passport       - x11
+- find_wm            - x8
 - bussines_level
 
 Incompleted (help need!):
@@ -22,7 +23,6 @@ Incompleted (help need!):
 - outgoing_invoices  - x4
 - finish_protect     - x5
 - check_sign         - x7
-- find_wm            - x8
 - balance            - x9
 - incoming_invoices  - x10
 - reject_protection  - x13
@@ -31,6 +31,9 @@ Incompleted (help need!):
 - trust_me              - x15
 - trust_save            - x15
 - create_purse          - x16
+- create_contract       - x17
+- transaction_get       - x18
+
 
 Please, see relative documentation and parameters on wiki:
 
@@ -48,17 +51,26 @@ http://www.webmoney.ru/rus/developers/interfaces/xml/index.shtml (in russian)
 
 = Setup
 
-@wm = Webmoney.new(:wmid => '123456789012', :password => 'my_pass', :key => 'gQABAIR6...2cC8FZTyKyjBM=')
+class MyWM
+  include Webmoney
+end
+
+@wm = MyWM.new(:wmid => '123456789012', :password => 'my_pass', :key => 'gQABAIR6...2cC8FZTyKyjBM=')
 
 wmid = '111222333444'
 
-= Passport (X11) request:
+= Passport (X11)
 
-passport = @wm.request(:get_passport, :wmid => wmid)
+Get attestat data:
+passport = Passport.new(wmid)
+passport.attestat     # { # Hash
+                      #   :attestat => 110, # == FORMAL attestat, as example
+                      #   :created_at => Wed Feb 25 21:54:01 +0300 2004 # Time object
+                      # }
 
-= Bussines level request:
+= Bussines level
 
-bl = @wm.request(:bussines_level, :wmid => wmid)
+bl = @wm.request(:bussines_level, :wmid => wmid)       #  => 15
 
 = Sending message
 
@@ -66,7 +78,24 @@ bl = @wm.request(:bussines_level, :wmid => wmid)
 @wm.request(:send_message, :wmid => wmid, :subj => 'Subject', :text => 'Body of \<b>message\</b>')
 
 ... for many messages (with queue):
-@wm.send_message(:wmid => wmid, :subj => 'Subject', :text => 'Body of \<b>message\</b>')
+@wm.send_message(:wmid => wmid, :subj => 'Subject', :text => 'Body of \<b>message\</b>') do |msg, result|
+  File.open("logfile", "w") do |file|
+    case result
+    when Hash
+      file.puts "Message #{msg.inspect} sended in:#{result[:date]} with id:#{result[:id]}"
+    else
+      file.puts "Error sent message #{msg.inspect}: #{result.message}"
+    end
+  end
+end
+
+= Purses and WMIDs
+
+@wm.wmid_exist?('123456789012')                   # => true
+
+purse = Purse.new('Z123456789012')
+purse.wmid                                        # => '123456789012'
+purse.belong_to?('123456789012')                  # => true
 
 
-Also, see examples into spec's.
+Also, see spec/* for examples.

data/lib/messenger.rb

@@ -1,10 +1,12 @@
 require 'thread'
 
-class Webmoney
+module Webmoney
 
   class Messenger
-    
-    def initialize(owner)
+
+    attr_reader :thread
+
+    def initialize(owner, &logger)
       @webmoney = owner
       @queue = Queue.new
       @thread = Thread.new(@queue) do |q|
@@ -13,16 +15,16 @@ class Webmoney
           unless msg.nil?
             begin
               result = @webmoney.request(:send_message, msg)
-              # Requeue if fail
+              logger.call(msg, result)
+              # Requeue message on fail
               @queue.push(msg) unless result.kind_of?(Hash)
             rescue ResultError, ResponseError => e
-              # TODO Replace this to logger call
-              # puts "#{e}: #{@webmoney.error} #{@webmoney.errormsg}"
-
+              logger.call(msg, e)
               # Requeue message
               @queue.push(msg)
             end
           end
+          sleep(0.2)
         end
       end
     end

data/lib/passport.rb

@@ -1,33 +1,9 @@
 require 'hpricot'
 
 # Class for store attestat information
-class Webmoney
+module Webmoney
   class Passport < Wmid
 
-    # doc - Hpricot::Doc or xml-string
-    def initialize(doc)
-      doc = Hpricot.XML(doc) unless doc.kind_of?(Hpricot::Doc)
-      root = doc.at('/response')
-      if root && root['retval'] && root['retval'].to_i == 0
-        super(doc.at('/response/certinfo')['wmid'])
-        raise NonExistentWmidError unless doc.at('/response/certinfo/attestat')
-        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
-        @attestat = ( recalled + locked > 0) ? ALIAS : tid
-        @created_at = Time.xmlschema(doc.at('/response/certinfo/attestat/row')['datecrt'])
-
-        # TODO more attestat fields...
-
-        # Make all instance variables readable
-        instance_variables.each do |n| 
-          class << self; self; end.instance_eval {
-            attr_reader n.sub(/^@/, '')
-          }
-        end
-      end
-    end
-
     # Attestate types
     ALIAS       = 100
     FORMAL      = 110
@@ -41,5 +17,21 @@ class Webmoney
     SERVICE     = 190
     SERVICE2    = 200
     OPERATOR    = 300
+
+    attr_reader :attestat
+
+    def self.worker= (worker)
+      @@worker = worker
+    end
+
+    def self.worker
+      @@worker
+    end
+
+    def attestat
+      # memoize
+      @attestat ||= @@worker.request(:get_passport, :wmid => self)
+    end
+
   end
 end

data/lib/purse.rb

@@ -0,0 +1,39 @@
+# Support class
+module Webmoney
+  class Purse < String
+
+    # Parameter: purse - String or Purse
+
+    def initialize(str)
+      str = str.to_s unless str.kind_of?(String)
+      raise IncorrectPurseError, str unless str =~ /^[BCDEGRUYZ]\d{12}$/
+      super(str)
+    end
+
+    def purse; self end
+
+    def self.worker= (worker)
+      @@worker = worker
+    end
+
+    def self.worker
+      @@worker
+    end
+
+    # Get WMID for this purse
+    def wmid
+      # memoize
+      @wmid ||=
+        begin
+          res = @@worker.request(:find_wm, :purse => self)
+          res[:retval] == 1 ? Wmid.new(res[:wmid]) : nil
+        end
+    end
+
+    # Purse is belong to wmid?
+    def belong_to?(wmid)
+      self.wmid == Wmid.new(wmid)
+    end
+
+  end
+end

data/lib/request_result.rb

@@ -0,0 +1,36 @@
+module Webmoney::RequestResult    # :nodoc:all
+
+  def result_check_sign(doc)
+    doc.at('//testsign/res').inner_html == 'yes' ? true : false
+  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'])
+    }
+  end
+
+  def result_bussines_level(doc)
+    doc.at('//level').inner_html.to_i
+  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 }
+  end
+
+  def result_find_wm(doc)
+    {
+      :retval => doc.at('//retval').inner_html.to_i,
+      :wmid   => (doc.at('//testwmpurse/wmid').inner_html rescue nil),
+      :purse  => (doc.at('//testwmpurse/purse').inner_html rescue nil)
+    }
+  end
+
+end

data/lib/request_retval.rb

@@ -0,0 +1,23 @@
+module Webmoney::RequestRetval    # :nodoc:all
+
+  def retval_common(doc)
+    retval_element = doc.at('//retval')
+    @error = retval_element.inner_html.to_i
+    @errormsg = doc.at('//retdesc') ? doc.at('//retdesc').inner_html : ''
+    raise Webmoney::ResultError, [@error, @errormsg].join(' ') unless @error == 0
+  end
+
+  def retval_get_passport(doc)
+    # retval is attribute <response>
+    @error = doc.at('//response')['retval'].to_i
+    @errormsg = doc.at('//response')['retdesc']
+    raise Webmoney::ResultError, [@error, @errormsg].join(' ') unless @error == 0
+    raise Webmoney::NonExistentWmidError unless doc.at('/response/certinfo/attestat')
+  end
+
+  def retval_find_wm(doc)
+    # do nothing
+    # retval = { 1 - found; 0 - not found }
+  end
+
+end

data/lib/{request.rb → request_xml.rb}

@@ -1,11 +1,11 @@
-module Webmoney::XMLRequest    # :nodoc:all
+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  
+  end
 
   def xml_get_passport(opt)
     x = envelope(false)
@@ -66,4 +66,22 @@ module Webmoney::XMLRequest    # :nodoc:all
     x
   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
+  end
+
 end

data/lib/webmoney.rb

@@ -11,20 +11,15 @@ require 'builder'
 require 'hpricot'
 
 $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 }
 
-require 'wmsigner'
-require 'wmid'
-require 'passport'
-require 'request'
-require 'result'
-require 'messenger'
-
-# Main class for Webmoney lib. Instance contain info
+# Module for Webmoney lib. Instance contain info
 # for WMT-interfaces requests (wmid, key, etc).
 # Implement general requests.
-class Webmoney
+module Webmoney
 
-  include XMLRequest
+  include RequestXML
+  include RequestRetval
   include RequestResult
 
   # Error classes
@@ -32,12 +27,14 @@ class Webmoney
   class RequestError < WebmoneyError;  end
   class ResultError < WebmoneyError;  end
   class IncorrectWmidError < WebmoneyError; end
+  class IncorrectPurseError < WebmoneyError; end
   class NonExistentWmidError < WebmoneyError; end
   class CaCertificateError < WebmoneyError; end
   
-  attr_reader :wmid, :error, :errormsg, :last_request, :messenger
-  attr_accessor :interfaces
-  
+  attr_reader :wmid, :error, :errormsg, :last_request
+  attr_accessor :interfaces, :messenger
+
+
   # Required options:
   #
   # - :wmid - WMID
@@ -51,11 +48,12 @@ class Webmoney
   #
   # Optional:
   #
-  # - :ca_cert - path of a CA certification file in PEM format
+  # - :ca_cert - file CA certificate or path to directory with certs (in PEM format)
 
   def initialize(opt = {})
+
     @wmid = Wmid.new(opt[:wmid])
-    
+
     # classic or light
     case opt[:key]
       when String
@@ -65,9 +63,9 @@ class Webmoney
         @cert = opt[:cert]
         @password = opt[:password]
     end
-    
+
     # ca_cert or default
-    @ca_cert = 
+    @ca_cert =
       if opt[:ca_cert].nil?
          File.dirname(__FILE__) + '/../lib/certs/'
       else
@@ -75,7 +73,7 @@ class Webmoney
       end
 
     w3s = 'https://w3s.wmtransfer.com/asp/'
-    
+
     @interfaces = {
       'create_invoice'  => URI.parse( w3s + 'XMLInvoice.asp' ), # x1
       'create_transaction'  => URI.parse( w3s + 'XMLTrans.asp' ), # x2
@@ -94,17 +92,22 @@ class Webmoney
       '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')
+
+    # initialize workers by self
+    Purse.worker = self
+    Passport.worker = self
   end
 
   # Webmoney instance is classic type?
-
   def classic?
-    ! @signer.nil?
+    !! @signer
   end
   
   # Send message through Queue and Thread
@@ -112,23 +115,32 @@ class Webmoney
   # Params: { :wmid, :subj, :text }
 
   def send_message(params)
-    @messenger = Messenger.new(self) if @messenger.nil?
+    @messenger = Messenger.new(self){} if @messenger.nil?
     @messenger.push(params)
   end
+
+  # Check existent WMID or not
+  #
+  # Params: wmid
+  def wmid_exist?(wmid)
+    request(:find_wm, :wmid => Wmid.new(wmid))[:retval] == 1
+  end
   
   # Generic function for request to WMT-interfaces
 
   def request(iface, opt ={})
-    reqn = reqn()
-    raise ArgumentError unless opt.kind_of?(Hash)
-    opt[:wmid] = @wmid if opt[:wmid].nil?
+    raise ArgumentError, "should be hash" unless opt.kind_of?(Hash)
+
+    # Use self wmid when not defined
+    opt[:wmid] ||= @wmid
 
     # Do request
     res = https_request(iface, make_xml(iface, opt))
 
     # Parse response
-    parse_retval(res)
-    make_result(iface, res)
+    doc = Hpricot.XML(res)
+    parse_retval(iface, doc)
+    make_result(iface, doc)
   end
 
   # Signing string by instance wmid's,
@@ -173,24 +185,6 @@ class Webmoney
     end
   end
 
-  def parse_retval(response_xml)         # :nodoc:
-    doc = Hpricot.XML(response_xml)
-    retval_element = doc.at('//retval')
-    # Workaround for passport interface
-    unless retval_element.nil?
-      retval = retval_element.inner_html.to_i
-      retdesc = doc.at('//retdesc').inner_html unless doc.at('//retdesc').nil?
-    else
-      retval = doc.at('//response')['retval'].to_i
-      retdesc = doc.at('//response')['retdesc']
-    end
-    unless retval == 0
-        @error = retval
-        @errormsg = retdesc
-        raise ResultError, [@error, @errormsg].join(' ')
-    end
-  end
-
   # Create unique Request Number based on time,
   # return 16 digits string
   def reqn
@@ -200,18 +194,22 @@ class Webmoney
   end
 
   def make_xml(iface, opt)            # :nodoc:
-    iface_func = ('xml_'+iface.to_s).to_sym
-    self.send(iface_func, opt).target!
-  rescue NoMethodError
-    raise NotImplementedError, "#{iface_func}()"
+    iface_func = "xml_#{iface}"
+    send(iface_func, opt).target!
   end
 
-  def make_result(iface, res)         # :nodoc:
-    doc = Hpricot.XML(res)
-    iface_result = ('result_'+iface.to_s).to_sym
-    self.send(iface_result, doc)
-  rescue NoMethodError
-    raise NotImplementedError, "#{iface_result}()"
+  def parse_retval(iface, doc)         # :nodoc:
+    method = "retval_#{iface}"
+    if respond_to?(method)
+      send(method, doc)
+    else
+      retval_common(doc)
+    end
+  end
+
+  def make_result(iface, doc)         # :nodoc:
+    iface_result = "result_#{iface}"
+    send(iface_result, doc)
   end
 
 end

data/lib/wmid.rb

@@ -1,5 +1,5 @@
 # Support class
-class Webmoney
+module Webmoney
   class Wmid < String
 
     # Parameter: wmid - String or Wmid

data/rakefile

@@ -4,7 +4,7 @@ require 'rake/clean'
 require 'tools/rakehelp'
 require 'spec/rake/spectask'
 
-GEM_VERSION="0.0.4.6"
+GEM_VERSION="0.0.4.7"
 
 setup_extension('wmsigner', 'wmsigner')
 

data/spec/spec_helper.rb

@@ -15,8 +15,12 @@ if ENV['WM_ENV']
 end
 ::WmConfig = OpenStruct.new(config.common)
 
+class TestWM
+  include Webmoney
+end
+
 def webmoney
-  Webmoney.new :wmid => WmConfig.wmid,
+  TestWM.new :wmid => WmConfig.wmid,
     :password => WmConfig.password,
     :key => WmConfig.key,
     :ca_cert => WmConfig.ca_cert

data/spec/unit/messenger_spec.rb

@@ -1,25 +1,40 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-class Webmoney
+module Webmoney
 
   describe Messenger, "class" do
 
     before(:each) do                                                                                                   
-      @wm = webmoney()                                                                                               
+      @wm = webmoney()
+      @params = { :wmid => @wm.wmid, :subj => 'FIRST', :text => 'BODY' }
     end
     
     it "should create instance" do
       @wm.messenger.should be_nil
-      @wm.send_message(:wmid => @wm.wmid, :subj => 'FIRST', :text => 'BODY')
+      @wm.send_message(@params)
       @wm.messenger.should be_instance_of(Messenger)
     end
-    
+
+    it "should send with logger call" do
+      self.should_receive(:log_it).once()
+      logger = Proc.new do |msg, result|
+        case result
+        when Hash
+          log_it "Message #{msg.inspect} sended in:#{result[:date]} with id:#{result[:id]}"
+        else
+          log_it "Error sent message #{msg.inspect}: #{result.message}"
+        end
+      end
+      @wm.messenger = Messenger.new(@wm, &logger)
+      @wm.send_message(@params)
+      sleep(2)
+    end
+
     it "should call request(:send_message) twice" do
-      params = { :wmid => @wm.wmid, :subj => 'FIRST', :text => 'BODY' }
       @wm.should_receive(:request).
-        with(:send_message, params).twice().and_return({:test => 'test'})
-      @wm.send_message(params)
-      @wm.send_message(params)
+        with(:send_message, @params).twice().and_return({:test => 'test'})
+      2.times {@wm.send_message(@params)}
+      sleep(2)
     end
 
   end

data/spec/unit/passport_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-class Webmoney
+module Webmoney
 
   describe Passport, "class" do
 
@@ -8,38 +8,34 @@ class Webmoney
       @wm = webmoney()                                                                                               
     end
     
-    def make_request(wmid=nil)      #   :nodoc:
-      test_wmid = wmid || @wm.wmid
-      x = Builder::XmlMarkup.new
-      x.request do
-        x.wmid @wm.wmid
-        x.passportwmid test_wmid
-        x.sign @wm.send(:sign, @wm.wmid + test_wmid)
-        x.params { x.dict 0; x.info 1; x.mode 0 }
-      end
-      x.target!
-    end
-    
-    it "should return empty on incorrect xml" do
-      Passport.new('<response/>').should == ''
+    it "should return Passport instance" do
+      Passport.new(@wm.wmid).should be_instance_of(Passport)
     end
 
-    it "should return Passport instance" do
-      Passport.new(@wm.send(:https_request, :get_passport, make_request)).should be_instance_of(Passport)
+    it "request result get_passport should be Hash" do
+      @wm.request(:get_passport, :wmid => @wm.wmid).should be_instance_of(Hash)
     end
     
     it "should return correct data" do
       wmid = '000000000007'
-      p = Passport.new(@wm.send(:https_request, :get_passport, make_request(wmid)))
+      p = Passport.new(wmid)
       p.wmid.should == wmid
-      p.attestat.should == Webmoney::Passport::REGISTRATOR
-      p.created_at.strftime('%Y-%m-%d %H:%M:%S').should == '2004-02-25 21:54:01'
+      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'
       
       wmid = '370860915669'
-      p = Passport.new(@wm.send(:https_request, :get_passport, make_request(wmid)))
+      p = Passport.new(wmid)
       p.wmid.should == wmid
-      p.attestat.should == Webmoney::Passport::ALIAS
-      p.created_at.strftime('%Y-%m-%d %H:%M:%S').should == '2006-04-19 10:16:30'
+      p.attestat[:attestat].should == Webmoney::Passport::ALIAS
+      p.attestat[:created_at].strftime('%Y-%m-%d %H:%M:%S').should == '2006-04-19 10:16:30'
+    end
+
+    it "should raise exception on bad WMID" do
+      lambda {@wm.request(:get_passport, :wmid => '111')}.should raise_error(Webmoney::ResultError)
+    end
+
+    it "should raise exception on non existent WMID" do
+      lambda {@wm.request(:get_passport, :wmid => '012345678901')}.should raise_error(Webmoney::NonExistentWmidError)
     end
 
   end

data/spec/unit/purse_spec.rb

@@ -0,0 +1,56 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+module Webmoney
+
+  describe Purse, "class" do
+
+    before(:all) do
+      # initialize worker
+      @wm = webmoney
+    end
+
+    before(:each) do
+      @t = Purse.new('Z136894439563')
+    end
+
+    it "should be kind of Wmid" do
+      @t.should be_kind_of(Purse)
+    end
+
+    it "should be string" do
+      @t.should == 'Z136894439563'
+    end
+
+    it "should raise error on incorrect" do
+      lambda{ Purse.new('X123456789012') }.
+        should raise_error(IncorrectPurseError)
+    end
+
+    it "should return wmid" do
+      @t.wmid.should == '405424574082'
+    end
+
+    it "should return true" do
+      @wm.should_receive(:request).with(:find_wm, :purse => @t).and_return(:retval=>1, :wmid => '405424574082')
+      @t.belong_to?('405424574082').should be_true
+    end
+
+    it "should return false" do
+      @wm.should_receive(:request).with(:find_wm, :purse => @t).and_return(:retval=>0)
+      @t.belong_to?('123456789012').should be_false
+    end
+
+    context "memoize" do
+
+      before(:each) { @t.wmid }
+
+      it "it" do
+        @wm.should_not_receive(:request).with(:find_wm, :purse => @t)
+        @t.belong_to?('405424574082').should be_true
+      end
+
+    end
+
+  end
+
+end

data/spec/unit/webmoney_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-class Webmoney
+module Webmoney
 
   describe Webmoney, "class" do
 
@@ -8,10 +8,6 @@ class Webmoney
       @wm = webmoney()
     end
 
-    it "should be instance of Webmoney" do
-      @wm.should be_instance_of(Webmoney)
-    end
-    
     it "should be classic" do
       @wm.classic?.should be_true
     end
@@ -95,10 +91,6 @@ class Webmoney
       @wm.errormsg.should match(%r{неверно указан проверяемый WMID})
     end
 
-    it "should get_passport" do
-      @wm.request(:get_passport, :wmid => @wm.wmid).should be_instance_of(Passport)
-    end
-
     it "should raise exception on bad WMID" do
       lambda {@wm.request(:get_passport, :wmid => '111')}.should raise_error(Webmoney::ResultError)
     end
@@ -117,15 +109,17 @@ class Webmoney
     end
     
     it "should send message" do
-      result = @wm.request(:send_message, 
-        :wmid => @wm.wmid, :subj => 'Текст', :text => 'Тело <b>сообщения</b>')
+      result = @wm.request( :send_message,
+        :wmid => @wm.wmid,
+        :subj => 'Текст',
+        :text => 'Тело <b>сообщения</b>')
       result.should be_kind_of(Hash)
       result[:id].should match(/^\d*$/)
       ((result[:date] + 60) > Time.now).should be_true
     end
     
     it "should raise error on undefined xml func" do
-      lambda { @wm.request(:unexistent_interface) }.should raise_error(::NotImplementedError)
+      lambda { @wm.request(:unexistent_interface) }.should raise_error(::NoMethodError)
     end
 
   end

data/spec/unit/wmid_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-class Webmoney
+module Webmoney
 
   describe Wmid, "class" do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webmoney
 version: !ruby/object:Gem::Version 
-  version: 0.0.4.6
+  version: 0.0.4.8
 platform: ruby
 authors: 
 - Alexander Oryol
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-12 00:00:00 +04:00
+date: 2009-10-03 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,11 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: 
+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.
+
 email: eagle.alex@gmail.com
 executables: []
 
@@ -50,9 +54,11 @@ files:
 - lib/certs/AddTrust_External_Root.crt
 - lib/certs/WebMoneyCA.crt
 - lib/messenger.rb
-- lib/request.rb
-- lib/result.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
@@ -104,6 +110,7 @@ test_files:
 - 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

data/lib/result.rb

@@ -1,21 +0,0 @@
-module Webmoney::RequestResult    # :nodoc:all
-
-  def result_check_sign(doc)
-    doc.at('//testsign/res').inner_html == 'yes' ? true : false
-  end
-
-  def result_get_passport(doc)
-    Webmoney::Passport.new(doc)
-  end
-
-  def result_bussines_level(doc)
-    doc.at('//level').inner_html.to_i
-  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 }
-  end
-end