emailable 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 708c483149a304ccfbac1757c300380475d579afa28a72c85738432ffeff7b6f
-  data.tar.gz: 3350fc08596f6f3a7b6991a299ec52eee0d246fef52727103b6d927cdd62d23c
+  metadata.gz: 90f1d586f58f97cf11f78a6dac64fa169e9ff0d1a2902a4f5df86a32f9d16dae
+  data.tar.gz: 20e10632676d8374b41048c9324fe879c5da2cc0841a71ae9bf920ea752abc58
 SHA512:
-  metadata.gz: '08863dd0a81fa48eeef2a871ca1b4249386c3b64f5246249bdd289dbd7d933242c24b50aa7817eac8f5defaa325a761bb96c98e9ddb49053801780577cddcd4d'
-  data.tar.gz: a49925c87814ea286e45a337ab372c353cae67a094c78244ba73264e18e98e00c8b43a88f6d70a1e5c31d76f97fa90fe422f8a3645e6b8f5da27e169fc495812
+  metadata.gz: 644ea041fc96995db1c0121be0b494f1cbea6df42dbbf691afebce236ce567a5db4ee87d34bf222dc26e244a4624777ca8a08a4df899a980050902403a31a7e0
+  data.tar.gz: 54b5b43f725562bcae4a38385b70a9ff61e74c4fbe74200b288d1112ed7b640eea2326c618ea8f1adf815f5aad42ef69982029f70f7246bbf55746bfe752435f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    emailable (3.0.2)
+    emailable (3.1.1)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,6 +1,6 @@
 # Emailable Ruby Library
 
-[![Build Status](https://app.travis-ci.com/emailable/emailable-ruby.svg)](https://travis-ci.com/emailable/emailable-ruby)
+[![Build Status](https://app.travis-ci.com/emailable/emailable-ruby.svg)](https://app.travis-ci.com/emailable/emailable-ruby)
 [![Maintainability](https://api.codeclimate.com/v1/badges/e7eef54e491adec95e6d/maintainability)](https://codeclimate.com/github/emailable/emailable-ruby/maintainability)
 
 This is the official ruby wrapper for the Emailable API.

data/bin/console

@@ -1,14 +1,14 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "emailable/ruby"
+require 'bundler/setup'
+require 'emailable'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
+# require 'pry'
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/lib/emailable/client.rb

@@ -1,5 +1,15 @@
 module Emailable
   class Client
+    ERRORS = {
+      400 => BadRequestError,
+      401 => UnauthorizedError,
+      402 => PaymentRequiredError,
+      403 => ForbiddenError,
+      404 => NotFoundError,
+      429 => TooManyRequestsError,
+      500 => InternalServerError,
+      503 => ServiceUnavailableError
+    }.freeze
 
     def initialize
       @base_url = 'https://api.emailable.com/v1'
@@ -33,22 +43,7 @@ module Emailable
       status = response.status
       return response if status.between?(200, 299)
 
-      error_attributes = {
-        message: response.body['message'],
-        code: status
-      }
-      error_map = {
-        '400' => BadRequestError,
-        '401' => UnauthorizedError,
-        '402' => PaymentRequiredError,
-        '403' => ForbiddenError,
-        '404' => NotFoundError,
-        '429' => TooManyRequestsError,
-        '500' => InternalServerError,
-        '503' => ServiceUnavailableError
-      }
-
-      raise error_map[status.to_s].new(error_attributes)
+      raise ERRORS[status].new(response.body['message'])
     end
 
     private

data/lib/emailable/errors.rb

@@ -0,0 +1,12 @@
+module Emailable
+  class Error < StandardError; end
+  class BadRequestError < Error; end
+  class UnauthorizedError < Error; end
+  class PaymentRequiredError < Error; end
+  class ForbiddenError < Error; end
+  class NotFoundError < Error; end
+  class TooManyRequestsError < Error; end
+  class InternalServerError < Error; end
+  class ServiceUnavailableError < Error; end
+  class TimeoutError < Error; end
+end

data/lib/emailable/resources/api_resource.rb

@@ -7,13 +7,21 @@ module Emailable
       end
     end
 
-    def inspect
-      ivars = instance_variables.map do |e|
-        [e.to_s.delete('@'), instance_variable_get(e)]
+    def to_h
+      instance_variables.map do |e|
+        [e.to_s.delete('@').to_sym, instance_variable_get(e)]
       end.to_h
-      fmtted_email = @email ? " #{@email}" : ''
-      "#<#{self.class}:0x#{(object_id << 1).to_s(16)}#{fmtted_email}> JSON: " +
-        JSON.pretty_generate(ivars)
+    end
+
+    alias_method :to_hash, :to_h
+
+    def to_json
+      JSON.generate(to_h)
+    end
+
+    def inspect
+      "#<#{self.class}:0x#{(object_id << 1).to_s(16)}> JSON: " +
+        JSON.pretty_generate(to_h)
     end
 
   end

data/lib/emailable/resources/verification.rb

@@ -11,5 +11,10 @@ module Emailable
       end
     end
 
+    def inspect
+      "#<#{self.class}:0x#{(object_id << 1).to_s(16)}#{@email}> JSON: " +
+        JSON.pretty_generate(to_h)
+    end
+
   end
 end

data/lib/emailable/version.rb

@@ -1,3 +1,3 @@
 module Emailable
-  VERSION = '3.1.0'
+  VERSION = '3.1.1'
 end

data/lib/emailable.rb

@@ -1,4 +1,8 @@
+require 'net/http'
+require 'json'
+
 require 'emailable/version'
+require 'emailable/errors'
 require 'emailable/client'
 require 'emailable/response'
 require 'emailable/batch'
@@ -33,9 +37,7 @@ module Emailable
     response = client.request(:get, 'verify', opts)
 
     if response.status == 249
-      raise Emailable::TimeoutError.new(
-        code: response.status, message: response.body
-      )
+      raise Emailable::TimeoutError.new(response.body)
     else
       Verification.new(response.body)
     end
@@ -47,22 +49,4 @@ module Emailable
     Account.new(response.body)
   end
 
-
-  class Error < StandardError
-    attr_accessor :code, :message
-
-    def initialize(code: nil, message: nil)
-      @code = code
-      @message = message
-    end
-  end
-  class BadRequestError < Error; end
-  class UnauthorizedError < Error; end
-  class PaymentRequiredError < Error; end
-  class ForbiddenError < Error; end
-  class NotFoundError < Error; end
-  class TooManyRequestsError < Error; end
-  class InternalServerError < Error; end
-  class ServiceUnavailableError < Error; end
-  class TimeoutError < Error; end
 end

data/test/email_validator_test.rb

@@ -1,3 +1,4 @@
+require 'active_model'
 require 'test_helper'
 
 class EmailValidatorTest < Minitest::Test

data/test/emailable/resources/api_resource_test.rb

@@ -0,0 +1,49 @@
+require 'test_helper'
+
+module Emailable
+  module Resources
+    class APIResourceTest < Minitest::Test
+      class Example < APIResource
+        attr_accessor :foo, :bar, :baz
+      end
+
+      def setup
+        @e = Example.new(foo: 'abc', bar: 123, baz: true)
+      end
+
+      def test_init
+        assert_equal 'abc', @e.foo
+        assert_equal 123,   @e.bar
+        assert_equal true,  @e.baz
+      end
+
+      def test_to_h
+        correct = {
+          foo: 'abc',
+          bar: 123,
+          baz: true,
+        }
+        assert_equal correct, @e.to_h
+        assert_equal correct, @e.to_hash
+      end
+
+      def test_to_json
+        correct = %q|{"foo":"abc","bar":123,"baz":true}|
+        assert_equal correct, @e.to_json
+      end
+
+      def test_inspect
+        correct = <<~STR.chomp
+          #<> JSON: {
+            "foo": "abc",
+            "bar": 123,
+            "baz": true
+          }
+        STR
+        output = @e.inspect.gsub(/<.*>/, '<>')
+        assert_equal correct, output
+      end
+    end
+
+  end
+end

data/test/test_helper.rb

@@ -1,5 +1,3 @@
-$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
-require 'active_model'
 require 'emailable'
 
 require 'pry'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emailable
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Emailable
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-19 00:00:00.000000000 Z
+date: 2021-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,6 +134,7 @@ files:
 - lib/emailable/batch.rb
 - lib/emailable/client.rb
 - lib/emailable/email_validator.rb
+- lib/emailable/errors.rb
 - lib/emailable/resources/account.rb
 - lib/emailable/resources/api_resource.rb
 - lib/emailable/resources/batch_status.rb
@@ -142,6 +143,7 @@ files:
 - lib/emailable/version.rb
 - test/email_validator_test.rb
 - test/emailable/batch_test.rb
+- test/emailable/resources/api_resource_test.rb
 - test/emailable_test.rb
 - test/test_helper.rb
 homepage: https://emailable.com
@@ -151,7 +153,7 @@ metadata:
   bug_tracker_uri: https://github.com/emailable/emailable-ruby/issues
   documentation_uri: https://docs.emailable.com/?ruby
   source_code_uri: https://github.com/emailable/emailable-ruby
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -167,11 +169,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Ruby bindings for the Emailable API
 test_files:
 - test/email_validator_test.rb
 - test/emailable/batch_test.rb
+- test/emailable/resources/api_resource_test.rb
 - test/emailable_test.rb
 - test/test_helper.rb