hubspot 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ee981f30172ab1c4e5036a39eea595441c685385e65729c388a8660cc85f6e3
-  data.tar.gz: c7e271737c34768fa555a510e5e00fd5024e575799caf812e98599c700284d7e
+  metadata.gz: eb398cc89a728fa7fb94a6fe6e1d40cb2fbd08aec630cd1b5dcb8bdc2f36dc82
+  data.tar.gz: d7cb88dfa7d5e264bb24196b8a135e24c6fbb8fbe56c796a282c3bbc085e4aca
 SHA512:
-  metadata.gz: 4203835be4ec47f6db2bafa6e9b2b7d0bf2c506fb65cf902cb1a72496e48350795827f65fbd6eefb087cac188b7a42d904885fd820766644117289d6139f50cd
-  data.tar.gz: 9e188bff0c87f84ef23fa8bf9b7bf799e5346e0ee5f6831f99bc485260d8ecee6fe590b98e296a8f8b6e5aa025a5d73b4cdd5ec7198431d619ba2d783b5d63b1
+  metadata.gz: 6ddaa74da599836c51149e1bbe2d1fc5a123e09dd0a9c24d946c1c6cfa5611e6ca82dba2f98e1ea6bceb1a4d2491856ed6402f40f24d595760a0d3878350bc6f
+  data.tar.gz: 60ec28484cfa527b89f34c767d1b70860991b7e79c2c86a3f25f29a3a9e8223c53e1ef10976df7458abd28a5d1e1e02ad1ffe7fb11abb6888512dfdc0aff6ed6

data/lib/hubspot.rb

@@ -28,14 +28,6 @@ module Hubspot
   class Configuration
     attr_accessor :hapikey, :user_name, :password, :address, :port
 
-    def initialize#(hapikey, user_name, password, address, port)
-      # @hapikey = hapikey
-      # @user_name = user_name
-      # @password = password
-      # @address = address
-      # @port = port
-    end
-
     def hubspot?
       ActionMailer::Base.delivery_method == :hubspot
     end
@@ -53,5 +45,5 @@ module Hubspot
 end
 
 require "hubspot/railtie" if defined?(Rails::Railtie)
-# require "hubspot/mailer" if defined?(ActionMailer::Base)
-# require "hubspot/transaction_email/mailer" if defined?(ActionMailer::Base)
+require "hubspot/mailer" if defined?(ActionMailer::Base)
+require "hubspot/transaction_email/mailer" if defined?(ActionMailer::Base)

data/lib/hubspot/api/transaction_email/single_send.rb

@@ -14,14 +14,14 @@ module Hubspot
 
         class << self
           def post(options)
-            SingleSend.new(Hubspot.configuration.hapikey).post(options)
+            config = Hubspot.configuration
+            SingleSend.new(config.hapikey).post(options)
           end
         end
 
-        # TODO: DWE: if RUBY_VERSION > "2.3" See -- dig(:message, :to)
         def post(options = {})
-          raise ArgumentError, "EmailId: Required Error" if options[:emailId].blank?
-          raise ArgumentError, "To: Required Error" if options[:message].blank?
+          raise ArgumentError, "EmailId: Required Error" if options.dig(:emailId).blank? 
+          raise ArgumentError, "To: Required Error" if options.dig(:message, :to).blank?
           raise KeyError, "Hubspot Api Key Error" if hapikey.blank?
 
           response = Hubspot.post("/email/public/v1/singleEmail/send?hapikey=#{hapikey}", options)

data/lib/hubspot/delivery_method.rb

@@ -1,18 +1,34 @@
 module Hubspot
   class DeliveryMethod
     def deliver!(mail)
-      configuration = Hubspot.configuration
-
-      smtp_user = configuration.user_name
-      smtp_password = configuration.password
-      smtp_host = configuration.address
-      smtp_port = configuration.port
-
-      delivery_method_options = { user_name: smtp_user, password: smtp_password, address: smtp_host, port: smtp_port, authentication: :plain, enable_starttls_auto: true }
+      raise NotImplementedError
+      delivery_method_options = { user_name: smtp_user_name, password: smtp_password, address: smtp_host, port: smtp_port, authentication: :plain, enable_starttls_auto: true }
 
       headers = headers.merge!(delivery_method_options: delivery_method_options)
 
       super(mail)
     end
+
+    private
+
+    def configuration
+      Hubspot.configuration
+    end
+
+    def smtp_user_name
+      configuration.user_name
+    end
+
+    def smtp_password
+      configuration.password
+    end
+
+    def smtp_host
+      configuration.address
+    end
+
+    def smtp_port
+      configuration.port
+    end
   end
 end

data/lib/hubspot/mailer.rb

@@ -1,18 +1,23 @@
 module Hubspot
   class Mailer < ActionMailer::Base
-    def mail(headers = {}, &block)
-      configuration = Hubspot.configuration
-
-      smtp_user = configuration.user_name
-      smtp_password = configuration.password
-      smtp_host = configuration.address
-      smtp_port = configuration.port
+    default smtp_user_name: -> { configuration.user_name }
+    default smtp_password: -> { configuration.password }
+    default smtp_host: -> { configuration.address }
+    default smtp_port: -> { configuration.port }
 
-      delivery_method_options = { user_name: smtp_user, password: smtp_password, address: smtp_host, port: smtp_port, authentication: :plain, enable_starttls_auto: true }
+    def mail(headers = {}, &block)
+      raise NotImplementedError
+      delivery_method_options = { user_name: default_params[:smtp_user_name], password: default_params[:smtp_password], address: default_params[:smtp_host], port: default_params[:smtp_port], authentication: :plain, enable_starttls_auto: true }
 
       headers = headers.merge!(delivery_method_options: delivery_method_options)
 
       super
     end
+
+    private
+
+    def configuration
+      Hubspot.configuration
+    end
   end
 end

data/lib/hubspot/transaction_email/delivery_method.rb

@@ -1,16 +1,12 @@
+require 'hubspot/api/transaction_email/single_send'
+
 module Hubspot
   module TransactionEmail
-    class DeliveryMethod < ActionMailer::Base
+    class DeliveryMethod
       def deliver!(mail)
         raise NotImplementedError
-        configuration = Hubspot.configuration
-
-        smtp_user = configuration.user_name
-        smtp_password = configuration.password
-        smtp_host = configuration.address
-        smtp_port = configuration.port
-
-        Api::TransactionEmail::SingleSend.post()
+        attributes = { emailId: mail.email_id, message: mail.message, contact_properties: mail.contact_properties, custom_properties: mail.custom_properties }
+        Api::TransactionEmail::SingleSend.post(attributes)
       end
     end
   end

data/lib/hubspot/transaction_email/mailer.rb

@@ -4,7 +4,7 @@ module Hubspot
   module TransactionEmail
     class Mailer < ActionMailer::Base
       def mail(headers = {}, &block)
-        attributes = { emailId: headers[:email_id], message: headers[:message] }
+        attributes = { emailId: headers[:email_id], message: headers[:message], contact_properties: headers[:contact_properties], custom_properties: headers[:custom_properties] }
         Api::TransactionEmail::SingleSend.post(attributes)
       end
     end

data/lib/hubspot/version.rb

@@ -1,3 +1,3 @@
 module Hubspot
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,37 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: hubspot
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Dustin Eichler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-28 00:00:00.000000000 Z
+date: 2019-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: actionmailer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -39,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 1.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,48 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: selenium-webdriver
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
@@ -150,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -178,34 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -234,20 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: combustion
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 description: Hubspot smtp mailer, delivery method and api wrapper
 email:
 - dustin@smalhaus.com
@@ -279,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="