wirecardmapper 0.2.0 → 0.6.0

data/LICENSE

@@ -1,3 +1,20 @@
-== wirecardmapper
+Copyright (c) 2010 Alexander Klaiber
 
-Put appropriate LICENSE for your project here.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -18,8 +18,6 @@ A Ruby Object Mapper for Wirecard XML interface
 
 ssh tunnelserver1 -L localhost:8080:wirecardserver:443
 
-== Problems or Questions?
-
 == Copyright
 
 See LICENSE for details.

data/Rakefile

@@ -1,35 +1,12 @@
 require 'rubygems'
+
 require 'rake'
-require 'rake/clean'
-require 'rake/gempackagetask'
 require 'rake/rdoctask'
-require 'rake/testtask'
-require 'spec/rake/spectask'
-
-require File.expand_path('../lib/wirecardmapper/version', __FILE__)
 
-spec = Gem::Specification.new do |s|
-  s.name = 'wirecardmapper'
-  s.homepage = 'http://github.com/aklaiber/wirecardmapper'
-  s.version = WirecardMapper::Version
-  s.has_rdoc = false
-  s.extra_rdoc_files = ['README.rdoc', 'LICENSE']
-  s.summary = 'A Ruby Object Mapper for Wirecard XML interface'
-  s.description = s.summary
-  s.author = 'Alexander Klaiber'
-  s.email = 'alex.klaiber@gmail.com'
-  s.files = %w(LICENSE README.rdoc Rakefile) + Dir.glob("{lib,spec,templates}/**/*")
-  s.require_path = "lib"
-
-  s.add_dependency 'nokogiri', '>= 1.4.2'
-  s.add_dependency 'uuid', '>= 2.3.1'
-end
+require "rspec"
+require "rspec/core/rake_task"
 
-Rake::GemPackageTask.new(spec) do |p|
-  p.gem_spec = spec
-  p.need_tar = true
-  p.need_zip = true
-end
+require File.expand_path('../lib/wirecardmapper/version', __FILE__)
 
 Rake::RDocTask.new do |rdoc|
   files =['README.rdoc', 'LICENSE', 'lib/**/*.rb']
@@ -40,15 +17,26 @@ Rake::RDocTask.new do |rdoc|
   rdoc.options << '--line-numbers'
 end
 
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*.rb']
-  t.libs << Dir["lib"]
+Rspec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = "spec/**/*_spec.rb"
+end
+
+namespace :wirecard do
+  desc 'Open ssh tunnel to wirecard test server'
+  task :ssh_tunnel do
+    sh "ssh test.freecent.com -L localhost:8080:c3-test.wirecard.com:443"
+  end
+end
+
+desc 'Builds the gem'
+task :build do
+  sh "gem build wirecardmapper.gemspec"
 end
 
 desc 'Tags version, pushes to remote, and pushes gem'
-task :release => [:spec, :gem] do
+task :release => [:spec, :build] do
   sh "git tag v#{WirecardMapper::Version}"
   sh "git push origin master"
   sh "git push origin v#{WirecardMapper::Version}"
-  sh "gem push pkg/wirecardmapper-#{WirecardMapper::Version}.gem"
-end
+  sh "gem push wirecardmapper-#{WirecardMapper::Version}.gem"
+end

data/lib/wirecardmapper.rb

@@ -1,3 +1,6 @@
+require "rubygems"
+require "bundler/setup"
+
 require 'net/https'
 require "base64"
 require 'nokogiri'
@@ -6,8 +9,21 @@ 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
+
+      plugin WirecardMapper::Xml
+      plugin WirecardMapper::Request
+      plugin WirecardMapper::Model
+    end
+  end
 end

data/lib/wirecardmapper/model.rb

@@ -1,82 +1,45 @@
 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
+      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
-            xml = open_xml("#{arg}.xml")
-            if xml
-              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")
-              main_xml.at_css('issuer-request').add_child(xml.at(arg.to_s.gsub(/_/,'-')))
+          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
-          return main_xml
         end
       end
-    end
 
-    xml_request_method :get_card_info, :create_card, :submit_payment, :update_card_info, :get_payment_info
- 
-    def request_id
-      UUID.generate
-    end
+      xml_request_method :get_card_info, :create_card, :submit_payment, :update_card_info
 
-    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
+      public
 
-    def main_xml
-      xml = open_xml('main.xml')
-      if xml
-        xml.at_css("issuer-request")['mode'] = Config.mode
-        xml.at_css("request-id").content = self.request_id
-        xml.at_css("entity-id").content = Config.entity_id
+      def get_payment_info(from, to)
+        request(get_payment_info_xml(from, to).to_s)
       end
-      return xml
-    end
 
-    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
+      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
 
-    def respone(xml)
-      return WirecardMapper::Response.new(xml)
     end
-
-    def print_request(request)
-	    request.each_header do |key, value|
-	      puts "#{key} : #{value}"
-	    end
-      puts request.body
-    end
-
   end
 end

data/lib/wirecardmapper/plugins.rb

@@ -0,0 +1,13 @@
+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,5 +1,28 @@
 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
+end

data/lib/wirecardmapper/response.rb

@@ -4,7 +4,7 @@ module WirecardMapper
     def self.node_reader(*args)
       args.each do |arg|
         define_method(arg) do
-          return @doc.at_css(arg.to_s.gsub(/_/,'-')).content
+          return parse(@doc.at_css(arg.to_s.gsub(/_/,'-')).content)
         end
       end
     end
@@ -15,7 +15,7 @@ module WirecardMapper
       :status_code, :status_message, :expiration_month, :expiration_year, 
       :card_security_code, :card_level, :card_comment, :issuing_date,
       :bank_code, :account_number, :currency, :first_name, :last_name,
-      :issuer_consumer_id
+      :issuer_consumer_id, :balance
 
     def initialize(xml)
       @doc = Nokogiri::XML(xml)
@@ -25,5 +25,19 @@ module WirecardMapper
       @doc.to_s
     end
 
+    def ok?
+      return_code.to_i.eql?(0)
+    end
+
+    private
+
+    def parse(value)
+      begin
+        return Integer(value)
+      rescue
+        return value
+      end
+    end
+
   end
 end

data/lib/wirecardmapper/version.rb

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

data/lib/wirecardmapper/xml.rb

@@ -0,0 +1,38 @@
+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
+      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
+      end
+
+      private
+
+      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
+      end
+
+    end
+  end
+end

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

@@ -3,43 +3,43 @@ require 'spec_helper'
 describe "Model" do
   
   before(:each) do
-    @card = Model do
-      class << self
-        def card_id
-          '47ae07020a010018157db66065da6e5c'
-        end
-
-        def number
-          11
-        end
-
-        def amount
-          10
-        end
-      end
-    end
+    @card = Card.new
   end
 
   it "should get cardinfo" do
     response = @card.get_card_info
+    response.ok?.should be_true
     response.card_id.should eql('47ae07020a010018157db66065da6e5c')
-    response.card_number.should eql('5274569796581777')
+    response.card_number.should eql(5274569796581777)
+    response.balance.should eql(200)
   end
 
   it "should create card" do
     response = @card.create_card
+    response.ok?.should be_true
     response.card_id.should_not be_empty
-    response.card_number.should_not be_empty
+    response.card_number.should_not be_nil
+    response.status_message.should eql('Active card')
+    response.status_code.should eql('activated')
   end
 
   it "should update card info" do
     response = @card.update_card_info
+    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
+    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)
+    response.ok?.should be_true
     response.return_code.to_i.should eql(0)
     response.return_message.should eql('Successful system entry.')
   end

data/spec/spec_helper.rb

@@ -5,19 +5,38 @@ require 'wirecardmapper'
 
 FIXTURES_PATH = "#{File.dirname(__FILE__)}/fixtures"
 
-def Model(name=nil, &block)
+def klass(name=nil, &block)
   klass = Class.new do
-    extend WirecardMapper::Model
+    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 = "https://c3-test.wirecard.com/issuer/client"
 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"
+
+RSpec.configure do |config|
+
+  config.before(:suite) do
+    Card = klass
+  end
+
+end

data/spec/unit/{response.rb → response_spec.rb}

@@ -6,21 +6,21 @@ describe "Response" do
     File.open("#{FIXTURES_PATH}/create_card.xml") do |file|
       response = WirecardMapper::Response.new(file)
       response.card_id.should eql('47ae07020a010018157db66065da6e5c')
-      response.card_number.should eql('5274569796581777')
+      response.card_number.should eql(5274569796581777)
       response.status_code.should eql('activated')
       response.status_message.should eql('Active card')
       response.expiration_month.should eql('08')
-      response.expiration_year.should eql('2011')
-      response.card_security_code.should eql('618')
+      response.expiration_year.should eql(2011)
+      response.card_security_code.should eql(618)
       response.card_level.should eql('P')
       response.card_comment.should eql('This is a test card')
       response.issuing_date.should eql('2010-08-06')
-      response.bank_code.should eql('51230800')
-      response.account_number.should eql('2345')
+      response.bank_code.should eql(51230800)
+      response.account_number.should eql(2345)
       response.currency.should eql('EUR')
       response.first_name.should eql('WD SCP Test')
       response.last_name.should eql('WD SCP Test')
-      response.issuer_consumer_id.should eql('2345')
+      response.issuer_consumer_id.should eql(2345)
     end
   end
   

data/spec/unit/{model.rb → xml_spec.rb}

@@ -1,23 +1,9 @@
 require 'spec_helper'
 
-describe "Model" do
-  
+describe 'Xml' do
+
   before(:each) do
-    @card = Model do
-      class << self
-        def card_id
-          '47ae07020a010018157db66065da6e5c'
-        end
-
-        def number
-          5274569796581777
-        end
-
-        def amount
-          10.10
-        end
-      end
-    end
+    @card = Card.new
   end
 
   it "should get main xml" do
@@ -40,7 +26,7 @@ describe "Model" do
   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_f.should eql(@card.amount)
+    xml.at_css("amount").content.to_i.should eql(@card.amount)
   end
 
   it "should get update card xml" do
@@ -49,7 +35,7 @@ describe "Model" do
   end
 
   it "should get payment info xml" do
-    xml = @card.get_payment_info_xml
+    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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wirecardmapper
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 6
   - 0
-  version: 0.2.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Alexander Klaiber
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-09 00:00:00 +02:00
+date: 2010-11-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,24 +63,26 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- lib/wirecardmapper/model.rb
-- lib/wirecardmapper/response.rb
-- lib/wirecardmapper/request.rb
-- lib/wirecardmapper/net_http_monkeypatch.rb
+- 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.rb
-- spec/spec_helper.rb
+- lib/wirecardmapper/response.rb
 - spec/fixtures/create_card.xml
-- spec/unit/model.rb
-- spec/unit/response.rb
-- spec/functional/model.rb
+- spec/unit/response_spec.rb
+- spec/unit/xml_spec.rb
+- spec/spec_helper.rb
+- spec/functional/model_spec.rb
+- templates/get_card_info.xml
 - templates/create_card.xml
-- templates/main.xml
+- templates/update_card_info.xml
 - templates/submit_payment.xml
+- templates/main.xml
 - templates/get_payment_info.xml
-- templates/update_card_info.xml
-- templates/get_card_info.xml
 has_rdoc: true
 homepage: http://github.com/aklaiber/wirecardmapper
 licenses: []