seven_api 0.6.0 → 0.6.1

data/lib/seven_api/hooks.rb

@@ -1,68 +1,69 @@
-# frozen_string_literal: true
-
-# This module holds all utilities related to the /hooks endpoint.
-module SevenApi::Hooks
-  module Action
-    READ = 'read'
-    SUBSCRIBE = 'subscribe'
-    UNSUBSCRIBE = 'unsubscribe'
-  end
-
-  module EventType
-    ALL = 'all'
-    NEW_INBOUND_SMS = 'sms_mo'
-    RCS = 'rcs'
-    SMS_STATUS_UPDATE = 'dlr'
-    TRACKING = 'tracking'
-    VOICE_CALL = 'voice_call'
-    VOICE_STATUS_UPDATE = 'voice_status'
-  end
-
-  module RequestMethod
-    GET = 'GET'
-    JSON = 'JSON'
-    POST = 'POST'
-  end
-
-  module Validator
-    def self.validate(params)
-      action = params[:action]
-
-      raise "Unknown action #{action}" unless SevenApi::Hooks::Validator::is_action?(action)
-
-      if SevenApi::Hooks::Action::SUBSCRIBE == action
-        raise 'Parameter validation failed' unless SevenApi::Hooks::Validator::subscribe(params)
-      elsif SevenApi::Hooks::Action::UNSUBSCRIBE == action
-        raise 'ID must be a positive integer' unless SevenApi::Hooks::Validator::unsubscribe(params)
-      end
-    end
-
-    def self.subscribe(params)
-      { :request_method => SevenApi::Hooks::RequestMethod::POST }.merge!(params)
-
-      self.event_type?(params[:event_type]) &&
-        self.request_method?(params[:request_method]) &&
-        self.target_url?(params[:target_url])
-    end
-
-    def self.unsubscribe(params)
-      SevenApi::Util::is_positive_integer?(params[:id])
-    end
-
-    def self.is_action?(str)
-      SevenApi::Util::in_module_constants?(str, SevenApi::Hooks::Action)
-    end
-
-    def self.event_type?(str)
-      SevenApi::Util::in_module_constants?(str, SevenApi::Hooks::EventType)
-    end
-
-    def self.request_method?(str)
-      SevenApi::Util::in_module_constants?(str, SevenApi::Hooks::RequestMethod)
-    end
-
-    def self.target_url?(str)
-      SevenApi::Util::is_valid_url?(str)
-    end
-  end
-end
+# frozen_string_literal: true
+
+# This module holds all utilities related to the /hooks endpoint.
+module SevenApi::Hooks
+  module Action
+    READ = 'read'
+    SUBSCRIBE = 'subscribe'
+    UNSUBSCRIBE = 'unsubscribe'
+  end
+
+  module EventType
+    ALL = 'all'
+    NEW_INBOUND_SMS = 'sms_mo'
+    RCS = 'rcs'
+    SMS_STATUS_UPDATE = 'dlr'
+    TRACKING = 'tracking'
+    VOICE_CALL = 'voice_call'
+    VOICE_DTMF = 'voice_dtmf'
+    VOICE_STATUS_UPDATE = 'voice_status'
+  end
+
+  module RequestMethod
+    GET = 'GET'
+    JSON = 'JSON'
+    POST = 'POST'
+  end
+
+  module Validator
+    def self.validate(params)
+      action = params[:action]
+
+      raise "Unknown action #{action}" unless SevenApi::Hooks::Validator::is_action?(action)
+
+      if SevenApi::Hooks::Action::SUBSCRIBE == action
+        raise 'Parameter validation failed' unless SevenApi::Hooks::Validator::subscribe(params)
+      elsif SevenApi::Hooks::Action::UNSUBSCRIBE == action
+        raise 'ID must be a positive integer' unless SevenApi::Hooks::Validator::unsubscribe(params)
+      end
+    end
+
+    def self.subscribe(params)
+      { :request_method => SevenApi::Hooks::RequestMethod::POST }.merge!(params)
+
+      self.event_type?(params[:event_type]) &&
+        self.request_method?(params[:request_method]) &&
+        self.target_url?(params[:target_url])
+    end
+
+    def self.unsubscribe(params)
+      SevenApi::Util::is_positive_integer?(params[:id])
+    end
+
+    def self.is_action?(str)
+      SevenApi::Util::in_module_constants?(str, SevenApi::Hooks::Action)
+    end
+
+    def self.event_type?(str)
+      SevenApi::Util::in_module_constants?(str, SevenApi::Hooks::EventType)
+    end
+
+    def self.request_method?(str)
+      SevenApi::Util::in_module_constants?(str, SevenApi::Hooks::RequestMethod)
+    end
+
+    def self.target_url?(str)
+      SevenApi::Util::is_valid_url?(str)
+    end
+  end
+end

data/lib/seven_api/journal.rb

@@ -1,39 +1,39 @@
-# frozen_string_literal: true
-
-# This module holds all utilities related to the /journal endpoint.
-module SevenApi::Journal
-  module Type
-    INBOUND = 'inbound'
-    OUTBOUND = 'outbound'
-    REPLIES = 'replies'
-    VOICE = 'voice'
-  end
-
-  module Validator
-    def self.validate(params)
-      type = params[:type]
-      date_from = params[:date_from]
-      date_to = params[:date_to]
-
-      raise "Unknown type #{type}" unless SevenApi::Journal::Validator::is_type?(type)
-      raise "Wrong date_from #{date_from}" unless SevenApi::Journal::Validator::is_date?(date_from)
-      raise "Wrong date_to #{date_to}" unless SevenApi::Journal::Validator::is_date?(date_to)
-    end
-
-    def self.subscribe(params)
-      { :request_method => SevenApi::Hooks::RequestMethod::POST }.merge!(params)
-
-      self.event_type?(params[:event_type]) &&
-        self.request_method?(params[:request_method]) &&
-        self.target_url?(params[:target_url])
-    end
-
-    def self.is_type?(str)
-      SevenApi::Util::in_module_constants?(str, SevenApi::Journal::Type)
-    end
-
-    def self.is_date?(date)
-      date.is_a?(NilClass) || date.match(/[\d]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][\d]|3[0-1])/)
-    end
-  end
-end
+# frozen_string_literal: true
+
+# This module holds all utilities related to the /journal endpoint.
+module SevenApi::Journal
+  module Type
+    INBOUND = 'inbound'
+    OUTBOUND = 'outbound'
+    REPLIES = 'replies'
+    VOICE = 'voice'
+  end
+
+  module Validator
+    def self.validate(params)
+      type = params[:type]
+      date_from = params[:date_from]
+      date_to = params[:date_to]
+
+      raise "Unknown type #{type}" unless SevenApi::Journal::Validator::is_type?(type)
+      raise "Wrong date_from #{date_from}" unless SevenApi::Journal::Validator::is_date?(date_from)
+      raise "Wrong date_to #{date_to}" unless SevenApi::Journal::Validator::is_date?(date_to)
+    end
+
+    def self.subscribe(params)
+      { :request_method => SevenApi::Hooks::RequestMethod::POST }.merge!(params)
+
+      self.event_type?(params[:event_type]) &&
+        self.request_method?(params[:request_method]) &&
+        self.target_url?(params[:target_url])
+    end
+
+    def self.is_type?(str)
+      SevenApi::Util::in_module_constants?(str, SevenApi::Journal::Type)
+    end
+
+    def self.is_date?(date)
+      date.is_a?(NilClass) || date.match(/[\d]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][\d]|3[0-1])/)
+    end
+  end
+end

data/lib/seven_api/lookup.rb

@@ -1,12 +1,12 @@
-# frozen_string_literal: true
-
-# This module holds all utilities related to the /lookup endpoint.
-module SevenApi::Lookup
-  module Type
-    CNAM = 'cnam'
-    FORMAT = 'format'
-    HLR = 'hlr'
-    MNP = 'mnp'
-    RCS = 'rcs'
-  end
-end
+# frozen_string_literal: true
+
+# This module holds all utilities related to the /lookup endpoint.
+module SevenApi::Lookup
+  module Type
+    CNAM = 'cnam'
+    FORMAT = 'format'
+    HLR = 'hlr'
+    MNP = 'mnp'
+    RCS = 'rcs'
+  end
+end

data/lib/seven_api/numbers.rb

@@ -1,9 +1,9 @@
-# frozen_string_literal: true
-
-# This module holds all utilities related to the /numbers endpoint.
-module SevenApi::Numbers
-  module PaymentInterval
-    ANNUALLY = 'annually'
-    MONTHLY = 'monthly'
-  end
-end
+# frozen_string_literal: true
+
+# This module holds all utilities related to the /numbers endpoint.
+module SevenApi::Numbers
+  module PaymentInterval
+    ANNUALLY = 'annually'
+    MONTHLY = 'monthly'
+  end
+end

data/lib/seven_api/paginated.rb

@@ -1,10 +1,10 @@
-# frozen_string_literal: true
-
-module SevenApi
-  module Paginated
-    module OrderDirection
-      ASCENDING = 'asc'
-      DESCENDING = 'desc'
-    end
-  end
-end
+# frozen_string_literal: true
+
+module SevenApi
+  module Paginated
+    module OrderDirection
+      ASCENDING = 'asc'
+      DESCENDING = 'desc'
+    end
+  end
+end

data/lib/seven_api/resource.rb

@@ -25,9 +25,8 @@ module SevenApi
 
     protected
 
-    def request(payload = {}, query = {}, path = '')
+    def request(http_method, payload = {}, query = {}, path = '')
       path = "#{@endpoint}#{path}"
-      http_method = @http_methods[caller_locations.first.label.to_sym]
 
       if :get == http_method
         query = payload

data/lib/seven_api/resources/analytics.rb

@@ -1,54 +1,54 @@
-# frozen_string_literal: true
-
-require 'seven_api/resource'
-
-# This module exposes the methods for communicating with the API endpoint /analytics.
-module SevenApi::Resources
-  class Analytics < SevenApi::Resource
-    @endpoint = SevenApi::Endpoint::ANALYTICS
-    PATHS = {
-      :by_country => "/country",
-      :by_date => "/date",
-      :by_label => "/label",
-      :by_subaccount => "/subaccount",
-    }
-    @http_methods = {
-      :by_country => :get,
-      :by_date => :get,
-      :by_label => :get,
-      :by_subaccount => :get,
-    }
-
-    # Retrieve analytics grouped by country
-    # read more: https://docs.seven.io/en/rest-api/endpoints/account#statistics
-    # @param params [Hash]
-    # @return [Array]
-    def by_country(params = {})
-      request({}, params, PATHS[:by_country])
-    end
-
-    # Retrieve analytics grouped by date
-    # read more: https://docs.seven.io/en/rest-api/endpoints/account#statistics
-    # @param params [Hash]
-    # @return [Array]
-    def by_date(params = {})
-      request({}, params, PATHS[:by_date])
-    end
-
-    # Retrieve analytics grouped by label
-    # read more: https://docs.seven.io/en/rest-api/endpoints/account#statistics
-    # @param params [Hash]
-    # @return [Array]
-    def by_label(params = {})
-      request({}, params, PATHS[:by_label])
-    end
-
-    # Retrieve analytics grouped by subaccount
-    # read more: https://docs.seven.io/en/rest-api/endpoints/account#statistics
-    # @param params [Hash]
-    # @return [Array]
-    def by_subaccount(params = {})
-      request({}, params, PATHS[:by_subaccount])
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'seven_api/resource'
+
+# This module exposes the methods for communicating with the API endpoint /analytics.
+module SevenApi::Resources
+  class Analytics < SevenApi::Resource
+    @endpoint = SevenApi::Endpoint::ANALYTICS
+    PATHS = {
+      :by_country => "/country",
+      :by_date => "/date",
+      :by_label => "/label",
+      :by_subaccount => "/subaccount",
+    }
+    @http_methods = {
+      :by_country => :get,
+      :by_date => :get,
+      :by_label => :get,
+      :by_subaccount => :get,
+    }
+
+    # Retrieve analytics grouped by country
+    # read more: https://docs.seven.io/en/rest-api/endpoints/account#statistics
+    # @param params [Hash]
+    # @return [Array]
+    def by_country(params = {})
+      request(:get, {}, params, PATHS[:by_country])
+    end
+
+    # Retrieve analytics grouped by date
+    # read more: https://docs.seven.io/en/rest-api/endpoints/account#statistics
+    # @param params [Hash]
+    # @return [Array]
+    def by_date(params = {})
+      request(:get,{}, params, PATHS[:by_date])
+    end
+
+    # Retrieve analytics grouped by label
+    # read more: https://docs.seven.io/en/rest-api/endpoints/account#statistics
+    # @param params [Hash]
+    # @return [Array]
+    def by_label(params = {})
+      request(:get,{}, params, PATHS[:by_label])
+    end
+
+    # Retrieve analytics grouped by subaccount
+    # read more: https://docs.seven.io/en/rest-api/endpoints/account#statistics
+    # @param params [Hash]
+    # @return [Array]
+    def by_subaccount(params = {})
+      request(:get,{}, params, PATHS[:by_subaccount])
+    end
+  end
+end

data/lib/seven_api/resources/balance.rb

@@ -1,20 +1,20 @@
-# frozen_string_literal: true
-
-require 'seven_api/resource'
-
-# This module exposes the methods for communicating with the API endpoint /balance.
-module SevenApi::Resources
-  class Balance < SevenApi::Resource
-    @endpoint = SevenApi::Endpoint::BALANCE
-    @http_methods = {
-      :retrieve => :get,
-    }
-
-    # Retrieve account balance for associated API key
-    # read more: https://docs.seven.io/en/rest-api/endpoints/account#balance
-    # @return [Hash]
-    def retrieve
-      request
-    end
-  end
+# frozen_string_literal: true
+
+require 'seven_api/resource'
+
+# This module exposes the methods for communicating with the API endpoint /balance.
+module SevenApi::Resources
+  class Balance < SevenApi::Resource
+    @endpoint = SevenApi::Endpoint::BALANCE
+    @http_methods = {
+      :retrieve => :get,
+    }
+
+    # Retrieve account balance for associated API key
+    # read more: https://docs.seven.io/en/rest-api/endpoints/account#balance
+    # @return [Hash]
+    def retrieve
+      request(:get)
+    end
+  end
 end

data/lib/seven_api/resources/contacts.rb

@@ -1,57 +1,57 @@
-# frozen_string_literal: true
-
-require 'seven_api/resource'
-
-# This module exposes the methods for communicating with the API endpoint /contacts.
-module SevenApi::Resources
-  class Contacts < SevenApi::Resource
-    @endpoint = SevenApi::Endpoint::CONTACTS
-    @http_methods = {
-      :all => :get,
-      :create => :post,
-      :delete => :delete,
-      :one => :get,
-      :update => :patch,
-    }
-
-    # Retrieve contacts associated with the API key
-    # read more: https://docs.seven.io/en/rest-api/endpoints/contacts#query-contact-list
-    # @param params [Hash]
-    # @return [Hash]
-    def all(params = {})
-      request(params)
-    end
-
-    # Retrieve a contact associated with the API key
-    # read more: https://docs.seven.io/en/rest-api/endpoints/contacts#retrieve-contact
-    # @param id [Int]
-    # @return [Hash]
-    def one(id)
-      request({}, {}, "/#{id}")
-    end
-
-    # Delete a contact with given ID
-    # read more: https://docs.seven.io/en/rest-api/endpoints/contacts#delete-contact
-    # @param id [Integer]
-    # @return [Hash]
-    def delete(id)
-      request({}, {}, "/#{id}")
-    end
-
-    # Create a contact
-    # read more: https://docs.seven.io/en/rest-api/endpoints/contacts#create-contact
-    # @param params [Hash]
-    # @return [Hash]
-    def create(params)
-      request( params)
-    end
-
-    # Update a contact
-    # read more: https://docs.seven.io/en/rest-api/endpoints/contacts#update-contact
-    # @param contact [Hash]
-    # @return [Hash]
-    def update(contact)
-      request(contact, {}, "/#{contact['id']}")
-    end
-  end
+# frozen_string_literal: true
+
+require 'seven_api/resource'
+
+# This module exposes the methods for communicating with the API endpoint /contacts.
+module SevenApi::Resources
+  class Contacts < SevenApi::Resource
+    @endpoint = SevenApi::Endpoint::CONTACTS
+    @http_methods = {
+      :all => :get,
+      :create => :post,
+      :delete => :delete,
+      :one => :get,
+      :update => :patch,
+    }
+
+    # Retrieve contacts associated with the API key
+    # read more: https://docs.seven.io/en/rest-api/endpoints/contacts#query-contact-list
+    # @param params [Hash]
+    # @return [Hash]
+    def all(params = {})
+      request(:get, params)
+    end
+
+    # Retrieve a contact associated with the API key
+    # read more: https://docs.seven.io/en/rest-api/endpoints/contacts#retrieve-contact
+    # @param id [Int]
+    # @return [Hash]
+    def one(id)
+      request(:get,{}, {}, "/#{id}")
+    end
+
+    # Delete a contact with given ID
+    # read more: https://docs.seven.io/en/rest-api/endpoints/contacts#delete-contact
+    # @param id [Integer]
+    # @return [Hash]
+    def delete(id)
+      request({}, {}, "/#{id}")
+    end
+
+    # Create a contact
+    # read more: https://docs.seven.io/en/rest-api/endpoints/contacts#create-contact
+    # @param params [Hash]
+    # @return [Hash]
+    def create(params)
+      request( :post, params)
+    end
+
+    # Update a contact
+    # read more: https://docs.seven.io/en/rest-api/endpoints/contacts#update-contact
+    # @param contact [Hash]
+    # @return [Hash]
+    def update(contact)
+      request(:patch, contact, {}, "/#{contact['id']}")
+    end
+  end
 end