maxmind 0.4.2 → 0.4.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4608e9c60c8244b7b82c9a95add791a1b0d4f718
+  data.tar.gz: 7e2da7ff1682d4db6c238b0a56480b3014265fdb
+SHA512:
+  metadata.gz: 7a9e248e97806a9391aa3e25d3c5c68e323d08b3ba28525bcf9da55fd2b0eecafe01c7ba071ff0db5ad9c0f1a13e66d4e0afce2e7db14abe7427f7ae7912a939
+  data.tar.gz: 17a3e05790a99d970ec19b08b0b932f5798bd4be29f47fc595c8437a33245c60540b71cdc5b2a18e2afe04f6440ff219df61c9009e1aea92d2cfc8d015a86b07

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - '1.9.3'
+  - '2.1.3'
+  - '2.2.0'

data/Gemfile

@@ -1,2 +1,9 @@
-source :rubygems
-gemspec
+source 'http://rubygems.org'
+gemspec
+
+gem 'guard-rspec'
+gem 'rake'
+gem 'rdoc'
+gem 'rspec'
+gem 'mocha'
+gem 'webmock'

data/Guardfile

@@ -4,3 +4,25 @@ guard 'rspec', :version => 2, :cli => '--color --format doc' do
   watch('lib/eventricle.rb') { "spec/eventricle.rb" }
   watch('spec/spec_helper.rb') { "spec" }
 end
+
+guard :rspec do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+
+  # Capybara features specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end
+

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Adam
+Copyright (c) 2009 Adam Daniels
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,8 +1,9 @@
 maxmind
 ==========
 
-A wrapper around MaxMind's minFraud anti-fraud service.
+An unofficial wrapper around MaxMind's minFraud anti-fraud service.
 
+For MaxMind's Proxy Detection Service, see this gem: [https://github.com/eric-smartlove/maxmind\_proxy\_detection](https://github.com/eric-smartlove/maxmind_proxy_detection)
 
 Installation
 ------------
@@ -15,7 +16,7 @@ Tests
 ------------
 
     bundle install
-    guard
+    bundle exec guard
 
 Dependencies
 ------------
@@ -27,7 +28,7 @@ Running Tests
 
 Run `bundle install` to make sure you have all the dependencies. Once that's done, run:
 
-    rake test
+    rake spec
 
 Usage
 -----
@@ -38,11 +39,7 @@ These are the only required fields to acquire a response from MaxMind.
     require 'maxmind'
     Maxmind.license_key = 'LICENSE_KEY'
     request = Maxmind::Request.new(
-      :client_ip => '24.24.24.24',
-      :city => 'New York',
-      :region	=> 'NY',
-      :postal	=> '11434',
-      :country => 'US'
+      :client_ip => '24.24.24.24'
     )
 
 	  response = request.process!
@@ -104,9 +101,6 @@ This is every field available.
 
 	  response = request.process!
 
-
-Also see examples/example.rb
-
 TODO
 ----
 * Improve specs (eg, test server failover)
@@ -115,15 +109,60 @@ Reference
 ---------
 [minFraud API Reference](http://www.maxmind.com/app/ccv)
 
+Also see examples/example.rb
+
+Chargeback Service
+------------------
+
+You can help improve the Minfraud service by reporting instances of fraud.  Only the IP address of a suspected fraudulent order is required, but you can pass additional information.  Note that your Maxmind User ID is required in addition to your license key.
+
+Chargeback Service Usage
+------------------------
+
+### Minimum Required ###
+These are the only required fields to acquire a response from MaxMind.
+
+    require 'maxmind'
+    Maxmind.license_key = 'LICENSE_KEY'
+    Maxmind.user_id     = 'MAXMIND_USER_ID'
+    request = Maxmind::ChargebackRequest.new(
+      :client_ip => '24.24.24.24'
+    )
+
+	  response = request.process!
+
+
+### Recommended ###
+For increased accuracy, these are the recommended fields to submit to MaxMind. The additional
+fields here are optional and can be all or none.
+
+    require 'maxmind'
+    Maxmind.license_key = 'LICENSE_KEY'
+    Maxmind.user_id     = 'MAXMIND_USER_ID'
+    request = Maxmind::ChargebackRequest.new(
+      :client_ip       => '24.24.24.24',
+      :chargeback_code => 'Fraud',
+      :fraud_score     => 'suspected_fraud',
+      :maxmind_id      => 'KW36L83C',
+      :transaction_id  => '12345'
+    )
+
+    response = request.process!
+
+[minFraud Chargeback reference](http://dev.maxmind.com/minfraud/chargeback)
+
 Contributors
 ------------
-Sam Oliver <sam@samoliver.com>
-Nick Wilson <nick@di.fm>
-Wolfram Arnold <wolfram@rubyfocus.biz>
-Jonathan Lim <snowblink@gmail.com>
-Tom Blomfield
-Thomas Morgan
-Tinu Cleatus <tinu.cleatus@me.com>
+* Sam Oliver <sam@samoliver.com>
+* Nick Wilson <nick@di.fm>
+* Wolfram Arnold <wolfram@rubyfocus.biz>
+* Jonathan Lim <snowblink@gmail.com>
+* Tom Blomfield
+* Thomas Morgan
+* Tinu Cleatus <tinu.cleatus@me.com>
+* Don Pflaster <dpflaster@gmail.com>
+* Igor Pstyga
+* Jack Kelly <jack@trikeapps.com>
 
 Thanks to all :)
 

data/examples/chargeback_example.rb

@@ -0,0 +1,20 @@
+require 'pp'
+require File.join(File.dirname(__FILE__), '..', 'lib/maxmind')
+
+required_fields = {
+  :client_ip => '24.24.24.24'
+}
+
+recommended_fields = {
+  :client_ip       => '24.24.24.24',
+  :chargeback_code => 'Fraud',
+  :fraud_score     => 'suspected_fraud',
+  :maxmind_id      => 'KW36L83C',
+  :transaction_id  => '12345'
+}
+
+Maxmind.license_key = 'LICENSE_KEY'
+Maxmind.user_id     = 'MAXMIND_USER_ID'
+request = Maxmind::ChargebackRequest.new(required_fields.merge(recommended_fields))
+response = request.process!
+pp response

data/lib/maxmind/chargeback_request.rb

@@ -0,0 +1,94 @@
+module Maxmind
+  class ChargebackRequest
+    DefaultTimeout = 60
+
+    # optionally set a default request type (one of 'standard' or 'premium')
+    #   Maxmind's default behavior is to use premium if you have credits, else use standard
+    class << self
+      attr_accessor :default_request_type
+      attr_accessor :timeout
+    end
+
+    # Required Fields
+    attr_accessor :client_ip
+
+    # Optional Fields
+    attr_accessor :chargeback_code, :fraud_score, :maxmind_id, :transaction_id
+
+    def initialize(attrs={})
+      self.attributes = attrs
+    end
+
+    def attributes=(attrs={})
+      attrs.each do |k, v|
+        self.send("#{k}=", v)
+      end
+    end
+
+    def process!
+      resp = post(query)
+      Maxmind::ChargebackResponse.new(resp.message, resp.code)
+    end
+
+    def process
+      process!
+    rescue Exception => e
+      false
+    end
+
+    def query
+      validate
+
+      required_fields = {
+        :ip_address       => @client_ip,
+      }
+
+      optional_fields = {
+        :chargeback_code  => @chargeback_code,
+        :fraud_score      => @fraud_score,
+        :maxmind_id       => @maxmind_id,
+        :transaction_id   => @transaction_id
+      }
+
+      field_set = required_fields.merge(optional_fields)
+      field_set.reject {|k, v| v.nil? }.to_json
+    end
+
+    private
+
+    # Upon a failure at the first URL, will automatically retry with the
+    # second & third ones before finally raising an exception
+    # Returns an HTTPResponse object
+    def post(query_params)
+      servers ||= SERVERS.map{|hostname| "https://#{hostname}/minfraud/chargeback"}
+      url = URI.parse(servers.shift)
+
+      req = Net::HTTP::Post.new(url.path, initheader = {'Content-Type' =>'application/json'})
+      req.basic_auth Maxmind::user_id, Maxmind::license_key
+      req.body = query_params
+
+      h = Net::HTTP.new(url.host, url.port)
+      h.use_ssl = true
+      h.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+      # set some timeouts
+      h.open_timeout  = 60 # this blocks forever by default, lets be a bit less crazy.
+      h.read_timeout  = self.class.timeout || DefaultTimeout
+      h.ssl_timeout   = self.class.timeout || DefaultTimeout
+
+      h.start { |http| http.request(req) }
+
+    rescue Exception => e
+      retry if servers.size > 0
+      raise e
+    end
+
+    protected
+
+    def validate
+      raise ArgumentError, 'License key is required' unless Maxmind::license_key
+      raise ArgumentError, 'User ID is required' unless Maxmind::user_id
+      raise ArgumentError, 'IP address is required' unless client_ip
+    end
+  end
+end

data/lib/maxmind/chargeback_response.rb

@@ -0,0 +1,12 @@
+module Maxmind
+  class ChargebackResponse
+    attr_accessor :attributes
+    attr_reader :response, :http_code
+
+    def initialize(response = nil, http_code = nil)
+      raise ArgumentError, 'Missing response string' unless response
+      @response = response
+      @http_code = http_code.to_i if http_code
+    end
+  end
+end

data/lib/maxmind/request.rb

@@ -1,11 +1,4 @@
 module Maxmind
-  # Your license key
-  class << self
-    attr_accessor :license_key
-  end
-	
-  SERVERS = %w(minfraud.maxmind.com minfraud-us-east.maxmind.com minfraud-us-west.maxmind.com)
-
   class Request
     DefaultTimeout = 60
 
@@ -16,7 +9,6 @@ module Maxmind
       attr_accessor :timeout
     end
 
-
     # Required Fields
     attr_accessor :client_ip, :city, :region, :postal, :country
 
@@ -25,20 +17,18 @@ module Maxmind
       :forwarded_ip, :email, :username, :password, :transaction_id, :session_id,
       :shipping_address, :shipping_city, :shipping_region, :shipping_postal,
       :shipping_country, :user_agent, :accept_language, :order_amount,
-      :order_currency
+      :order_currency, :avs_result, :cvv_result, :txn_type
 
     def initialize(attrs={})
       self.attributes = attrs
     end
 
-
     def attributes=(attrs={})
       attrs.each do |k, v|
         self.send("#{k}=", v)
       end
     end
 
-
     # email domain ... if a full email is provided, take just the domain portion
     def domain=(email)
       @domain = if email =~ /@(.+)/
@@ -51,16 +41,16 @@ module Maxmind
     # customer email ... sends just an MD5 hash of the email.
     # also sets the email domain at the same time.
     def email=(email)
-      @email = Digest::MD5.hexdigest(email.downcase)
+      @email = md5_digest(email)
       self.domain = email unless domain
     end
 
     def username=(username)
-      @username = Digest::MD5.hexdigest(username.downcase)
+      @username = md5_digest(username)
     end
 
     def password=(password)
-      @password = Digest::MD5.hexdigest(password.downcase)
+      @password = md5_digest(password)
     end
 
     # if a full card number is passed, grab just the first 6 digits (which is the bank id number)
@@ -68,10 +58,10 @@ module Maxmind
       @bin = bin ? bin[0,6] : nil
     end
 
-
     def process!
       resp = post(query)
-      Maxmind::Response.new(resp)
+      resp.body.encode!("utf-8", "iso-8859-1") if resp.body.respond_to?(:encode!)
+      Maxmind::Response.new(resp.body, resp.code)
     end
 
     def process
@@ -80,9 +70,6 @@ module Maxmind
       false
     end
 
-
-    private
-
     def query
       validate
 
@@ -114,47 +101,58 @@ module Maxmind
         :txnID            => @transaction_id,
         :sessionID        => @session_id,
         :user_agent       => @user_agent,
-        :accept_language  => @accept_langage
+        :accept_language  => @accept_language,
+        :avs_result       => @avs_result,
+        :cvv_result       => @cvv_result,
+        :txn_type         => @txn_type,
+        :order_amount     => @order_amount,
+        :order_currency   => @order_currency
       }
 
       field_set = required_fields.merge(optional_fields)
       field_set.reject {|k, v| v.nil? }
     end
 
+    private
+
     # Upon a failure at the first URL, will automatically retry with the
     # second & third ones before finally raising an exception
+    # Returns an HTTPResponse object
     def post(query_params)
       servers ||= SERVERS.map{|hostname| "https://#{hostname}/app/ccv2r"}
       url = URI.parse(servers.shift)
-      
+
       req = Net::HTTP::Post.new(url.path)
       req.set_form_data(query_params)
 
       h = Net::HTTP.new(url.host, url.port)
       h.use_ssl = true
       h.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      
+
       # set some timeouts
       h.open_timeout  = 60 # this blocks forever by default, lets be a bit less crazy.
       h.read_timeout  = self.class.timeout || DefaultTimeout
       h.ssl_timeout   = self.class.timeout || DefaultTimeout
 
-      response = h.start { |http| http.request(req) }
-      response.body
+      h.start { |http| http.request(req) }
 
     rescue Exception => e
       retry if servers.size > 0
       raise e
     end
-    
+
+    def md5_digest(value)
+      if value =~ /^[0-9a-f]{32}$/i
+        value
+      else
+        Digest::MD5.hexdigest(value.downcase)
+      end
+    end
+
     protected
     def validate
       raise ArgumentError, 'License key is required' unless Maxmind::license_key
       raise ArgumentError, 'IP address is required' unless client_ip
-      raise ArgumentError, 'City is required' unless city
-      raise ArgumentError, 'Region is required' unless region
-      raise ArgumentError, 'Postal code is required' unless postal
-      raise ArgumentError, 'Country is required' unless country
     end
   end
 end

data/lib/maxmind/response.rb

@@ -1,16 +1,20 @@
 module Maxmind
   class Response
     attr_accessor :attributes
+    attr_reader :body, :http_code
 
     ATTRIBUTE_MAP = {
       'custPhoneInBillingLoc' => 'phone_in_billing_location',
       'maxmindID' => 'maxmind_id',
       'isTransProxy' => 'is_transparent_proxy',
-      'err' => 'error'
+      'err' => 'error',
+      'carderEmail' => 'high_risk_email'
     }
 
-    def initialize(response = nil)
+    def initialize(response = nil, http_code = nil)
       raise ArgumentError, 'Missing response string' unless response
+      @body = response
+      @http_code = http_code.to_i if http_code
       @attributes = {}
       parse(response)
     end
@@ -34,8 +38,8 @@ module Maxmind
     end
 
     def method_missing(meth, *args)
-      if meth.to_s[-1] == '?'
-        send(meth[0..-2])
+      if meth.to_s[-1, 1] == '?'
+        send(meth.to_s[0..-2])
       elsif attributes.has_key?(meth)
         attributes[meth]
       else
@@ -44,7 +48,7 @@ module Maxmind
     end
 
     def respond_to?(meth)
-      if meth.to_s[-1] == '?'
+      if meth.to_s[-1, 1] == '?'
         respond_to? meth[0..-2]
       else
         super
@@ -64,13 +68,13 @@ module Maxmind
       v = Integer(v) rescue Float(v) rescue v;
 
       case v
-      when /[Yy]es/
+      when 'Yes', 'yes'
         attributes[k] = true
-      when /[Nn]o/
+      when 'No', 'no'
         attributes[k] = false
       else
         attributes[k] = v
       end
     end
   end
-end
+end

data/lib/maxmind/version.rb

@@ -1,3 +1,3 @@
 module Maxmind
-  VERSION = '0.4.2'
-end
+  VERSION = '0.4.7'
+end

data/lib/maxmind.rb

@@ -1,11 +1,18 @@
-require 'active_support'
-unless Module.respond_to?(:mattr_accessor)
-  require 'active_support/core_ext/module/attribute_accessors'# rescue nil  # this may be needed for ActiveSupport versions >= 3.x
-end
-require 'active_support/core_ext/hash'
-require 'net/http'
 require 'net/https'
 require 'uri'
 require 'digest/md5'
-require File.join(File.dirname(__FILE__), 'maxmind/request')
-require File.join(File.dirname(__FILE__), 'maxmind/response')
+
+require 'maxmind/version'
+require 'maxmind/request'
+require 'maxmind/chargeback_request'
+require 'maxmind/chargeback_response'
+require 'maxmind/response'
+
+module Maxmind
+  SERVERS = %w(minfraud.maxmind.com minfraud-us-east.maxmind.com minfraud-us-west.maxmind.com)
+  
+  class << self
+    attr_accessor :license_key
+    attr_accessor :user_id
+  end
+end

data/maxmind.gemspec

@@ -3,28 +3,21 @@ $:.push File.expand_path('../lib', __FILE__)
 require 'maxmind/version'
 
 Gem::Specification.new do |s|
-  s.name = "maxmind"
-  s.version = Maxmind::VERSION
+  s.name             = "maxmind"
+  s.version          = Maxmind::VERSION
 
-  s.authors = ["Adam Daniels", "Tinu Cleatus", "t.e.morgan", "Sam Oliver"]
-  s.date = "2012-01-06"
-  s.description = "A wrapper around MaxMind's minFraud anti-fraud service. \n\nhttp://www.maxmind.com/app/ccv_overview\n"
-  s.email = "adam@mediadrive.ca"
+  s.authors          = ["Adam Daniels"]
+  s.description      = "A wrapper around MaxMind's minFraud anti-fraud service. \n\nhttp://www.maxmind.com/app/ccv_overview\n"
+  s.email            = "adam@mediadrive.ca"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md"
   ]
-  
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.homepage = "http://github.com/adam12/maxmind"
-  s.require_paths = ["lib"]
-  s.summary = "Wrapper for MaxMind's minFraud service"
 
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'mocha'
-  s.add_development_dependency 'webmock'
-
-  s.add_runtime_dependency 'active_support', '>= 3.0.0'
+  s.files            = `git ls-files`.split("\n")
+  s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.homepage         = "http://github.com/adam12/maxmind"
+  s.require_paths    = ["lib"]
+  s.summary          = "Wrapper for MaxMind's minFraud service"
+  s.license          = 'MIT'
 end
-

data/spec/data/response.txt

@@ -1 +1 @@
-distance=329;countryMatch=Yes;countryCode=US;freeMail=Yes;anonymousProxy=No;score=7.66;binMatch=Yes;binCountry=US;err=;proxyScore=0.00;ip_region=NY;ip_city=Syracuse;ip_latitude=43.0514;ip_longitude=-76.1495;binName=;ip_isp=Road Runner;ip_org=Road Runner;binNameMatch=Yes;binPhoneMatch=Yes;binPhone=;custPhoneInBillingLoc=No;highRiskCountry=No;queriesRemaining=955;cityPostalMatch=No;shipCityPostalMatch=Yes;maxmindID=9VSOSDE2;isTransProxy=No;carderEmail=No;shipForward=Yes;highRiskUsername=No;highRiskPassword=No;riskScore=2.00;explanation=This order is very high risk, and we suggest you not accept it. This order is considered to be very slightly higher risk because the distance between the billing address and the user's actual location is larger than expected. The order is slightly riskier because the e-mail domain, yahoo.com, is a free e-mail provider. The order is slightly riskier because the phone number supplied by the user is not located within the zip code of the billing address for the credit card. The order is riskier because the shipping address given is a mail forwarding address, so there is no way to know where the products are actually going
+distance=329;countryMatch=Yes;countryCode=US;freeMail=Yes;anonymousProxy=No;score=7.66;binMatch=Yes;binCountry=US;err=;proxyScore=0.00;ip_region=NY;ip_city=Syracuse;ip_latitude=43.0514;ip_longitude=-76.1495;binName=;ip_isp=Road Runnere�;ip_org=Road Runner;binNameMatch=Yes;binPhoneMatch=Yes;binPhone=;custPhoneInBillingLoc=No;highRiskCountry=No;queriesRemaining=955;cityPostalMatch=No;shipCityPostalMatch=Yes;maxmindID=9VSOSDE2;isTransProxy=No;carderEmail=Yes;shipForward=Yes;highRiskUsername=No;highRiskPassword=No;riskScore=2.00;explanation=This order is very high risk, and we suggest you not accept it. This order is considered to be very slightly higher risk because the distance between the billing address and the user's actual location is larger than expected. The order is slightly riskier because the e-mail domain, yahoo.com, is a free e-mail provider. The order is slightly riskier because the phone number supplied by the user is not located within the zip code of the billing address for the credit card. The order is riskier because the shipping address given is a mail forwarding address, so there is no way to know where the products are actually going

data/spec/maxmind/chargeback_request_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Maxmind::ChargebackRequest do
+  before do
+    Maxmind.user_id = 'user'
+    Maxmind.license_key = 'key'
+    @request = Maxmind::ChargebackRequest.new(:client_ip => '198.51.100.2')
+  end
+
+  it "requires a License Key" do
+    Maxmind.license_key = nil
+    expect { @request.send(:validate) }.to raise_error(ArgumentError)
+    Maxmind.license_key = 'key'
+  end
+
+  it "requires a User ID" do
+    Maxmind.user_id = nil
+    expect { @request.send(:validate) }.to raise_error(ArgumentError)
+    Maxmind.user_id = 'user'
+  end
+
+  it "requires a client IP" do
+    @request.client_ip = nil
+    expect { @request.send(:validate) }.to raise_error(ArgumentError)
+  end
+end

data/spec/maxmind/chargeback_response_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Maxmind::ChargebackResponse do
+  before do
+    Maxmind.user_id = 'USER_ID'
+    Maxmind.license_key = 'LICENSE_KEY'
+
+    request = Maxmind::ChargebackRequest.new(:client_ip => '198.51.100.2')
+    stub_request(:post, "https://USER_ID:LICENSE_KEY@minfraud.maxmind.com/minfraud/chargeback").
+      to_return(:body => '', :status => 200)
+    @response = request.process!
+  end
+
+  it "requires a response" do
+    expect { Maxmind::ChargebackResponse.new }.to raise_exception(ArgumentError)
+  end
+
+  it "exposes the http response code" do
+    expect(@response.http_code).to eq  200
+  end
+
+  it "exposes the http response" do
+    expect(@response.response).to_not be_nil
+  end
+end

data/spec/maxmind/request_spec.rb

@@ -14,37 +14,72 @@ describe Maxmind::Request do
   end
 
   it "requires client IP" do
-    expect { @request.client_ip = nil; @request.send(:validate) }.to raise_exception(ArgumentError)
+    expect {
+      @request.client_ip = nil; @request.send(:validate)
+    }.to raise_exception(ArgumentError)
   end
 
-  it "requires city" do
-    expect { @request.city = nil; @request.send(:validate) }.to raise_exception(ArgumentError)
+  it "doesn't require city" do
+    expect {
+      @request.city = nil; @request.send(:validate)
+    }.not_to raise_error
   end
 
-  it "requires region" do
-    expect { @request.region = nil; @request.send(:validate) }.to raise_exception(ArgumentError)
+  it "doesn't require region" do
+    expect {
+      @request.region = nil; @request.send(:validate)
+    }.not_to raise_error
   end
 
-  it "requires postal" do
-    expect { @request.postal = nil; @request.send(:validate) }.to raise_exception(ArgumentError)
+  it "doesn't require postal" do
+    expect {
+      @request.postal = nil; @request.send(:validate)
+    }.not_to raise_error
   end
 
-  it "requires country" do
-    expect { @request.country = nil; @request.send(:validate) }.to raise_exception(ArgumentError)
+  it "doesn't require country" do
+    expect {
+      @request.country = nil; @request.send(:validate)
+    }.not_to raise_error
+  end
+
+  it "saves order currency" do
+    @request.order_currency = 'GBP'
+    expect(@request.query[:order_currency]).to eq 'GBP'
   end
 
   it "converts username to MD5" do
     @request.username = 'testuser'
-    @request.username.should == '5d9c68c6c50ed3d02a2fcf54f63993b6'
+    expect(@request.username).to eq '5d9c68c6c50ed3d02a2fcf54f63993b6'
   end
 
   it "converts password to MD5" do
     @request.password = 'testpassword'
-    @request.password.should == 'e16b2ab8d12314bf4efbd6203906ea6c'
+    expect(@request.password).to eq 'e16b2ab8d12314bf4efbd6203906ea6c'
   end
 
   it "converts email to MD5" do
     @request.email = 'test@test.com'
-    @request.email.should == 'b642b4217b34b1e8d3bd915fc65c4452'
+    expect(@request.email).to eq 'b642b4217b34b1e8d3bd915fc65c4452'
+  end
+
+  it "does not double convert an md5 username" do
+    @request.username = 'b642b4217b34b1e8d3bd915fc65c4452'
+    expect(@request.username).to eq 'b642b4217b34b1e8d3bd915fc65c4452'
+  end
+
+  it "does not double convert an md5 password" do
+    @request.password = 'b642b4217b34b1e8d3bd915fc65c4452'
+    expect(@request.password).to eq 'b642b4217b34b1e8d3bd915fc65c4452'
   end
-end
+
+  it "does not double convert an md5 email" do
+    @request.email = 'b642b4217b34b1e8d3bd915fc65c4452'
+    expect(@request.email).to eq 'b642b4217b34b1e8d3bd915fc65c4452'
+  end
+
+  it "exposes the query parameters" do
+    expect(@request.query).to be_a Hash
+  end
+
+end

data/spec/maxmind/response_spec.rb

@@ -1,11 +1,5 @@
 require 'spec_helper'
 
-REQUIRED_FIELDS =
-
-RECOMMENDED_FIELDS =
-
-OPTIONAL_FIELDS =
-
 describe Maxmind::Response do
   before do
     Maxmind.license_key = 'LICENSE_KEY'
@@ -14,10 +8,12 @@ describe Maxmind::Response do
     recommended_fields = JSON.parse(load_fixture("recommended_fields.json"))
     optional_fields = JSON.parse(load_fixture("optional_fields.json"))
     all_fields = required_fields.merge(recommended_fields).merge(optional_fields)
+    @response_body = load_fixture("response.txt")
+    @response_body.encode!("utf-8", "iso-8859-1") if @response_body.respond_to?(:encode!)
 
     request = Maxmind::Request.new(all_fields)
     stub_request(:post, "https://minfraud.maxmind.com/app/ccv2r").
-      to_return(:body => load_fixture("response.txt"), :status => 200)
+      to_return(:body => @response_body, :status => 200)
     @response = request.process!
   end
 
@@ -26,47 +22,59 @@ describe Maxmind::Response do
   end
 
   it "exposes its attributes" do
-    @response.attributes.should be_a Hash
+    expect(@response.attributes).to be_a Hash
+  end
+
+  it "exposes the raw response body" do
+    expect(@response.body).to eq @response_body
+  end
+
+  it "exposes the http response code" do
+    expect(@response.http_code).to eq 200
   end
 
   it "has a distance" do
-    @response.distance.should == 329
+    expect(@response.distance).to eq 329
   end
 
   it "has a maxmind ID" do
-    @response.maxmind_id.should == '9VSOSDE2'
+    expect(@response.maxmind_id).to eq '9VSOSDE2'
   end
 
   it "has a risk score" do
-    @response.risk_score.should == 2.0
+    expect(@response.risk_score).to eq 2.0
   end
 
   it "has a score" do
-    @response.score.should == 7.66
+    expect(@response.score).to eq 7.66
   end
 
   it "has queries remaining" do
-    @response.queries_remaining.should == 955
+    expect(@response.queries_remaining).to eq 955
   end
 
   it "has an explanation" do
-    @response.explanation.should_not == nil
+    expect(@response.explanation).to be_a String
   end
 
   it "has a country match" do
-    @response.country_match.should_not == nil
+    expect(@response.country_match).not_to be_nil
   end
 
   it "has a boolean country match" do
-    @response.country_match.should_not == "Yes"
-    @response.country_match.should == true
+    expect(@response.country_match).not_to eq "Yes"
+    expect(@response.country_match).to be_truthy
   end
 
   it "has a phone in billing location" do
-    @response.phone_in_billing_location.should == false
+    expect(@response.phone_in_billing_location).to be_falsey
   end
 
   it "has a phone in billing location ? method" do
-    @response.phone_in_billing_location?.should == false
+    expect(@response.phone_in_billing_location?).to be_falsey
+  end
+
+  it "has a high risk email" do
+    expect(@response.high_risk_email).to be_truthy
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,7 @@
-require 'mocha_standalone'
+require 'rubygems'
+require 'bundler/setup'
+
+require 'mocha/api'
 require 'maxmind'
 require 'json'
 require 'webmock/rspec'
@@ -7,24 +10,12 @@ RSpec.configure do |config|
 
   config.before(:suite) do
     # Disable all live HTTP requests
-    WebMock.disable_net_connect!(allow_localhost: true)
+    WebMock.disable_net_connect!(:allow_localhost => true)
   end
 
   config.mock_with :mocha
 end
 
-# Constants (classes, etc) defined within a block passed to this method
-# will be removed from the global namespace after the block as run.
-def isolate_constants
-  existing_constants = Object.constants
-  yield
-ensure
-  (Object.constants - existing_constants).each do |constant|
-    Object.send(:remove_const, constant)
-  end
-end
-
-
 def load_fixture(*filename)
   File.open(File.join('spec', 'data', *filename)).read
 end

metadata

@@ -1,84 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: maxmind
 version: !ruby/object:Gem::Version
-  version: 0.4.2
-  prerelease: 
+  version: 0.4.7
 platform: ruby
 authors:
 - Adam Daniels
-- Tinu Cleatus
-- t.e.morgan
-- Sam Oliver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-06 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: active_support
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-description: ! "A wrapper around MaxMind's minFraud anti-fraud service. \n\nhttp://www.maxmind.com/app/ccv_overview\n"
+date: 2015-10-22 00:00:00.000000000 Z
+dependencies: []
+description: "A wrapper around MaxMind's minFraud anti-fraud service. \n\nhttp://www.maxmind.com/app/ccv_overview\n"
 email: adam@mediadrive.ca
 executables: []
 extensions: []
@@ -86,14 +18,18 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE
 - README.md
 - Rakefile
+- examples/chargeback_example.rb
 - examples/example.rb
 - lib/maxmind.rb
+- lib/maxmind/chargeback_request.rb
+- lib/maxmind/chargeback_response.rb
 - lib/maxmind/request.rb
 - lib/maxmind/response.rb
 - lib/maxmind/version.rb
@@ -102,44 +38,42 @@ files:
 - spec/data/recommended_fields.json
 - spec/data/required_fields.json
 - spec/data/response.txt
+- spec/maxmind/chargeback_request_spec.rb
+- spec/maxmind/chargeback_response_spec.rb
 - spec/maxmind/request_spec.rb
 - spec/maxmind/response_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/adam12/maxmind
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1867686245011996081
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1867686245011996081
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Wrapper for MaxMind's minFraud service
 test_files:
 - spec/data/optional_fields.json
 - spec/data/recommended_fields.json
 - spec/data/required_fields.json
 - spec/data/response.txt
+- spec/maxmind/chargeback_request_spec.rb
+- spec/maxmind/chargeback_response_spec.rb
 - spec/maxmind/request_spec.rb
 - spec/maxmind/response_spec.rb
 - spec/spec_helper.rb