eport 0.0.1.2 → 0.0.2

data/lib/catalog_parser.rb

@@ -6,7 +6,7 @@ class CatalogParser
   end
   
   
-  ITEM_SEPARATOR    = "\r\n"
+  ITEM_SEPARATOR = "\r\n"
   VALUE_SEPARATOR = "\t"
   
   VALUES = {:x => [:version, :prev_version, :form_date, :money], 
@@ -17,16 +17,14 @@ class CatalogParser
 
   def new_catalog(data)   
     ic = Iconv.new('UTF-8', 'WINDOWS-1251')
-    
     strings = data.split(ITEM_SEPARATOR)
     strings[1..-1].each do |string|
       values = string.split(VALUE_SEPARATOR)
-      type = ic.iconv(values[0])
-      key = type[1].to_sym
-      
+      type = ic.iconv(values[0]).to_s
+      key = type.last.to_sym
       if ["+v", "+x", "+e", "+p"].include?(type)
         hash = {}
-        VALUES[key].each_index{|index| hash[VALUES[key][index]] = ic.iconv(values[index+1]).to_s}
+        VALUES[key].each_with_index{|o, index| hash[VALUES[key][index]] = ic.iconv(values[index+1]).to_s}
         @catalog[key] << hash      
       end
     end

data/lib/eport.rb

@@ -17,41 +17,44 @@ class Eport
       r.path = "/cp/dir"
       r.body = ""
     end
+
     data = req.confirm
-    cp = CatalogParser.new
+    cp   = CatalogParser.new
     cp.new_catalog(data)    
   end  
   
   def get_balance
-     req = Request.new do |r|
-       r.point = @config[:eport][:point]
-       r.private_key_path = "#{RAILS_ROOT}/#{@config[:eport][:private_key_path]}"
-
-       r.host = @config[:eport][:host]
-       r.path = "/cp/bal"
-       r.body = ""
-     end
-      ic = Iconv.new('UTF-8', 'WINDOWS-1251')
-      ic.iconv(req.confirm)    
+   req = Request.new do |r|
+     r.point = @config[:eport][:point]
+     r.private_key_path = "#{RAILS_ROOT}/#{@config[:eport][:private_key_path]}"
+     r.host  = @config[:eport][:host]
+     r.path  = "/cp/bal"
+     r.body  = ""
    end
+
+   ic = Iconv.new('UTF-8', 'WINDOWS-1251')
+   ic.iconv(req.confirm)    
+  end
   
   def refill_operation(operation_name, operation_id, product_id, value, account)
-     req = Request.new do |r|
-     r.point = @config[:eport][:point]
-     r.private_key_path = "#{RAILS_ROOT}/#{@config[:eport][:private_key_path]}"
+    req = Request.new do |r|
+      r.point = @config[:eport][:point]
+      r.private_key_path = "#{RAILS_ROOT}/#{@config[:eport][:private_key_path]}"
 
-     r.host = @config[:eport][:host]
-     r.path = "/cp/fe"
+      r.host = @config[:eport][:host]
+      r.path = "/cp/fe"
+
+      req = EportRequestPlainText.new
 
-     req = EportRequestPlainText.new
+      req.operation_type = operation_name.to_s.upcase if [:operation, :confirm, :check, :cancel].include?(operation_name)
+      req.operation_id   = operation_id
+      req.product_id     = product_id
+      req.value          = value
+      req.account        = account
 
-     req.operation_type = operation_name.to_s.upcase if [:operation, :confirm, :check, :cancel].include?(operation_name)
-     req.operation_id   = operation_id
-     req.product_id     = product_id
-     req.value          = value
-     req.account        = account
-     r.body = req.body
+      r.body = req.body
     end
+
     ic = Iconv.new('UTF-8', 'WINDOWS-1251')
     ic.iconv(req.confirm)
    end

data/lib/request.rb

@@ -6,7 +6,7 @@ class Request
   attr_accessor :point, :private_key_path, :host, :path, :additional_headers, :body
 
   def initialize(&block)
-    block.yield(self)
+    yield self
 
     @headers = {
       "Content-Type"   => "text/plain; charset=Windows-1251",

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
   - 2
-  version: 0.0.1.2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Alexander Lomakin, Dmitry Andreev
@@ -15,7 +14,7 @@ autorequire: eport
 bindir: bin
 cert_chain: []
 
-date: 2010-04-29 00:00:00 +04:00
+date: 2010-05-07 00:00:00 +04:00
 default_executable: 
 dependencies: []