fat_zebra 1.0.2 → 1.1.0

data/FatZebra.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "yard"
   s.add_development_dependency "yard-tomdoc"
+  s.add_development_dependency "ZenTest"
   
 
   s.add_runtime_dependency "rest-client"

data/lib/fat_zebra/gateway.rb

@@ -57,6 +57,8 @@ module FatZebra
 		#               includes: 
 		#                 - id (unique purchase ID)
 		#                 - reference (merchant reference)
+		# 				  - from (Date)
+		# 				  - to (Date)
 		#                 - offset (defaults to 0) - for pagination
 		#                 - limit (defaults to 10) for pagination
 		# @return [Array<Purchase>] array of purchases
@@ -64,6 +66,11 @@ module FatZebra
 			id = options.delete(:id)
 			options.merge!({:offets => 0, :limit => 10})
 
+			# Format dates for the request
+			options[:from] = options[:from].strftime("%Y%m%dT%H%M") if options[:from]
+			options[:to] = options[:to].strftime("%Y%m%dT%H%M") if options[:to]
+
+
 			if id.nil?
 				response = make_request(:get, "purchases", options)
 				if response["successful"]
@@ -146,6 +153,26 @@ module FatZebra
 			end
 		end
 
+		# Public: Tokenizes a credit card
+		# 
+		# card_holder - the credit card holder name
+		# card_number - the card number
+		# expiry - the credit card expiry date (mm/yyyy)
+		# cvv - the card CVV
+		#
+		# Returns FatZebra::Models::Response
+		def tokenize(card_holder, card_number, expiry, cvv)
+			params = {
+				:card_holder => card_holder,
+				:card_number => card_number,
+				:card_expiry => expiry,
+				:cvv => cvv
+			}
+
+			response = make_request(:post, "credit_cards", params)
+			FatZebra::Models::Response.new(response, :card)
+		end
+
 
 		private
 		# Private: Extracts the date value from a Date/DateTime value
@@ -198,10 +225,10 @@ module FatZebra
 			end
 
 			unless data.nil?
-				url = url + "?"
-				data.each do |key, value|
-					url += "#{key}=#{value}" # TODO: URL Encode this
-				end
+				url = url + "?" + 
+				data.map do |key, value|
+					"#{key}=#{value}" # TODO: URL Encode this
+				end.join("&")
 			end
 
 			url
@@ -222,7 +249,13 @@ module FatZebra
   			} : {}
 
   			opts = {:user => self.username, :password => self.token}
-			RestClient::Resource.new(build_url(uri), opts.merge(ssl_options))
+			if method == :get
+				url = build_url(uri, data)
+			else
+				url = build_url(uri)
+			end
+
+			RestClient::Resource.new(url, opts.merge(ssl_options))
 		end
 
 		# Public: Performs the HTTP(s) request and returns a response object, handing errors etc
@@ -236,25 +269,35 @@ module FatZebra
 			resource = get_resource(resource, method, data)
 
 			payload = (method == :post) ? data.to_json : {}
+			headers = options[:headers] || {}
 
-			resource.send(method, payload) do |response, request, result, &block|
-				case response.code
-				when 201
-					JSON.parse(response)
-				when 200
-					JSON.parse(response)
-				when 400
-					raise RequestError, "Bad Data"
-				when 401
-					raise RequestError, "Unauthorized, please check your username and token"
-				when 404	
-					raise RequestError, "Requested URL not found"
-				when 500
-					raise RequestError, "Server Error, please check https://www.fatzebra.com.au"
-				when 501
-					raise RequestError, "Problem processing your request - please check your data"
+			if method == :get
+				resource.send(method, headers) do |response, request, result, &block|
+					handle_response(response)
 				end
+			else
+				resource.send(method, payload, headers) do |response, request, result, &block|
+					handle_response(response)
+				end
+			end
+		end
 
+		def handle_response(response)
+			case response.code
+			when 201
+				JSON.parse(response)
+			when 200
+				JSON.parse(response)
+			when 400
+				raise RequestError, "Bad Data"
+			when 401
+				raise RequestError, "Unauthorized, please check your username and token"
+			when 404	
+				raise RequestError, "Requested URL not found"
+			when 500
+				raise RequestError, "Server Error, please check https://www.fatzebra.com.au"
+			when 501
+				raise RequestError, "Problem processing your request - please check your data"
 			end
 		end
 	end

data/lib/fat_zebra/models/card.rb

@@ -0,0 +1,7 @@
+module FatZebra
+	module Models
+		class Card < Base
+			attribute :token, :card_holder, :card_number, :card_expiry, :transaction_count, :raw
+		end
+	end
+end

data/lib/fat_zebra/models/response.rb

@@ -3,7 +3,7 @@ module FatZebra
 		class Response
 			attr_accessor :successful, :result, :errors, :test, :raw
 			def initialize(response, type = :purchase)
-				self.raw = response.dup
+				self.raw = response.dup unless response.nil?
 				self.test = response["test"]
 				self.successful = response["successful"]
 				self.errors = response["errors"]
@@ -15,6 +15,9 @@ module FatZebra
 					when :refund
 						self.result = Refund.new(response["response"])
 						alias refund result
+					when :card
+						self.result = Card.new(response["response"])
+						alias card result
 				end
 			end
 

data/lib/fat_zebra/version.rb

@@ -1,3 +1,3 @@
 module FatZebra
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/lib/fat_zebra.rb

@@ -8,4 +8,5 @@ require 'fat_zebra/gateway'
 require 'fat_zebra/models/base'
 require 'fat_zebra/models/purchase'
 require 'fat_zebra/models/refund'
-require 'fat_zebra/models/response'
+require 'fat_zebra/models/card'
+require 'fat_zebra/models/response'

data/spec/gateway_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 TEST_USER = "TEST"
 TEST_TOKEN = "TEST"
-TEST_LOCAL = false
+TEST_LOCAL = ENV["TEST_LOCAL"] == "true" || false
 
 describe FatZebra::Gateway do
 	before :each do
@@ -35,7 +35,33 @@ describe FatZebra::Gateway do
 		purchase.id.should == result.purchase.id
 	end
 
-	it "should fetch a purchase within a date range"
+	it "should fetch a purchase via reference" do
+		ref = "TES#{rand}T"
+		result = @gw.purchase(10000, {:card_holder => "Matthew Savage", :number => "5555555555554444", :expiry => "05/2013", :cvv => 123}, ref, "1.2.3.4")
+
+		purchases = @gw.purchases(:reference => ref)
+		purchases.id.should == result.purchase.id
+	end
+
+	it "should fetch purchases within a date range" do
+		start = Time.now
+		5.times do |i|
+			@gw.purchase(10000, {:card_holder => "Matthew Savage", :number => "5555555555554444", :expiry => "05/2013", :cvv => 123}, "TEST#{rand(1000)}-#{i}", "1.2.3.4")
+		end
+
+		purchases = @gw.purchases(:from => start - 300, :to => Time.now + 300)
+		purchases.count.should >= 5
+	end
+
+	it "should fetch purchases with a from date" do
+		start = Time.now
+		5.times do |i|
+			@gw.purchase(10000, {:card_holder => "Matthew Savage", :number => "5555555555554444", :expiry => "05/2013", :cvv => 123}, "TEST#{rand(1000)}-#{i}", "1.2.3.4")
+		end
+
+		purchases = @gw.purchases(:from => start)
+		purchases.count.should >= 5
+	end
 
 	it "should refund a transaction" do
 		purchase = @gw.purchase(10000, {:card_holder => "Matthew Savage", :number => "5555555555554444", :expiry => "05/2013", :cvv => 123}, "TES#{rand}T", "1.2.3.4")
@@ -44,4 +70,10 @@ describe FatZebra::Gateway do
 		result.should be_successful
 		result.result.successful.should be_true
 	end
+
+	it "should tokenize a card" do
+		response = @gw.tokenize("M Smith", "5123456789012346", "05/2013", "123")
+		response.should be_successful
+		response.result.token.should_not be_nil
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fat_zebra
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000 Z
+date: 2012-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70212724986440 !ruby/object:Gem::Requirement
+  requirement: &70289032097440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212724986440
+  version_requirements: *70289032097440
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70212724985820 !ruby/object:Gem::Requirement
+  requirement: &70289032096820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212724985820
+  version_requirements: *70289032096820
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70212724985040 !ruby/object:Gem::Requirement
+  requirement: &70289032095980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212724985040
+  version_requirements: *70289032095980
 - !ruby/object:Gem::Dependency
   name: yard-tomdoc
-  requirement: &70212724984080 !ruby/object:Gem::Requirement
+  requirement: &70289032095080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212724984080
+  version_requirements: *70289032095080
+- !ruby/object:Gem::Dependency
+  name: ZenTest
+  requirement: &70289032094060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70289032094060
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70212724983620 !ruby/object:Gem::Requirement
+  requirement: &70289032093020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212724983620
+  version_requirements: *70289032093020
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70212724982560 !ruby/object:Gem::Requirement
+  requirement: &70289032092480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212724982560
+  version_requirements: *70289032092480
 description: Provides integration with the Fat Zebra internet payment gateway (www.fatzebra.com.au),
   including purchase, refund, auth, capture and recurring billing functionality.
 email:
@@ -86,6 +97,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .travis.yml
 - FatZebra.gemspec
 - Gemfile
@@ -96,6 +108,7 @@ files:
 - lib/fat_zebra/errors.rb
 - lib/fat_zebra/gateway.rb
 - lib/fat_zebra/models/base.rb
+- lib/fat_zebra/models/card.rb
 - lib/fat_zebra/models/purchase.rb
 - lib/fat_zebra/models/refund.rb
 - lib/fat_zebra/models/response.rb
@@ -120,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4020829074121266006
+      hash: 1093919880626549256
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -129,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4020829074121266006
+      hash: 1093919880626549256
 requirements: []
 rubyforge_project: fat_zebra
 rubygems_version: 1.8.10