webmoney 0.0.7 → 0.0.8

data/.gitignore

@@ -1,3 +1,4 @@
+.bundle
 doc/*
 lib/wmsigner.so
 pkg/*

data/ChangeLog

@@ -1,5 +1,12 @@
 ChangeLog
 
+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/Gemfile

@@ -0,0 +1,6 @@
+source "http://rubygems.org"
+
+gem 'rake-compiler'
+gem 'jeweler'
+gem 'rspec'
+gem 'nokogiri'

data/Gemfile.lock

@@ -0,0 +1,41 @@
+--- 
+dependencies: 
+  rspec: 
+    group: 
+    - :default
+    version: ">= 0"
+  rake-compiler: 
+    group: 
+    - :default
+    version: ">= 0"
+  jeweler: 
+    group: 
+    - :default
+    version: ">= 0"
+  nokogiri: 
+    group: 
+    - :default
+    version: ">= 0"
+specs: 
+- rake: 
+    version: 0.8.7
+- gemcutter: 
+    version: 0.6.1
+- git: 
+    version: 1.2.5
+- json_pure: 
+    version: 1.4.6
+- rubyforge: 
+    version: 2.0.4
+- jeweler: 
+    version: 1.4.0
+- nokogiri: 
+    version: 1.4.3.1
+- rake-compiler: 
+    version: 0.7.1
+- rspec: 
+    version: 1.3.0
+hash: 46b2419c1fae88ace745852a84f3ee395ef8a70e
+sources: 
+- Rubygems: 
+    uri: http://rubygems.org

data/README

@@ -5,6 +5,7 @@ XML-interfaces: http://www.wmtransfer.com/eng/developers/interfaces/index.shtml
 
 Gem have built-in native *wmsigner*.
 
+Compatible with ruby: 1.8.7, 1.9.2
 Reqirements: Nokogiri >= 1.4.1 built with libxml2 >= 2.7 (IMPORTANT!)
 
 Author::    Alexander Oryol (mailto:eagle.alex@gmail.com)
@@ -61,6 +62,12 @@ end
 
 wmid = '111222333444'
 
+= Light
+
+cert = OpenSSL::X509::Certificate.new(File.read("webmoney.cert"))
+key = OpenSSL::PKey::RSA.new(File.read("webmoney.key"), "password")
+mywm = MyWM.new(:wmid => '123456789012', :cert => cert, :key => key)
+
 = Passport (X11)
 
 Get attestat data:

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/ext/wmsigner/extconf.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 # Loads mkmf which is used to make makefiles for Ruby extensions
 require 'mkmf'
 

data/ext/wmsigner/wmsigner.cpp

@@ -48,22 +48,22 @@ extern "C" VALUE signer_new(VALUE self, VALUE szWMID, VALUE szPwd, VALUE szKeyDa
     if(NIL_P(szWMID))	rb_raise(rb_eArgError, "nil wmid");    
 
     // check WMID
-    if (! IsWmid(RSTRING(szWMID)->ptr)) rb_raise(rb_eArgError, "Incorrect WMID");
+    if (! IsWmid(RSTRING_PTR(szWMID))) rb_raise(rb_eArgError, "Incorrect WMID");
 
     if(NIL_P(szPwd)) rb_raise(rb_eArgError, "nil password");
 
     if(NIL_P(szKeyData64)) rb_raise(rb_eArgError, "nil key");
 
     // check base64 data
-    if ( RSTRING(szKeyData64)->len != 220 ) rb_raise(rb_eArgError, "Illegal size for base64 keydata");
+    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(szKeyData64)->ptr, BUF_64_SIZE );
+    int bytes = code64( ENCODE, KeyBuffer, ASCII_SIZE, RSTRING_PTR(szKeyData64), BUF_64_SIZE );
 
     // check encoded key
     if ( bytes != 164) rb_raise(rb_eArgError, "Illegal size for keydata");
 
-    pSign = new Signer(RSTRING(szWMID)->ptr, RSTRING(szPwd)->ptr, "");
+    pSign = new Signer(RSTRING_PTR(szWMID), RSTRING_PTR(szPwd), "");
     VALUE tdata = Data_Wrap_Struct(self, 0, signer_free, pSign);
 
     pSign->isIgnoreKeyFile = TRUE;
@@ -93,7 +93,7 @@ extern "C" VALUE signer_sign(VALUE self, VALUE szIn)
     if (pSign)
     {   
       szptr szSign;
-			if (pSign->Sign(RSTRING(szIn)->ptr, szSign))
+			if (pSign->Sign(RSTRING_PTR(szIn), szSign))
 			{
 		 	    ret = rb_str_new2((char *)(const char *)szSign);
 			}

data/lib/messenger.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 require 'thread'
 
 module Webmoney

data/lib/passport.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 # Class for store attestat information
 module Webmoney
 

data/lib/purse.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 # Support class
 module Webmoney
   class Purse < String

data/lib/request_result.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 module Webmoney::RequestResult    # :nodoc:all
 
   def result_check_sign(doc)

data/lib/request_retval.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 module Webmoney::RequestRetval    # :nodoc:all
 
   def retval_common(doc)

data/lib/request_xml.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 module Webmoney::RequestXML    # :nodoc:all
 
   def xml_get_passport(opt)

data/lib/webmoney.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 # :title:Webmoney library Documentation
 # :main:lib/webmoney.rb
 # :include:README
@@ -96,7 +97,7 @@ module Webmoney
       when OpenSSL::PKey::RSA, OpenSSL::PKey::DSA
         @key = opt[:key]
         @cert = opt[:cert]
-        @password = opt[:password]
+        #@password = opt[:password]
     end
 
     # ca_cert or default
@@ -193,6 +194,10 @@ module Webmoney
     else
       raise CaCertificateError, @ca_cert
     end
+    unless classic?
+      http.cert = @cert
+      http.key = @key
+    end
     http.use_ssl = true
     @last_request = xml
     @last_response = result = http.post( url.path, xml, "Content-Type" => "text/xml" )

data/lib/wmid.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 # Support class
 module Webmoney
   class Wmid < String

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 require 'rubygems'
 require 'test/unit'
 require 'spec'
@@ -16,11 +17,14 @@ end
 
 class TestWM
   include Webmoney
-end
 
-def webmoney
-  TestWM.new :wmid => WmConfig.wmid,
-    :password => WmConfig.password,
-    :key => WmConfig.key,
-    :ca_cert => WmConfig.ca_cert
-end
+  def initialize(opt = {})
+    defaults = {:wmid => WmConfig.wmid,
+                :password => WmConfig.password,
+                :key => WmConfig.key,
+                :ca_cert => WmConfig.ca_cert}
+    defaults.merge!(opt)
+    super(defaults)
+  end
+
+end

data/spec/unit/messenger_spec.rb

@@ -1,46 +1,43 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+#encoding: utf-8
+require 'spec_helper'
 
-module Webmoney
+describe Webmoney::Messenger, "class" do
 
-  describe Messenger, "class" do
+  before(:each) do
+    @wm = TestWM.new
+    @params = { :wmid => @wm.wmid, :subj => 'FIRST', :text => 'BODY' }
+  end
 
-    before(:each) do                                                                                                   
-      @wm = webmoney()
-      @params = { :wmid => @wm.wmid, :subj => 'FIRST', :text => 'BODY' }
-    end
-    
-    it "should create instance" do
-      @wm.messenger.should be_nil
-      @wm.send_message(@params)
-      @wm.messenger.should be_instance_of(Messenger)
-    end
+  it "should create instance" do
+    @wm.messenger.should be_nil
+    @wm.send_message(@params)
+    @wm.messenger.should be_instance_of(Webmoney::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
+  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
-      @wm.messenger = Messenger.new(@wm, &logger)
-      @wm.send_message(@params)
-      sleep(2)
-    end
-
-    it "should call request(:send_message) twice" do
-      # if spec failed here, increase sleep time
-      @wm.should_receive(:request).
-        with(:send_message, @params).twice().and_return({:test => 'test'})
-      2.times {@wm.send_message(@params)}
-      # Don't take:
-      # @wm.messenger.thread.join
-      # this will create deadlock
-      sleep(2)
     end
+    @wm.messenger = Webmoney::Messenger.new(@wm, &logger)
+    @wm.send_message(@params)
+    sleep(2)
+  end
 
+  it "should call request(:send_message) twice" do
+    # if spec failed here, increase sleep time
+    @wm.should_receive(:request).
+      with(:send_message, @params).twice().and_return({:test => 'test'})
+    2.times {@wm.send_message(@params)}
+    # Don't take:
+    # @wm.messenger.thread.join
+    # this will create deadlock
+    sleep(2)
   end
 
 end

data/spec/unit/passport_spec.rb

@@ -1,140 +1,126 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+#encoding: utf-8
+require 'spec_helper'
+require 'date'
 
-module Webmoney
+describe Webmoney::Passport, "class" do
 
-  describe Passport, "class" do
+  before(:each) do
+    @wm = TestWM.new
+  end
 
-    before(:each) do                                                                                                   
-      @wm = webmoney()                                                                                               
-    end
-    
-    it "should return Passport instance" do
-      Passport.new(@wm.wmid).should be_instance_of(Passport)
-    end
+  it "should return Passport instance" do
+    Webmoney::Passport.new(@wm.wmid).should be_instance_of(Webmoney::Passport)
+  end
 
-    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
-      }
+  it "request result get_passport should be hash with data" do
+    wmid = '000000000007'
+    res = @wm.request(:get_passport, :wmid => wmid, :dict => 1)
+    res[:full_access].should be_false
+    res[:wmids][wmid][:created_at].should be_a(Time)
+    res[:attestat][:created_at].should be_a(Time)
+    [:regcid, :locked, :recalled, :cid, :admlocked, :created_at, :datecrt, :regnickname,
+      :regwmid, :attestat, :tid, :datediff].each do |key|
+      res[:attestat].should have_key(key)
+    end
 
-      u_info = {
-        :locked=>"0",
-        :ctype=>"1",
-        :citid=>"12918",
-        :cap_owner=>"0",
-        :region=>"Москва",
-        :countryid=>"195",
-        :city=>"Москва",
-        :pasdoc=>"0",
-        :nickname=>"Арбитр",
-        :country=>"Россия",
-        :inndoc=>"0",
-        :sex=>"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=>"", :jabberid=>""
-      }
+    u_info = {
+      :locked=>"0",
+      :ctype=>"1",
+      :citid=>"12918",
+      :cap_owner=>"0",
+      :region=>"Москва",
+      :countryid=>"195",
+      :city=>"Москва",
+      :pasdoc=>"0",
+      :nickname=>"Арбитр",
+      :country=>"Россия",
+      :inndoc=>"0",
+      :sex=>"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=>"", :jabberid=>""
+    }
 
 #      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=>"Аттестат Оператора"
-        }
+    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 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
+    }
+  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)
-      p.wmid.should == wmid
-      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'
-
-      wmid = '210971342927'
-      p = Passport.new(wmid)
-      p.attestat.should_not be_nil
-    end
+  it "should return userinfo attributes with checked/locked" do
+    wmid = '000000000007'
+    p = Webmoney::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 raise exception on bad WMID" do
-      lambda {@wm.request(:get_passport, :wmid => '111')}.should raise_error(Webmoney::ResultError)
-    end
+  it "should return correct fields" do
+    wmid = '000000000007'
+    p = Webmoney::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 = Webmoney::Passport.new(wmid)
+    p.wmid.should == wmid
+    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'
+
+    wmid = '210971342927'
+    p = Webmoney::Passport.new(wmid)
+    p.attestat.should_not be_nil
+  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
+  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 blank response" do
-      @wm.stub!(:http_request).and_return(nil)
-      lambda {@wm.request(:get_passport, :wmid => '012345678901')}.should raise_error(Webmoney::NonExistentWmidError)
-    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
 
+  it "should raise exception on blank response" do
+    @wm.stub!(:http_request).and_return(nil)
+    lambda {@wm.request(:get_passport, :wmid => '012345678901')}.should raise_error(Webmoney::NonExistentWmidError)
   end
 
 end

data/spec/unit/purse_spec.rb

@@ -1,54 +1,51 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+#encoding: utf-8
+require 'spec_helper'
 
-module Webmoney
+describe Webmoney::Purse, "class" do
 
-  describe Purse, "class" do
-
-    before(:all) do
-      # initialize worker
-      @wm = webmoney
-    end
-
-    before(:each) do
-      @t = Purse.new('Z136894439563')
-    end
+  before(:all) do
+    # initialize worker
+    @wm = TestWM.new
+  end
 
-    it "should be kind of Wmid" do
-      @t.should be_kind_of(Purse)
-    end
+  before(:each) do
+    @t = Webmoney::Purse.new('Z136894439563')
+  end
 
-    it "should be string" do
-      @t.should == 'Z136894439563'
-    end
+  it "should be kind of Wmid" do
+    @t.should be_kind_of(Webmoney::Purse)
+  end
 
-    it "should raise error on incorrect" do
-      lambda{ Purse.new('X123456789012') }.
-        should raise_error(IncorrectPurseError)
-    end
+  it "should be string" do
+    @t.should == 'Z136894439563'
+  end
 
-    it "should return wmid" do
-      @t.wmid.should == '405424574082'
-    end
+  it "should raise error on incorrect" do
+    lambda{ Webmoney::Purse.new('X123456789012') }.
+      should raise_error(Webmoney::IncorrectPurseError)
+  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 wmid" do
+    @t.wmid.should == '405424574082'
+  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
+  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
 
-    context "memoize" do
+  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
 
-      before(:each) { @t.wmid }
+  context "memoize" do
 
-      it "it" do
-        @wm.should_not_receive(:request).with(:find_wm, :purse => @t)
-        @t.belong_to?('405424574082').should be_true
-      end
+    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

data/spec/unit/signer_spec.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+#encoding: utf-8
+require 'spec_helper'
 
 describe Signer, "class" do
 

data/spec/unit/time_spec.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+#encoding: utf-8
+require 'spec_helper'
 
 describe Time, "class" do
   it "should test time from_ms" do

data/spec/unit/webmoney_spec.rb

@@ -1,144 +1,166 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+#encoding: utf-8
+require 'spec_helper'
 
-module Webmoney
+describe Webmoney, "class" do
 
-  describe Webmoney, "class" do
+  before(:each) do
+    @wm = TestWM.new
+  end
 
-    before(:each) do                                                                                                   
-      @wm = webmoney()
-    end
+  it "should be classic" do
+    @wm.should be_classic # @wm.classic? == true
+  end
 
-    it "should be classic" do
-      @wm.should be_classic # @wm.classic? == true
-    end
-    
-    it "should return reqn" do
-      t1 = @wm.send(:reqn)
-      sleep(0.1)
-      t2 = @wm.send(:reqn)
-      t1.should match(/^\d{16}$/)
-      (t2 > t1).should be_true
-    end
+  it "should return reqn" do
+    t1 = @wm.send(:reqn)
+    sleep(0.1)
+    t2 = @wm.send(:reqn)
+    t1.should match(/^\d{16}$/)
+    (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 prepare interfaces urls" do
+    wm = TestWM.new :wmid => WmConfig.wmid , :key => nil
+    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'
-    end
+  it "should correct reqn" do
+    Time.stub!(:now).and_return(Time.at(1244704683.69677))
+    @wm.send(:reqn).should == '2009061111180369'
+  end
 
-    it "should correct reqn with zero microsec" do
-      Time.stub!(:now).and_return(Time.at(1244704683))
-      @wm.send(:reqn).should == '2009061111180300'
-    end
+  it "should correct reqn with zero microsec" do
+    Time.stub!(:now).and_return(Time.at(1244704683))
+    @wm.send(:reqn).should == '2009061111180300'
+  end
 
-    it "should raise error on incorrect arg" do
-      lambda { @wm.send(:request, :check_sign, 1) }.
-        should raise_error(ArgumentError)
-    end
-    
-    it "should send request" do
-      doc = Nokogiri.XML(@wm.send(:https_request, :check_sign, '<w3s.request/>'))
-      doc.root.should_not be_nil
-    end
+  it "should raise error on incorrect arg" do
+    lambda { @wm.send(:request, :check_sign, 1) }.
+      should raise_error(ArgumentError)
+  end
 
-    it"should raise error on bad response" do
-      lambda { @wm.send(:https_request, 
-        'https://w3s.wmtransfer.com/asp/XMLUnexistantIface.asp', '<w3s.request/>')}.
-        should raise_error(RequestError)
-      @wm.error.should == '404'
-      @wm.errormsg.should match(/^<!DOCTYPE HTML PUBLIC/)
-    end
+  it "should send request" do
+    doc = Nokogiri.XML(@wm.send(:https_request, :check_sign, '<w3s.request/>'))
+    doc.root.should_not be_nil
+  end
 
-    it "should parse retval and raise error" do
-      lambda { @wm.request(:send_message, :wmid => '')}.should raise_error(ResultError)
-      @wm.error.should == -2
-      @wm.errormsg.should match(%r{value of w3s.request/message/receiverwmid  is incorrect})
-    end
+  it"should raise error on bad response" do
+    lambda { @wm.send(:https_request,
+      'https://w3s.wmtransfer.com/asp/XMLUnexistantIface.asp', '<w3s.request/>')}.
+      should raise_error(Webmoney::RequestError)
+    @wm.error.should == '404'
+    @wm.errormsg.should match(/^<!DOCTYPE HTML PUBLIC/)
+  end
 
-    it "should sign string" do
-      @wm.send(:sign, 'Test123').should match(/^[0-9a-f]{132}$/)
-    end
-    
-    it "should return nil on sign empty string" do
-      @wm.send(:sign, '').should be_nil
-    end
-    
-    it "should check_sign" do
-      plan = 'test123'
-      @wm.request(:check_sign, 
-        :wmid => @wm.wmid, :plan => plan, :sign => @wm.send(:sign, plan)).
-        should be_true
-    end
+  it "should parse retval and raise error" do
+    lambda { @wm.request(:send_message, :wmid => '')}.should raise_error(Webmoney::ResultError)
+    @wm.error.should == -2
+    @wm.errormsg.should match(%r{value of w3s.request/message/receiverwmid  is incorrect})
+  end
 
-    it "should check_sign broken" do
-      plan = 'test123'
-      @wm.request(:check_sign, 
-        :wmid => @wm.wmid, :plan => plan, :sign => 'abcd').
-        should be_false
-    end
-    
-    it "should check_sign with specials" do
-      plan = '<test>текст</test>'
-      real_plan = Iconv.conv('CP1251', 'UTF-8', plan)
-      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
-      lambda { @wm.request(:get_passport, :wmid => '') }.should raise_error(ResultError)
-      @wm.error.should == 2
-      @wm.errormsg.should match(%r{неверно указан проверяемый WMID})
-    end
+  it "should sign string" do
+    @wm.send(:sign, 'Test123').should match(/^[0-9a-f]{132}$/)
+  end
 
-    it "should raise exception on bad WMID" do
-      lambda {@wm.request(:get_passport, :wmid => '111')}.should raise_error(Webmoney::ResultError)
-    end
+  it "should return nil on sign empty string" do
+    @wm.send(:sign, '').should be_nil
+  end
 
-    it "should raise exception on non existent WMID" do
-      lambda {@wm.request(:get_passport, :wmid => '012345678901')}.should raise_error(Webmoney::NonExistentWmidError)
-    end
+  it "should check_sign" do
+    plan = 'test123'
+    @wm.request(:check_sign,
+      :wmid => @wm.wmid, :plan => plan, :sign => @wm.send(:sign, plan)).
+      should be_true
+  end
 
-    it "should return correct BL" do
-      wmid = '370860915669'
-      @wm.request(:bussines_level, :wmid => wmid).should == 0
+  it "should check_sign broken" do
+    plan = 'test123'
+    @wm.request(:check_sign,
+      :wmid => @wm.wmid, :plan => plan, :sign => 'abcd').
+      should be_false
+  end
 
-      wmid = Wmid.new '000000000007'
-      bl = @wm.request(:bussines_level, :wmid => wmid)
-      (bl > 1000).should be_true
-    end
-    
-    it "should send message" do
-      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
+  it "should check_sign with specials" do
+    plan = '<test>текст</test>'
+    real_plan = Iconv.conv('CP1251', 'UTF-8', plan)
+    begin
+    @wm.request(:check_sign,
+      :wmid => @wm.wmid,
+      :plan => plan,
+      :sign => @wm.send(:sign, real_plan )
+    ).should be_true
     end
+  end
 
-    it "should create transaction" do
-      # TODO @wm.request( :create_transaction, ...)
-    end
+  it "should parse retval and raise error on broken get_passport" do
+    lambda { @wm.request(:get_passport, :wmid => '') }.should raise_error(Webmoney::ResultError)
+    @wm.error.should == 2
+    @wm.errormsg.should match(%r{неверно указан проверяемый WMID})
+  end
 
-    it "should raise error on undefined xml func" do
-      lambda { @wm.request(:unexistent_interface) }.should raise_error(::NoMethodError)
-    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
+
+  it "should return correct BL" do
+    wmid = '370860915669'
+    @wm.request(:bussines_level, :wmid => wmid).should == 0
+
+    wmid = Webmoney::Wmid.new '000000000007'
+    bl = @wm.request(:bussines_level, :wmid => wmid)
+    (bl > 1000).should be_true
+  end
+
+  it "should send message" do
+    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 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,
+    # :purse => "Z161888783954",
+    # :tranid => 148696631,
+    # :wminvid => 148613215,
+    # :orderid => 1,
+    # :datestart => Date.today() - 1,
+    # :datefinish => Date.today() + 1
+    #)
+  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
 
-end
+end

data/spec/unit/wmid_spec.rb

@@ -1,30 +1,27 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+#encoding: utf-8
+require 'spec_helper'
 
-module Webmoney
+describe Webmoney::Wmid, "class" do
 
-  describe Wmid, "class" do
-
-    before(:each) do
-      @t = Wmid.new('123456789012')
-    end
-
-    it "should be kind of Wmid" do
-      @t.should be_kind_of(Wmid)
-    end
+  before(:each) do
+    @t = Webmoney::Wmid.new('123456789012')
+  end
 
-    it "should be string" do
-      @t.should == '123456789012'
-    end
+  it "should be kind of Wmid" do
+    @t.should be_kind_of(Webmoney::Wmid)
+  end
 
-    it "should permit initialize by integer" do
-      Wmid.new(123456789012).should == '123456789012'
-    end 
+  it "should be string" do
+    @t.should == '123456789012'
+  end
 
-    it "should raise error on incorrect wmid" do
-      lambda{Wmid.new('abc')}.
-        should raise_error(IncorrectWmidError)
-    end 
+  it "should permit initialize by integer" do
+    Webmoney::Wmid.new(123456789012).should == '123456789012'
+  end
 
+  it "should raise error on incorrect wmid" do
+    lambda{Webmoney::Wmid.new('abc')}.
+      should raise_error(Webmoney::IncorrectWmidError)
   end
 
 end

data/webmoney.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webmoney}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Oryol"]
-  s.date = %q{2010-06-07}
+  s.date = %q{2010-08-24}
   s.email = %q{eagle.alex@gmail.com}
   s.extensions = ["ext/wmsigner/extconf.rb"]
   s.extra_rdoc_files = [
@@ -19,6 +19,8 @@ Gem::Specification.new do |s|
   s.files = [
     ".gitignore",
      "ChangeLog",
+     "Gemfile",
+     "Gemfile.lock",
      "README",
      "RUNNING_TESTS",
      "VERSION",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmoney
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Alexander Oryol
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-07 00:00:00 +04:00
+date: 2010-08-24 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,6 +44,8 @@ extra_rdoc_files:
 files: 
 - .gitignore
 - ChangeLog
+- Gemfile
+- Gemfile.lock
 - README
 - RUNNING_TESTS
 - VERSION