sendgrid-ruby 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ee165cdc74cf8a9ac2aeedc52cea6a99c7c8877
-  data.tar.gz: 96cb466d3c83640b210072ab4a45530ae690b1eb
+  metadata.gz: cf1a1f3164a5f6b1b0009b4c99cfb86e2fe57d5c
+  data.tar.gz: 980956fc2fefd6458d025fb8bcd9032ff2556195
 SHA512:
-  metadata.gz: 00aba1d4ef01167d3266b0f75ab280f7d87dfba267ef7ef60c9a735cd67dc3382e32fd03de48161940a921f7d06ec15fd989246f832e8c9bee001b181cbf6b51
-  data.tar.gz: 50da10d5775c3cb3c4f65e0a2cb153dbacaff0f607004429f20acaebff0b9ca85b81a86446b5b27efacc1140850795ca6645cf86989761c62dc8143d65b04700
+  metadata.gz: 024e2ec69046cf1e75509bca8298c83952f6445cd1aca58d174fae8b74e29c9d867b4a6502224654e845d5339dead0fcc12791839fec266c7651c386cfe55fc8
+  data.tar.gz: 4fe14bcdf32b5b96d1663ac88028fc636a159e9799f539eb0d81f9448eabe2dc810712a9a31ab0c5942acd5208cac33283d1795b5c7d5e88789b8eee6e9185f3

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [3.0.3] - 2016-06-15 ##
+### Fixing
+- Import structure
+
 ## [3.0.2] - 2016-06-15 ##
 ### Added
 - Relative import for mail/helper

data/Gemfile

@@ -1,3 +1,3 @@
 source 'http://rubygems.org'
 
-gem "ruby_http_client"
+gem 'ruby_http_client'

data/Rakefile

@@ -2,7 +2,7 @@ require 'rake/testtask'
 
 Rake::TestTask.new do |t|
   t.libs << 'test'
-  t.test_files = FileList['test/test*.rb', 'test/helpers/mail/test*.rb']
+  t.test_files = FileList['test/sendgrid/test*.rb', 'test/sendgrid/helpers/mail/test*.rb']
   t.verbose = true
 end
 

data/lib/sendgrid-ruby.rb

@@ -1,34 +1,3 @@
-# Quickly and easily access the SendGrid API.
-require 'ruby_http_client'
-require_relative 'helpers/mail'
-
-module SendGrid
-  # Initialize the HTTP client
-  class API
-    attr_accessor :client
-    attr_reader :VERSION, :request_headers, :host, :version
-    # * *Args*    :
-    #   - +api_key+ -> your SendGrid API key
-    #   - +host+ -> the base URL for the API
-    #   - +request_headers+ -> any headers that you want to be globally applied
-    #   - +version+ -> the version of the API you wish to access,
-    #                  currently only "v3" is supported
-    #
-    def initialize(api_key: nil, host: nil, request_headers: nil, version: nil)
-      @VERSION = '3.0.2'
-      @api_key          = api_key
-      @host             = host ? host : 'https://api.sendgrid.com'
-      @version          = version ? version : 'v3'
-      @user_agent       = "sendgrid/#{@VERSION};ruby"
-      @request_headers  = JSON.parse('
-        {
-          "Authorization": "Bearer ' + @api_key + '"
-        }
-      ')
-
-      @request_headers = @request_headers.merge(request_headers) if request_headers
-      @client = Client.new(host: "#{@host}/#{@version}",
-                           request_headers: @request_headers)
-    end
-  end
-end
+require_relative 'sendgrid/client'
+require_relative 'sendgrid/version'
+require_relative 'sendgrid/helpers/mail/mail'

data/lib/sendgrid/client.rb

@@ -0,0 +1,33 @@
+# Quickly and easily access the SendGrid API.
+require 'ruby_http_client'
+require_relative 'version'
+
+module SendGrid
+  # Initialize the HTTP client
+  class API
+    attr_accessor :client
+    attr_reader :request_headers, :host, :version
+    # * *Args*    :
+    #   - +api_key+ -> your SendGrid API key
+    #   - +host+ -> the base URL for the API
+    #   - +request_headers+ -> any headers that you want to be globally applied
+    #   - +version+ -> the version of the API you wish to access,
+    #                  currently only "v3" is supported
+    #
+    def initialize(api_key: nil, host: nil, request_headers: nil, version: nil)
+      @api_key          = api_key
+      @host             = host ? host : 'https://api.sendgrid.com'
+      @version          = version ? version : 'v3'
+      @user_agent       = "sendgrid/#{SendGrid::VERSION};ruby"
+      @request_headers  = JSON.parse('
+        {
+          "Authorization": "Bearer ' + @api_key + '"
+        }
+      ')
+
+      @request_headers = @request_headers.merge(request_headers) if request_headers
+      @client = Client.new(host: "#{@host}/#{@version}",
+                           request_headers: @request_headers)
+    end
+  end
+end

data/lib/sendgrid/version.rb

@@ -0,0 +1,3 @@
+module SendGrid
+  VERSION = '3.0.3'
+end

data/sendgrid-ruby.gemspec

@@ -1,10 +1,11 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'sendgrid/version'
 
 Gem::Specification.new do |spec|
   spec.name        = 'sendgrid-ruby'
-  spec.version     = '3.0.2'
+  spec.version     = SendGrid::VERSION
   spec.authors     = ['Elmer Thomas', 'Robin Johnson', 'Eddie Zaneski']
   spec.email       = 'dx@sendgrid.com'
   spec.summary     = 'Official SendGrid Gem'
@@ -15,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(/^bin/) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(/^(test|spec|features)/)
-  spec.require_paths = ['lib', 'lib/helpers/mail']
+  spec.require_paths = ['lib']
 
   spec.add_dependency 'ruby_http_client', '~> 2.1.2'
   spec.add_development_dependency 'rake', '~> 0'

data/test/{helpers → sendgrid/helpers}/mail/test_mail.rb

@@ -1,5 +1,5 @@
-require_relative "../../../lib/helpers/mail/mail"
-require_relative "../../../lib/sendgrid-ruby"
+require_relative "../../../../lib/sendgrid/helpers/mail/mail"
+require_relative "../../../../lib/sendgrid/client"
 include SendGrid
 require "json"
 require 'minitest/autorun'

data/test/{test_sendgrid-ruby.rb → sendgrid/test_sendgrid-ruby.rb}

@@ -1,4 +1,4 @@
-require_relative '../lib/sendgrid-ruby.rb'
+require_relative "../../lib/sendgrid/client"
 require 'ruby_http_client'
 require 'minitest/autorun'
 
@@ -29,7 +29,6 @@ class TestAPI < Minitest::Test
             ')
         assert_equal(test_headers, sg.request_headers)
         assert_equal("v3", sg.version)
-        assert_equal("2.0.0", sg.VERSION)
         assert_instance_of(SendGrid::Client, sg.client)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid-ruby
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Elmer Thomas
@@ -80,12 +80,14 @@ files:
 - examples/trackingsettings/trackingsettings.rb
 - examples/user/user.rb
 - examples/whitelabel/whitelabel.rb
-- lib/helpers/mail/README.md
-- lib/helpers/mail/mail.rb
 - lib/sendgrid-ruby.rb
+- lib/sendgrid/client.rb
+- lib/sendgrid/helpers/mail/README.md
+- lib/sendgrid/helpers/mail/mail.rb
+- lib/sendgrid/version.rb
 - sendgrid-ruby.gemspec
-- test/helpers/mail/test_mail.rb
-- test/test_sendgrid-ruby.rb
+- test/sendgrid/helpers/mail/test_mail.rb
+- test/sendgrid/test_sendgrid-ruby.rb
 homepage: http://github.com/sendgrid/sendgrid-ruby
 licenses:
 - MIT
@@ -94,7 +96,6 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
-- lib/helpers/mail
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -112,5 +113,5 @@ signing_key:
 specification_version: 4
 summary: Official SendGrid Gem
 test_files:
-- test/helpers/mail/test_mail.rb
-- test/test_sendgrid-ruby.rb
+- test/sendgrid/helpers/mail/test_mail.rb
+- test/sendgrid/test_sendgrid-ruby.rb