maxmind 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86e1f00f56877745ccb1a9abb4def3a574ab5e39
-  data.tar.gz: 6cb391c94e902c903a4231c3760e49e0c1e45fe3
+  metadata.gz: 0223f7f1a71376a601edbad80dfd6fe9031a4ec3
+  data.tar.gz: 907d96e343272de90ce1bd41cfe703e223978735
 SHA512:
-  metadata.gz: fa6c8d0f6338fdf40e435fad867ac08d882bc96cdc547a25f393f59ffdf5359df1a5677c0eea7b53b8e51640b169afd953abbfbefda1264db6d3c301f3496930
-  data.tar.gz: 1ceffa7a4b3c2bac93c89f36a8912a85e39c2290cda325cc4438b6f3ca0033a1379924e2bbfe630e42c9f80182575cc1998f7a31933db2fbc4225621200c4c94
+  metadata.gz: 1d814a2b9c81a9a28b0777da2e4e648ec7cb295a7aa912d2a56503c3ddb61135bacde0ea2f833e8fc7fbe841f9769a0d7f707e6670f031f1a84ea2f0832bce0c
+  data.tar.gz: b65d325cfc013068bf024b1a2c2a0b7e3d2bf2f108c319338c5e384d7f0604d7db6d3af3a83a3dde754439fec73a2e6b490db4c10c981239509b266086f103c2

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
-rvm: 
-  - '1.8.7'
-  - '1.9.2'
+rvm:
   - '1.9.3'
-
+  - '2.1.3'
+  - '2.2.0'

data/README.md

@@ -38,11 +38,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!
@@ -164,6 +160,7 @@ Contributors
 * Thomas Morgan
 * Tinu Cleatus <tinu.cleatus@me.com>
 * Don Pflaster <dpflaster@gmail.com>
+* Igor Pstyga
 
 Thanks to all :)
 

data/lib/maxmind/request.rb

@@ -120,14 +120,14 @@ module Maxmind
     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
@@ -147,15 +147,11 @@ module Maxmind
         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/version.rb

@@ -1,3 +1,3 @@
 module Maxmind
-  VERSION = '0.4.5'
+  VERSION = '0.4.6'
 end

data/spec/maxmind/request_spec.rb

@@ -14,57 +14,67 @@ 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 "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'
-    @request.username.should == 'b642b4217b34b1e8d3bd915fc65c4452'
+    expect(@request.username).to eq 'b642b4217b34b1e8d3bd915fc65c4452'
   end
 
   it "does not double convert an md5 password" do
     @request.password = 'b642b4217b34b1e8d3bd915fc65c4452'
-    @request.password.should == 'b642b4217b34b1e8d3bd915fc65c4452'
+    expect(@request.password).to eq 'b642b4217b34b1e8d3bd915fc65c4452'
   end
 
   it "does not double convert an md5 email" do
     @request.email = 'b642b4217b34b1e8d3bd915fc65c4452'
-    @request.email.should == 'b642b4217b34b1e8d3bd915fc65c4452'
+    expect(@request.email).to eq 'b642b4217b34b1e8d3bd915fc65c4452'
   end
 
   it "exposes the query parameters" do
-    @request.query.should be_a Hash
+    expect(@request.query).to be_a Hash
   end
 
 end

data/spec/maxmind/response_spec.rb

@@ -22,59 +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
-    @response.body.should == @response_body
+    expect(@response.body).to eq @response_body
   end
 
   it "exposes the http response code" do
-    @response.http_code.should == 200
+    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 be_a String
+    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
-    @response.high_risk_email.should == true
+    expect(@response.high_risk_email).to be_truthy
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maxmind
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Adam Daniels
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-27 00:00:00.000000000 Z
+date: 2015-02-16 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
@@ -18,8 +18,8 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE
@@ -53,17 +53,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Wrapper for MaxMind's minFraud service