iap_verifier 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d89828b0eed3faefdafd855ad7de9e956a098557
-  data.tar.gz: f1fec54b3ebbcc1aa7dad8538062e73e3cdcd3fe
+  metadata.gz: 12b8929ff939efa3791342dea19cb317a0a7fc85
+  data.tar.gz: 106416c9890832238e63870e29561eed5a451a3c
 SHA512:
-  metadata.gz: d37bf0595895be84ae763af57d5d7fd4f7829b2b0f76695ab35e839f0dc1803de41ed6c443476b85408111e8c20cd4d38516660239f5ebcfe88b4d42493a468c
-  data.tar.gz: 8e376237522bd58407ebfeca8a549529e7beba250977f019a47f3fb8008c7b081c54f6934416bf304b36761571146702f85c222f6cdd748bd706fa4a0852b581
+  metadata.gz: 3e5ed21ace584601597c4446e9a559af34ea8b24cd907024ed0fb2f475d792e39b55424f7d5147c779cca2b261fd373de8496f70146125288001513477a3aba1
+  data.tar.gz: 6556e1ab3f7397dc8fbf8e796ae58f7c273b120f5755d50abc993d8c836b1c53f7f9266b104ad07326023e7c623a81407e03d560a338cc9e72049cdb8c5f343a

data/CHANGELOG.md

@@ -2,13 +2,27 @@
 
 ## master
 
+## v0.3.0
+
+Improvement
+
+* Handle malformed response from Apple's server.
+* Remove external dependencies (Oj and HTTPClient).
+
 ## v0.2.0
 
+Fix
+
 * Fixes OpenSSL::SSL::SSLError [#1](https://github.com/linjunpop/iap_verifier/pull/1)
+
+Improvement
+
 * curb is not thread-safe, [httpclient](https://github.com/nahi/httpclient) does.
 
 ## v0.1.0
 
+Improvement
+
 * Use [oj](https://github.com/ohler55/oj) to load JSON.
 * Use [curb](https://github.com/taf2/curb) as http client.
 * Support ruby 1.9 & 2.0.

data/README.md

@@ -1,7 +1,6 @@
 # IAPVerifier
 
 [![Build Status](https://travis-ci.org/linjunpop/iap_verifier.svg)](https://travis-ci.org/linjunpop/iap_verifier)
-[![Dependency Status](http://img.shields.io/gemnasium/linjunpop/iap_verifier.svg)](https://gemnasium.com/linjunpop/iap_verifier)
 [![Code Climate](http://img.shields.io/codeclimate/github/linjunpop/iap_verifier.svg)](https://codeclimate.com/github/linjunpop/iap_verifier)
 [![Gem Version](http://img.shields.io/gem/v/iap_verifier.svg)](https://rubygems.org/gems/iap_verifier)
 [![License](http://img.shields.io/:license-mit-blue.svg)](http://linjunpop.mit-license.org)

data/iap_verifier.gemspec

@@ -18,9 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'httpclient'
-  spec.add_runtime_dependency 'oj'
-
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "pry"

data/lib/iap_verifier.rb

@@ -1,7 +1,6 @@
 require "iap_verifier/version"
 require 'iap_verifier/error'
 require 'iap_verifier/request'
-require 'iap_verifier/request_data'
 require 'iap_verifier/response_data'
 require 'iap_verifier/receipt'
 

data/lib/iap_verifier/error.rb

@@ -18,17 +18,17 @@ module IAPVerifier
       end
     end
 
-    class MalformedReceiptData < Standard
+    class MalformedResponseData < Standard
       def initialize(data)
         @data = data
       end
 
       def message
-        "Malformed Receipt data: #{@data}"
+        "Malformed response from Apple Server: #{data}"
       end
     end
 
-    class InvalidResponseData < Standard
+    class InvalidReceiptData < Standard
       MESSAGES = {
         21000 => "App store could not read",
         21002 => "Data was malformed",

data/lib/iap_verifier/receipt.rb

@@ -3,10 +3,6 @@ module IAPVerifier
     def initialize(response_data)
       @receipt_data = response_data['receipt']
 
-      unless @receipt_data.is_a?(Hash)
-        raise Error::MalformedReceiptData
-      end
-
       @receipt_data.each do |key, value|
         define_singleton_method key.to_s, -> { value }
       end

data/lib/iap_verifier/request.rb

@@ -1,7 +1,3 @@
-require 'json'
-require 'httpclient'
-require 'oj'
-
 module IAPVerifier
   class Request
     PRODUCTION_URL = "https://buy.itunes.apple.com/verifyReceipt"
@@ -12,7 +8,9 @@ module IAPVerifier
         raise Error::EmptyReceipt.new
       end
 
-      @request_data = RequestData.new(receipt)
+      @request_data = {
+        'receipt-data' => receipt
+      }
     end
 
     def response
@@ -32,15 +30,21 @@ module IAPVerifier
     end
 
     def verify(request_data, url)
-      http = HTTPClient.new
-      http.ssl_config.ssl_version = :TLSv1
-      response = http.post(
-        url,
-        body: request_data.to_json,
-        header: {'Content-Type' => "application/json", 'Accept' => 'application/json'}
-      )
-
-      ResponseData.new(Oj.load(response.content))
+      uri = URI(url)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+
+      request = Net::HTTP::Post.new(uri.request_uri)
+
+      request['Accept'] = "application/json"
+      request['Content-Type'] = "application/json"
+
+      request.body = request_data.to_json
+
+      response = http.request(request)
+
+      ResponseData.new(response.body)
     end
   end
 end

data/lib/iap_verifier/response_data.rb

@@ -1,10 +1,16 @@
+require 'json'
+
 module IAPVerifier
   class ResponseData
-    SUCCESS_RESPONSE_CODE = 0
-    SANDBOX_RECEIPT_CODE = 21007
+    SUCCESS_RESPONSE_CODE = 0.freeze
+    SANDBOX_RECEIPT_CODE = 21007.freeze
+
+    def initialize(json)
+      @response_data = JSON.parse(json)
 
-    def initialize(response_data)
-      @response_data = response_data
+      raise Error::MalformedResponseData.new(json) unless @response_data.is_a?(Hash)
+    rescue JSON::ParserError
+      raise Error::MalformedResponseData.new(json)
     end
 
     def valid?
@@ -19,7 +25,7 @@ module IAPVerifier
       if valid?
         Receipt.new(@response_data)
       else
-        raise Error::InvalidResponseData.new(status_code)
+        raise Error::InvalidReceiptData.new(status_code)
       end
     end
 

data/lib/iap_verifier/version.rb

@@ -1,3 +1,3 @@
 module IAPVerifier
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/test/response_data_test.rb

@@ -5,14 +5,14 @@ require 'iap_verifier/error'
 
 class ResponseDataTest < MiniTest::Test
   def test_success_response_json
-    success_response_json = { 'status' => 0, 'receipt' => { } }
+    success_response_json = { 'status' => 0, 'receipt' => { } }.to_json
     response_data = IAPVerifier::ResponseData.new(success_response_json)
 
     assert_equal true, response_data.valid?
   end
 
   def test_error_response_json
-    error_response_json = { 'status' => 21002 }
+    error_response_json = { 'status' => 21002 }.to_json
     response_data = IAPVerifier::ResponseData.new(error_response_json)
 
     assert_equal false, response_data.valid?
@@ -20,7 +20,7 @@ class ResponseDataTest < MiniTest::Test
 
   def test_sandbox_response_json
     # sandbox receipt sent to production server
-    sandbox_response_json = { 'status' => 21007 }
+    sandbox_response_json = { 'status' => 21007 }.to_json
     response_data = IAPVerifier::ResponseData.new(sandbox_response_json)
 
     assert_equal false, response_data.valid?
@@ -28,17 +28,22 @@ class ResponseDataTest < MiniTest::Test
   end
 
   def test_receipt
-    response_data = IAPVerifier::ResponseData.new({ 'receipt' => { } })
+    response_data = IAPVerifier::ResponseData.new({ 'receipt' => { } }.to_json)
     response_data.stubs(:valid?).returns(true)
 
     assert_equal true, response_data.receipt.instance_of?(IAPVerifier::Receipt)
   end
 
-  def test_invalid_response_data
-    assert_raises(IAPVerifier::Error::InvalidResponseData) do
-      response_data = IAPVerifier::ResponseData.new({ 'receipt' => { } })
-      response_data.stubs(:valid?).returns(false)
+  def test_malformed_response_data
+    assert_raises(IAPVerifier::Error::MalformedResponseData) do
+      IAPVerifier::ResponseData.new('')
+    end
+  end
 
+  def text_invalid_receipt_data
+    assert_raises(IAPVerifier::Error::InvalidReceiptData) do
+      IAPVerifier::ResponseData.new({ 'receipt' => { } }.to_json)
+      response_data.stubs(:valid?).returns(false)
       response_data.receipt
     end
   end

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: iap_verifier
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jun Lin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-30 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: httpclient
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: oj
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -155,13 +127,11 @@ files:
 - lib/iap_verifier/error.rb
 - lib/iap_verifier/receipt.rb
 - lib/iap_verifier/request.rb
-- lib/iap_verifier/request_data.rb
 - lib/iap_verifier/response_data.rb
 - lib/iap_verifier/version.rb
 - test/fixtures/base64_receipt
 - test/fixtures/vcr_cassettes/valid_receipt.yml
 - test/receipt_test.rb
-- test/request_data_test.rb
 - test/request_test.rb
 - test/response_data_test.rb
 - test/test_helper.rb
@@ -193,7 +163,6 @@ test_files:
 - test/fixtures/base64_receipt
 - test/fixtures/vcr_cassettes/valid_receipt.yml
 - test/receipt_test.rb
-- test/request_data_test.rb
 - test/request_test.rb
 - test/response_data_test.rb
 - test/test_helper.rb

data/lib/iap_verifier/request_data.rb

@@ -1,17 +0,0 @@
-module IAPVerifier
-  class RequestData
-    def initialize(receipt)
-      @receipt = receipt
-    end
-
-    def to_h
-      {
-        'receipt-data' => @receipt
-      }
-    end
-
-    def to_json
-      to_h.to_json
-    end
-  end
-end

data/test/request_data_test.rb

@@ -1,13 +0,0 @@
-require 'test_helper'
-require 'iap_verifier/request_data'
-
-class RequestDataTest < MiniTest::Test
-  def test_base64_receipt
-    receipt = File.read(File.expand_path("../fixtures/base64_receipt", __FILE__))
-
-    expected = {
-      'receipt-data' => receipt
-    }
-    assert_equal expected, IAPVerifier::RequestData.new(receipt).to_h
-  end
-end