twilito 0.3.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cfb75e4c673aacee3f2e2d4d76bc4106c0129820825918b12f6ccd0c440a2bb
-  data.tar.gz: de0d9a0d43911c1db4cd3406aab39a4beb89f6f17d75e02b4dd0c13863c5bd8e
+  metadata.gz: 7735e0e748d2013a87e0184c5d6c233f3bf0c90ede19b62c6674e96b3f592d18
+  data.tar.gz: 1ec6957aa7b4efa692ab07716595debff865c11c54267befdee64d4cd84596a4
 SHA512:
-  metadata.gz: 37fdc8154d808290a9b85c6d55a5a93905882d558203ebdd587148d6a2b9f4661cc5455287a86a3d0739792aee9cabbe58b58eefe150980e13bebcdcb2646479
-  data.tar.gz: 607ad6172943a0ddc9d8bdfd9ed51b78e9d3f1f005bb34a6003967b1c6b089013eec8974d48cebd4b699ca7a3ccc6a621fcdb696908d201c6322de5314376fc4
+  metadata.gz: e91c012d2b04d4003d49344f6cf288c5e590ffe5ab3e531b277252ae823d1a1dabf8522133869f09c3ad4ae2627cf9376dc9e14e5624fc26bb359945a64a6e97
+  data.tar.gz: 024b225407ef5e759703186b13b9919a9c449363642b5bde09b4a6074251213f7a81092c3c806b430f5dbf49d935601ff6e52076a4fce53e34c4a605b93e0989

data/.github/workflows/main.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ["2.4", "2.5", "2.6", "2.7", "3.0"]
+        ruby: ["3.0", "3.1", "3.2"]
     name: Run Tests (Ruby ${{ matrix.ruby }})
     steps:
       - uses: actions/checkout@master

data/.rubocop.yml

@@ -2,6 +2,8 @@ AllCops:
   Exclude:
     - "bin/**/*"
     - "twilito.gemspec"
+  AllCops:
+    TargetRubyVersion: 3.2
 
 Metrics/BlockLength:
   Exclude:

data/Gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-ruby '>= 2.4.0'
+ruby '>= 3.0.0'
 
 source "https://rubygems.org"
 

data/Gemfile.lock

@@ -1,27 +1,27 @@
 PATH
   remote: .
   specs:
-    twilito (0.3.3)
+    twilito (0.4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.1)
-    coderay (1.1.2)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    hashdiff (0.3.8)
-    method_source (0.9.2)
+    coderay (1.1.3)
+    crack (0.4.5)
+      rexml
+    hashdiff (1.0.1)
+    method_source (1.0.0)
     minitest (5.11.3)
     parallel (1.19.2)
     parser (2.7.1.3)
       ast (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    public_suffix (3.0.3)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (4.0.6)
     rainbow (3.0.0)
     rake (13.0.1)
     regexp_parser (1.7.1)
@@ -38,12 +38,11 @@ GEM
     rubocop-ast (0.0.3)
       parser (>= 2.7.0.1)
     ruby-progressbar (1.10.1)
-    safe_yaml (1.0.5)
     unicode-display_width (1.7.0)
-    webmock (3.5.1)
+    webmock (3.12.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-      hashdiff
+      hashdiff (>= 0.4.0, < 2.0.0)
     yard (0.9.25)
 
 PLATFORMS
@@ -52,15 +51,15 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.0)
   minitest (~> 5.11)
-  pry
+  pry (~> 0.14)
   rake (~> 13.0)
   rubocop
   twilito!
-  webmock (~> 3)
+  webmock (~> 3.12)
   yard (~> 0.9)
 
 RUBY VERSION
-   ruby 2.7.2p137
+   ruby 3.2.2p53
 
 BUNDLED WITH
-   2.2.14
+   2.4.19

data/README.md

@@ -1,6 +1,6 @@
 # Twilito
 
-A tiny, zero dependency helper for sending text messages with Twilio. Just enough of a wrapper to abstract away Twilio's REST API for sending messages, without _anything_ else.
+A tiny, zero dependency helper for sending text messages with Twilio. _Just enough_ of a wrapper to abstract away Twilio's REST API for sending messages, without _anything_ else.
 
 [![Gem Version](https://badge.fury.io/rb/twilito.svg)](https://badge.fury.io/rb/twilito) [![Actions Status](https://github.com/alexford/twilito/workflows/CI/badge.svg)](https://github.com/alexford/twilito/actions)
 
@@ -16,7 +16,7 @@ If you use more of Twilio, consider [twilio-ruby](https://github.com/twilio/twil
 
 ## Usage
 
-Twilito should work on Ruby 2.4 and up.
+Twilito is designed for currently maintained Ruby versions. (3.0 and up as of 8/2023). Unit tests [run in CI](https://github.com/alexford/twilito/actions) on 3.0, 3.1, and 3.2
 
 #### Install the gem
 
@@ -27,11 +27,11 @@ gem 'twilito'
 #### Simplest case
 
 ```ruby
-# All of these arguments are required, but can be defaulted (see below)
+# All of these arguments are required, but can be configured as defaults (see below)
 result = Twilito.send_sms(
   to: '+15555555555',
-  from: '+15554444444',
-  content: 'This is my content',
+  from: '+15554444444', # or 'messaging_service_sid'
+  body: 'This is my content',
   account_sid: '...', # Twilio Credentials
   auth_token: '...'
 )
@@ -63,7 +63,9 @@ rescue Twilito::SendError => e
 end
 ```
 
-#### Every argument can be defaulted
+### Configuring Defaults For Required Arguments
+
+The five required arguments (`to`, `from` (or `messaging_service_sid`), `body`, `account_sid`, and `auth_token`) can be configured as defaults with `Twilito.configure`.
 
 ```ruby
 # In an initializer or something like that:
@@ -83,34 +85,21 @@ end
 Twilito.send_sms!(to: '+15555555555', body: 'Foo')
 ```
 
-**Everything can be defaulted, including the message body, so that a bare `Twilio.send_sms!` can work in your code**
+### Using Other, Optional (Arbitrary) Arguments
 
-#### Sending MMS
+There are a number of optional parameters defined by Twilio for sending a message (see [the API documentation](https://www.twilio.com/docs/sms/api/message-resource#create-a-message-resource)). Any of these can be sent with Twilito using the "Ruby-style" snake cased equivalent of the parameter.
 
 ```ruby
-# Use the optional media_url argument, which is sent
-# to Twilio as MediaUrl
+# Twilito sends arbitrary arguments to Twilio's API after CamelCasing keys to match Twilio's style.
+# NOTE: This example assumes auth_token, account_sid, and from have already been configured.
 
 result = Twilito.send_sms(
   to: '+15555555555',
-  content: 'This is my content',
-  media_url: 'https://example.com/image.png',
+  body: 'This is my content',
+  media_url: 'https://example.com/image.png', # MediaUrl
+  status_callback: 'https://your.app.io/sms/callback', # StatusCallback
+  smart_encoded: true # SmartEncoded
 )
-
-```
-
-#### Set the optional `callback_url` argument if you want to receive HTTP callbacks from Twilio
-
-```ruby
-# Use the optional media_url argument, which is sent
-# to Twilio as MediaUrl
-
-result = Twilito.send_sms(
-  to: '+15555555555',
-  content: 'This is my content',
-  status_callback: 'https://your.app.io/sms/callback',
-)
-
 ```
 
 ## Testing your code

data/lib/twilito/api.rb

@@ -9,7 +9,7 @@ module Twilito
         req = Net::HTTP::Post.new(uri)
         req.initialize_http_header('User-Agent' => user_agent)
         req.basic_auth(args[:account_sid], args[:auth_token])
-        req.set_form_data(twilio_params(args))
+        req.set_form_data(twilio_form_data(args))
 
         http.request(req)
       end
@@ -31,14 +31,13 @@ module Twilito
 
     private
 
-    def twilio_params(args)
-      {
-        'To' => args[:to],
-        'From' => args[:from],
-        'Body' => args[:body],
-        'MediaUrl' => args[:media_url],
-        'StatusCallback' => args[:status_callback]
-      }.compact
+    # NOTE: Converts snake_cased hash of arguments to CamelCase to match Twilio
+    # API expectations. Also, removes auth_token and account_sid as those are
+    # included separately in .send_response as basic auth instead of POST body
+    def twilio_form_data(args)
+      args
+        .merge(auth_token: nil, account_sid: nil).compact
+        .reduce({}) { |result, (k, v)| result.merge(k.to_s.split('_').collect(&:capitalize).join => v) }
     end
 
     def user_agent

data/lib/twilito/configuration.rb

@@ -15,7 +15,7 @@ module Twilito
 
   class Configuration
     attr_accessor :account_sid, :auth_token, :from, :to, :body,
-                  :twilio_host, :twilio_version
+                  :twilio_host, :twilio_version, :messaging_service_sid
 
     TWILIO_HOST = 'api.twilio.com'
     TWILIO_VERSION = '2010-04-01'
@@ -24,6 +24,7 @@ module Twilito
       {
         to: to,
         from: from,
+        messaging_service_sid: messaging_service_sid,
         body: body,
         account_sid: account_sid,
         auth_token: auth_token

data/lib/twilito/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Twilito
-  VERSION = "0.3.3"
+  VERSION = "0.5.0"
 end

data/lib/twilito.rb

@@ -38,6 +38,13 @@ module Twilito
       configuration.to_h.merge(args).tap do |merged|
         missing_keys = merged.select { |_k, v| v.nil? }.keys
 
+        # Only one of :from or :messaging_service_sid must be set
+        missing_keys = [] if (missing_keys == [:from]) || (missing_keys == [:messaging_service_sid])
+        missing_keys = missing_keys.map do |key|
+          key == :from ? "from (or messaging_service_sid)" : key
+        end
+        missing_keys.delete(:messaging_service_sid)
+
         raise ArgumentError, "Missing argument(s): #{missing_keys.join(', ')}" if missing_keys.any?
       end
     end

data/twilito.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.version       = Twilito::VERSION
   spec.authors       = ["Alex Ford"]
   spec.email         = ["alexford@hey.com"]
-  spec.required_ruby_version = '>= 2.4.0'
+  spec.required_ruby_version = '>= 3.0'
 
   spec.summary       = "A tiny, zero dependency, and easy to test helper for sending text messages with Twilio"
   spec.homepage      = "https://github.com/alexford/twilito"
@@ -24,9 +24,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "minitest", "~> 5.11"
-  spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry", "~> 0.14"
   spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rubocop"
-  spec.add_development_dependency "webmock", "~> 3"
+  spec.add_development_dependency "rubocop", "~> 0.85"
+  spec.add_development_dependency "webmock", "~> 3.12"
   spec.add_development_dependency "yard", "~> 0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twilito
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Alex Ford
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-12 00:00:00.000000000 Z
+date: 2023-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,16 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -70,30 +70,30 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.85'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.85'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -145,14 +145,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A tiny, zero dependency, and easy to test helper for sending text messages