webmoney 0.0.13 → 0.0.14

data/README.md

@@ -20,6 +20,7 @@ Completed:
 * outgoing_invoices  - x4
 * send_message       - x6
 * find_wm            - x8
+* balance            - x9
 * get_passport       - x11
 * i_trust            - x15
 * trust_me           - x15
@@ -32,7 +33,6 @@ Incompleted (help need!):
 * operation_history  - x3
 * finish_protect     - x5
 * check_sign         - x7
-* balance            - x9
 * incoming_invoices  - x10
 * reject_protection  - x13
 * transaction_moneyback - x14
@@ -83,7 +83,7 @@ mywm = MyWM.new(:wmid => '123456789012', :cert => cert, :key => key)
 Get attestat data:
 
 ```ruby
-passport = Webmoney::Passport.new(wmid)
+passport = Webmoney::Passport.new(wmid, :mode => 1) # optionally :mode, :dict, :info
 passport.attestat     # { # hash
                       #   :attestat => 110, # == FORMAL attestat, as example
                       #   :created_at => Wed Feb 25 21:54:01 +0300 2004 # Time object

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

data/ext/wmsigner/wmsigner.cpp

@@ -45,7 +45,7 @@ extern "C" VALUE signer_new(VALUE self, VALUE szWMID, VALUE szPwd, VALUE szKeyDa
 {
     Signer *pSign;
 
-    if(NIL_P(szWMID))	rb_raise(rb_eArgError, "nil wmid");    
+    if(NIL_P(szWMID))	rb_raise(rb_eArgError, "nil wmid");
 
     // check WMID
     if (! IsWmid(RSTRING_PTR(szWMID))) rb_raise(rb_eArgError, "Incorrect WMID");
@@ -56,7 +56,7 @@ extern "C" VALUE signer_new(VALUE self, VALUE szWMID, VALUE szPwd, VALUE szKeyDa
 
     // check base64 data
     if ( RSTRING_LEN(szKeyData64) != 220 ) rb_raise(rb_eArgError, "Illegal size for base64 keydata");
-    
+
     char KeyBuffer[ASCII_SIZE];
     int bytes = code64( ENCODE, KeyBuffer, ASCII_SIZE, RSTRING_PTR(szKeyData64), BUF_64_SIZE );
 
@@ -68,7 +68,7 @@ extern "C" VALUE signer_new(VALUE self, VALUE szWMID, VALUE szPwd, VALUE szKeyDa
 
     pSign->isIgnoreKeyFile = TRUE;
     pSign->Key64Flag = TRUE;
-        
+
     if (pSign) pSign->SetKeyFromCL( TRUE, KeyBuffer );
 
     return tdata;
@@ -86,12 +86,12 @@ extern "C" VALUE signer_sign(VALUE self, VALUE szIn)
 
     Signer *pSign;
 
-    Data_Get_Struct(self, Signer, pSign);    
-    
+    Data_Get_Struct(self, Signer, pSign);
+
     if(NIL_P(szIn)) rb_raise(rb_eArgError, "nil for sign");
 
     if (pSign)
-    {   
+    {
       szptr szSign;
 			if (pSign->Sign(RSTRING_PTR(szIn), szSign))
 			{
@@ -101,16 +101,14 @@ extern "C" VALUE signer_sign(VALUE self, VALUE szIn)
 
     int err_no = pSign->ErrorCode();
     if (err_no){
-			char err[20];
-			sprintf(err, "Signer error: %d", err_no);
-			rb_raise(rb_eStandardError, err);
+			rb_raise(rb_eStandardError, "Signer error: %d", err_no);
     }
 
    return ret;
 }
 
 // The initialization method for this module
-extern "C" void Init_wmsigner() 
+extern "C" void Init_wmsigner()
 {
     cSigner = rb_define_class("Signer", rb_cObject);
     rb_define_singleton_method(cSigner, "new", (ruby_method*) &signer_new, 3);

data/lib/interfaces.rb

@@ -13,7 +13,8 @@ module Webmoney
       :find_wm            => { :url => 'XMLFindWMPurse.asp' },   # x8
       :balance            => { :url => 'XMLPurses.asp' },        # x9
       :incoming_invoices  => { :url => 'XMLInInvoices.asp' },    # x10
-      :get_passport       => { :url => 'https://passport.webmoney.ru/asp/XMLGetWMPassport.asp' }, # x11
+      :get_passport       => { :url => 'https://passport.webmoney.ru/asp/XMLGetWMPassport.asp' , # x11
+                               :x509 => lambda {|url| url.sub(/\.asp$/, 'Cert.asp')} },
       :reject_protection  => { :url => 'XMLRejectProtect.asp' }, # x13
       :transaction_moneyback => { :url => 'XMLTransMoneyback.asp' }, # x14
       :i_trust            => { :url => 'XMLTrustList.asp'  },    # x15
@@ -37,16 +38,16 @@ module Webmoney
     # default transform to x509 version for w3s urls
     default_lambda = lambda {|url| url.sub(/\.asp$/, 'Cert.asp') }
 
-    @interfaces = interface_urls.inject({}) do |m,k|
-      url = k[1][:url]
+    @interfaces = interface_urls.inject({}) do |m,(k,v)|
+      url = v[:url]
       unless url.match %r{^https://}
         url = w3s_url + url
         url = default_lambda.call(url) if !classic?
       else
-        transform = k[1][:x509]
+        transform = v[:x509]
         url = transform.call(url) if !classic? && transform && transform.respond_to?(:call)
       end
-      m.merge!(k[0] => URI.parse(url))
+      m.merge!(k => URI.parse(url))
     end
 
   end

data/lib/passport.rb

@@ -30,6 +30,12 @@ module Webmoney
       @@worker
     end
 
+    # extra permit :dict, :info, :dict params
+    def initialize(str, extra = {})
+      super(str)
+      @extra = extra
+    end
+
     # memoize data
     def attestat; @attestat ||= getinfo[:attestat] end
     def directory; @directory ||= getinfo[:directory] end
@@ -40,12 +46,7 @@ module Webmoney
     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
+      @info ||= @@worker.request(:get_passport, @extra.merge(:wmid => self))
     end
 
     def self.parse_result(doc)

data/lib/request_result.rb

@@ -104,4 +104,19 @@ module Webmoney::RequestResult    # :nodoc:all
     }
   end
 
+  def result_balance(doc)
+    purses = []
+    doc.at('//purses').children.each do |purse|
+      purses_hash = {}
+      purse.children.each do |child|
+        purses_hash[child.name.to_sym] = child.content
+      end
+      purses << purses_hash unless purses_hash.empty?
+    end
+    {
+      :purses => purses,
+      :retval => doc.at('//retval').inner_html.to_i
+    }
+  end
+
 end

data/lib/request_retval.rb

@@ -52,4 +52,11 @@ module Webmoney::RequestRetval    # :nodoc:all
     raise Webmoney::ResultError, [@error, @errormsg].join(' ') unless not_exception_result_errors.include?(@error)
   end
 
+  def retval_balance(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
+
 end

data/lib/request_xml.rb

@@ -4,15 +4,15 @@ module Webmoney::RequestXML    # :nodoc:all
   def xml_get_passport(opt)
     Nokogiri::XML::Builder.new { |x|
       x.request {
-        x.wmid @wmid
+        x.wmid @wmid if classic?
         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 )
+        # unless mode == 1, signed data need'nt, but elem <sign/> required
+        x.sign( opt[:mode]==1 ? sign(@wmid+opt[:wmid]) : nil ) if classic?
       }
     }
   end
@@ -163,7 +163,7 @@ module Webmoney::RequestXML    # :nodoc:all
       x.send('w3s.request') {
         x.reqn req
         x.wmid @wmid
-        x.sign sign("#{opt[:wmid]}#{req}")
+        x.sign sign("#{opt[:wmid]}#{req}") if classic?
         x.gettrustlist do
           x.wmid opt[:wmid]
         end
@@ -193,4 +193,18 @@ module Webmoney::RequestXML    # :nodoc:all
     }
   end
 
+  def xml_balance(opt)
+    req = reqn()
+    Nokogiri::XML::Builder.new { |x|
+      x.send('w3s.request') {
+        x.reqn req
+        x.wmid @wmid
+        x.sign sign("#{opt[:wmid]}#{req}") if classic?
+        x.getpurses do
+          x.wmid opt[:wmid]
+        end
+      }
+    }
+  end
+
 end

data/lib/wmid.rb

@@ -10,8 +10,8 @@ module Webmoney
       raise IncorrectWmidError, str unless str =~ /^\d{12}$/
       super(str)
     end
-    
+
     def wmid; self end
-    
+
   end
 end

data/spec/unit/balance_spec.rb

@@ -0,0 +1,21 @@
+#encoding: utf-8
+require 'spec_helper'
+
+describe "balance (x9) interface" do
+
+  before(:each) do
+    @wm = webmoney()
+  end
+
+  it "result should have purse list" do
+    result = @wm.request(:balance)
+    result[:purses].should_not be_empty
+  end
+
+  it "retval should be zero" do
+    result = @wm.request(:balance)
+    result[:retval].should == 0
+  end
+
+
+end

data/spec/unit/interfaces_spec.rb

@@ -28,7 +28,7 @@ describe "interfaces url" do
     wml.interfaces[:balance].to_s.should == 'https://w3s.wmtransfer.com/asp/XMLPursesCert.asp'
     wml.interfaces[:check_user].to_s.should == 'https://apipassport.webmoney.ru/XMLCheckUserCert.aspx'
     # non-converted
-    wml.interfaces[:get_passport].to_s.should == 'https://passport.webmoney.ru/asp/XMLGetWMPassport.asp'
+    wml.interfaces[:transaction_get].to_s.should == 'https://merchant.webmoney.ru/conf/xml/XMLTransGet.asp'
   end
 
 end

data/spec/unit/passport_spec.rb

@@ -5,7 +5,7 @@ require 'date'
 describe Webmoney::Passport, "class" do
 
   before(:each) do
-    @wm = TestWM.new
+    @wm = webmoney()
   end
 
   it "should return Passport instance" do
@@ -78,7 +78,7 @@ describe Webmoney::Passport, "class" do
   end
 
   it "should have wmids" do
-    passport = Webmoney::Passport.new(@wm.wmid)
+    passport = Webmoney::Passport.new(@wm.wmid, :mode => 1)
     passport.wmids.should be_instance_of(Hash)
     passport.wmids.has_key?(@wm.wmid).should be_true
     passport.wmids[@wm.wmid].should be_instance_of(Hash)

data/webmoney.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "webmoney"
-  s.version = "0.0.13"
+  s.version = "0.0.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Oryol"]
-  s.date = "2012-04-11"
+  s.date = "2012-10-25"
   s.email = "eagle.alex@gmail.com"
   s.extensions = ["ext/wmsigner/extconf.rb"]
   s.extra_rdoc_files = [
@@ -49,6 +49,7 @@ Gem::Specification.new do |s|
     "lib/wmid.rb",
     "rakefile",
     "spec/spec_helper.rb",
+    "spec/unit/balance_spec.rb",
     "spec/unit/check_user.rb",
     "spec/unit/iconv_spec.rb",
     "spec/unit/interfaces_spec.rb",
@@ -68,9 +69,9 @@ Gem::Specification.new do |s|
   ]
   s.require_paths = ["lib"]
   s.rubyforge_project = "webmoney"
-  s.rubygems_version = "1.8.17"
+  s.rubygems_version = "1.8.24"
   s.summary = "Webmoney interfaces and native wmsigner"
-  s.test_files = ["Gemfile", "spec/spec_helper.rb", "spec/unit/interfaces_spec.rb", "spec/unit/check_user.rb", "spec/unit/purse_spec.rb", "spec/unit/messenger_spec.rb", "spec/unit/iconv_spec.rb", "spec/unit/webmoney_spec.rb", "spec/unit/signer_spec.rb", "spec/unit/time_spec.rb", "spec/unit/wmid_spec.rb", "spec/unit/trust_spec.rb", "spec/unit/login_spec.rb", "spec/unit/passport_spec.rb"]
+  s.test_files = ["Gemfile", "spec/spec_helper.rb", "spec/unit/balance_spec.rb", "spec/unit/purse_spec.rb", "spec/unit/time_spec.rb", "spec/unit/check_user.rb", "spec/unit/interfaces_spec.rb", "spec/unit/messenger_spec.rb", "spec/unit/signer_spec.rb", "spec/unit/passport_spec.rb", "spec/unit/trust_spec.rb", "spec/unit/wmid_spec.rb", "spec/unit/login_spec.rb", "spec/unit/webmoney_spec.rb", "spec/unit/iconv_spec.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webmoney
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &84373370 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84373370
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &84373070 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84373070
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &84372740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84372740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &84372410 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84372410
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &84372120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84372120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: eagle.alex@gmail.com
 executables: []
@@ -107,6 +132,7 @@ files:
 - lib/wmid.rb
 - rakefile
 - spec/spec_helper.rb
+- spec/unit/balance_spec.rb
 - spec/unit/check_user.rb
 - spec/unit/iconv_spec.rb
 - spec/unit/interfaces_spec.rb
@@ -135,6 +161,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1774018962906030977
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -143,22 +172,23 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: webmoney
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Webmoney interfaces and native wmsigner
 test_files:
 - Gemfile
 - spec/spec_helper.rb
-- spec/unit/interfaces_spec.rb
-- spec/unit/check_user.rb
+- spec/unit/balance_spec.rb
 - spec/unit/purse_spec.rb
+- spec/unit/time_spec.rb
+- spec/unit/check_user.rb
+- spec/unit/interfaces_spec.rb
 - spec/unit/messenger_spec.rb
-- spec/unit/iconv_spec.rb
-- spec/unit/webmoney_spec.rb
 - spec/unit/signer_spec.rb
-- spec/unit/time_spec.rb
-- spec/unit/wmid_spec.rb
+- spec/unit/passport_spec.rb
 - spec/unit/trust_spec.rb
+- spec/unit/wmid_spec.rb
 - spec/unit/login_spec.rb
-- spec/unit/passport_spec.rb
+- spec/unit/webmoney_spec.rb
+- spec/unit/iconv_spec.rb