webmoney 0.0.11 → 0.0.12

data/ChangeLog

@@ -1,5 +1,10 @@
 ChangeLog
 
+Tue Arp 26 2011 16:31:00 +0400
+----------------------------
+  V 0.0.12
+  * Fix compile on gcc-4.5 under mingw (unnecessary macros removed)
+
 Fri Feb 18 2011 18:30:00 +0300
 ----------------------------
   V 0.0.11

data/VERSION

@@ -1 +1 @@
-0.0.11
+0.0.12

data/ext/wmsigner/signer.cpp

@@ -10,18 +10,12 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
-#define __open _open
-#define __read _read
-#define __close _close
 #else
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/uio.h>
 #include <unistd.h>
 #include <errno.h>
-#define __open	open
-#define __read	read
-#define __close	close
 #endif
 
 #ifndef TRUE
@@ -115,9 +109,9 @@ int Signer::LoadKeys()
 
 if( (!isIgnoreKeyFile) && (Key64Flag == FALSE) ) {
   #ifdef O_BINARY
-  fh = __open( m_szKeyFileName, O_RDONLY | O_BINARY);
+  fh = open( m_szKeyFileName, O_RDONLY | O_BINARY);
   #else
-  fh = __open( m_szKeyFileName, O_RDONLY);
+  fh = open( m_szKeyFileName, O_RDONLY);
   #endif
 
   if( fh == -1 )
@@ -131,10 +125,10 @@ if( (!isIgnoreKeyFile) && (Key64Flag == FALSE) ) {
   if (st_size == lMinKeyFileSize)
   {
     // load 164 bytes from "small" keys file
-    nReaden = __read( fh, pBufRead, nMaxBufLen );
+    nReaden = read( fh, pBufRead, nMaxBufLen );
     bKeysReaded = (nReaden == lMinKeyFileSize);
   }
-  __close( fh );
+  close( fh );
 } 
 else {
    bKeysReaded = true;

data/lib/request_result.rb

@@ -32,12 +32,12 @@ module Webmoney::RequestResult    # :nodoc:all
     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),
+      :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[:id]  = doc.at('//invoice')['id'].to_i
+      res[:ts]  = doc.at('//invoice')['ts'].to_i
+      res[:state] = doc.at('//invoice/state').inner_html.to_i
       res[:created_at] = Time.parse(doc.at('//invoice/datecrt').inner_html)
     end
     res
@@ -58,22 +58,21 @@ module Webmoney::RequestResult    # :nodoc:all
       :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 = Time.parse(value) if [:datecrt, :dateupd].include?(name)
-          r[name] = value
-        end
-        r
+    res[:invoices] = doc.xpath('//outinvoices/outinvoice').map do |invoice|
+      r = {
+        :id => invoice['id'].to_i,
+        :ts => invoice['ts'].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 = Time.parse(value) if [:datecrt, :dateupd].include?(name)
+        value = @ic_in.iconv(value) if [:desc, :address].include?(name)
+        r[name] = value
       end
+      r
     end
     res
   end

data/lib/request_xml.rb

@@ -115,7 +115,7 @@ module Webmoney::RequestXML    # :nodoc:all
           x.period( opt[:period] || 0 )                # protection period (0 - no protection)
           x.pcode( pcode ) if pcode  # protection code
           x.desc desc_in
-          x.wminvid( wminvid )             # invoice number (0 - without invoice)
+          x.wminvid( opt[:wminvid] || 0 )              # invoice number (0 - without invoice)
         }
       }
     }

data/lib/webmoney.rb

@@ -86,10 +86,10 @@ module Webmoney
     # when uncovertable character in input sequence. It is default behavior.
     # With option :force_encoding Iconv initialized with //IGNORE option, and
     # uncovertable characters will be cutted.
+    @ic_in  = Iconv.new('UTF-8', 'CP1251')
     if opt[:force_encoding]
       #Iconv.new(to, from)
       @ic_out = Iconv.new('CP1251//IGNORE', 'UTF-8')
-      @ic_in  = Iconv.new('UTF-8', 'CP1251')
       instance_eval do
         def filter_str(str)
           str_out = @ic_out.iconv(str)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Alexander Oryol
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-18 00:00:00 +03:00
+date: 2011-04-26 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency