wirecardmapper 0.6.0 → 0.7.0

data/lib/wirecardmapper/config.rb

@@ -2,7 +2,7 @@ module WirecardMapper
   module Config
 
     class << self
-      attr_accessor :mode, :entity_id, :server_uri, :login, :password
+      attr_accessor :mode, :entity_id, :server_uri, :login, :password, :product_id
       attr_writer :templates_path, :server_port
     end
     

data/lib/wirecardmapper/version.rb

@@ -1,3 +1,3 @@
 module WirecardMapper
-  Version = '0.6.0'
+  Version = '0.7.0'
 end

data/lib/wirecardmapper/xml.rb

@@ -1,38 +1,43 @@
 module WirecardMapper
   module Xml
-    module InstanceMethods
-      
-      def main_xml
-        xml = open_xml('main.xml')
-        if xml
-          xml.at_css("issuer-request")['mode'] = Config.mode
-          xml.at_css("request-id").content = request_id
-          xml.at_css("entity-id").content = Config.entity_id
-        end
-        return xml
+
+    def main_xml
+      xml = open_xml('main.xml')
+      if xml
+        xml.at_css("issuer-request")['mode'] = Config.mode
+        xml.at_css("request-id").content = request_id
+        xml.at_css("entity-id").content = Config.entity_id
       end
+      return xml
+    end
 
-      def sub_xml(name)
-        xml = open_xml(name)
-        xml.at_css("card-id").content = self.card_id if xml.at_css("card-id")
-        xml.at_css("product-id").content = self.number if xml.at_css("product-id")
-        xml.at_css("amount").content = self.amount if xml.at_css("amount")
-        yield xml
+    def sub_xml(name, params)
+      xml = open_xml(name)
+      xml.at_css("product-id").content = Config.product_id if xml.at_css("product-id")
+      params.each do |param, value|
+        if xml.at_css(param.to_s.gsub(/_/,'-'))
+          if value.kind_of?(Time)
+            xml.at_css(param.to_s.gsub(/_/,'-')).content = value.iso8601
+          else
+            xml.at_css(param.to_s.gsub(/_/,'-')).content = value
+          end
+        end
       end
+      yield xml
+    end
 
-      private
+    private
 
-      def request_id
-        UUID.generate
-      end
+    def request_id
+      UUID.generate
+    end
 
-      def open_xml(file_name)
-        xml_file = File.open(File.join(Config.templates_path, file_name))
-        if xml_file
-          return Nokogiri::XML(xml_file)
-        end
+    def open_xml(file_name)
+      xml_file = File.open(File.join(Config.templates_path, file_name))
+      if xml_file
+        return Nokogiri::XML(xml_file)
       end
-
     end
+
   end
 end

data/lib/wirecardmapper.rb

@@ -9,21 +9,60 @@ require 'uuid'
 require 'wirecardmapper/net_http_monkeypatch'
 
 module WirecardMapper
-  autoload :Plugins, 'wirecardmapper/plugins'
   autoload :Config, 'wirecardmapper/config'
-  
   autoload :Xml, 'wirecardmapper/xml'
   autoload :Response, 'wirecardmapper/response'
-  autoload :Request, 'wirecardmapper/request'
-  autoload :Model, 'wirecardmapper/model'
 
-  def self.included(model)
-    model.class_eval do
-      extend  Plugins
+  extend Xml
 
-      plugin WirecardMapper::Xml
-      plugin WirecardMapper::Request
-      plugin WirecardMapper::Model
+  def self.create_card(params = {})
+    request("create_card", params)
+  end
+
+  def self.update_card_info(params = {})
+    request("update_card_info", params)
+  end
+
+  def self.card_info(params = {})
+    request("get_card_info", params)
+  end
+
+  def self.submit_payment(params = {})
+    request("submit_payment", params)
+  end
+
+  def self.payment_info(params = {})
+    request("get_payment_info", params)
+  end
+
+  def self.request(xml_request_name, params)
+    main_xml = self.main_xml
+    if main_xml
+      sub_xml("#{xml_request_name}.xml", params) do |xml|
+        main_xml.at_css('issuer-request').add_child(xml.at(xml_request_name.to_s.gsub(/_/,'-')))
+      end
+    end
+    return post(main_xml.to_s)
+  end
+
+  def self.post(xml)
+    uri = URI.parse(Config.server_uri)
+    unless uri.nil?
+      http = Net::HTTP.new(uri.host, Config.server_port)
+      if http
+        http.use_ssl = true
+        request = Net::HTTP::Post.new(uri.path)
+        if request
+          request.content_type = "text/xml"
+          request.content_length = xml.size
+          request.basic_auth(Config.login, Config.password)
+          request.body = xml
+          response = http.request(request)
+          if response
+            return WirecardMapper::Response.new(response.body)
+          end
+        end
+      end
     end
   end
-end
+end

data/spec/functional/{model_spec.rb → request_spec.rb}

@@ -1,13 +1,9 @@
 require 'spec_helper'
 
-describe "Model" do
-  
-  before(:each) do
-    @card = Card.new
-  end
+describe 'Request' do
 
   it "should get cardinfo" do
-    response = @card.get_card_info
+    response = WirecardMapper.card_info(:card_id => '47ae07020a010018157db66065da6e5c')
     response.ok?.should be_true
     response.card_id.should eql('47ae07020a010018157db66065da6e5c')
     response.card_number.should eql(5274569796581777)
@@ -15,7 +11,7 @@ describe "Model" do
   end
 
   it "should create card" do
-    response = @card.create_card
+    response = WirecardMapper.create_card
     response.ok?.should be_true
     response.card_id.should_not be_empty
     response.card_number.should_not be_nil
@@ -24,24 +20,32 @@ describe "Model" do
   end
 
   it "should update card info" do
-    response = @card.update_card_info
+    response = WirecardMapper.update_card_info(:card_id => '47ae07020a010018157db66065da6e5c')
     response.ok?.should be_true
     response.return_code.to_i.should eql(0)
     response.return_message.should eql('Successful system entry.')
   end
 
-  it "should submit payment" do
-    response = @card.submit_payment
+  it "should submit payment load" do
+    response = WirecardMapper.submit_payment(:card_id => '47ae07020a010018157db66065da6e5c', :amount => 10, :payment_comment => "Test Comment")
     response.ok?.should be_true
     response.return_code.to_i.should eql(0)
     response.return_message.should eql('Successful system entry.')
   end
 
-  it "should get payment info" do
-    response = @card.get_payment_info(Time.now - (24 * 3600), Time.now)
+  it "should submit payment unload" do
+    response = WirecardMapper.submit_payment(:card_id => '47ae07020a010018157db66065da6e5c', :amount => -10, :payment_comment => "Test Comment")
     response.ok?.should be_true
     response.return_code.to_i.should eql(0)
     response.return_message.should eql('Successful system entry.')
   end
 
+  it "should get payment info" do
+    response = WirecardMapper.payment_info(:card_id => '47ae07020a010018157db66065da6e5c', :from => Time.now - (24 * 3600), :to => Time.now)
+    response.ok?.should be_true
+    response.return_code.to_i.should eql(0)
+    response.return_message.should eql('Successful system entry.')
+  end
+  
 end
+

data/spec/spec_helper.rb

@@ -5,38 +5,14 @@ require 'wirecardmapper'
 
 FIXTURES_PATH = "#{File.dirname(__FILE__)}/fixtures"
 
-def klass(name=nil, &block)
-  klass = Class.new do
-    include WirecardMapper
-
-    def card_id
-      '47ae07020a010018157db66065da6e5c'
-    end
-
-    def number
-      11
-    end
-
-    def amount
-      10
-    end
-  end
-
-  klass.class_eval(&block) if block_given?
-  klass
-end
-
 WirecardMapper::Config.server_uri = "http://localhost/issuer/client"
 WirecardMapper::Config.server_port = 8080
 WirecardMapper::Config.login = "000000315ED21E8A";
 WirecardMapper::Config.password = "FDJqLhoRX";
 WirecardMapper::Config.mode = "test"
 WirecardMapper::Config.entity_id = "000000315ED21F74"
+WirecardMapper::Config.product_id = 11
 
 RSpec.configure do |config|
 
-  config.before(:suite) do
-    Card = klass
-  end
-
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wirecardmapper
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: false
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Alexander Klaiber
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-18 00:00:00 +01:00
+date: 2010-12-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,19 +64,15 @@ files:
 - README.rdoc
 - Rakefile
 - lib/wirecardmapper.rb
-- lib/wirecardmapper/plugins.rb
 - lib/wirecardmapper/version.rb
 - lib/wirecardmapper/net_http_monkeypatch.rb
-- lib/wirecardmapper/request.rb
-- lib/wirecardmapper/model.rb
 - lib/wirecardmapper/xml.rb
 - lib/wirecardmapper/config.rb
 - lib/wirecardmapper/response.rb
 - spec/fixtures/create_card.xml
 - spec/unit/response_spec.rb
-- spec/unit/xml_spec.rb
 - spec/spec_helper.rb
-- spec/functional/model_spec.rb
+- spec/functional/request_spec.rb
 - templates/get_card_info.xml
 - templates/create_card.xml
 - templates/update_card_info.xml

data/lib/wirecardmapper/model.rb

@@ -1,45 +0,0 @@
-module WirecardMapper
-  module Model
-    module InstanceMethods
-
-      def self.xml_request_method(*args)
-        args.each do |arg|
-          define_method(arg) do
-            request(self.send("#{arg}_xml").to_s)
-          end
-
-          define_method("#{arg}_xml") do
-            main_xml = self.main_xml
-            if main_xml
-              sub_xml("#{arg}.xml") do |xml|
-                main_xml.at_css('issuer-request').add_child(xml.at(arg.to_s.gsub(/_/,'-')))
-              end
-            end
-            return main_xml
-          end
-        end
-      end
-
-      xml_request_method :get_card_info, :create_card, :submit_payment, :update_card_info
-
-      public
-
-      def get_payment_info(from, to)
-        request(get_payment_info_xml(from, to).to_s)
-      end
-
-      def get_payment_info_xml(from, to)
-        main_xml = self.main_xml
-        if main_xml
-          sub_xml("get_payment_info.xml") do |xml|
-            xml.at_css("from").content = from.iso8601 if xml.at_css("from")
-            xml.at_css("to").content = to.iso8601 if xml.at_css("to")
-            main_xml.at_css('issuer-request').add_child(xml.at('get-payment-info'))
-          end
-        end
-        return main_xml
-      end
-
-    end
-  end
-end

data/lib/wirecardmapper/plugins.rb

@@ -1,13 +0,0 @@
-module WirecardMapper
-  module Plugins
-    def plugins
-      @plugins ||= []
-    end
-
-    def plugin(mod)
-      extend mod::ClassMethods if mod.const_defined?(:ClassMethods)
-      include mod::InstanceMethods if mod.const_defined?(:InstanceMethods)
-      plugins << mod
-    end
-  end
-end

data/lib/wirecardmapper/request.rb

@@ -1,28 +0,0 @@
-module WirecardMapper
-  module Request
-    module InstanceMethods
-
-      def request(xml)
-        uri = URI.parse(Config.server_uri)
-        unless uri.nil?
-          http = Net::HTTP.new(uri.host, Config.server_port)
-          if http
-            http.use_ssl = true
-            request = Net::HTTP::Post.new(uri.path)
-            if request
-              request.content_type = "text/xml"
-              request.content_length = xml.size
-              request.basic_auth(Config.login, Config.password)
-              request.body = xml
-              response = http.request(request)
-              if response
-                return WirecardMapper::Response.new(response.body)
-              end
-            end
-          end
-        end
-      end
-      
-    end
-  end
-end

data/spec/unit/xml_spec.rb

@@ -1,41 +0,0 @@
-require 'spec_helper'
-
-describe 'Xml' do
-
-  before(:each) do
-    @card = Card.new
-  end
-
-  it "should get main xml" do
-    xml = @card.main_xml
-    xml.at_css("issuer-request")['mode'].should eql(WirecardMapper::Config.mode)
-    xml.at_css("entity-id").content.to_s.should eql(WirecardMapper::Config.entity_id)
-    xml.at_css("request-id").content.to_s.should_not be_empty
-  end
-
-  it "should get cardinfo xml" do
-    xml = @card.get_card_info_xml
-    xml.at_css("card-id").content.should eql(@card.card_id)
-  end
-
-  it "should get create card xml" do
-    xml = @card.create_card_xml
-    xml.at_css("product-id").content.to_i.should eql(@card.number)
-  end
-
-  it "should get submit payment xml" do
-    xml = @card.submit_payment_xml
-    xml.at_css("card-id").content.should eql(@card.card_id)
-    xml.at_css("amount").content.to_i.should eql(@card.amount)
-  end
-
-  it "should get update card xml" do
-    xml = @card.update_card_info_xml
-    xml.at_css("card-id").content.should eql(@card.card_id)
-  end
-
-  it "should get payment info xml" do
-    xml = @card.get_payment_info_xml(Time.now - (24 * 3600), Time.now)
-    xml.at_css("card-id").content.should eql(@card.card_id)
-  end
-end