rack-webmoney 0.0.5 → 0.0.6

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.homepage = "http://github.com/SkyEagle/rack-webmoney"
     gem.authors = ['Anton Orel', 'Alexander Orel']
     gem.add_dependency(%q<rack>, ">= 1.1.0")
-    gem.add_dependency(%q<savon>, ">= 0.7.9")
+    gem.add_dependency(%q<webmoney>, ">= 0.0.9")
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/rack/webmoney.rb

@@ -1,8 +1,9 @@
 #encoding: utf-8
 require 'rack/request'
 require 'rack/utils'
+require 'logger'
 
-require "savon"
+require "webmoney"
 
 module Rack #:nodoc:
   # A Rack middleware that provides a more HTTPish API around Webmoney authentication
@@ -14,8 +15,14 @@ module Rack #:nodoc:
   # On competition, the Webmoney response is automatically verified and
   # assigned to <tt>env["rack.webmoney.response"]</tt>.
   class Webmoney
+    class WmLib
+      include ::Webmoney
+    end
+
     class Response
       ERROR_MESSAGES = {
+        # -3 unknown response
+        :server_not_available => "Unknown response",
         # -2 raised network error
         :server_not_available => "Sorry, the Webmoney Login server is not available",
         # -1
@@ -70,14 +77,10 @@ module Rack #:nodoc:
       end
 
       def wmid
-        @info[:wmid]
+        @info[:WmLogin_WMID]
       end
     end
 
-    #SOAP driver setup
-    #@@driver = SOAP::WSDLDriverFactory.new('https://login.wmtransfer.com/ws/Security.asmx?WSDL').create_rpc_driver
-    #@@driver.options['protocol.http.ssl_config.verify_mode'] = OpenSSL::SSL::VERIFY_PEER
-
     #
     # Helper method for building the "WWW-Authenticate" header value.
     #
@@ -133,18 +136,25 @@ module Rack #:nodoc:
 
     URL_FIELD_SELECTOR = lambda { |field| field.to_s =~ %r{^https://} }
 
-    attr_reader :credentials, :mode
+    attr_reader :credentials, :mode, :wm_instance
 
     # :startdoc:
 
     # Initialize middleware with application
     #
-    #   use Rack::Webmoney, :credentials => {:site_holder_wmid => 'your_site_holder_wmid', :site_rid => 'your_site_rid'}, :mode => Rails.env
+    #   use Rack::Webmoney, :credentials => {:site_holder_wmid => 'your_site_holder_wmid',
+    #                                        :site_rid => 'your_site_rid'},
+    #                       :mode => Rails.env
     #
     def initialize(app, opts ={})
       @app = app
       @credentials = opts[:credentials]
       @mode = opts[:mode]
+      @wm_instance = if defined?(Rails)
+                       Rails.webmoney
+                     else
+                       WmLib.new(:wmid => @credentials[:site_holder_wmid])
+                     end
     end
 
     # Standard Rack +call+ dispatch that accepts an +env+ and
@@ -185,57 +195,48 @@ module Rack #:nodoc:
         end
 
         wminfo =
-          { :ticket      => req.params["WmLogin_Ticket"],
-            :url_id      => req.params["WmLogin_UrlID"],
-            :expires     => req.params["WmLogin_Expires"],
-            :auth_type   => req.params["WmLogin_AuthType"],
-            :last_access => req.params["WmLogin_LastAccess"],
-            :created     => req.params["WmLogin_Created"],
-            :wmid        => req.params["WmLogin_WMID"],
-            :user_ip     => req.params["WmLogin_UserAddress"] }
+          { :WmLogin_Ticket      => req.params["WmLogin_Ticket"],
+            :WmLogin_UrlID       => req.params["WmLogin_UrlID"],
+            :WmLogin_Expire      => req.params["WmLogin_Expires"],
+            :WmLogin_AuthType    => req.params["WmLogin_AuthType"],
+            :WmLogin_LastAccess  => req.params["WmLogin_LastAccess"],
+            :WmLogin_Created     => req.params["WmLogin_Created"],
+            :WmLogin_WMID        => req.params["WmLogin_WMID"],
+            :WmLogin_UserAddress => req.params["WmLogin_UserAddress"] }
 
         # work around for local development
-        ip_to_check = %w(development test).include?(mode) ? wminfo[:user_ip] : req.ip
-
-        check_req_params = {
-          :SiteHolderWMID => credentials[:site_holder_wmid],
-          :wmId           => wminfo[:wmid],
-          :ticket         => wminfo[:ticket],
-          :urlId          => wminfo[:url_id],
-          :authType       => wminfo[:auth_type],
-          :userAddress    => ip_to_check
-        }
+        ip_to_check = %w(development test).include?(mode) ? wminfo[:WmLogin_UserAddress] : req.ip
+
+        check_req_params = wminfo.merge({:remote_ip => ip_to_check})
 
         begin
-          soap_client = Savon::Client.new "https://login.wmtransfer.com/ws/Security.asmx"
-          response = soap_client.authorize! do |soap| # (!) disable WSDL
-            soap.namespace = "http://WmLogin.webmoney.ru/"
-            soap.action = "http://WmLogin.webmoney.ru/Authorize"
-            soap.body = check_req_params
-          end.to_hash[:authorize_response][:authorize_result]
-        rescue Errno::ECONNRESET, Errno::ECONNREFUSED, Timeout::Error
-          response = '-2'
+          response = wm_instance.request(:login, check_req_params)[:retval]
+        rescue Errno::ECONNRESET, Errno::ECONNREFUSED, Timeout::Error => e
+          logger.info("Rack webmoney exception: #{e}")
+          response = -2
+        rescue ::Webmoney::ResultError => e
+          logger.info("Rack webmoney exception: #{e}")
+          response = wm_instance.error
         end
 
         status = case response
-        when '0'  then :successful
-        when '-2'  then :server_not_available
-        when '-1'  then :internal_error
-        when '1'   then :invalid_arguments
-        when '2'   then :ticket_invalid
-        when '3'   then :ticket_expired
-        when '4'   then :user_not_found
-        when '5'   then :holder_not_found
-        when '6'   then :website_not_found
-        when '7'   then :url_not_found
-        when '8'   then :settings_not_found
-        when '9'   then :invalid_password
-        when '10'  then :not_trusted
-        when '11'  then :pwd_access_blocked
-        when '12'  then :user_blocked
-        when '201' then :ip_differs
-        else
-          "Unknown response code(#{response})"
+        when 0  then :successful
+        when -3  then :unknown_response
+        when -2  then :server_not_available
+        when -1  then :internal_error
+        when 1   then :invalid_arguments
+        when 2   then :ticket_invalid
+        when 3   then :ticket_expired
+        when 4   then :user_not_found
+        when 5   then :holder_not_found
+        when 6   then :website_not_found
+        when 7   then :url_not_found
+        when 8   then :settings_not_found
+        when 9   then :invalid_password
+        when 10  then :not_trusted
+        when 11  then :pwd_access_blocked
+        when 12  then :user_blocked
+        when 201 then :ip_differs
         end
 
         env[RESPONSE] = Response.new(status, wminfo)
@@ -248,7 +249,7 @@ module Rack #:nodoc:
       end
 
       def logger
-        @logger ||= Rails.logger if defined?(Rails)
+        @logger ||= defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
       end
   end
 end

data/rack-webmoney.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-webmoney}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anton Orel", "Alexander Orel"]
-  s.date = %q{2010-09-03}
+  s.date = %q{2010-09-24}
   s.description = %q{Rack webmoney authentication}
   s.email = ["eagle.anton@gmail.com", "eagle.alex@gmail.com"]
   s.extra_rdoc_files = [
@@ -36,14 +36,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, [">= 1.1.0"])
-      s.add_runtime_dependency(%q<savon>, [">= 0.7.9"])
+      s.add_runtime_dependency(%q<webmoney>, [">= 0.0.9"])
     else
       s.add_dependency(%q<rack>, [">= 1.1.0"])
-      s.add_dependency(%q<savon>, [">= 0.7.9"])
+      s.add_dependency(%q<webmoney>, [">= 0.0.9"])
     end
   else
     s.add_dependency(%q<rack>, [">= 1.1.0"])
-    s.add_dependency(%q<savon>, [">= 0.7.9"])
+    s.add_dependency(%q<webmoney>, [">= 0.0.9"])
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Anton Orel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-03 00:00:00 +04:00
+date: 2010-09-24 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,7 +34,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: savon
+  name: webmoney
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -43,9 +43,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 7
+        - 0
         - 9
-        version: 0.7.9
+        version: 0.0.9
   type: :runtime
   version_requirements: *id002
 description: Rack webmoney authentication