apple_warranty_check 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28cf9938788f73aecbcd2157555a7b233068e150
-  data.tar.gz: 21886b40f483d2966c2c14a224db1734a0368eb2
+  metadata.gz: 60bcec6d62ab2bc0417c81e48217baa8135f3e91
+  data.tar.gz: d34d92ced8b939bd51e2f4e95dbd58e35858535e
 SHA512:
-  metadata.gz: 628e17aea374f37e996fcee3568ac240d8af740e28de703cbb7018a8b0a6e79224fc1bdee02e7ee5fd42c36ccdd2942e06a6bb83b21aa69245cc896fa6afc4b0
-  data.tar.gz: c912ec837824e5ce3828b8dfbafe25dc97dae411275f7de62f98c1876dea9c4d2bea36a9f645eca0ca10044297c686f028c151267ca6dda6e00b17d9308fb38c
+  metadata.gz: a6732a3072693525ff52b36fa6b40befa186e20c99fc707c79e4bc4cc14f1862fe27b04012508942845a9f313f33cfb48babd4ad3c162ddcbeeb70e9f79c3d8e
+  data.tar.gz: 735b771c3a5a1569a50efe5d1f20610a869e477a08572d1b140874b4c81065b17cede030aed8555ac65c203081b1288ee3922a5f83360d44b6bf97264c122a82

data/.gitignore

@@ -1,5 +1,7 @@
 /.bundle/
 /.yardoc
+.ruby-version
+.ruby-gemset
 /Gemfile.lock
 /_yardoc/
 /coverage/

data/README.md

@@ -1,7 +1,9 @@
 # AppleWarrantyCheck
 
+[![Gem Version](https://badge.fury.io/rb/apple_warranty_check.svg)](http://badge.fury.io/rb/apple_warranty_check)
 [![Build Status](https://travis-ci.org/flowerett/apple_warranty_check.svg?branch=master)](https://travis-ci.org/flowerett/apple_warranty_check)
 [![Code Climate](https://codeclimate.com/github/flowerett/apple_warranty_check/badges/gpa.svg)](https://codeclimate.com/github/flowerett/apple_warranty_check)
+[![Dependency Status](https://gemnasium.com/flowerett/apple_warranty_check.svg)](https://gemnasium.com/flowerett/apple_warranty_check)
 
 Simple tool to get warranty info for Apple devices by it's IMEI.
 

data/lib/apple_warranty_check/process.rb

@@ -8,14 +8,14 @@ module AppleWarrantyCheck
     BOOL_ARG = "(true|false)".freeze
 
     PRODUCT_INFO_REGEXP = /warrantyPage.warrantycheck.displayProductInfo\((.*)\)/.freeze
-    PH_SUPPORT_INFO_REGEXP = /warrantyPage.warrantycheck.displayPHSupportInfo\(\s*#{BOOL_ARG},\s*#{STR_ARG},\s*#{STR_ARG},\s*#{STR_ARG}/
+    PH_SUPPORT_INFO_REGEXP = /warrantyPage.warrantycheck.displayPHSupportInfo\(\s*#{BOOL_ARG},\s*#{STR_ARG},\s*#{STR_ARG},\s*#{STR_ARG}/.freeze
     HW_SUPPORT_INFO_REGEXP = /warrantyPage.warrantycheck.displayHWSupportInfo\(\s*#{BOOL_ARG},\s*#{STR_ARG},\s*#{STR_ARG},\s*#{STR_ARG},\s*#{STR_ARG}/.freeze
 
     PH_SUPPORT_STATUS = /Telephone Technical Support: (Active|Expired)/.freeze
     HW_SUPPORT_STATUS = /Repairs and Service Coverage: (Active|Expired)/.freeze
     EXP_DATE = /Estimated Expiration Date: (.*\s\d{2},\s\d{4})/.freeze
 
-    ERR_RESP_REGEXP = /var errorMsg = '(.*)';/
+    ERR_RESP_REGEXP = /var errorMsg = '(.*)';/.freeze
 
     NOT_REGISTERED_REGEXP = /window.location.href =(.*);/.freeze
 
@@ -23,14 +23,20 @@ module AppleWarrantyCheck
     PH_SUPPORT_INFO_KEYS = %i(hasPhoneSuppCov phoneSuppSubHeader phoneSuppCovTxt phoneSuppLink).freeze
     HW_SUPPORT_INFO_KEYS = %i(hasHWSuppCov HWRepairSubHead HWSuppCovTxt HWSuppLnk hasCLMessageCode).freeze
 
-    attr_accessor :imei
+    attr_accessor :imei, :response
 
     def initialize(imei=nil)
       @imei = imei
+      @response = get_response
     end
 
     def run
-      parse_body get_response.body
+      case response
+      when Net::HTTPSuccess
+        parse_body response.body
+      else
+        error_msg [response.code, response.message].join(': ')
+      end
     end
 
     def parse_body(html)
@@ -54,10 +60,12 @@ module AppleWarrantyCheck
     end
 
     def get_product_info(html)
-      [
-        PRODUCT_INFO_KEYS,
-        PRODUCT_INFO_REGEXP.match(html)[1].split(',').map{ |el| el.strip.gsub('\'', '') }
-      ].transpose.to_h
+      process_with_exception 'could not find product info' do
+        [
+          PRODUCT_INFO_KEYS,
+          PRODUCT_INFO_REGEXP.match(html)[1].split(',').map{ |el| el.strip.gsub('\'', '') }
+        ].transpose.to_h
+      end
     end
 
     private
@@ -68,26 +76,40 @@ module AppleWarrantyCheck
 
       uri.query = URI.encode_www_form(params)
 
-      Net::HTTP.get_response(uri)
+      res = Net::HTTP.get_response(uri)
     end
 
     def get_support_info(regexp, keys, status_regexp, html)
-      match_data = regexp.match(html)
+      process_with_exception 'could not find support info' do
+        match_data = regexp.match(html)
+
+        keys.map.
+          with_index{ |el, i| [el, match_data[i+1]] }.
+          to_h.
+          merge!(
+            support_status: status_regexp.match(match_data[2])[1],
+            expiration_date: (EXP_DATE.match(match_data[3])[1] rescue nil)
+          )
+      end
+    end
 
-      keys.map.with_index{ |el, i| [el, match_data[i+1]] }.to_h.
-        merge!(
-          support_status: status_regexp.match(match_data[2])[1],
-          expiration_date: (EXP_DATE.match(match_data[3])[1] rescue nil)
-        )
+    def process_with_exception(message)
+      yield
+    rescue NoMethodError
+      message
     end
 
     def error_response(html)
-      { error: ERR_RESP_REGEXP.match(html)[1] }
+      error_msg ERR_RESP_REGEXP.match(html)[1]
     end
 
     # TODO follow redirect to get live apple message
     def not_registered
-      { error: "Please validate your product's purchase date. Apple is unable to provide information about your service coverage." }
+      error_msg "Please validate your product's purchase date. Apple is unable to provide information about your service coverage."
+    end
+
+    def error_msg(message)
+      { error: message }
     end
   end
 end

data/lib/apple_warranty_check/version.rb

@@ -1,3 +1,3 @@
 module AppleWarrantyCheck
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/apple_warranty_check_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe AppleWarrantyCheck do
   it 'has a version number' do
-    expect(AppleWarrantyCheck::VERSION).to eq '0.0.2'
+    expect(AppleWarrantyCheck::VERSION).to eq '0.0.3'
   end
 
   let(:valid_warranty_html)  { File.open('spec/files/valid_warranty_resp.html').read }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apple_warranty_check
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Nick Chernyshev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler