atpay_tokens 3.1.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a316e114f4a086c4227846c8284a3359423c24d
-  data.tar.gz: f3dcc1c0269c4862fd07f8717ada624e26e65f8c
+  metadata.gz: a561123201e45863246cd4cc57ed9c96f877c773
+  data.tar.gz: 1adedd079256fa02fa52a4952f5377e69acecbe3
 SHA512:
-  metadata.gz: 95f762cfabfd4d9d11e9b930b89c8b0c4e6a2b18af286fe83199c64091f87835764f6bfbafcde58b39c01d7d8f5050c19e33ff52e8b2ff0176c5dc602a8c5417
-  data.tar.gz: e3e92a15df93196559c59071e5ee057691f928497ba04b277dfad79c775dbc5d3687d6e427e10808ca6835e2cebfe6cd273a0f27eb779b631819b21a73e982dd
+  metadata.gz: f978e26cf815ae4bb44bf4f8e81e4b3d57bcacaf1ff3cf6e19702a4826f584856df86bbf3211981c6a9ffc96ac12d6ad1f8149c548d398ec1334c56fe7ee5f9a
+  data.tar.gz: 5f76c320cd73b3409053b709cb01ae4f3b7c94033022edbfe1157566b6160b14ab9fe4ed5df9036f1e1d3cdf8604802a0d0391bccb9ab3e6bb379179a338411d

data/Gemfile

@@ -10,3 +10,7 @@ gem 'simplecov', :require => false, :group => :test
 gem 'bundler'
 gem 'rake'
 gem 'coveralls', require: false
+
+group :development do
+  gem 'pry'
+end

data/atpay_tokens.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name          = 'atpay_tokens'
-  s.version       = '3.1.0'
-  s.date          = '2014-03-31'
+  s.version       = '4.0.0'
+  s.date          = '2014-06-04'
   s.summary       = "@Pay Token Generator"
   s.description   = "Client interface for the @Pay API, key generation for performance optimization"
   s.authors       = ["James Kassemi", "Glen Holcomb"]

data/lib/atpay/security_key.rb

@@ -15,14 +15,14 @@ module AtPay
     end
 
     def email_token
-      "@#{version}#{Base64.strict_encode64([nonce, partner_frame, body_frame].join)}@"
+      "@#{version}#{Base64.urlsafe_encode64([nonce, partner_frame, body_frame].join)}@"
     ensure
       @nonce = nil
     end
 
     def site_token(remote_addr, headers)
       raise ArgumentError.new("card or member required for site tokens") if @options[:card].nil? and @options[:member].nil?
-      "@#{version}#{Base64.strict_encode64([nonce, partner_frame, site_frame(remote_addr, headers), body_frame].join)}"
+      "@#{version}#{Base64.urlsafe_encode64([nonce, partner_frame, site_frame(remote_addr, headers), body_frame].join)}"
     ensure
       @nonce = nil
     end
@@ -34,7 +34,7 @@ module AtPay
 
     private
     def version
-      @options[:version] ? (Base64.strict_encode64([@options[:version]].pack("Q>")) + '-') : nil
+      @options[:version] ? (Base64.urlsafe_encode64([@options[:version]].pack("Q>")) + '~') : nil
     end
 
     def partner_frame

data/lib/atpay/tokenator.rb

@@ -35,7 +35,7 @@ module AtPay
     class << self
       # Get the version of the given token.
       def token_version(token)
-        token.scan('-').empty? ? 0 : unpack_version(token.split('-')[0])
+        token.scan('~').empty? ? 0 : unpack_version(token.split('~')[0])
       end
 
       # Check and make sure we haven't seen this token before.
@@ -51,7 +51,9 @@ module AtPay
 
       # Unpack the actual version value.
       def unpack_version(version)
-        Base64.decode64(version[1..-1]).unpack("Q>")[0]
+        v = version[0] == '@' ? Base64.urlsafe_decode64(version[1..-1]) : Base64.urlsafe_decode64(version)
+        
+        v.unpack("Q>")[0]
       end
     end
 
@@ -101,12 +103,12 @@ module AtPay
 
     # Strip the version frame from the token.
     def strip_version
-      @token = @token.split('-').last
+      @token = @token.split('~').last
     end
 
     # Fix our Base64 problems
     def decode
-      @token = Base64.decode64 @token
+      @token = Base64.urlsafe_decode64(@token)
     end
 
     # Extract our entropy
@@ -193,9 +195,8 @@ module AtPay
 
     def format_token(token)
       tok = token.dup
-      trim_tail tok
-
-      tok
+      
+      tok.gsub('@', '').strip
     end
   end
 end

data/spec/atpay/tokenator_spec.rb

@@ -2,6 +2,7 @@ require 'atpay_tokens'
 require 'rbnacl'
 require 'base64'
 require 'helper'
+require 'pry'
 
 describe AtPay::Tokenator do
   let(:headers) { {'HTTP_USER_AGENT' => 'agent', 'HTTP_ACCEPT_LANGUAGE' => 'lang', 'HTTP_ACCEPT_CHARSET' => 'charset'} }

data/spec/atpay_tokens_spec.rb

@@ -1,8 +1,9 @@
 require 'helper'
 require 'atpay_tokens'
+require 'pry'
 
 describe "atpay_tokens" do
-  let(:key_pattern) { /@((([A-Za-z0-9+=*]{4})*-)?([A-Za-z0-9+=\/]{4}){5,})/ }
+  let(:key_pattern) { /@((([A-Za-z0-9\-=*]{4})*~)?([A-Za-z0-9\-=_]{4}){5,})/ }
   let(:base_args) { "--environment test --private-key \"#{private_key}\" --public-key \"#{public_key}\" --partner-id 1 --amount 24.0"}
   let(:universal_token_args) { "#{base_args} --type universal --url http://bob.com" }
   let(:site_token_args) { "#{base_args} --type site --card cardtoken --header-user-agent bob --header-accept-language en --header-accept-charset us --ip-address 127.0.0.1" }
@@ -54,4 +55,4 @@ describe "atpay_tokens" do
       expect(tokenator.source[:email]).to eq('bob@bob.com')
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: atpay_tokens
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 4.0.0
 platform: ruby
 authors:
 - James Kassemi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi