webmoney 0.0.8 → 0.0.9

data/ChangeLog

@@ -1,12 +1,18 @@
 ChangeLog
 
+Mon Sep 20 2010 14:31:00 +0300
+----------------------------
+  V 0.0.9
+  * Add light-keys support
+  * Fix Purse bug
+  * Add Passport#wmids method
+
 Mon Aug 24 2010 12:00:00 +0300
 ----------------------------
   V 0.0.8
   * Compatible with ruby 1.9.2
   * Added Gemfile
 
-
 Mon Jun 07 2010 19:01:30 +0400
 ----------------------------
   V 0.0.7

data/README

@@ -113,4 +113,38 @@ purse.wmid                                        # => '123456789012'
 purse.belong_to?('123456789012')                  # => true
 
 
+== Example: Create invoice and check it's state
+
+@wm = MyWM.new(:wmid => '123456789012', :password => 'my_pass', :key => 'gQABAIR6...2cC8FZTyKyjBM=')
+
+# Create invoice
+@invoice = @wm.request(:create_invoice,
+  :orderid => 5,
+  :amount => 10,
+  :customerwmid => CUSTOMER_WMID,
+  :storepurse => STORE_PURSE,
+  :desc => "Test invoice",
+  :address => "Delivery Address"
+)
+
+# Check state
+res = @wm.request(:outgoing_invoices,
+  :purse => STORE_PURSE,
+  :wminvid => @invoice[:id],
+  :orderid => @invoice[:orderid],
+  :customerwmid => CUSTOMER_WMID,
+  :datestart => @invoice[:created_at],
+  :datefinish => @invoice[:created_at]
+)
+if res[:retval].should == 0 && !res[:invoices].empty?
+  invoice = res[:invoices].first
+  case invoice[:state]
+    when 0 then # Not Paid
+    when 1 then # Paid with protection
+    when 2 then # Payment complete
+    when 3 then # Rejected
+  end
+end
+
+
 Also, see spec/* for examples.

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/lib/passport.rb

@@ -35,6 +35,7 @@ module Webmoney
     def directory; @directory ||= getinfo[:directory] end
     def full_access; @full_access = getinfo[:full_access] end
     def userinfo; @userinfo ||= getinfo[:userinfo] end
+    def wmids; @userinfo ||= getinfo[:wmids] end
 
     protected
 
@@ -100,4 +101,4 @@ module Webmoney
     end
 
   end
-end
+end

data/lib/purse.rb

@@ -26,7 +26,7 @@ module Webmoney
       # memoize
       @wmid ||=
         begin
-          res = @@worker.request(:find_wm, :purse => self)
+          res = @@worker.request(:find_wm, :purse => self, :wmid => "")
           res[:retval] == 1 ? Wmid.new(res[:wmid]) : nil
         end
     end

data/lib/request_result.rb

@@ -28,6 +28,21 @@ module Webmoney::RequestResult    # :nodoc:all
     }
   end
 
+  def result_create_invoice(doc)
+    res = {
+      :retval => doc.at('//retval').inner_html.to_i,
+      :retdesc   => (doc.at('//testwmpurse/retdesc').inner_html rescue nil),
+      :orderid  => (doc.at('//invoice/orderid').inner_html.to_i),
+    }
+    if res[:retval] == 0
+      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"))
+    end
+    res
+  end
+
   def result_create_transaction(doc)
     op = doc.at('//operation')
     {
@@ -38,4 +53,28 @@ module Webmoney::RequestResult    # :nodoc:all
     end )
   end
 
-end
+  def result_outgoing_invoices(doc)
+    res = {
+      :retval => doc.at('//retval').inner_html.to_i,
+      :retdesc   => (doc.at('//testwmpurse/retdesc').inner_html rescue nil),
+    }
+    if res[:retval] == 0
+      res[:invoices] = doc.at('//outinvoices').elements.collect do |invoice|
+        r = {
+          :id => invoice.attributes['id'].value.to_i,
+          :ts => invoice.attributes['ts'].value.to_i,
+        }
+        invoice.elements.each do |tag|
+          name = tag.name.to_sym
+          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)
+          r[name] = value
+        end
+        r
+      end
+    end
+    res
+  end
+end

data/lib/request_retval.rb

@@ -21,4 +21,15 @@ module Webmoney::RequestRetval    # :nodoc:all
     # retval = { 1 - found; 0 - not found }
   end
 
-end
+  def retval_create_invoice(doc)
+    @error = doc.at('//retval').inner_html.to_i
+    @errormsg = doc.at('//retdesc').inner_html
+    raise Webmoney::ResultError, [@error, @errormsg].join(' ') unless @error == 0
+  end
+
+  def retval_outgoing_invoices(doc)
+    @error = doc.at('//retval').inner_html.to_i
+    @errormsg = doc.at('//retdesc').inner_html
+    raise Webmoney::ResultError, [@error, @errormsg].join(' ') unless @error == 0
+  end
+end

data/lib/request_xml.rb

@@ -83,7 +83,35 @@ module Webmoney::RequestXML    # :nodoc:all
     }
   end
 
-    def xml_create_transaction(opt)
+  def xml_create_invoice(opt)
+    req = reqn()
+    desc = @ic_out.iconv(opt[:desc])
+    address = @ic_out.iconv(opt[:address])[0...255].strip
+    amount = opt[:amount].to_f.to_s.gsub(/\.?0+$/, '')
+    Nokogiri::XML::Builder.new( :encoding => 'windows-1251' ) { |x|
+      x.send('w3s.request') {
+        x.wmid @wmid
+        x.reqn req
+        x.invoice do
+          x.orderid opt[:orderid]
+          x.customerwmid opt[:customerwmid]
+          x.storepurse opt[:storepurse]
+          x.amount amount
+          x.desc desc
+          x.address address
+          x.period opt[:period].to_i
+          x.expiration opt[:expiration].to_i
+        end
+        if classic?
+          @plan = "#{opt[:orderid]}#{opt[:customerwmid]}#{opt[:storepurse]}" + amount
+          @plan+= desc + address + "#{opt[:period].to_i}#{opt[:expiration].to_i}" + req
+          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|
@@ -105,4 +133,25 @@ module Webmoney::RequestXML    # :nodoc:all
     }
   end
 
+  def xml_outgoing_invoices(opt)
+    req = reqn()
+    Nokogiri::XML::Builder.new( :encoding => 'windows-1251' ) { |x|
+      x.send('w3s.request') {
+        x.wmid @wmid
+        x.reqn req
+        x.getoutinvoices do
+          x.purse opt[:purse]
+          x.wminvid opt[:wminvid]
+          x.orderid opt[:orderid]
+          x.datestart opt[:datestart].strftime("%Y%m%d %H:%M:%S")
+          x.datefinish opt[:datefinish].strftime("%Y%m%d %H:%M:%S")
+        end
+        if classic?
+          # TODO
+          @plan = opt[:purse] + req
+          x.sign sign(@plan)
+        end
+      }
+    }
+  end
 end

data/lib/webmoney.rb

@@ -139,7 +139,7 @@ module Webmoney
   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 ={})

data/spec/spec_helper.rb

@@ -1,4 +1,25 @@
 #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:
+#
+
 require 'rubygems'
 require 'test/unit'
 require 'spec'
@@ -8,23 +29,49 @@ require 'time'
 require File.dirname(__FILE__) + '/../lib/webmoney'
 
 # Variables may be access, for example WmConfig.wmid
-config = OpenStruct.new(YAML.load_file("#{ENV['HOME']}/.wm/config.yml"))
+config = YAML.load_file("#{ENV['HOME']}/.wm/config.yml")
 if ENV['WM_ENV']
   env_config = config.send(ENV['WM_ENV'])
   config.common.update(env_config) unless env_config.nil?
 end
-::WmConfig = OpenStruct.new(config.common)
+::WmConfig = OpenStruct.new(config)
+raise "First user wmtype must be classic!" if WmConfig.first['wmtype'] != 'classic'
 
 class TestWM
   include Webmoney
 
   def initialize(opt = {})
-    defaults = {:wmid => WmConfig.wmid,
-                :password => WmConfig.password,
-                :key => WmConfig.key,
+    defaults = {:wmid => WmConfig.first['wmid'],
+                :password => WmConfig.first['password'],
+                :key => WmConfig.first['key'],
                 :ca_cert => WmConfig.ca_cert}
     defaults.merge!(opt)
     super(defaults)
   end
+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)
+    TestWM.new :wmid => config.wmid,
+      :key => key,
+      :cert => cert,
+      :ca_cert => WmConfig.ca_cert
+  else
+    # classic
+    TestWM.new :wmid => config.wmid,
+      :password => config.password,
+      :key => config.key,
+      :ca_cert => config.ca_cert
+  end
+end
+
+def webmoney
+  getwm(OpenStruct.new(WmConfig.first))
+end
 
+def contragent
+  getwm(OpenStruct.new(WmConfig.second))
 end

data/spec/unit/passport_spec.rb

@@ -123,4 +123,10 @@ describe Webmoney::Passport, "class" do
     lambda {@wm.request(:get_passport, :wmid => '012345678901')}.should raise_error(Webmoney::NonExistentWmidError)
   end
 
+  it "should have wmids" do
+    passport = Webmoney::Passport.new(@wm.wmid)
+    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)
+  end
 end

data/spec/unit/purse_spec.rb

@@ -12,6 +12,11 @@ describe Webmoney::Purse, "class" do
     @t = Webmoney::Purse.new('Z136894439563')
   end
 
+  it "should return 111111111111 wmid for Z111111111111 purse" do
+    t = Webmoney::Purse.new("Z111111111111")
+    t.wmid.should == '111111111111'
+  end
+
   it "should be kind of Wmid" do
     @t.should be_kind_of(Webmoney::Purse)
   end
@@ -26,16 +31,16 @@ describe Webmoney::Purse, "class" do
   end
 
   it "should return wmid" do
-    @t.wmid.should == '405424574082'
+    @t.wmid.should == '128984249415'
   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
+    @wm.should_receive(:request).with(:find_wm, :purse => @t, :wmid => '').and_return(:retval=>1, :wmid => '128984249415')
+    @t.belong_to?('128984249415').should be_true
   end
 
   it "should return false" do
-    @wm.should_receive(:request).with(:find_wm, :purse => @t).and_return(:retval=>0)
+    @wm.should_receive(:request).with(:find_wm, :purse => @t, :wmid => '').and_return(:retval=>0, :wmid => '128984249415')
     @t.belong_to?('123456789012').should be_false
   end
 
@@ -45,7 +50,7 @@ describe Webmoney::Purse, "class" do
 
     it "it" do
       @wm.should_not_receive(:request).with(:find_wm, :purse => @t)
-      @t.belong_to?('405424574082').should be_true
+      @t.belong_to?('128984249415').should be_true
     end
 
   end

data/spec/unit/signer_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 
 describe Signer, "class" do
 
-  before(:each) do                                                                                                   
-    @s = Signer.new( WmConfig.wmid, WmConfig.password, WmConfig.key)                                                                                             
+  before(:all) do
+    @s = Signer.new( WmConfig.first['wmid'].to_s, WmConfig.first['password'], WmConfig.first['key'])
   end
 
   it "should be Signer class" do
@@ -33,4 +33,4 @@ describe Signer, "class" do
     lambda{Signer.new('405424574082', 'test', '')}.should raise_error(ArgumentError)
   end
   
-end
+end

data/spec/unit/webmoney_spec.rb

@@ -20,7 +20,7 @@ describe Webmoney, "class" do
   end
 
   it "should correct prepare interfaces urls" do
-    wm = TestWM.new :wmid => WmConfig.wmid , :key => nil
+    wm = TestWM.new :wmid => WmConfig.first['wmid'], :key => nil
     wm.should_not be_classic
     wm.interfaces[:balance].class.should == URI::HTTPS
     # converted to light-auth version
@@ -111,6 +111,10 @@ describe Webmoney, "class" do
     lambda {@wm.request(:get_passport, :wmid => '012345678901')}.should raise_error(Webmoney::NonExistentWmidError)
   end
 
+  it "should create transaction" do
+    # TODO @wm.request( :create_transaction, ...)
+  end
+
   it "should return correct BL" do
     wmid = '370860915669'
     @wm.request(:bussines_level, :wmid => wmid).should == 0
@@ -163,4 +167,43 @@ describe Webmoney, "class" do
     lambda { @wm.request(:unexistent_interface) }.should raise_error(::NoMethodError)
   end
 
+  describe "invoice" do
+    before(:each) do
+      @wm = webmoney()
+      @ca = contragent()
+      # create invoice
+      @invoice = @ca.request(:create_invoice,
+        :orderid => 1,
+        :amount => 1,
+        :customerwmid => @wm.wmid,
+        :storepurse => WmConfig.second['wmz'],
+        :desc => "Test invoice",
+        :address => "Address"
+      )
+    end
+
+    it "should be created" do
+      @invoice[:retval].should == 0
+      @invoice[:state].should == 0
+      @invoice[:orderid].should == 1
+      @invoice[:ts].should > 0
+      @invoice[:id].should > 0
+    end
+
+    it "should be in state 0 (not paid)" do
+      res = @ca.request(:outgoing_invoices,
+        :purse => WmConfig.second['wmz'],
+        :wminvid => @invoice[:id],
+        :orderid => @invoice[:orderid],
+        :customerwmid => @wm.wmid,
+        :datestart => @invoice[:created_at],
+        :datefinish => @invoice[:created_at]
+      )
+      res[:retval].should == 0
+      res[:invoices].length.should == 1
+      res[:invoices][0][:state].should == 0
+      res[:invoices][0][:amount].should == 1
+    end
+  end
+
 end

data/webmoney.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webmoney}
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Oryol"]
-  s.date = %q{2010-08-24}
+  s.date = %q{2010-09-20}
   s.email = %q{eagle.alex@gmail.com}
   s.extensions = ["ext/wmsigner/extconf.rb"]
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmoney
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Alexander Oryol
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-24 00:00:00 +04:00
+date: 2010-09-20 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency