trycourier 1.0.2 → 1.4.0

data/lib/trycourier.rb

@@ -1,12 +1,18 @@
+require "trycourier/events"
+require "trycourier/brands"
+require "trycourier/lists"
+require "trycourier/profiles"
+require "trycourier/session"
+require "trycourier/messages"
+require "trycourier/automations"
+require "trycourier/bulk"
 require "trycourier/version"
+require "trycourier/exceptions"
 require "net/http"
 require "json"
 require "openssl"
 
 module Courier
-  class ResponseError < StandardError; end
-  class InputError < StandardError; end
-
   class SendResponse
     attr_reader :code
     attr_reader :message_id
@@ -17,50 +23,111 @@ module Courier
     end
   end
 
+  class SendMessageResponse
+    attr_reader :code
+    attr_reader :request_id
+
+    def initialize(code, request_id)
+      @code = code
+      @request_id = request_id
+    end
+  end
+
   class Client
-    def initialize(auth_token = nil)
-      @auth_token = auth_token || ENV['COURIER_AUTH_TOKEN']
-      @uri = URI.parse('https://api.trycourier.app/send')
-      if @auth_token == nil or @auth_token == ""
-        raise InputError, "Client requires an auth_token be supplied."
+    def initialize(auth_token = nil, username: nil, password: nil, base_url: nil)
+      base = if base_url
+        base_url
+      elsif ENV["COURIER_BASE_URL"]
+        ENV["COURIER_BASE_URL"]
+      else
+        "https://api.courier.com"
+      end
+
+      @session = Courier::CourierAPISession.new(base)
+
+      if auth_token
+        @session.init_token_auth(auth_token)
+      elsif ENV["COURIER_AUTH_TOKEN"]
+        @session.init_token_auth(ENV["COURIER_AUTH_TOKEN"])
+      elsif username && password
+        @session.init_basic_auth(username, password)
+      elsif ENV["COURIER_AUTH_USERNAME"] && ENV["COURIER_AUTH_PASSWORD"]
+        @session.init_basic_auth(ENV["COURIER_AUTH_USERNAME"], ENV["COURIER_AUTH_PASSWORD"])
       end
+
+      @messages = Courier::Messages.new(@session)
+      @profiles = Courier::Profiles.new(@session)
+      @lists = Courier::Lists.new(@session)
+      @events = Courier::Events.new(@session)
+      @brands = Courier::Brands.new(@session)
+      @automations = Courier::Automations.new(@session)
+      @bulk = Courier::Bulk.new(@session)
     end
 
     def send(body)
-      if not body.is_a?(Hash)
+      if !body.is_a?(Hash)
         raise InputError, "Client#send must be passed a Hash as first argument."
-      elsif body["event"] == nil
+      elsif body["event"].nil? && body[:event].nil?
         raise InputError, "Must specify the 'event' key in Hash supplied to Client#send."
-      elsif body["recipient"] == nil
+      elsif body["recipient"].nil? && body[:recipient].nil?
         raise InputError, "Must specify the 'recipient' key in Hash supplied to Client#send."
-      elsif body["data"] != nil and not body["data"].is_a?(Hash)
+      elsif (!body["data"].nil? && !body["data"].is_a?(Hash)) || (!body[:data].nil? && !body[:data].is_a?(Hash))
         raise InputError, "The 'data' key in the Hash supplied to Client#send must also be a Hash."
-      elsif body["profile"] != nil and not body["profile"].is_a?(Hash)
+      elsif (!body["profile"].nil? && !body["profile"].is_a?(Hash)) || (!body[:profile].nil? && !body[:profile].is_a?(Hash))
         raise InputError, "The 'profile' key in the Hash supplied to Client#send must also be a Hash."
       end
 
-      http = Net::HTTP.new(@uri.host, @uri.port)
-      http.use_ssl = true
-      http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-
-      req = Net::HTTP::Post.new(@uri)
-      req["authorization"] = "Bearer #{@auth_token}"
-      req["content-type"] = "application/json"
-      req["User-Agent"] = "courier-ruby/#{Courier::VERSION}"
-      req.body = body.to_json
+      res = @session.send("/send", "POST", body: body)
 
-      res = http.request(req)
       code = res.code.to_i
       obj = JSON.parse res.read_body
 
       if code == 200
         message_id = obj["messageId"]
-        return SendResponse.new(code, message_id)
-      elsif
-        message = obj["Message"] == nil ? obj["message"] : obj["Message"]
+        SendResponse.new(code, message_id)
+      elsif (message = obj["Message"].nil? ? obj["message"] : obj["Message"])
         err = "#{code}: #{message}"
-        raise ResponseError, err
+        raise CourierAPIError, err
       end
     end
+
+    def send_message(body)
+      if !body.is_a?(Hash)
+        raise InputError, "Client#send_message must be passed a Hash as first argument."
+      elsif (!body["message"].nil? && !body["message"].is_a?(Hash)) || (!body[:message].nil? && !body[:message].is_a?(Hash))
+        raise InputError, "The 'message' key in the Hash supplied to Client#send_message must also be a Hash."
+      end
+
+      res = @session.send("/send", "POST", body: body)
+
+      code = res.code.to_i
+      obj = JSON.parse res.read_body
+
+      if code == 202
+        request_id = obj["requestId"]
+        SendMessageResponse.new(code, request_id)
+      elsif (message = obj["Message"].nil? ? obj["message"] : obj["Message"])
+        err = "#{code}: #{message}"
+        raise CourierAPIError, err
+      end
+    end
+
+    # getters for all class variables
+
+    attr_reader :session
+
+    attr_reader :messages
+
+    attr_reader :profiles
+
+    attr_reader :events
+
+    attr_reader :lists
+
+    attr_reader :brands
+
+    attr_reader :automations
+
+    attr_reader :bulk
   end
 end

data/trycourier.gemspec

@@ -1,15 +1,15 @@
-require_relative 'lib/trycourier/version'
+require_relative "lib/trycourier/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "trycourier"
-  spec.version       = Courier::VERSION
-  spec.authors       = ["Courier"]
-  spec.email         = ["support@trycourier.com"]
+  spec.name = "trycourier"
+  spec.version = Courier::VERSION
+  spec.authors = ["Courier"]
+  spec.email = ["support@courier.com"]
 
-  spec.summary       = %q{Wraps calls to the Courier REST API}
-  spec.description   = %q{Courier is the smartest way to design & deliver notifications. Design your notifications once, deliver them to any channel through one API.}
-  spec.homepage      = "https://github.com/trycourier/courier-ruby"
-  spec.license       = "MIT"
+  spec.summary = "Wraps calls to the Courier REST API"
+  spec.description = "Courier is the smartest way to design & deliver notifications. Design your notifications once, deliver them to any channel through one API."
+  spec.homepage = "https://github.com/trycourier/courier-ruby"
+  spec.license = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
@@ -20,10 +20,13 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "rspec", "~> 3.2"
+  spec.add_development_dependency "webmock", ">=1.24.2"
 end

metadata

@@ -1,28 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: trycourier
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Courier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-06 00:00:00.000000000 Z
-dependencies: []
+date: 2022-01-31 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.24.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.24.2
 description: Courier is the smartest way to design & deliver notifications. Design
   your notifications once, deliver them to any channel through one API.
 email:
-- support@trycourier.com
+- support@courier.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/workflows/gem-push.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -31,6 +61,15 @@ files:
 - bin/console
 - bin/setup
 - lib/trycourier.rb
+- lib/trycourier/automations.rb
+- lib/trycourier/brands.rb
+- lib/trycourier/bulk.rb
+- lib/trycourier/events.rb
+- lib/trycourier/exceptions.rb
+- lib/trycourier/lists.rb
+- lib/trycourier/messages.rb
+- lib/trycourier/profiles.rb
+- lib/trycourier/session.rb
 - lib/trycourier/version.rb
 - trycourier.gemspec
 homepage: https://github.com/trycourier/courier-ruby
@@ -56,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Wraps calls to the Courier REST API

data/.travis.yml

@@ -1,6 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - 2.7.0
-before_install: gem install bundler -v 2.1.4